[SER-690] Removed requestProcessor when removing widgets

Author: pnrgenc

bin/upgrade/DEV/scripts/remove_deleted_recors_from_widgets.js

@@ -1,37 +1,5 @@
 var plugins = require('../../../../plugins/pluginManager');
-const fetch = require('node-fetch');
-const https = require('https');
-
-// PLEASE ENTER BELOW INFORMATIONS BEFORE RUNNING THIS SCRIPT
-const API_KEY = "YOUR_API_KEY";
-const SERVER_URL = "http://localhost";
-
-
-async function sendRequest(params) {
-    try {
-        const url = new URL(params.Url || SERVER_URL);
-        const options = {
-            method: params.requestType,
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            agent: new https.Agent({
-                rejectUnauthorized: false,
-            }),
-        };
-
-        const response = await fetch(url.href, options);
-        if (response.status === 200 || response.status === 201) {
-            return true;
-        }
-        else {
-            return { err: 'There was an error while sending a request.', code: response.status + " " + response.statusText };
-        }
-    }
-    catch (error) {
-        return { err: 'There was an error while sending a request.', code: error.code || 'Unknown' };
-    }
-}
+const dashboard = require('../../../../plugins/dashboards/api/parts/dashboards.js');
 
 async function recheckFunnelWidgets(countlyDb) {
     console.log("Detecting deleted data for funnels...");
@@ -63,13 +31,7 @@ async function recheckFunnelWidgets(countlyDb) {
         };
 
         try {
-            var response = await sendRequest({
-                requestType: 'GET',
-                Url: SERVER_URL + "/o/dashboards/recheck_widgets?apiKey=" + API_KEY + "&matchOperator=" + JSON.stringify(matchOperator),
-            });
-            if (!response.err) {
-                console.log("Deleted funnels removed from widgets successfully.");
-            }
+           return await dashboard.removeDeletedRecordsFromWidgets({member: {username: 'unknown'}}, matchOperator, countlyDb);
         }
         catch (error) {
             console.log('Error while sending a request: ', error);
@@ -113,13 +75,7 @@ async function recheckFormulasWidgets(countlyDb) {
         };
 
         try {
-            var response = await sendRequest({
-                requestType: 'GET',
-                Url: SERVER_URL + "/o/dashboards/recheck_widgets?apiKey=" + API_KEY + "&matchOperator=" + JSON.stringify(matchOperator),
-            });
-            if (!response.err) {
-                console.log("Deleted formulas removed from widgets successfully.");
-            }
+            return await dashboard.removeDeletedRecordsFromWidgets({member: {username: 'unknown'}}, matchOperator, countlyDb);
         }
         catch (error) {
             console.log('Error while sending a request: ', error);
@@ -130,28 +86,21 @@ async function recheckFormulasWidgets(countlyDb) {
     }
 }
 
-async function recheckDrillWidgets() {
+async function recheckDrillWidgets(countlyDb) {
     console.log("Detecting deleted data for drill...");
     const matchOperator = {
         "widget_type": "drill",
         "drill_query": { $size: 0 }
     };
 
     try {
-        var response = await sendRequest({
-            requestType: 'GET',
-            Url: SERVER_URL + "/o/dashboards/recheck_widgets?apiKey=" + API_KEY + "&matchOperator=" + JSON.stringify(matchOperator),
-        });
-        if (!response.err) {
-            console.log("Deleted drills removed from widgets successfully.");
-        }
+        return await dashboard.removeDeletedRecordsFromWidgets({member: {username: 'unknown'}}, matchOperator, countlyDb);
     }
     catch (error) {
         console.log('Error while sending a request: ', error);
     }
 }
 
-
 plugins.dbConnection().then(async(countlyDb) => {
     try {
         await recheckFunnelWidgets(countlyDb);
@@ -168,11 +117,12 @@ plugins.dbConnection().then(async(countlyDb) => {
     }
 
     try {
-        await recheckDrillWidgets();
+        await recheckDrillWidgets(countlyDb);
     }
     catch (error) {
         console.log('Error in recheckDrillWidgets:', error);
     }
-    countlyDb.close();
+    finally {
+        countlyDb.close();
+    }
 });
-

plugins/dashboards/api/parts/dashboards.js

@@ -9,7 +9,6 @@ var countlyModel = require("../../../../api/lib/countly.model.js"),
     countlyCommon = require('../../../../api/lib/countly.common'),
     fetch = require("../../../../api/parts/data/fetch.js"),
     log = common.log('dashboards:api'),
-    requestProcessor = require('../../../../api/utils/requestProcessor.js'),
     plugins = require("../../../pluginManager.js");
 
 /** @lends module:api/parts/data/dashboard */
@@ -563,25 +562,28 @@ dashboard.fetchNoteData = async function(params, apps, widget) {
     return widget;
 };
 
-
 /**
  * Remove deleted records from widgets
- * 
- * @param {string} apiKey user's api key
+ * @param {object} params params object
  * @param {object} matchOperator match operator for aggregation
+ * @param {object} db database object - if coming from script
  * @returns {boolean} true if success
  */
-dashboard.removeDeletedRecordsFromWidgets = async function(apiKey, matchOperator) {
+dashboard.removeDeletedRecordsFromWidgets = async function(params, matchOperator, db) {
     try {
-        if (!apiKey || !matchOperator) {
-            log.e('missing parameters for removeDeletedRecordsFromWidgets', apiKey, matchOperator);
+        if (!params || !matchOperator) {
+            log.e('missing parameters for removeDeletedRecordsFromWidgets', params, matchOperator);
             return false;
         }
 
         if (typeof matchOperator === 'string') {
             matchOperator = JSON.parse(matchOperator);
         }
 
+        if (typeof db !== 'undefined') {
+            common.db = db;
+        }
+
         var pipeline = [
             {
                 $match: matchOperator
@@ -614,22 +616,17 @@ dashboard.removeDeletedRecordsFromWidgets = async function(apiKey, matchOperator
                 log.e('dashbordId or widgetId could not found in remove widget');
                 continue;
             }
-            var params = {
-                'req': {
-                    url: "/i/dashboards/remove-widget?dashboard_id=" + dashboardId + "&widget_id=" + widgetId + "&api_key=" + apiKey
-                },
-                //adding custom processing for API responses
-                'APICallback': function(err, responseData, headers, returnCode) {
-                    if (err) {
-                        log.e('Error while removing widget from dashboard', err, responseData, headers, returnCode);
-                        return false;
+
+            await new Promise((resolve, reject) => {
+                dashboard.deleteWidget(params, dashboardId, widgetId, function(success) {
+                    if (success) {
+                        resolve();
                     }
                     else {
-                        return true;
+                        reject();
                     }
-                }
-            };
-            requestProcessor.processRequest(params);
+                });
+            });
         }
         return true;
     }
@@ -639,16 +636,34 @@ dashboard.removeDeletedRecordsFromWidgets = async function(apiKey, matchOperator
     }
 };
 
+dashboard.deleteWidget = function(params, dashboardId, widgetId, callback) {
+    common.db.collection("dashboards").update({_id: common.db.ObjectID(dashboardId)}, { $pull: {widgets: common.db.ObjectID(widgetId)}}, function(dashboardErr) {
+        if (!dashboardErr) {
+            common.db.collection("widgets").findAndModify({_id: common.db.ObjectID(widgetId)}, {}, {}, {remove: true}, function(widgetErr, widgetResult) {
+                if (widgetErr || !widgetResult || !widgetResult.value) {
+                    common.returnMessage(params, 500, "Failed to remove widget");
+                    callback(false);
+                }
+                else {
+                    var logData = widgetResult.value;
+                    logData.dashboard = dashboard.name;
 
-dashboard.callWidgetRecheck = function(apiKey, matchOperator) {
-    return plugins.dispatch("/dashboard/clean-deleted-widgets", {
-        api_key: apiKey,
-        match: matchOperator
+                    plugins.dispatch("/systemlogs", {params: params, action: "widget_deleted", data: logData});
+                    plugins.dispatch("/dashboard/widget/deleted", {params: params, widget: widgetResult.value});
+                    common.returnMessage(params, 200, 'Success');
+                    callback(true);
+                }
+            });
+        }
+        else {
+            common.returnMessage(params, 500, "Failed to remove widget");
+            callback(false);
+        }
     });
 };
 
 plugins.register("/dashboard/clean-deleted-widgets", async function(ob) {
-    var response = await dashboard.removeDeletedRecordsFromWidgets(ob.api_key, ob.match);
+    var response = await dashboard.removeDeletedRecordsFromWidgets(ob.params, ob.match);
     return response;
 }, true);