fix(Query): correct batch format and add error handler (#443)

Author: leeyeh

src/query.js

@@ -240,9 +240,27 @@ module.exports = function(AV) {
       }
       return obj;
     },
-    _createRequest: function(params, options){
-      return AVRequest('classes', this.className, null, "GET",
-                                   params || this.toJSON(), options);
+    _createRequest(params = this.toJSON(), options) {
+      if (JSON.stringify(params).length > 2000) {
+        const body = {
+          requests: [{
+            method: 'GET',
+            path: `/1.1/classes/${this.className}`,
+            params,
+          }],
+        };
+        return AVRequest('batch', null, null, 'POST', body, options)
+          .then(response => {
+            const result = response[0];
+            if (result.success) {
+              return result.success;
+            }
+            const error = new Error(result.error.error || 'Unknown batch error');
+            error.code = result.error.code;
+            throw error;
+          });
+      }
+      return AVRequest('classes', this.className, null, "GET", params, options);
     },
 
     /**
@@ -255,7 +273,7 @@ module.exports = function(AV) {
     find: function(options) {
       var self = this;
 
-      var request = this._createRequest(null, options);
+      var request = this._createRequest(undefined, options);
 
       return request.then(function(response) {
         return _.map(response.results, function(json) {

src/request.js

@@ -278,16 +278,6 @@ const AVRequest = (route, className, objectId, method, dataObject = {}, authOpti
   }
   return getServerURLPromise.then(() => {
     const apiURL = createApiUrl(route, className, objectId, method, dataObject);
-    // prevent URI too long
-    if (apiURL.length > 2000 && method.toLowerCase() === 'get') {
-      const body = {
-        request: {
-          method,
-          path: apiURL,
-        },
-      };
-      return AVRequest('batch', null, null, 'POST', body, authOptions);
-    }
     return setHeaders(authOptions).then(
       headers => ajax(method, apiURL, dataObject, headers)
         .then(

test/query.js

@@ -210,8 +210,11 @@ describe('Queries', function () {
 
     it('containsAll with an large array should not cause URI too long', () => {
       return new AV.Query(GameScore)
-        .containsAll('test', new Array(1000).fill('5821abe62e958a00540046d5'))
-        .find();
+        .containsAll('arr', new Array(200).fill('contains-all-test'))
+        .find()
+        .then(gameScores => {
+          gameScores.should.have.length(1);
+        });
     });
   });