fix: fix ExactFilter

Fixes #7478

Author: Coffee2CodeNL

src/Doctrine/Orm/Filter/ExactFilter.php

@@ -31,19 +31,25 @@ final class ExactFilter implements FilterInterface, OpenApiParameterFilterInterf
     public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
     {
         $parameter = $context['parameter'];
-        $value = $parameter->getValue();
-        $property = $parameter->getProperty();
         $alias = $queryBuilder->getRootAliases()[0];
-        $parameterName = $queryNameGenerator->generateParameterName($property);
-
-        if (\is_array($value)) {
-            $queryBuilder
-                ->{$context['whereClause'] ?? 'andWhere'}(\sprintf('%s.%s IN (:%s)', $alias, $property, $parameterName));
-        } else {
-            $queryBuilder
-                ->{$context['whereClause'] ?? 'andWhere'}(\sprintf('%s.%s = :%s', $alias, $property, $parameterName));
+        $properties = $parameter->getProperties() ?? [$parameter->getProperty()];
+        foreach ($properties as $property) {
+            $parameterName = $queryNameGenerator->generateParameterName($property);
+            $values = $parameter->getValue();
+
+            if (is_iterable($values)) {
+                $queryBuilder
+                    ->{$context['whereClause'] ?? 'andWhere'}(
+                        \sprintf('%s.%s IN (:%s)', $alias, $property, $parameterName)
+                    );
+            } else {
+                $queryBuilder
+                    ->{$context['whereClause'] ?? 'andWhere'}(
+                        \sprintf('%s.%s = :%s', $alias, $property, $parameterName)
+                    );
+            }
+
+            $queryBuilder->setParameter($parameterName, $values);
         }
-
-        $queryBuilder->setParameter($parameterName, $value);
     }
 }

tests/Fixtures/TestBundle/Entity/SearchFilterParameter.php

@@ -13,6 +13,7 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\ExactFilter;
 use ApiPlatform\Doctrine\Orm\Filter\PartialSearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiResource;
@@ -35,10 +36,14 @@
         'searchPartial[:property]' => new QueryParameter(filter: 'app_search_filter_partial'),
         'searchExact[:property]' => new QueryParameter(filter: 'app_search_filter_with_exact'),
         'searchOnTextAndDate[:property]' => new QueryParameter(filter: 'app_filter_date_and_search'),
-        'searchParameter[:property]' => new QueryParameter(
+        'searchPartialProperties[:property]' => new QueryParameter(
             filter    : new PartialSearchFilter(),
             properties: ['foo'],
         ),
+        'searchExactProperties[:property]' => new QueryParameter(
+            filter: new ExactFilter(),
+            properties: ['foo'],
+        ),
         'q' => new QueryParameter(property: 'hydra:freetextQuery'),
     ]
 )]

tests/Functional/Parameters/DoctrineTest.php

@@ -49,7 +49,7 @@ public function testDoctrineEntitySearchFilter(): void
         $this->assertEquals('bar', $a['hydra:member'][1]['foo']);
 
         $this->assertArraySubset(['hydra:search' => [
-            'hydra:template' => \sprintf('/%s{?foo,fooAlias,order[order[id]],order[order[foo]],searchPartial[foo],searchExact[foo],searchOnTextAndDate[foo],searchOnTextAndDate[createdAt][before],searchOnTextAndDate[createdAt][strictly_before],searchOnTextAndDate[createdAt][after],searchOnTextAndDate[createdAt][strictly_after],searchParameter[foo],q,id,createdAt}', $route),
+            'hydra:template' => \sprintf('/%s{?foo,fooAlias,order[order[id]],order[order[foo]],searchPartial[foo],searchExact[foo],searchOnTextAndDate[foo],searchOnTextAndDate[createdAt][before],searchOnTextAndDate[createdAt][strictly_before],searchOnTextAndDate[createdAt][after],searchOnTextAndDate[createdAt][strictly_after],searchPartialProperties[foo],searchExactProperties[foo],q,id,createdAt}', $route),
         ]], $a);
 
         $this->assertArraySubset(['@type' => 'IriTemplateMapping', 'variable' => 'fooAlias', 'property' => 'foo'], $a['hydra:search']['hydra:mapping'][1]);
@@ -118,14 +118,26 @@ public function testPropertyPlaceholderFilter(): void
         $this->assertEquals($a['hydra:member'][0]['foo'], 'baz');
     }
 
-    public function testPartialSearchFilter(): void
+    public function testPartialSearchFilterWithProperties(): void
     {
         static::bootKernel();
         $resource = $this->isMongoDB() ? SearchFilterParameterDocument::class : SearchFilterParameter::class;
         $this->recreateSchema([$resource]);
         $this->loadFixtures($resource);
         $route = 'search_filter_parameter';
-        $response = self::createClient()->request('GET', $route.'?searchParameter[foo]=baz');
+        $response = self::createClient()->request('GET', $route.'?searchPartialProperties[foo]=baz');
+        $a = $response->toArray();
+        $this->assertEquals($a['hydra:member'][0]['foo'], 'baz');
+    }
+
+    public function testExactFilterWithProperties(): void
+    {
+        static::bootKernel();
+        $resource = $this->isMongoDB() ? SearchFilterParameterDocument::class : SearchFilterParameter::class;
+        $this->recreateSchema([$resource]);
+        $this->loadFixtures($resource);
+        $route = 'search_filter_parameter';
+        $response = self::createClient()->request('GET', $route.'?searchExactProperties[foo]=baz');
         $a = $response->toArray();
         $this->assertEquals($a['hydra:member'][0]['foo'], 'baz');
     }