Add support for using $text operator in a aggregation with a filter

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php

@@ -264,6 +264,11 @@ public function getAggregation(array $options = []): IterableResult
      * @param bool $applyFilters Whether to apply filters on the aggregation
      * pipeline stage
      *
+     * For pipelines where the first stage is a $match stage, it will merge
+     * the document filters with the existing stage in a logical $and. This is
+     * required as $text operator can be used anywhere in the first $match stage
+     * or in the document filters.
+     *
      * For pipelines where the first stage is a $geoNear stage, it will apply
      * the document filters and discriminator queries to the query portion of
      * the geoNear operation. For all other pipelines, it prepends a $match stage
@@ -314,7 +319,16 @@ public function getPipeline(/* bool $applyFilters = true */): array
 
         $matchExpression = $this->applyFilters([]);
         if ($matchExpression !== []) {
-            array_unshift($pipeline, ['$match' => $matchExpression]);
+            if (! empty($pipeline[0]['$match'])) {
+                $pipeline[0]['$match'] = [
+                    '$and' => [
+                        $matchExpression,
+                        $pipeline[0]['$match'],
+                    ],
+                ];
+            } else {
+                array_unshift($pipeline, ['$match' => $matchExpression]);
+            }
         }
 
         return $pipeline;

tests/Doctrine/ODM/MongoDB/Tests/Aggregation/BuilderTest.php

@@ -368,6 +368,39 @@ public function testBuilderAppliesFilterAndDiscriminatorWithMatchStage(): void
         self::assertEquals($expectedPipeline, $builder->getPipeline());
     }
 
+    public function testBuilderMergeFilterAndDiscriminatorWithMatchStage(): void
+    {
+        $this->dm->getFilterCollection()->enable('testFilter');
+        $filter = $this->dm->getFilterCollection()->getFilter('testFilter');
+        $filter->setParameter('class', GuestServer::class);
+        $filter->setParameter('field', 'filtered');
+        $filter->setParameter('value', true);
+
+        $builder = $this->dm->createAggregationBuilder(GuestServer::class);
+        $builder
+            ->match()
+                ->text('Paul');
+
+        $expectedPipeline = [
+            [
+                '$match' => [
+                    '$and' => [
+                        [
+                            '$and' => [
+                                ['stype' => 'server_guest'],
+                                ['filtered' => true],
+                            ],
+                        ],
+                        ['$text' => ['$search' => 'Paul']],
+                    ],
+                ],
+
+            ],
+        ];
+
+        self::assertEquals($expectedPipeline, $builder->getPipeline());
+    }
+
     public function testBuilderAppliesFilterAndDiscriminatorWithGeoNearStage(): void
     {
         $this->dm->getFilterCollection()->enable('testFilter');

tests/Doctrine/ODM/MongoDB/Tests/Functional/FilterTest.php

@@ -334,4 +334,22 @@ public function testMultipleFiltersOnSameField(): void
          */
         self::assertEmpty($this->getUsernamesWithFindAll());
     }
+
+    public function testFilterOnMatchStageUsingTextOperator(): void
+    {
+        $this->dm->getDocumentCollection(User::class)->createIndex(['username' => 'text']);
+
+        $this->fc->enable('testFilter');
+        $testFilter = $this->fc->getFilter('testFilter');
+        $testFilter->setParameter('class', User::class);
+        $testFilter->setParameter('field', 'hits');
+        $testFilter->setParameter('value', 10);
+
+        $builder = $this->dm->createAggregationBuilder(User::class)
+            ->match()
+            ->field('username')
+            ->text('John');
+
+        self::assertCount(1, $builder->getAggregation()->execute());
+    }
 }