Fixed resource namespace for commands

Author: panservicesas

src/Commands/MakeApiRequest.php

@@ -104,10 +104,10 @@ public function handle(): int
 
         $requestDirectory = "{$baseResourcePath}/Api/Requests/$nameClass.php";
 
-        $modelNamespace = app("{$namespace}\\{$resourceClass}")->getModel();
+        $modelNamespace = app("{$namespace}\\{$pluralModelClass}\\{$resourceClass}")->getModel();
 
         $this->copyStubToApp('Request', $requestDirectory, [
-            'namespace' => "{$namespace}\\{$resourceClass}\\Api\\Requests",
+            'namespace' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api\\Requests",
             'nameClass' => $nameClass,
             'validationRules' => $this->getValidationRules(new $modelNamespace),
         ]);

src/Commands/MakeApiServiceCommand.php

@@ -119,22 +119,22 @@ public function handle(): int
             });
 
         $this->copyStubToApp('ResourceApiService', $resourceApiDirectory, [
-            'namespace' => "{$namespace}\\{$resourceClass}\\Api",
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'namespace' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}\\Api",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'resourcePageClass' => $resourceApiDirectory,
             'apiServiceClass' => $apiServiceClass,
         ]);
 
         $this->copyStubToApp('DeleteHandler', $deleteHandlerDirectory, [
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'handlersNamespace' => $handlersNamespace,
             'model' => $model,
         ]);
 
         $this->copyStubToApp('DetailHandler', $detailHandlerDirectory, [
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'handlersNamespace' => $handlersNamespace,
             'transformer' => $transformer,
@@ -143,21 +143,21 @@ public function handle(): int
         ]);
 
         $this->copyStubToApp('CreateHandler', $createHandlerDirectory, [
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'handlersNamespace' => $handlersNamespace,
             'model' => $model,
         ]);
 
         $this->copyStubToApp('UpdateHandler', $updateHandlerDirectory, [
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'handlersNamespace' => $handlersNamespace,
             'model' => $model,
         ]);
 
         $this->copyStubToApp('PaginationHandler', $paginationHandlerDirectory, [
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'handlersNamespace' => $handlersNamespace,
             'transformer' => $transformer,

src/Commands/MakeApiTransformerCommand.php

@@ -89,11 +89,11 @@ public function handle(): int
 
         $resourceApiTransformerDirectory = "{$baseResourcePath}/Api/Transformers/$apiTransformerClass.php";
 
-        $modelClass = app("{$namespace}\\{$resourceClass}")->getModel();
+        $modelClass = app("{$namespace}\\{$pluralModelClass}\\{$resourceClass}")->getModel();
 
         $this->copyStubToApp('ApiTransformer', $resourceApiTransformerDirectory, [
             'namespace' => "{$namespace}\\{$resourceClass}\\Api\\Transformers",
-            'resource' => "{$namespace}\\{$resourceClass}",
+            'resource' => "{$namespace}\\{$pluralModelClass}\\{$resourceClass}",
             'resourceClass' => $resourceClass,
             'resourcePageClass' => $resourceApiTransformerDirectory,
             'apiTransformerClass' => $apiTransformerClass,