feat(Object): add batch error.results (#516)

Author: leeyeh

src/object.js

@@ -16,6 +16,16 @@ const checkReservedKey = key => {
   }
 };
 
+const handleBatchResults = (results) => {
+  const firstError = _.find(results, result => result instanceof Error);
+  if (!firstError) {
+    return results;
+  }
+  const error = new AVError(firstError.code, firstError.message);
+  error.results = results;
+  throw error;
+};
+
 // Helper function to get a value from a Backbone object as a property
 // or as a function.
 function getValue(object, prop) {
@@ -139,17 +149,17 @@ module.exports = function(AV) {
         }),
       }, options)
     ).then(function(response) {
-      _.forEach(objects, function(object, i) {
+      const results = _.map(objects, function(object, i) {
         if (response[i].success) {
-          object._finishFetch(
-            object.parse(response[i].success));
-        } else {
-          const error = new Error(response[i].error.error);
-          error.code = response[i].error.code;
-          throw error;
+          object._finishFetch(object.parse(response[i].success));
+          return object;
+        }
+        if (response[i].success === null) {
+          return new AVError(AVError.OBJECT_NOT_FOUND, 'Object not found.');
         }
+        return new AVError(response[i].error.code, response[i].error.error);
       });
-      return objects;
+      return handleBatchResults(results);
     });
 
   // Attach all inheritable methods to the AV.Object prototype.
@@ -1309,21 +1319,26 @@ module.exports = function(AV) {
       if (!objects || objects.length === 0){
 		    return AV.Promise.resolve();
       }
-      const objectsByClassNameAndFlags = _.groupBy(objects, object => JSON.stringify({
-        className: object.className,
-        flags: object._flags
-      }));
       const body = {
-        requests: _.map(objectsByClassNameAndFlags, objects => {
-          const ids = _.map(objects, 'id').join(',');
+        requests: _.map(objects, object => {
+          if (!object.className) throw new Error('object must have className to destroy');
+          if (!object.id) throw new Error('object must have id to destroy');
           return {
             method: 'DELETE',
-            path: `/1.1/classes/${objects[0].className}/${ids}`,
-            body: objects[0]._flags
-          }
-        })
+            path: `/1.1/classes/${object.className}/${object.id}`,
+            body: object._flags
+          };
+        }),
       };
-      return _request('batch', null, null, 'POST', body, options);
+      return _request('batch', null, null, 'POST', body, options).then(function(response) {
+        const results = _.map(objects, function(object, i) {
+          if (response[i].success) {
+            return null;
+          }
+          return new AVError(response[i].error.code, response[i].error.error);
+        });
+        return handleBatchResults(results);
+      });
    };
 
   /**
@@ -1627,21 +1642,15 @@ module.exports = function(AV) {
             })
 
           }, options).then(function(response) {
-            var error;
-            AV._arrayEach(batch, function(object, i) {
+            const results = _.map(batch, function(object, i) {
               if (response[i].success) {
-                object._finishSave(
-                  object.parse(response[i].success));
-              } else {
-                error = error || response[i].error;
-                object._cancelSave();
+                object._finishSave(object.parse(response[i].success));
+                return object;
               }
+              object._cancelSave();
+              return new AVError(response[i].error.code, response[i].error.error);
             });
-            if (error) {
-              return AV.Promise.reject(
-                new AVError(error.code, error.error));
-            }
-
+            return handleBatchResults(results);
           })
         );
         AV._arrayEach(batch, function(object) {

test/hooks.js

@@ -187,9 +187,11 @@ describe('hooks', function() {
       return object.save();
     })).then(function() {
       return AV.Object.destroyAll([object, objectIgnoreBefore]);
-    }).then(function(result) {
-      expect(result[0].error).to.be.ok();
-      expect(result[1].error).to.not.be.ok();
-    });
+    }).catch(error => {
+      error.results.should.be.length(2);
+      error.results[0].should.be.instanceof(Error);
+      expect(error.results[1]).to.equal(null);
+      throw new Error('handled error');
+    }).should.be.rejectedWith('handled error');
   });
 });

test/object.js

@@ -389,11 +389,19 @@ describe('Objects', function(){
         expect(score2.id).to.be.eql(gameScore.id);
       })
     );
-    it('fetchAll with non-existed Class should fail', () =>
+    it('fetchAll with non-existed Class/object should fail', () =>
       AV.Object.fetchAll([
         AV.Object.createWithoutData('GameScore', gameScore.id),
+        AV.Object.createWithoutData('GameScore', 'fakeId'),
         AV.Object.createWithoutData('FakeClass', gameScore.id),
-      ]).should.be.rejected()
+      ]).catch(error => {
+        error.message.should.eql('Object not found.');
+        error.results.should.be.length(3);
+        error.results[0].should.be.instanceof(GameScore);
+        error.results[1].should.be.instanceof(Error);
+        error.results[2].should.be.instanceof(Error);
+        throw new Error('handled error');
+      }).should.be.rejectedWith('handled error')
     );
     it('fetchAll with dirty objet should fail', () =>
       AV.Object.fetchAll([
@@ -404,9 +412,28 @@ describe('Objects', function(){
   });
 
   describe("Deleting Objects",function(){
-    it("should delete cheatMode",function(){
-      gameScore.unset("cheatMode");
-      return gameScore.save();
+    it("should delete object",function(){
+      return new GameScore().save().then(gameScore =>
+        gameScore.destroy().then(() =>
+          GameScore.query.get(gameScore.id)
+            .should.be.rejectedWith('Object not found.')
+        )
+      )
+    });
+    it("batch delete",function(){
+      const acl = new AV.ACL();
+      acl.setPublicWriteAccess(false);
+      return new GameScore({ACL: acl}).save().then(gameScore =>
+        AV.Object.destroyAll([
+          AV.Object.createWithoutData('GameScore', 'fakeId'),
+          gameScore,
+        ]).catch(error => {
+          error.results.should.be.length(2);
+          const [_, err] = error.results;
+          err.should.be.instanceof(Error);
+          throw new Error('handled error');
+        }).should.be.rejectedWith('handled error')
+      );
     });
   });
 
@@ -525,6 +552,23 @@ describe('Objects', function(){
       });
     });
 
+    it("should save all partially", function(){
+      var Person = AV.Object.extend("Person");
+      return AV.Object.saveAll([
+        AV.Object.createWithoutData('Person', 'fakeid').set('age', 30),
+        new Person({
+          age: 40,
+        }),
+      ]).catch(error => {
+        error.results.should.be.length(2);
+        const [err, person] = error.results;
+        err.should.be.instanceof(Error);
+        person.should.be.instanceof(Person);
+        person.id.should.be.ok();
+        person.get('age').should.eql(40);
+      });
+    });
+
     it("should query relational data",function(){
       var Person=AV.Object.extend("Person");
       var query=new AV.Query(Person);