fix(Query): throw NOT_FOUND error when getting a non-existing object

Author: leeyeh

src/query.js

@@ -3,7 +3,7 @@ const debug = require('debug')('leancloud:query');
 const Promise = require('./promise');
 const AVError = require('./error');
 const AVRequest = require('./request').request;
-const { ensureArray } = require('./utils');
+const { ensureArray, transformFetchOptions } = require('./utils');
 
 const requires = (value, message) => {
   if (value === undefined) {
@@ -187,19 +187,22 @@ module.exports = function(AV) {
         throw errorObject;
       }
 
-      var self = this;
-
-      var obj = self._newObject();
+      var obj = this._newObject();
       obj.id = objectId;
 
-      var queryJSON = self.toJSON();
+      var queryJSON = this.toJSON();
       var fetchOptions = {};
 
       if (queryJSON.keys) fetchOptions.keys = queryJSON.keys;
       if (queryJSON.include) fetchOptions.include = queryJSON.include;
       if (queryJSON.includeACL) fetchOptions.includeACL = queryJSON.includeACL;
 
-      return obj.fetch(fetchOptions, options);
+      return AVRequest('classes', this.className, objectId, 'GET', transformFetchOptions(fetchOptions), options)
+        .then((response) => {
+          if (_.isEmpty(response)) throw new AVError(AVError.OBJECT_NOT_FOUND, 'Object not found.');
+          obj._finishFetch(obj.parse(response), true);
+          return obj;
+        });
     },
 
     /**

test/query.js

@@ -41,6 +41,10 @@ describe('Queries', function () {
       }).to.throwError();
 
     });
+    it('should throw when object not exists', function () {
+      query = new AV.Query(GameScore);
+      return query.get('123').should.be.rejectedWith(/Object not found/);
+    });
 
   });
 
@@ -287,12 +291,11 @@ describe('Queries', function () {
 
       var userQ = new AV.Query('Person');
 
-      return userQ.get('52f9bea1e4b035debf88b730').then(function (p) {
-        p.relation('likes').query();
+      return userQ.first().then(function (p) {
+        return p.relation('likes').query().count();
         // p.relation('likes').query().count().then(function(c){
         // 	debug(c)
         // })
-        debug(p);
       });
 
       // userQ.first().then(function(p){