fix(test): apply review requested changes

Author: vinceAmstoutz

src/Doctrine/Odm/Filter/PartialSearchFilter.php

@@ -32,10 +32,10 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
     {
         $parameter = $context['parameter'];
         $property = $parameter->getProperty();
-        $values = (array) $parameter->getValue();
+        $values = $parameter->getValue();
 
-        if (1 === \count($values)) {
-            $escapedValue = preg_quote((string) $values[0], '/');
+        if (!is_iterable($values)) {
+            $escapedValue = preg_quote($values, '/');
             $aggregationBuilder
                 ->match()
                 ->field($property)
@@ -46,7 +46,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
 
         $match = $aggregationBuilder->match();
         foreach ($values as $value) {
-            $escapedValue = preg_quote((string) $value, '/');
+            $escapedValue = preg_quote($value, '/');
 
             $match->addOr(
                 $match->expr()

src/Doctrine/Orm/Filter/PartialSearchFilter.php

@@ -31,11 +31,22 @@ final class PartialSearchFilter implements FilterInterface, OpenApiParameterFilt
     public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
     {
         $parameter = $context['parameter'];
-        $values = (array) $parameter->getValue();
-
         $property = $parameter->getProperty();
         $alias = $queryBuilder->getRootAliases()[0];
         $field = $alias.'.'.$property;
+        $parameterName = $queryNameGenerator->generateParameterName($property);
+        $values = $parameter->getValue();
+
+        if (!is_iterable($values)) {
+            $queryBuilder->setParameter($parameterName, '%'.strtolower($values).'%');
+
+            $queryBuilder->{$context['whereClause'] ?? 'andWhere'}($queryBuilder->expr()->like(
+                'LOWER('.$field.')',
+                ':'.$parameterName
+            ));
+
+            return;
+        }
 
         $likeExpressions = [];
         foreach ($values as $val) {
@@ -44,16 +55,11 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
                 'LOWER('.$field.')',
                 ':'.$parameterName
             );
-
             $queryBuilder->setParameter($parameterName, '%'.strtolower($val).'%');
         }
 
-        if (1 === \count($likeExpressions)) {
-            $queryBuilder->{$context['whereClause'] ?? 'andWhere'}($likeExpressions[0]);
-        } else {
-            $queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
-                $queryBuilder->expr()->orX(...$likeExpressions)
-            );
-        }
+        $queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
+            $queryBuilder->expr()->orX(...$likeExpressions)
+        );
     }
 }

tests/Fixtures/TestBundle/Document/ChickenCoop.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Doctrine\Odm\Filter\ExactFilter;
 use ApiPlatform\Doctrine\Odm\Filter\IriFilter;
 use ApiPlatform\Doctrine\Odm\Filter\OrFilter;
+use ApiPlatform\Doctrine\Odm\Filter\PartialSearchFilter;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\QueryParameter;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -29,7 +30,11 @@
         'chickens' => new QueryParameter(filter: new IriFilter()),
         'relation' => new QueryParameter(
             filter: new OrFilter([new IriFilter(), new ExactFilter()]),
-            property: 'chickens'
+            property: 'chickens',
+        ),
+        'relationBis' => new QueryParameter(
+            filter: new OrFilter([new ExactFilter(), new PartialSearchFilter()]),
+            property: 'chickens',
         ),
     ])
 ]

tests/Fixtures/TestBundle/Entity/ChickenCoop.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Doctrine\Orm\Filter\ExactFilter;
 use ApiPlatform\Doctrine\Orm\Filter\IriFilter;
 use ApiPlatform\Doctrine\Orm\Filter\OrFilter;
+use ApiPlatform\Doctrine\Orm\Filter\PartialSearchFilter;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\QueryParameter;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -29,7 +30,11 @@
         'chickens' => new QueryParameter(filter: new IriFilter()),
         'relation' => new QueryParameter(
             filter: new OrFilter([new IriFilter(), new ExactFilter()]),
-            property: 'chickens'
+            property: 'chickens',
+        ),
+        'relationBis' => new QueryParameter(
+            filter: new OrFilter([new ExactFilter(), new PartialSearchFilter()]),
+            property: 'chickens',
         ),
     ]
 )]

tests/Functional/Parameters/OrFilterTest.php

@@ -80,6 +80,21 @@ public static function orFilterDataProvider(): \Generator
             'url' => '/chickens?relation[]=/chickens/1&relation[]=/chickens/2',
             'expectedCount' => 2,
         ];
+
+        yield 'relationBis: filter by coop 1 (IRI) OR coop 2 (partial name)' => [
+            'url' => '/chickens?relationBis[]=/chicken_coops/1&relationBis[]=Henri',
+            'expectedCount' => 2,
+        ];
+
+        yield 'relationBis: filter by coop 1 (partial name) OR coop 2 (partial name)' => [
+            'url' => '/chickens?relationBis[]=Gertrude&relationBis[]=Henri',
+            'expectedCount' => 2,
+        ];
+
+        yield 'relationBis: filter by partial name matching both coops' => [
+            'url' => '/chickens?relationBis[]=Coop',
+            'expectedCount' => 2,
+        ];
     }
 
     /**