Merge pull request #5245 from Countly/feedback-index

[SER-1507] [star-rating] Add text index for comment and email

Author: kanwarujjaval

plugins/star-rating/api/api.js

@@ -1041,10 +1041,7 @@ function uploadFile(myfile, id, callback) {
             query.device_id = params.qstring.device_id;
         }
         if (params.qstring.sSearch && params.qstring.sSearch !== "") {
-            query.$or = [
-                { comment: {$regex: new RegExp(`.*${params.qstring.sSearch}.*`, 'i')} },
-                { email: {$regex: new RegExp(`.*${params.qstring.sSearch}.*`, 'i')} },
-            ];
+            query.$text = { $search: params.qstring.sSearch };
         }
         if (params.qstring.iSortCol_0) {
             try {
@@ -1426,6 +1423,9 @@ function uploadFile(myfile, id, callback) {
         common.db.collection('feedback' + appId).ensureIndex({
             "ts": 1
         }, function() {});
+        common.db.collection('feedback' + appId).ensureIndex({
+            comment: 'text', email: 'text'
+        }, () => {});
     });
     plugins.register("/i/apps/delete", function(ob) {
         var appId = ob.appId;
@@ -1468,6 +1468,9 @@ function uploadFile(myfile, id, callback) {
             common.db.collection('feedback' + appId).ensureIndex({
                 "ts": 1
             }, function() {});
+            common.db.collection('feedback' + appId).ensureIndex({
+                comment: 'text', email: 'text'
+            }, () => {});
         });
         common.db.collection("events" + crypto.createHash('sha1').update("[CLY]_star_rating" + appId).digest('hex')).drop(function() {});
         if (common.drillDb) {
@@ -1487,6 +1490,9 @@ function uploadFile(myfile, id, callback) {
             common.db.collection('feedback' + appId).ensureIndex({
                 "ts": 1
             }, function() {});
+            common.db.collection('feedback' + appId).ensureIndex({
+                comment: 'text', email: 'text'
+            }, () => {});
         });
         common.db.collection("events" + crypto.createHash('sha1').update("[CLY]_star_rating" + appId).digest('hex')).drop(function() {});
         if (common.drillDb) {

plugins/star-rating/install.js

@@ -20,12 +20,13 @@ pluginManager.dbConnection().then((countlyDb) => {
                 console.log("Adding ratings collections to " + app.name);
                 function cb() {
                     cnt++;
-                    if (cnt == 2) {
+                    if (cnt == 3) {
                         done();
                     }
                 }
                 countlyDb.collection('feedback' + app._id).ensureIndex({"uid": 1}, {background: true}, cb);
                 countlyDb.collection('feedback' + app._id).ensureIndex({"ts": 1}, {background: true}, cb);
+                countlyDb.collection('feedback' + app._id).ensureIndex({comment: 'text', email: 'text'}, {background: true}, cb);
             }
             async.forEach(apps, upgrade, function() {
                 console.log("Ratings plugin installation finished");