Merge pull request #406 from alcaeus/data-collector-aggregate-support

Format aggregation queries in data collector

Author: alcaeus

DataCollector/PrettyDataCollector.php

@@ -84,7 +84,15 @@ 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']);
+
+                    if ($log['options']) {
+                        $query .= ', ' . $this->bsonEncode($log['options']);
+                    }
+
+                    $query .= ')';
+                } elseif (isset($log['authenticate'])) {
                     $query .= '.authenticate()';
                 } elseif (isset($log['batchInsert'])) {
                     if (1 === $log['num']) {

Tests/DataCollector/PrettyDataCollectorTest.php

@@ -312,4 +312,54 @@ public function testCollectLimitAndSort()
         $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',
+            ],
+            [
+                'aggregate' => true,
+                'pipeline' => [
+                    [
+                        '$group' => [
+                            '_id' => '$verified',
+                            'count' => ['$sum' => 1],
+                        ],
+                    ],
+                ],
+                'options' => ['group' => true],
+                'db' => 'foo',
+                'collection' => 'User',
+            ],
+        ];
+
+        $formatted = [
+            'use foo;',
+            'db.User.aggregate([ { "$group": { "_id": "$verified", "count": { "$sum": 1 } } } ]);',
+            'db.User.aggregate([ { "$group": { "_id": "$verified", "count": { "$sum": 1 } } } ], { "group": true });',
+        ];
+
+
+        $collector = new PrettyDataCollector();
+        foreach ($queries as $query) {
+            $collector->logQuery($query);
+        }
+        $collector->collect(new Request(), new Response());
+
+        $this->assertEquals(2, $collector->getQueryCount());
+        $this->assertEquals($formatted, $collector->getQueries());
+    }
 }