fix: map uriVariables to uriTemplate vars (#5410)

nikophil · web-flow · commit 1170c384636b · 2023-02-18T12:01:15.000+01:00
diff --git a/src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php
@@ -185,7 +185,10 @@ private function configureUriVariables(ApiResource|HttpOperation $operation): Ap
                     $entityClass = $options->getEntityClass();
                 }
 
-                $newUriVariables[$variable] = (new Link())->withFromClass($entityClass)->withIdentifiers(['id'])->withParameterName($variable);
+                $newUriVariables[$variable] = (new Link())
+                    ->withFromClass($entityClass)
+                    ->withIdentifiers([property_exists($entityClass, $variable) ? $variable : 'id'])
+                    ->withParameterName($variable);
             }
 
             return $operation->withUriVariables($newUriVariables);
diff --git a/tests/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactoryTest.php b/tests/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactoryTest.php
@@ -121,6 +121,16 @@ class: AttributeResource::class,
                         ),
                     ]
                 ),
+                new ApiResource(
+                    shortName: 'AttributeResource',
+                    class: AttributeResource::class,
+                    uriTemplate: '/attribute_resources/by_name/{name}',
+                ),
+                new ApiResource(
+                    shortName: 'AttributeResource',
+                    class: AttributeResource::class,
+                    uriTemplate: '/attribute_resources/{foo}',
+                ),
             ]),
         );
 
@@ -198,6 +208,20 @@ class: AttributeResource::class,
                             name: '_api_/prefix/attribute_resources/{id}{._format}_get'),
                     ]
                 ),
+                new ApiResource(
+                    shortName: 'AttributeResource',
+                    class: AttributeResource::class,
+                    uriTemplate: '/attribute_resources/by_name/{name}',
+                    uriVariables: ['name' => new Link(fromClass: AttributeResource::class, identifiers: ['name'], parameterName: 'name')],
+                    operations: [],
+                ),
+                new ApiResource(
+                    shortName: 'AttributeResource',
+                    class: AttributeResource::class,
+                    uriTemplate: '/attribute_resources/{foo}',
+                    uriVariables: ['foo' => new Link(fromClass: AttributeResource::class, identifiers: ['id'], parameterName: 'foo')],
+                    operations: [],
+                ),
             ]),
             $uriTemplateResourceMetadataCollectionFactory->create(AttributeResource::class)
         );

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,10 @@ private function configureUriVariables(ApiResource\|HttpOperation $operation): Ap`
`185`	`185`	`$entityClass = $options->getEntityClass();`
`186`	`186`	`}`
`187`	`187`
`188`		`- $newUriVariables[$variable] = (new Link())->withFromClass($entityClass)->withIdentifiers(['id'])->withParameterName($variable);`
	`188`	`+ $newUriVariables[$variable] = (new Link())`
	`189`	`+ ->withFromClass($entityClass)`
	`190`	`+ ->withIdentifiers([property_exists($entityClass, $variable) ? $variable : 'id'])`
	`191`	`+ ->withParameterName($variable);`
`189`	`192`	`}`
`190`	`193`
`191`	`194`	`return $operation->withUriVariables($newUriVariables);`