Making sure deletion is fully triggered

Author: Cookiezaurs

plugins/views/api/api.js

@@ -145,18 +145,18 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
                                             common.db.collection("app_userviews").update({"_id": {"$regex": "^" + appId + "_.*"}}, {$unset: {viewid: 1}}, {multi: true});
                                             //remove from meta
                                             common.db.collection("app_viewsmeta").remove({'_id': viewid});
-                                            if (common.drillDb) {
-                                                plugins.dispatch("/core/delete_granular_data", {
-                                                    db: "drill",
-                                                    collection: "drill_events",
-                                                    query: { a: appId + "", e: "[CLY]_view", n: viewName }
-                                                });
-                                                plugins.dispatch("/core/delete_granular_data", {
-                                                    db: "drill",
-                                                    collection: "drill_events",
-                                                    query: { a: appId + "", e: "[CLY]_action", n: viewUrl }
-                                                });
-                                            }
+
+                                            plugins.dispatch("/core/delete_granular_data", {
+                                                db: "drill",
+                                                collection: "drill_events",
+                                                query: { a: appId + "", e: "[CLY]_view", n: viewName }
+                                            });
+                                            plugins.dispatch("/core/delete_granular_data", {
+                                                db: "drill",
+                                                collection: "drill_events",
+                                                query: { a: appId + "", e: "[CLY]_action", n: viewUrl }
+                                            });
+
                                             plugins.dispatch("/view/delete", {appId: appId, view: viewid + ""});
                                             /** */
                                             Promise.all(deleteDocs).then(function() {

plugins/views/tests/views.js

@@ -623,9 +623,17 @@ describe('Testing views plugin', function() {
                     if (err) {
                         console.log(err);
                     }
-                    setTimeout(done, 1000 * testUtils.testScalingFactor);
+                    setTimeout(done, 500 * testUtils.testScalingFactor + 2000);
                 });
         });
+        it('Trigger deletion job to run to clean out data completely from granular data', function(done) {
+            testUtils.triggerJobToRun("api:deletionManagerJob", function(error) {
+                if (error) {
+                    console.log(error);
+                }
+                setTimeout(done, 500 * testUtils.testScalingFactor + 2000);
+            });
+        });
         verifyTotals("30days");
     });
 
@@ -996,11 +1004,7 @@ describe('Testing views plugin', function() {
                     setTimeout(done, 100 * testUtils.testScalingFactor + waitTime);
                 });
         });
-        it("wait", function(done) {
-            setTimeout(done, 30000);
-        });
         verifyTotals("30days");
-
         it("End the first view(should not flush yet)", function(done) {
             var data = JSON.stringify([{"key": "[CLY]_view", "count": 1, "dur": 100, "segmentation": {"name": "testviewFirst"}}]);
             request
@@ -1046,14 +1050,8 @@ describe('Testing views plugin', function() {
         verifyTotals("30days");
     });
 
-    describe("wait", function() {
-        it("waiting some time for db to settle", function(done) {
-            setTimeout(done, 30000);
-        });
-    });
-
     describe('reset app', function() {
-        it('should reset data', function(done) {
+        it('trigger reset endpoint', function(done) {
             var params = {app_id: APP_ID, "period": "reset"};
             request
                 .get('/i/apps/reset?api_key=' + API_KEY_ADMIN + "&args=" + JSON.stringify(params))
@@ -1067,6 +1065,11 @@ describe('Testing views plugin', function() {
                     setTimeout(done, 500 * testUtils.testScalingFactor);
                 });
         });
+        it('Trigger deletion job to run', function(done) {
+            testUtils.triggerJobToRun("api:deletionManagerJob", function() {
+                setTimeout(done, 500 * testUtils.testScalingFactor);
+            });
+        });
     });
 
     describe('verify empty views tables', function() {
@@ -1431,7 +1434,7 @@ describe('Testing views plugin', function() {
     });
 
     describe('reset app', function() {
-        it('should reset data', function(done) {
+        it('trigger reset endpoint', function(done) {
             var params = {app_id: APP_ID, "period": "reset"};
             request
                 .get('/i/apps/reset?api_key=' + API_KEY_ADMIN + "&args=" + JSON.stringify(params))
@@ -1442,9 +1445,14 @@ describe('Testing views plugin', function() {
                     }
                     var ob = JSON.parse(res.text);
                     ob.should.have.property('result', 'Success');
-                    setTimeout(done, 500 * testUtils.testScalingFactor + 2000);
+                    setTimeout(done, 500 * testUtils.testScalingFactor);
                 });
         });
+        it('Trigger deletion job to run', function(done) {
+            testUtils.triggerJobToRun("api:deletionManagerJob", function() {
+                setTimeout(done, 500 * testUtils.testScalingFactor);
+            });
+        });
     });
 
     describe('verify empty views tables', function() {

test/3.api.write/3.reset.app.js

@@ -58,6 +58,11 @@ describe('Reseting app', function() {
                     setTimeout(done, 1000 * testUtils.testScalingFactor);
                 });
         });
+        it('Trigger deletion job to run', function(done) {
+            testUtils.triggerJobToRun("api:deletionManagerJob", function() {
+                setTimeout(done, 5000);
+            });
+        });
     });
 });
 describe('Checking if app data reset', function() {

test/testUtils.js

@@ -1,6 +1,7 @@
 var should = require('should');
 var countlyConfig = require("../frontend/express/config.js");
 var common = require('../api/utils/common.js');
+const reqq = require('supertest');
 should.Assertion.add('haveSameItems', function(other) {
     this.params = { operator: 'to be have same items' };
 
@@ -171,19 +172,17 @@ var testUtils = function testUtils() {
     };
 
     this.triggerJobToRun = function(jobName, callback) {
-        this.db.collection("jobConfigs").updateOne({ jobName: jobName}, {$set: {runNow: true}}, function(err, res) {
-            if (err) {
-                callback(err);
-            }
-            else {
-                if (res.result.nModified === 0) {
-                    callback("Job not found");
+        var request = reqq.agent(this.url);
+        request.get("/jobs/i?jobName=" + encodeURIComponent(jobName) + "&action=runNow&api_key=" + props.API_KEY_ADMIN)
+            .expect(200)
+            .end(function(err, res) {
+                if (err) {
+                    callback(err);
                 }
                 else {
                     callback();
                 }
-            }
-        });
+            });
     };
 
     this.triggerMergeProcessing = function(callback) {