fix an issue in swagger generator when using two groups

Author: Amrouche Hamza

src/Swagger/Serializer/DocumentationNormalizer.php

@@ -189,6 +189,7 @@ private function getPathOperation(string $operationName, array $operation, strin
     private function updateGetOperation(\ArrayObject $pathOperation, array $mimeTypes, bool $collection, ResourceMetadata $resourceMetadata, string $resourceClass, string $resourceShortName, string $operationName, \ArrayObject $definitions)
     {
         $responseDefinitionKey = $this->getDefinition($definitions, $collection, false, $resourceMetadata, $resourceClass, $operationName);
+
         $pathOperation['produces'] ?? $pathOperation['produces'] = $mimeTypes;
 
         if ($collection) {
@@ -203,7 +204,7 @@ private function updateGetOperation(\ArrayObject $pathOperation, array $mimeType
                 ],
             ];
 
-            if (!isset($pathOperation['parameters']) && count($parameters = $this->getFiltersParameters($resourceClass, $operationName, $resourceMetadata)) > 0) {
+            if (!isset($pathOperation['parameters']) && count($parameters = $this->getFiltersParameters($resourceClass, $operationName, $resourceMetadata, $responseDefinitionKey)) > 0) {
                 $pathOperation['parameters'] = $parameters;
             }
 
@@ -350,8 +351,7 @@ private function getDefinition(\ArrayObject $definitions, bool $collection, bool
         } else {
             $definitionKey = $resourceMetadata->getShortName();
         }
-
-        $definitions[$definitionKey] = $this->getDefinitionSchema($resourceClass, $resourceMetadata, $serializerContext);
+        $definitions[$definitionKey] = $this->getDefinitionSchema($resourceClass, $resourceMetadata, $serializerContext, $definitionKey);
 
         return $definitionKey;
     }
@@ -369,7 +369,7 @@ private function getDefinition(\ArrayObject $definitions, bool $collection, bool
      *
      * @return \ArrayObject
      */
-    private function getDefinitionSchema(string $resourceClass, ResourceMetadata $resourceMetadata, array $serializerContext = null): \ArrayObject
+    private function getDefinitionSchema(string $resourceClass, ResourceMetadata $resourceMetadata, array $serializerContext = null, $definitionKey = null): \ArrayObject
     {
         $definitionSchema = new \ArrayObject(['type' => 'object']);
 
@@ -390,7 +390,7 @@ private function getDefinitionSchema(string $resourceClass, ResourceMetadata $re
                 $definitionSchema['required'][] = $normalizedPropertyName;
             }
 
-            $definitionSchema['properties'][$normalizedPropertyName] = $this->getPropertySchema($propertyMetadata);
+            $definitionSchema['properties'][$normalizedPropertyName] = $this->getPropertySchema($propertyMetadata, $definitionKey);
         }
 
         return $definitionSchema;
@@ -405,7 +405,7 @@ private function getDefinitionSchema(string $resourceClass, ResourceMetadata $re
      *
      * @return \ArrayObject
      */
-    private function getPropertySchema(PropertyMetadata $propertyMetadata): \ArrayObject
+    private function getPropertySchema(PropertyMetadata $propertyMetadata, $definitionKey = null): \ArrayObject
     {
         $propertySchema = new \ArrayObject();
 
@@ -430,7 +430,7 @@ private function getPropertySchema(PropertyMetadata $propertyMetadata): \ArrayOb
             $className = $valueType->getClassName();
         }
 
-        $valueSchema = $this->getType($builtinType, $isCollection, $className, $propertyMetadata->isReadableLink());
+        $valueSchema = $this->getType($builtinType, $isCollection, $className, $propertyMetadata->isReadableLink(), $definitionKey);
 
         return new \ArrayObject((array) $propertySchema + $valueSchema);
     }
@@ -445,10 +445,10 @@ private function getPropertySchema(PropertyMetadata $propertyMetadata): \ArrayOb
      *
      * @return array
      */
-    private function getType(string $type, bool $isCollection, string $className = null, bool $readableLink = null): array
+    private function getType(string $type, bool $isCollection, string $className = null, bool $readableLink = null, $definitionKey = null): array
     {
         if ($isCollection) {
-            return ['type' => 'array', 'items' => $this->getType($type, false, $className, $readableLink)];
+            return ['type' => 'array', 'items' => $this->getType($type, false, $className, $readableLink, $definitionKey)];
         }
 
         if (Type::BUILTIN_TYPE_STRING === $type) {
@@ -481,7 +481,7 @@ private function getType(string $type, bool $isCollection, string $className = n
             }
 
             if (true === $readableLink) {
-                return ['$ref' => sprintf('#/definitions/%s', $this->resourceMetadataFactory->create($className)->getShortName())];
+                return ['$ref' => sprintf('#/definitions/%s', $definitionKey ?: $this->resourceMetadataFactory->create($className)->getShortName())];
             }
         }
 
@@ -529,7 +529,7 @@ private function computeDoc(Documentation $documentation, \ArrayObject $definiti
      *
      * @return array
      */
-    private function getFiltersParameters(string $resourceClass, string $operationName, ResourceMetadata $resourceMetadata): array
+    private function getFiltersParameters(string $resourceClass, string $operationName, ResourceMetadata $resourceMetadata, $definitionKey): array
     {
         if (null === $this->filterCollection) {
             return [];
@@ -548,7 +548,7 @@ private function getFiltersParameters(string $resourceClass, string $operationNa
                     'in' => 'query',
                     'required' => $data['required'],
                 ];
-                $parameter += $this->getType($data['type'], false);
+                $parameter += $this->getType($data['type'], false, null, null, $definitionKey);
 
                 if (isset($data['swagger'])) {
                     $parameter = $data['swagger'] + $parameter;