Merge pull request #4297 from Countly/feature/push-recurring-3

[push] User Profiles querying by push tokens & messages

Author: ar2rsawseen

bin/upgrade/23.06/scripts/push_drop_indexes.js

@@ -7,7 +7,14 @@ pluginManager.dbConnection('countly').then(async(db) => {
             fields_appusers = fields(platforms, true);
         console.log(`Dropping indexes for ${apps.length} apps`);
         for (let app of apps) {
-            await db.collection(`app_users${app._id}`).dropIndexes(fields_appusers);
+            for (let field of fields_appusers) {
+                try {
+                    await db.collection(`app_users${app._id}`).dropIndex(field);
+                }
+                catch (e) {
+                    // do nothing
+                }
+            }
             console.log('Dropped indexes for ', app._id);
         }
         console.log('Dropping indexes DONE');

plugins/push/api/api-drill.js

@@ -1,6 +1,7 @@
 const common = require('../../../api/utils/common'),
     countlyCommon = require('../../../api/lib/countly.common.js'),
-    log = common.log('push:api:drill');
+    log = common.log('push:api:drill'),
+    { FIELDS_TITLES } = require('./send/platforms');
 
 module.exports.drillAddPushEvents = ({uid, params, events, event}) => {
     return new Promise((res, rej) => {
@@ -113,7 +114,7 @@ const toIdsMappers = {
 };
 
 module.exports.drillPreprocessQuery = async function({query, params}) {
-    if (query && params) {
+    if (query && params && params.qstring && params.qstring.event === '[CLY]_push_action') {
         if (query.$or) {
             for (let i = 0; i < query.$or.length; i++) {
                 let q = query.$or[i];
@@ -162,6 +163,67 @@ module.exports.drillPreprocessQuery = async function({query, params}) {
         //     delete query.push;
         // }
     }
+    else if (query && params) {
+        if (query.message) {
+            let q = messageQuery(query.message);
+
+            if (!q) {
+                return;
+            }
+
+            log.d(`removing message ${JSON.stringify(query.message)} from queryObject`);
+            delete query.message;
+
+            try {
+                let ids = await common.db.collection(`push_${params.app_id}`).find(q, {projection: {_id: 1}}).toArray();
+                ids = (ids || []).map(id => id._id);
+                query.uid = {$in: ids};
+                log.d(`filtered by message: uids out of ${ids.length}`);
+            }
+            catch (e) {
+                log.e(e);
+            }
+        }
+
+        if (query.push) {
+            let q;
+            if (query.push.$nin) {
+                q = {
+                    $and: query.push.$nin.map(tk => {
+                        return {[tk]: {$exists: false}};
+                    })
+                };
+            }
+            if (query.push.$in) {
+                q = {
+                    $or: query.push.$in.map(tk => {
+                        return {[tk]: {$exists: true}};
+                    })
+                };
+            }
+            if (query.push.$regex) {
+                q = Object.keys(FIELDS_TITLES).filter(k => query.push.$regex.test(FIELDS_TITLES[k])).map(tk => {
+                    return {[tk]: {$exists: true}};
+                });
+            }
+
+            delete query.push;
+
+            if (q) {
+                if (query.$or) {
+                    query.$and = [query.$or, q];
+                }
+                else if (query.$and) {
+                    query.$and = [query.$and, q];
+                }
+                else {
+                    for (let k in q) {
+                        query[k] = q[k];
+                    }
+                }
+            }
+        }
+    }
 };
 
 // module.exports.drillPreprocessQuery = ({query, params}) => {

plugins/push/api/send/platforms/a.js

@@ -410,7 +410,7 @@ const FIELDS = {
  * A number comes from SDK, we need to map it into smth like tkip/tkid/tkia
  */
 const FIELDS_TITLES = {
-    '0': 'FCM Token',
+    '0': 'Android Firebase Token',
 };
 
 /**

plugins/push/api/send/platforms/h.js

@@ -512,7 +512,7 @@ const FIELDS = {
  * A number comes from SDK, we need to map it into smth like tkhp/tkht
  */
 const FIELDS_TITLES = {
-    '0': 'HMS Token',
+    '0': 'Android Huawei Token',
 };
 
 /**

plugins/push/api/send/platforms/i.js

@@ -50,9 +50,9 @@ const FIELDS = {
  * A number comes from SDK, we need to map it into smth like tkip/tkid/tkia
  */
 const FIELDS_TITLES = {
-    '0': 'APN Production Token', // prod
-    '1': 'APN Development Token', // debug
-    '2': 'APN AdHoc / TestFlight Token', // ad hoc
+    '0': 'iOS Production Token', // prod
+    '1': 'iOS Development Token', // debug
+    '2': 'iOS AdHoc / TestFlight Token', // ad hoc
 };
 
 /**

plugins/push/frontend/public/javascripts/countly.models.js

@@ -3275,4 +3275,24 @@
             destroy: false,
         });
     };
+
+    var TT = {
+        tkid: 'iOS Development Token',
+        tkia: 'iOS Ad Hoc / TestFlight Token',
+        tkip: 'iOS Production Token',
+        tkap: 'Android Firebase Token',
+        tkhp: 'Android Huawei Token'
+    };
+
+    countlyPushNotification.getTokenTypes = function() {
+        return Object.keys(TT);
+    };
+
+    countlyPushNotification.getTokenNames = function() {
+        return Object.values(TT);
+    };
+
+    countlyPushNotification.getTokenName = function(type) {
+        return TT[type];
+    };
 }(window.countlyPushNotification = window.countlyPushNotification || {}));

plugins/push/frontend/public/javascripts/countly.views.js

@@ -2138,7 +2138,7 @@
                 var queryData = {message: {"$nin": [this.pushNotification._id]}};
                 var $in = [];
                 if (this.pushNotification.user) {
-                    queryData.user = this.pushNotification.user;
+                    Object.assign(queryData, JSON.parse(this.pushNotification.user));
                 }
                 if (this.pushNotification.locations && this.pushNotification.locations.length) {
                     queryData.geo = {"$in": this.pushNotification.locations};