[export] fix user data export

Author: ar2rsawseen

api/parts/mgmt/app_users.js

@@ -108,6 +108,9 @@ usersApi.update = function(app_id, query, update, params, callback) {
         callback = params;
         params = {};
     }
+    plugins.dispatch("/drill/preprocess_query", {
+        query: query
+    });
     if (Object.keys(update).length) {
         for (var i in update) {
             if (i.indexOf("$") !== 0) {
@@ -152,6 +155,9 @@ usersApi.delete = function(app_id, query, params, callback) {
         callback = params;
         params = {};
     }
+    plugins.dispatch("/drill/preprocess_query", {
+        query: query
+    });
     common.db.collection("app_users" + app_id).aggregate([
         {$match: query},
         {
@@ -238,6 +244,10 @@ usersApi.search = function(app_id, query, project, sort, limit, skip, callback)
         }
     }
 
+    plugins.dispatch("/drill/preprocess_query", {
+        query: query
+    });
+
     project = project || {};
     if (typeof project === "string" && project.length) {
         try {
@@ -294,6 +304,10 @@ usersApi.count = function(app_id, query, callback) {
         }
     }
 
+    plugins.dispatch("/drill/preprocess_query", {
+        query: query
+    });
+
     common.db.collection('app_users' + app_id).find(query).count(callback);
 };
 
@@ -704,6 +718,11 @@ usersApi.export = function(app_id, query, params, callback) {
             }
         });
     }
+
+    plugins.dispatch("/drill/preprocess_query", {
+        query: query
+    });
+
     common.db.collection("app_users" + app_id).aggregate([
         {$match: query},
         {
@@ -817,10 +836,10 @@ usersApi.export = function(app_id, query, params, callback) {
                 }
             }).then(function() {
                 //export data from metric_changes
-                return run_command('mongoexport', [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{uid:{$in: ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]);
+                return run_command('mongoexport', [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]);
             }).then(function() {
                 //export data from app_users
-                return run_command('mongoexport', [...dbargs, "--collection", "app_users" + app_id, "-q", '{uid:{$in: ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/app_users" + app_id + ".json"]);
+                return run_command('mongoexport', [...dbargs, "--collection", "app_users" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/app_users" + app_id + ".json"]);
             }).then(
                 function() {
                     //get other export commands from other plugins

plugins/crashes/api/api.js

@@ -87,8 +87,8 @@ plugins.setConfigs("crashes", {
                 if (!ob.export_commands.crashes) {
                     ob.export_commands.crashes = [];
                 }
-                ob.export_commands.crashes.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_crashes' + ob.app_id, '-q', '{uid:{$in: ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/crashes' + ob.app_id + '.json']});
-                ob.export_commands.crashes.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_crashusers' + ob.app_id, '-q', '{uid:{$in: ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/crashusers' + ob.app_id + '.json']});
+                ob.export_commands.crashes.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_crashes' + ob.app_id, '-q', '{"uid":{"$in": ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/crashes' + ob.app_id + '.json']});
+                ob.export_commands.crashes.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_crashusers' + ob.app_id, '-q', '{"uid":{"$in": ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/crashusers' + ob.app_id + '.json']});
                 resolve();
             }
         });

plugins/push/api/api.js

@@ -576,7 +576,7 @@ const PUSH_CACHE_GROUP = 'P';
     plugins.register('/i/app_users/export', ({app_id, uids, export_commands, dbargs, export_folder}) => {
         if (uids && uids.length) {
             if (!export_commands.push) {
-                export_commands.push = [{cmd: 'mongoexport', args: [...dbargs, '--collection', `push_${app_id}`, '-q', `{uid: {$in: ${JSON.stringify(uids)}}}`, '--out', `${export_folder}/push_${app_id}.json`]}];
+                export_commands.push = [{cmd: 'mongoexport', args: [...dbargs, '--collection', `push_${app_id}`, '-q', `{"uid": {"$in": ${JSON.stringify(uids)}}}`, '--out', `${export_folder}/push_${app_id}.json`]}];
             }
         }
     });

plugins/star-rating/api/api.js

@@ -784,7 +784,7 @@ const widgetPropertyPreprocessors = {
                 if (!ob.export_commands.feedback) {
                     ob.export_commands.feedback = [];
                 }
-                ob.export_commands.feedback.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'feedback' + ob.app_id, '-q', '{uid:{$in: ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/feedback' + ob.app_id + '.json']});
+                ob.export_commands.feedback.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'feedback' + ob.app_id, '-q', '{"uid":{"$in": ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/feedback' + ob.app_id + '.json']});
                 resolve();
             }
         });

plugins/views/api/api.js

@@ -212,7 +212,7 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
             if (!ob.export_commands.views) {
                 ob.export_commands.views = [];
             }
-            ob.export_commands.views.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_userviews' + ob.app_id, '-q', '{_id:{$in: ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/app_userviews' + ob.app_id + '.json']});
+            ob.export_commands.views.push({cmd: 'mongoexport', args: [...ob.dbargs, '--collection', 'app_userviews' + ob.app_id, '-q', '{"_id":{"$in": ["' + uids.join('","') + '"]}}', '--out', ob.export_folder + '/app_userviews' + ob.app_id + '.json']});
             resolve();
         });
     });