Merge branch 'develop' into fix-eslint-test

Author: scottinet

src/kuzzleDataCollection.js

@@ -98,7 +98,9 @@ KuzzleDataCollection.prototype.advancedSearch = function (filters, options, cb)
   query = self.kuzzle.addHeaders({body: filters}, this.headers);
 
   self.kuzzle.query(this.buildQueryArgs('read', 'search'), query, options, function (error, result) {
-    var documents = [];
+    var
+      response,
+      documents = [];
 
     if (error) {
       return cb(error);
@@ -112,7 +114,16 @@ KuzzleDataCollection.prototype.advancedSearch = function (filters, options, cb)
       documents.push(newDocument);
     });
 
-    cb(null, { total: result.result.total, documents: documents });
+    response = {
+      total: result.result.total,
+      documents: documents
+    };
+
+    if (result.result.aggregations) {
+      response.aggregations = result.result.aggregations;
+    }
+
+    cb(null, response);
   });
 };
 

test/kuzzleDataCollection/methods.test.js

@@ -55,7 +55,7 @@ describe('KuzzleDataCollection methods', function () {
       kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});
       kuzzle.query = queryStub;
       emitted = false;
-      result = { result: { total: 123, hits: [ {_id: 'foobar', _source: { foo: 'bar'}} ]}};
+      result = { result: { total: 123, hits: [ {_id: 'foobar', _source: { foo: 'bar'}} ], aggregations: {someAggregate: {}}}};
       error = null;
       expectedQuery = {
         index: 'bar',
@@ -82,6 +82,7 @@ describe('KuzzleDataCollection methods', function () {
         should(res.total).be.a.Number().and.be.exactly(result.result.total);
         should(res.documents).be.an.Array();
         should(res.documents.length).be.exactly(result.result.hits.length);
+        should(res.aggregations).be.deepEqual(result.result.aggregations);
 
         res.documents.forEach(function (item) {
           should(item).be.instanceof(KuzzleDocument);