From a432aee3de344da17262e3de2b86a74d5461828c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 2 Aug 2024 11:24:15 -0700 Subject: [PATCH 1/3] Added empty query to request object --- Server/controllers/authController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 6f34f71ce..ffb38559e 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -440,6 +440,7 @@ const deleteUserController = async (req, res, next) => { const { _id, email } = decodedToken; const decodedTokenCastedAsRequest = { + query: {}, params: { userId: _id, }, From a04ecad11f91c73d15a21260cc8dd2fd0338226f Mon Sep 17 00:00:00 2001 From: Alexander Holliday Date: Fri, 2 Aug 2024 11:25:35 -0700 Subject: [PATCH 2/3] Update authController.js --- Server/controllers/authController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index ffb38559e..296b3fd63 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -439,6 +439,7 @@ const deleteUserController = async (req, res, next) => { const decodedToken = jwt.decode(token); const { _id, email } = decodedToken; + // TODO fix this hack const decodedTokenCastedAsRequest = { query: {}, params: { From 6c92dbe3581f0c35ef9a926365681cd98c06572a Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 2 Aug 2024 11:38:38 -0700 Subject: [PATCH 3/3] Delete pagespeed checks when user deleted --- Server/controllers/authController.js | 1 + Server/controllers/monitorController.js | 1 + Server/db/mongo/MongoDB.js | 4 ++-- Server/db/mongo/modules/pageSpeedCheckModule.js | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index ffb38559e..041395161 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -481,6 +481,7 @@ const deleteUserController = async (req, res, next) => { await req.jobQueue.deleteJob(monitor); await req.db.deleteChecks(monitor._id); await req.db.deleteAlertByMonitorId(monitor._id); + await req.db.deletePageSpeedChecksByMonitorId(monitor._id); await req.db.deleteNotificationsByMonitorId(monitor._id); }) ); diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index e05ed0389..d45b300f8 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -182,6 +182,7 @@ const deleteMonitor = async (req, res, next) => { await req.jobQueue.deleteJob(monitor); await req.db.deleteChecks(monitor._id); await req.db.deleteAlertByMonitorId(monitor._id); + await req.db.deletePageSpeedChecksByMonitorId(monitor._id); await req.db.deleteNotificationsByMonitorId(monitor._id); /** diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js index 2813a3c00..68597a794 100644 --- a/Server/db/mongo/MongoDB.js +++ b/Server/db/mongo/MongoDB.js @@ -79,7 +79,7 @@ const { const { createPageSpeedCheck, getPageSpeedChecks, - deletePageSpeedChecks, + deletePageSpeedChecksByMonitorId, } = require("./modules/pageSpeedCheckModule"); //**************************************** @@ -157,7 +157,7 @@ module.exports = { deleteMonitorsByUserId, createPageSpeedCheck, getPageSpeedChecks, - deletePageSpeedChecks, + deletePageSpeedChecksByMonitorId, createMaintenanceWindow, getMaintenanceWindowsByUserId, getMaintenanceWindowsByMonitorId, diff --git a/Server/db/mongo/modules/pageSpeedCheckModule.js b/Server/db/mongo/modules/pageSpeedCheckModule.js index 65376a324..92f87d060 100644 --- a/Server/db/mongo/modules/pageSpeedCheckModule.js +++ b/Server/db/mongo/modules/pageSpeedCheckModule.js @@ -48,7 +48,7 @@ const getPageSpeedChecks = async (monitorId) => { * @throws {Error} */ -const deletePageSpeedChecks = async (monitorId) => { +const deletePageSpeedChecksByMonitorId = async (monitorId) => { try { const result = await PageSpeedCheck.deleteMany({ monitorId }); return result.deletedCount; @@ -60,5 +60,5 @@ const deletePageSpeedChecks = async (monitorId) => { module.exports = { createPageSpeedCheck, getPageSpeedChecks, - deletePageSpeedChecks, + deletePageSpeedChecksByMonitorId, };