Merge pull request #1004 from ParsePlatform/flovilmart.PushStatus

Push Status API

src/Controllers/PushController.js

@@ -6,6 +6,7 @@ import { PushAdapter } from '../Adapters/Push/PushAdapter';
 import deepcopy from 'deepcopy';
 import features from '../features';
 import RestQuery from '../RestQuery';
+import pushStatusHandler from '../pushStatusHandler';
 
 const FEATURE_NAME = 'push';
 const UNSUPPORTED_BADGE_KEY = "unsupported";
@@ -38,7 +39,7 @@ export class PushController extends AdaptableController {
     }
   }
 
-  sendPush(body = {}, where = {}, config, auth) {
+  sendPush(body = {}, where = {}, config, auth, wait) {
     var pushAdapter = this.adapter;
     if (!pushAdapter) {
       throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
@@ -65,7 +66,7 @@ export class PushController extends AdaptableController {
       }
       let updateWhere = deepcopy(where);
 
-      badgeUpdate = () => { 
+      badgeUpdate = () => {
         let badgeQuery = new RestQuery(config, auth, '_Installation', updateWhere);
         return badgeQuery.buildRestWhere().then(() => {
           let restWhere = deepcopy(badgeQuery.restWhere);
@@ -81,38 +82,58 @@ export class PushController extends AdaptableController {
         })
       }
     }
-
-    return badgeUpdate().then(() => {
+    let pushStatus = pushStatusHandler(config);
+    return Promise.resolve().then(() => {
+      return pushStatus.setInitial(body, where);
+    }).then(() => {
+      return badgeUpdate();
+    }).then(() => {
       return rest.find(config, auth, '_Installation', where);
     }).then((response) => {
-      if (body.data && body.data.badge && body.data.badge == "Increment") {
-        // Collect the badges to reduce the # of calls
-        let badgeInstallationsMap = response.results.reduce((map, installation) => {
-          let badge = installation.badge;
-          if (installation.deviceType != "ios") {
-            badge = UNSUPPORTED_BADGE_KEY;
-          }
-          map[badge+''] = map[badge+''] || [];
-          map[badge+''].push(installation);
-          return map;
-        }, {});
-
-        // Map the on the badges count and return the send result
-        let promises = Object.keys(badgeInstallationsMap).map((badge) => {
-          let payload = deepcopy(body);
-          if (badge == UNSUPPORTED_BADGE_KEY) {
-            delete payload.data.badge;
-          } else {
-            payload.data.badge = parseInt(badge);
-          }
-          return pushAdapter.send(payload, badgeInstallationsMap[badge]);
-        });
-        return Promise.all(promises);
-      }
-      return pushAdapter.send(body, response.results);
+      pushStatus.setRunning();
+      return this.sendToAdapter(body, response.results, pushStatus, config);
+    }).then((results) => {
+      return pushStatus.complete(results);
     });
   }
 
+  sendToAdapter(body, installations, pushStatus, config) {
+    if (body.data && body.data.badge && body.data.badge == "Increment") {
+      // Collect the badges to reduce the # of calls
+      let badgeInstallationsMap = installations.reduce((map, installation) => {
+        let badge = installation.badge;
+        if (installation.deviceType != "ios") {
+          badge = UNSUPPORTED_BADGE_KEY;
+        }
+        map[badge+''] = map[badge+''] || [];
+        map[badge+''].push(installation);
+        return map;
+      }, {});
+
+      // Map the on the badges count and return the send result
+      let promises = Object.keys(badgeInstallationsMap).map((badge) => {
+        let payload = deepcopy(body);
+        if (badge == UNSUPPORTED_BADGE_KEY) {
+          delete payload.data.badge;
+        } else {
+          payload.data.badge = parseInt(badge);
+        }
+        return this.adapter.send(payload, badgeInstallationsMap[badge]);
+      });
+      // Flatten the promises results
+      return Promise.all(promises).then((results) => {
+        if (Array.isArray(results)) {
+          return Promise.resolve(results.reduce((memo, result) => {
+            return memo.concat(result);
+          },[]));
+        } else {
+          return Promise.resolve(results);
+        }
+      })
+    }
+    return this.adapter.send(body, installations);
+  }
+
   /**
    * Get expiration time from the request body.
    * @param {Object} request A request object