#101098 Request class name with dir

Author: setopt

src/Generators/BaseGenerator.php

@@ -112,10 +112,17 @@ private function formattedGlobalParams(): array
         return $params;
     }
 
-    protected function getActualClassNameAndNamespace(string $className, string $namespace): array
+    protected function getActualClassNameAndNamespace(?string $className, ?string $namespace): array
     {
         $parseClassName = explode('/', $className);
         if (count($parseClassName) > 1) {
+
+            if (str_contains($namespace, '\Request')) {
+                $namespace = substr($namespace, 0, strpos($namespace, '\Request') + 8);
+            } elseif (str_contains($namespace, '\Resources')) {
+                $namespace = substr($namespace, 0, strpos($namespace, '\Resources') + 10);
+            }
+
             $className = array_pop($parseClassName);
             $namespace .= '\\' . implode('\\', $parseClassName);
         }

src/Generators/ResourcesGenerator.php

@@ -52,6 +52,8 @@ protected function extractResources(SpecObjectInterface $specObject): array
                     continue;
                 }
 
+                list($className, $namespace) = $this->getActualClassNameAndNamespace($className, $namespace);
+
                 if (isset($resources["$namespace\\$className"])) {
                     continue;
                 }

tests/GenerateServerTest.php

@@ -37,11 +37,14 @@
     assertEqualsCanonicalizing([
         $this->makeFilePath('/app/Http/ApiV1/OpenApiGenerated/routes.php'),
 
+        $this->makeFilePath('/app/Http/Controllers/Foo/TestController.php'),
         $this->makeFilePath('/app/Http/Controllers/ResourcesController.php'),
         $this->makeFilePath('/app/Http/Requests/TestFullGenerateRequest.php'),
         $this->makeFilePath('/app/Http/Tests/ResourcesComponentTest.php'),
         $this->makeFilePath('/app/Http/Requests/TestFooRenameRequest.php'),
 
+        $this->makeFilePath('/app/Http/Request/WithDirRequests/Request.php'),
+        $this->makeFilePath('/app/Http/Requests/Foo/TestNamespaceWithDirRequest.php'),
         $this->makeFilePath('/app/Http/Requests/LaravelValidationsApplicationJsonRequest.php'),
         $this->makeFilePath('/app/Http/Requests/LaravelValidationsMultipartFormDataRequest.php'),
         $this->makeFilePath('/app/Http/Requests/LaravelValidationsNonAvailableContentTypeRequest.php'),
@@ -57,7 +60,10 @@
 
         $this->makeFilePath('/app/Http/Resources/ResourcesResource.php'),
         $this->makeFilePath('/app/Http/Resources/ResourcesDataDataResource.php'),
+        $this->makeFilePath('/app/Http/Resources/Foo/ResourcesDataDataResource.php'),
         $this->makeFilePath('/app/Http/Resources/ResourceRootResource.php'),
+        $this->makeFilePath('/app/Http/Resources/Foo/WithDirResource.php'),
+        $this->makeFilePath('/app/Http/Tests/Foo/TestComponentTest.php'),
 
         $this->makeFilePath('/app/Http/Controllers/PoliciesController.php'),
         $this->makeFilePath('/app/Http/Tests/PoliciesComponentTest.php'),

tests/resources/index.yaml

@@ -147,6 +147,29 @@ paths:
             application/json:
               schema:
                 $ref: './schemas/test_resource_generation.yaml#/GenerateResourceWithoutPropertiesResponse'
+  /resources:test-class-name-with-dir:
+    post:
+      operationId: testNamespaceWithDir
+      x-lg-handler: '\App\Http\Controllers\Foo\TestController@testNamespaceWithDirRequest'
+      x-lg-request-class-name: 'WithDirRequests/Request'
+      responses:
+        "200":
+          description: Успешный ответ c контекстом
+          content:
+            application/json:
+              schema:
+                $ref: './schemas/test_resource_generation.yaml#/ResourceDataDataResponse'
+  /resources:test-resource-class-name-with-dir:
+    post:
+      operationId: testNamespaceWithDir
+      x-lg-handler: '\App\Http\Controllers\Foo\TestController@testNamespaceWithDirResource'
+      responses:
+        "200":
+          description: Успешный ответ c контекстом
+          content:
+            application/json:
+              schema:
+                $ref: './schemas/test_resource_generation.yaml#/ResourceWithDirResponse'
   /policies:test-generate-policy-method-foo:
     post:
       operationId: generatePolicyMethodFoo

tests/resources/schemas/test_resource_generation.yaml

@@ -37,6 +37,16 @@ ResourceDataDataResponse:
         data:
           $ref: '#/ResourceForTestResourceGeneration'
 
+ResourceWithDirResponse:
+  type: object
+  x-lg-resource-response-key: data.data
+  x-lg-resource-class-name: Foo/WithDirResource
+  properties:
+    data:
+      properties:
+        data:
+          $ref: '#/ResourceForTestResourceGeneration'
+
 ResourceRootResponse:
   type: object
   x-lg-resource-response-key: false