Format aggregation queries in data collector

Author: alcaeus

DataCollector/PrettyDataCollector.php

@@ -84,7 +84,9 @@ public function collect(Request $request, Response $response, \Exception $except
                 }
 
                 // format the method call
-                if (isset($log['authenticate'])) {
+                if (isset($log['aggregate'])) {
+                    $query .= '.aggregate('.$this->bsonEncode($log['pipeline']).', '.$this->bsonEncode($log['options']).')';
+                } elseif (isset($log['authenticate'])) {
                     $query .= '.authenticate()';
                 } elseif (isset($log['batchInsert'])) {
                     if (1 === $log['num']) {

Tests/DataCollector/PrettyDataCollectorTest.php

@@ -303,6 +303,41 @@ public function testCollectLimitAndSort()
             'db.User.find({ "_id": "foo" }).limit(10).sort({ "name": 1, "city": -1 });',
         ];
 
+        $collector = new PrettyDataCollector();
+        foreach ($queries as $query) {
+            $collector->logQuery($query);
+        }
+        $collector->collect(new Request(), new Response());
+
+        $this->assertEquals(1, $collector->getQueryCount());
+        $this->assertEquals($formatted, $collector->getQueries());
+    }
+
+    public function testCollectAggregate()
+    {
+        $queries = [
+            [
+                'aggregate' => true,
+                'pipeline' => [
+                    [
+                        '$group' => [
+                            '_id' => '$verified',
+                            'count' => ['$sum' => 1],
+                        ],
+                    ],
+                ],
+                'options' => [],
+                'db' => 'foo',
+                'collection' => 'User',
+            ],
+        ];
+
+        $formatted = [
+            'use foo;',
+            'db.User.aggregate([ { "$group": { "_id": "$verified", "count": { "$sum": 1 } } } ], [ ]);'
+        ];
+
+
         $collector = new PrettyDataCollector();
         foreach ($queries as $query) {
             $collector->logQuery($query);