fix: revert batched delete

Author: leeyeh

changelog.md

@@ -1,11 +1,11 @@
 # 3.3.0 (2017-10-24)
 
 ### Features
-- `AV.Object` 的批量操作 API（`.saveAll`，`.fetchAll` 与 `deleteAll`）失败时，抛出的异常 error 对象增加 `results` 属性，类型为 `Array<AV.Object|Error>`。通过这个属性，开发者可以知道哪些对象的操作成功了，哪些失败了。
+- `AV.Object.saveAll` 与 `AV.Object.fetchAll` 失败时，抛出的异常 error 对象增加 `results` 属性，类型为 `Array<AV.Object|Error>`。通过这个属性，开发者可以知道哪些对象的操作成功了，哪些失败了。
 - `AV.User` 增加了 `#associateWithAuthData` 与 `#disassociateAuthData` 用于关联、解绑第三方平台。原有的静态方法 `AV.User.associateWithAuthData` 已废弃。
 
 ### Bug Fixes
-- 优化了关联对象保存时的逻辑，减少了一些不必要的保存请求，避免了在关联对象有循环依赖时可能会出现死循环的问题。
+- 优化了关联对象保存时的逻辑，减少了一些不必要的保存请求，避免了在关联对象有循环依赖时可能会出现死循环的问题。
 - 修复了使用应用内社交模块 `inboxQuery` 查询时可能出现 `URI too long` 异常的问题。
 
 

src/object.js

@@ -1315,31 +1315,30 @@ module.exports = function(AV) {
     * @return {Promise} A promise that is fulfilled when the save
     *     completes.
     */
-   AV.Object.destroyAll = function(objects, options = {}){
-      if (!objects || objects.length === 0){
-		    return AV.Promise.resolve();
-      }
-      const body = {
-        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/${object.className}/${object.id}`,
-            body: object._flags
-          };
-        }),
-      };
-      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);
-      });
-   };
+  AV.Object.destroyAll = function(objects, options = {}){
+    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(',');
+        return {
+          method: 'DELETE',
+          path: `/1.1/classes/${objects[0].className}/${ids}`,
+          body: objects[0]._flags
+        }
+      })
+    };
+    return _request('batch', null, null, 'POST', body, options).then(response => {
+      const firstError = _.find(response, result => !result.success);
+      if (firstError) throw new AVError(firstError.error.code, firstError.error.error);
+      return undefined;
+    });
+  };
 
   /**
    * Returns the appropriate subclass for making new instances of the given

test/hooks.js

@@ -186,12 +186,7 @@ describe('hooks', function() {
     return Promise.all([object, objectIgnoreBefore].map(function(object) {
       return object.save();
     })).then(function() {
-      return AV.Object.destroyAll([object, objectIgnoreBefore]);
-    }).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');
+      return AV.Object.destroyAll([objectIgnoreBefore, object]);
+    }).should.be.rejectedWith(/Error from beforeDelete/);
   });
 });

test/object.js

@@ -420,21 +420,6 @@ describe('Objects', function(){
         )
       )
     });
-    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')
-      );
-    });
   });
 
   describe('Array Data', function () {