Do not add JOINs for Filters without a value (#3703)

Author: WybrenKoelmans

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Mercure: Do not use data in options when deleting (#4056)
 * Doctrine: Support for foreign identifiers (#4042)
 * Doctrine: Support for binary UUID in search filter (#3774)
+* Doctrine: Do not add join or lookup for search filter with empty value (#3703)
 * JSON Schema: Allow generating documentation when property and method start from "is" (property `isActive` and method `isActive`) (#4064)
 * OpenAPI: Fix missing 422 responses in the documentation (#4086)
 * OpenAPI: Fix error when schema is empty (#4051)

src/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php

@@ -77,6 +77,11 @@ protected function filterProperty(string $property, $value, Builder $aggregation
 
         $matchField = $field = $property;
 
+        $values = $this->normalizeValues((array) $value, $property);
+        if (null === $values) {
+            return;
+        }
+
         $associations = [];
         if ($this->isPropertyNested($property, $resourceClass)) {
             [$matchField, $field, $associations] = $this->addLookupsForNestedProperty($property, $aggregationBuilder, $resourceClass);
@@ -87,11 +92,6 @@ protected function filterProperty(string $property, $value, Builder $aggregation
          */
         $metadata = $this->getNestedMetadata($resourceClass, $associations);
 
-        $values = $this->normalizeValues((array) $value, $property);
-        if (null === $values) {
-            return;
-        }
-
         $caseSensitive = true;
 
         if ($metadata->hasField($field) && !$metadata->hasAssociation($field)) {

src/Bridge/Doctrine/Orm/Filter/SearchFilter.php

@@ -81,16 +81,16 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
         $alias = $queryBuilder->getRootAliases()[0];
         $field = $property;
 
-        $associations = [];
-        if ($this->isPropertyNested($property, $resourceClass)) {
-            [$alias, $field, $associations] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
-        }
-
         $values = $this->normalizeValues((array) $value, $property);
         if (null === $values) {
             return;
         }
 
+        $associations = [];
+        if ($this->isPropertyNested($property, $resourceClass)) {
+            [$alias, $field, $associations] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
+        }
+
         $metadata = $this->getNestedMetadata($resourceClass, $associations);
 
         if ($metadata->hasField($field)) {

tests/Bridge/Doctrine/Common/Filter/SearchFilterTestTrait.php

@@ -466,6 +466,14 @@ private function provideApplyTestArguments(): array
                     'relatedDummy.symfony' => 'exact',
                 ],
             ],
+            'empty nested property' => [
+                [
+                    'relatedDummy.symfony' => null,
+                ],
+                [
+                    'relatedDummy.symfony' => [],
+                ],
+            ],
         ];
     }
 }

tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php

@@ -686,6 +686,10 @@ public function provideApplyTestData(): array
                     ],
                     $filterFactory,
                 ],
+                'empty nested property' => [
+                    [],
+                    $filterFactory,
+                ],
             ]
         );
     }

tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php

@@ -559,6 +559,11 @@ public function provideApplyTestData(): array
                     ],
                     $filterFactory,
                 ],
+                'empty nested property' => [
+                    sprintf('SELECT %s FROM %s %1$s', $this->alias, Dummy::class),
+                    [],
+                    $filterFactory,
+                ],
             ]
         );
     }