SearchFilter: Allow strategy on associations (ODM)

Author: jpierront

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

@@ -94,6 +94,14 @@ protected function filterProperty(string $property, $value, Builder $aggregation
 
         $caseSensitive = true;
 
+        $strategy = $this->properties[$property] ?? self::STRATEGY_EXACT;
+
+        // prefixing the strategy with i makes it case insensitive
+        if (0 === strpos($strategy, 'i')) {
+            $strategy = substr($strategy, 1);
+            $caseSensitive = false;
+        }
+
         if ($metadata->hasField($field) && !$metadata->hasAssociation($field)) {
             if ('id' === $field) {
                 $values = array_map([$this, 'getIdFromValue'], $values);
@@ -107,17 +115,10 @@ protected function filterProperty(string $property, $value, Builder $aggregation
                 return;
             }
 
-            $strategy = $this->properties[$property] ?? self::STRATEGY_EXACT;
-
-            // prefixing the strategy with i makes it case insensitive
-            if (0 === strpos($strategy, 'i')) {
-                $strategy = substr($strategy, 1);
-                $caseSensitive = false;
-            }
-
             $inValues = [];
+            $type = $metadata->getTypeOfField($field);
             foreach ($values as $inValue) {
-                $inValues[] = $this->addEqualityMatchStrategy($strategy, $field, $inValue, $caseSensitive, $metadata);
+                $inValues[] = $this->addEqualityMatchStrategy($strategy, $field, $inValue, $caseSensitive, $type);
             }
 
             $aggregationBuilder
@@ -149,10 +150,15 @@ protected function filterProperty(string $property, $value, Builder $aggregation
             return;
         }
 
+        $inValues = [];
+        foreach ($values as $inValue) {
+            $inValues[] = $this->addEqualityMatchStrategy($strategy, $field, $inValue, $caseSensitive, $doctrineTypeField);
+        }
+
         $aggregationBuilder
             ->match()
             ->field($matchField)
-            ->in($values);
+            ->in($inValues);
     }
 
     /**
@@ -162,10 +168,8 @@ protected function filterProperty(string $property, $value, Builder $aggregation
      *
      * @return Regex|string
      */
-    private function addEqualityMatchStrategy(string $strategy, string $field, $value, bool $caseSensitive, ClassMetadata $metadata)
+    private function addEqualityMatchStrategy(string $strategy, string $field, $value, bool $caseSensitive, string $type)
     {
-        $type = $metadata->getTypeOfField($field);
-
         switch ($strategy) {
             case MongoDbType::STRING !== $type:
                 return MongoDbType::getType($type)->convertToDatabaseValue($value);