Search filter should not use DbRef for association (#2575)

Author: alanpoulain

features/doctrine/search_filter.feature

@@ -415,6 +415,17 @@ Feature: Search filter on collections
     And the JSON node "_embedded.item[1]._links.relatedDummies" should have 3 elements
     And the JSON node "_embedded.item[2]._links.relatedDummies" should have 3 elements
 
+  @createSchema
+  Scenario: Search by related collection id
+    Given there are 2 dummy objects having each 2 relatedDummies
+    When I add "Accept" header equal to "application/hal+json"
+    And I send a "GET" request to "/dummies?relatedDummies=3"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the JSON node "totalItems" should be equal to "1"
+    And the JSON node "_links.item" should have 1 element
+    And the JSON node "_links.item[0].href" should be equal to "/dummies/2"
+
   @createSchema
   Scenario: Get collection by id equals 9.99 which is not possible
     Given there are 30 dummy objects

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

@@ -135,7 +135,7 @@ protected function filterProperty(string $property, $value, Builder $aggregation
 
         $aggregationBuilder
             ->match()
-            ->field("$matchField.\$id")
+            ->field($matchField)
             ->in($values);
     }
 

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

@@ -346,9 +346,9 @@ public function provideApplyTestData(): array
                         ],
                         [
                             '$match' => [
-                                'relatedDummy.$id' => [
+                                'relatedDummy' => [
                                     '$in' => [
-                                        'foo',
+                                        0,
                                     ],
                                 ],
                             ],
@@ -472,9 +472,9 @@ public function provideApplyTestData(): array
                     [
                         [
                             '$match' => [
-                                'relatedDummy.$id' => [
+                                'relatedDummy' => [
                                     '$in' => [
-                                        'exact',
+                                        0,
                                     ],
                                 ],
                             ],
@@ -511,7 +511,7 @@ public function provideApplyTestData(): array
                     [
                         [
                             '$match' => [
-                                'relatedDummy.$id' => [
+                                'relatedDummy' => [
                                     '$in' => [
                                         1,
                                         '2',
@@ -521,7 +521,7 @@ public function provideApplyTestData(): array
                         ],
                         [
                             '$match' => [
-                                'relatedDummies.$id' => [
+                                'relatedDummies' => [
                                     '$in' => [
                                         '1',
                                     ],

tests/Fixtures/TestBundle/Document/RelatedToDummyFriend.php

@@ -51,7 +51,7 @@ class RelatedToDummyFriend
     private $description;
 
     /**
-     * @ODM\ReferenceOne(targetDocument=DummyFriend::class)
+     * @ODM\ReferenceOne(targetDocument=DummyFriend::class, storeAs="id")
      * @Groups({"fakemanytomany", "friends"})
      * @Assert\NotNull
      */