[push] Migrated to the new events collection

Author: Cihad Tekin

plugins/push/api/api-dashboard.js

@@ -15,11 +15,29 @@ function add(from, to) {
     });
 }
 
+function eventIdFilter(event, app_id, agy, agm, noy, mts, nom) {
+    const eventHash = crypto
+        .createHash('sha1')
+        .update(common.fixEventKey(event) + app_id)
+        .digest('hex');
+    const prefix = app_id + "_" + eventHash + "_";
+    const ids = (seg, val) => ([
+        prefix + seg + '_' + noy + ':' + (nom + 1) + '_' + crypto.createHash('md5').update(val + '').digest('base64')[0],
+        prefix + seg + '_' + (nom === 0 ? agy : noy) + ':' + (nom === 0 ? 12 : nom) + '_' + crypto.createHash('md5').update(val + '').digest('base64')[0]
+    ]);
+    return mts.map((m, i) => prefix + 'no-segment_' + (agm + i >= 12 ? noy : agy) + ':' + m)
+        .concat(platforms.map(p => mts.map((m, i) => prefix + 'p_' + (agm + i >= 12 ? noy : agy) + ':' + m + '_' + crypto.createHash('md5').update(p).digest('base64')[0])).flat())
+        .concat(ids('a', 'true'))
+        .concat(ids('t', 'true'))
+        .concat(platforms.map(p => ids('ap', 'true' + p)).flat())
+        .concat(platforms.map(p => ids('tp', 'true' + p)).flat())
+}
+
 /**
  * Dashboard request handler
- * 
+ *
  * @param {object} params params object
- * 
+ *
  * @api {get} o/push/dashboard Get dashboard data
  * @apiName dashboard
  * @apiDescription Get push notification dashboard data
@@ -125,32 +143,17 @@ module.exports.dashboard = async function(params) {
         wkt = wks.map(w => 'W' + w),
         // wkt = wks.map((w, i) => (i === 0 || w > wks[0] ? agy : noy) + '-w' + w),
 
-        /**
-         * Generate ids of event docs
-         * 
-         * @param {string} seg segment name
-         * @param {string} val segment value
-         * @returns {string[]} event doc ids
-         */
-        ids = (seg, val) => ([
-            seg + '_' + noy + ':' + (nom + 1) + '_' + crypto.createHash('md5').update(val + '').digest('base64')[0],
-            seg + '_' + (nom === 0 ? agy : noy) + ':' + (nom === 0 ? 12 : nom) + '_' + crypto.createHash('md5').update(val + '').digest('base64')[0]
-        ]),
-
         // event docs query
-        que = {
-            _id: {
-                $in: mts.map((m, i) => 'no-segment_' + (agm + i >= 12 ? noy : agy) + ':' + m)
-                    .concat(platforms.map(p => mts.map((m, i) => 'p_' + (agm + i >= 12 ? noy : agy) + ':' + m + '_' + crypto.createHash('md5').update(p).digest('base64')[0])).flat())
-                    .concat(ids('a', 'true'))
-                    .concat(ids('t', 'true'))
-                    .concat(platforms.map(p => ids('ap', 'true' + p)).flat())
-                    .concat(platforms.map(p => ids('tp', 'true' + p)).flat())
-            }
+        sentQuery = {
+            e: "[CLY]_push_sent",
+            _id: { $in: eventIdFilter('[CLY]_push_sent', app_id, agy, agm, noy, mts, nom) }
+        },
+        actionQuery = {
+            e: "[CLY]_push_action",
+            _id: { $in: eventIdFilter('[CLY]_push_action', app_id, agy, agm, noy, mts, nom) }
         },
 
-        sen = 'events' + crypto.createHash('sha1').update(common.fixEventKey('[CLY]_push_sent') + app_id).digest('hex'),
-        act = 'events' + crypto.createHash('sha1').update(common.fixEventKey('[CLY]_push_action') + app_id).digest('hex'),
+        // app users collection name
         app = 'app_users' + app_id,
 
         // platform token queries ({$or: [{tkip: true}, {tkia: true}, {tkid: true}]}, {$or: [{tkap: true}, {tkat: true}]})
@@ -178,18 +181,22 @@ module.exports.dashboard = async function(params) {
         wkt.push(wkt.shift());
     }
 
-    log.d('sen', sen, 'act', act);
     log.d('mts', mts);
     log.d('wks', wks);
-    log.d('que', que);
+    log.d('sentQuery', JSON.stringify(sentQuery));
+    log.d('actionQuery', JSON.stringify(actionQuery));
     log.d('ptq', JSON.stringify(ptq));
     log.d('any', JSON.stringify(any));
 
-    let results = await Promise.all(ptq.map(q => common.dbPromise(app, 'count', q)).concat([common.dbPromise(app, 'count', any)]).concat([
-        common.dbPromise(sen, 'find', que),
-        common.dbPromise(act, 'find', que),
-        common.dbPromise(app, 'estimatedDocumentCount'),
-    ]));
+    let results = await Promise.all(
+        ptq.map(q => common.dbPromise(app, 'count', q))
+            .concat([common.dbPromise(app, 'count', any)])
+            .concat([
+                common.dbPromise("events_data", 'find', sentQuery),
+                common.dbPromise("events_data", 'find', actionQuery),
+                common.dbPromise(app, 'estimatedDocumentCount'),
+            ])
+    );
 
     try {
         let counts = results.splice(0, ptq.length + 1),