#106821 Fetch x-lg-resource-class-name from final object

Author: valerialukinykh

src/Generators/ResourcesGenerator.php

@@ -65,14 +65,19 @@ protected function extractResources(SpecObjectInterface $specObject): array
                     $responseKeyParts = explode('.', $responseKey);
                     foreach ($responseKeyParts as $responseKeyPart) {
                         $flag = false;
-                        do_with_all_of($responseData, function (stdClass $p) use (&$responseData, &$flag, $responseKeyPart) {
+                        do_with_all_of($responseData, function (stdClass $p) use (&$responseData, &$flag, $responseKeyPart, &$className) {
                             if (std_object_has($p, 'properties')) {
                                 if (std_object_has($p->properties, $responseKeyPart)) {
                                     $responseData = $p->properties->$responseKeyPart;
                                     $flag = true;
+
+                                    if (std_object_has($p->properties->$responseKeyPart, 'x-lg-resource-class-name')) {
+                                        $className = $p->properties->$responseKeyPart->{'x-lg-resource-class-name'};
+                                    }
                                 }
                             }
                         });
+
                         if (!$flag) {
                             $responseData = null;
 

tests/GenerateServerTest.php

@@ -57,6 +57,7 @@
 
         $this->makeFilePath('/app/Http/Resources/ResourcesResource.php'),
         $this->makeFilePath('/app/Http/Resources/ResourcesDataDataResource.php'),
+        $this->makeFilePath('/app/Http/Resources/ResourcesDataWithNameResource.php'),
         $this->makeFilePath('/app/Http/Resources/ResourceRootResource.php'),
 
         $this->makeFilePath('/app/Http/Controllers/PoliciesController.php'),

tests/ResourceGenerationTest.php

@@ -43,5 +43,6 @@
 
     assertEqualsCanonicalizing(['foo', 'bar'], $resources['ResourcesResource.php']);
     assertEqualsCanonicalizing(['foo', 'bar'], $resources['ResourcesDataDataResource.php']);
+    assertEqualsCanonicalizing(['foo', 'bar'], $resources['ResourcesDataWithNameResource.php']);
     assertEqualsCanonicalizing(['data'], $resources['ResourceRootResource.php']);
 });

tests/resources/index.yaml

@@ -4,6 +4,30 @@ info:
   version: 1.0.0
   description: Тестовый конфиг
 paths:
+  /resources:test-empty-rename-request:
+    post:
+      operationId: testEmptyRenameRequest
+      x-lg-handler: '\App\Http\Controllers\ResourcesController@testEmptyRenameRequest'
+      x-lg-request-class-name: ''
+      responses:
+        "200":
+          description: Успешный ответ c контекстом
+          content:
+            application/json:
+              schema:
+                $ref: './schemas/test_resource_generation.yaml#/ResourceDataDataResponse'
+  /resources:test-rename-from-key-request:
+    post:
+      operationId: testRenameFromKeyRequest
+      x-lg-handler: '\App\Http\Controllers\ResourcesController@testRenameFromKeyRequest'
+      x-lg-request-class-name: ''
+      responses:
+        "200":
+          description: Успешный ответ c контекстом
+          content:
+            application/json:
+              schema:
+                $ref: './schemas/test_resource_generation.yaml#/ResourceDataWithNameResponse'
   /resources:test-full-generate/{id}:
     post:
       operationId: testFullGenerate
@@ -22,18 +46,6 @@ paths:
                 $ref: './schemas/test_resource_generation.yaml#/ResourceForTestResourceGenerationResponse'
         "500":
           $ref: '#/components/responses/ServerError'
-  /resources:test-empty-rename-request:
-    post:
-      operationId: testEmptyRenameRequest
-      x-lg-handler: '\App\Http\Controllers\ResourcesController@testEmptyRenameRequest'
-      x-lg-request-class-name: ''
-      responses:
-        "200":
-          description: Успешный ответ c контекстом
-          content:
-            application/json:
-              schema:
-                $ref: './schemas/test_resource_generation.yaml#/ResourceDataDataResponse'
   /resources:test-rename-request:
     post:
       operationId: testRenameRequest

tests/resources/schemas/test_resource_generation.yaml

@@ -4,6 +4,13 @@ ResourceForTestResourceGeneration:
     - $ref: '#/ResourceFillableProperties'
     - $ref: '#/ResourceRequired'
 
+ResourceForTestResourceWithNameGeneration:
+  x-lg-resource-class-name: ResourcesDataWithNameResource
+  allOf:
+    - $ref: '#/ResourceReadOnlyProperties'
+    - $ref: '#/ResourceFillableProperties'
+    - $ref: '#/ResourceRequired'
+
 ResourceReadOnlyProperties:
   type: object
   properties:
@@ -37,6 +44,15 @@ ResourceDataDataResponse:
         data:
           $ref: '#/ResourceForTestResourceGeneration'
 
+ResourceDataWithNameResponse:
+  type: object
+  x-lg-resource-response-key: data.test
+  properties:
+    data:
+      properties:
+        test:
+          $ref: '#/ResourceForTestResourceWithNameGeneration'
+
 ResourceRootResponse:
   type: object
   x-lg-resource-response-key: false