PHPORM-103 Use Aggregation Builder for the query builder

Author: GromNaN

composer.json

@@ -31,6 +31,7 @@
         "mongodb/mongodb": "^1.15"
     },
     "require-dev": {
+        "mongodb/builder": "^0.1",
         "phpunit/phpunit": "^10.3",
         "orchestra/testbench": "^8.0|^9.0",
         "mockery/mockery": "^1.4.4",

src/Query/Builder.php

@@ -21,6 +21,17 @@
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
+use MongoDB\Builder\Accumulator\FirstAccumulator;
+use MongoDB\Builder\BuilderEncoder;
+use MongoDB\Builder\Expression\FieldPath;
+use MongoDB\Builder\Pipeline;
+use MongoDB\Builder\Stage\GroupStage;
+use MongoDB\Builder\Stage\LimitStage;
+use MongoDB\Builder\Stage\MatchStage;
+use MongoDB\Builder\Stage\ReplaceRootStage;
+use MongoDB\Builder\Stage\SkipStage;
+use MongoDB\Builder\Stage\SortStage;
+use MongoDB\Builder\Variable;
 use MongoDB\Driver\Cursor;
 use Override;
 use RuntimeException;
@@ -297,6 +308,8 @@ public function toMql(): array
 
         $wheres = $this->compileWheres();
 
+        $pipeline = [new MatchStage($wheres)];
+
         // Use MongoDB's aggregation framework when using grouping or aggregation functions.
         if ($this->groups || $this->aggregate) {
             $group   = [];
@@ -409,7 +422,13 @@ public function toMql(): array
 
             $options = $this->inheritConnectionOptions();
 
-            return ['distinct' => [$column, $wheres, $options]];
+            $pipeline[] = new GroupStage(
+                _id: new FieldPath($column),
+                _document: new FirstAccumulator(Variable::root()),
+            );
+            $pipeline[] = new ReplaceRootStage(
+                newRoot: new FieldPath('_document'),
+            );
         }
 
         // Normal query
@@ -429,18 +448,19 @@ public function toMql(): array
         }
 
         if ($this->orders) {
-            $options['sort'] = $this->orders;
+            $pipeline[] = new SortStage($this->orders);
         }
 
         if ($this->offset) {
-            $options['skip'] = $this->offset;
+            $pipeline[] = new SkipStage($this->offset);
         }
 
         if ($this->limit) {
-            $options['limit'] = $this->limit;
+            $pipeline[] = new LimitStage($this->limit);
         }
 
         if ($this->hint) {
+            // @todo
             $options['hint'] = $this->hint;
         }
 
@@ -458,7 +478,10 @@ public function toMql(): array
 
         $options = $this->inheritConnectionOptions($options);
 
-        return ['find' => [$wheres, $options]];
+        $encoder = new BuilderEncoder();
+        $pipeline = $encoder->encode(new Pipeline(...$pipeline));
+
+        return ['aggregate' => [$pipeline, $options]];
     }
 
     /**

tests/ModelTest.php

@@ -1006,6 +1006,7 @@ public function testNumericFieldName(): void
         $user->{2} = ['3' => 'two.three'];
         $user->save();
 
+        // Test failure: 1 is transformed into 0 by array unpacking and variadic arguments
         $found = User::where(1, 'one')->first();
         $this->assertInstanceOf(User::class, $found);
         $this->assertEquals('one', $found[1]);