Merge pull request #156 from kuzzleio/newRequestModel

Adapt from & size to be part of the query instead of the body

Author: scottinet

src/kuzzle.js

@@ -1257,6 +1257,14 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
       object.refresh = options.refresh;
     }
 
+    if (options.from) {
+      object.from = options.from;
+    }
+
+    if (options.size) {
+      object.size = options.size;
+    }
+
     if (options.metadata) {
       Object.keys(options.metadata).forEach(function (meta) {
         object.metadata[meta] = options.metadata[meta];

src/kuzzleDataCollection.js

@@ -339,17 +339,6 @@ KuzzleDataCollection.prototype.fetchAllDocuments = function (options, cb) {
     options = null;
   }
 
-  // copying pagination options to the search filter
-  if (options) {
-    if (options.from) {
-      filters.from = options.from;
-    }
-
-    if (options.size) {
-      filters.size = options.size;
-    }
-  }
-
   this.kuzzle.callbackRequired('KuzzleDataCollection.fetchAll', cb);
 
   this.advancedSearch(filters, options, cb);

test/kuzzle/methods.test.js

@@ -345,12 +345,12 @@ describe('Kuzzle methods', function () {
     });
 
     it('should handle from option correctly', function (done) {
-      expectedQuery.body.from = 'foobar';
+      expectedQuery.from = 'foobar';
       kuzzle.listCollections('foo', {from: 'foobar'}, () => done());
     });
 
     it('should handle size option correctly', function (done) {
-      expectedQuery.body.size = 'foobar';
+      expectedQuery.size = 'foobar';
       kuzzle.listCollections('foo', {size: 'foobar'}, () => done());
     });
 

test/kuzzle/query.test.js

@@ -172,6 +172,22 @@ describe('Query management', function () {
       should(requestObject.refresh).match(refresh);
     });
 
+    it('should handle option size properly', function () {
+      var
+        size = 'foo';
+
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {size: size});
+      should(requestObject.size).match(size);
+    });
+
+    it('should handle option from properly', function () {
+      var
+        from = 'foo';
+
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {from: from});
+      should(requestObject.from).match(from);
+    });
+
     it('should exit early if the query is not queuable and the SDK is offline', function () {
       kuzzle.state = 'offline';
       kuzzle.query(queryArgs, { body: { some: 'query'}}, {queuable: false});

test/kuzzleDataCollection/methods.test.js

@@ -507,6 +507,13 @@ describe('KuzzleDataCollection methods', function () {
     beforeEach(function () {
       kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});
       emitted = false;
+      expectedQuery = {
+        index: 'bar',
+        collection: 'foo',
+        action: 'get',
+        controller: 'document',
+        body: {}
+      };
     });
 
     it('should forward the query to the advancedSearch method', function () {
@@ -549,7 +556,7 @@ describe('KuzzleDataCollection methods', function () {
 
       collection.fetchAllDocuments({from: 123, size: 456}, function () {});
       should(stub.calledOnce).be.true();
-      should(stub.calledWithMatch({from: 123, size: 456})).be.true();
+      should(stub.calledWithMatch({}, {from: 123, size: 456})).be.true();
       stub.restore();
     });
   });