Merge branch 'bluewave-labs:develop' into fix/invite-error-handling

Server/controllers/controllerUtils.js

@@ -6,8 +6,8 @@ const handleValidationError = (error, serviceName) => {
   return error;
 };
 
-const handleError = (error, serviceName, method, code = 500) => {
-  error.code === undefined ? (error.code = code) : null;
+const handleError = (error, serviceName, method, status = 500) => {
+  error.status === undefined ? (error.status = status) : null;
   error.service === undefined ? (error.service = serviceName) : null;
   error.method === undefined ? (error.method = method) : null;
   return error;

Server/controllers/monitorController.js

@@ -33,7 +33,7 @@ const { handleError, handleValidationError } = require("./controllerUtils");
 const getAllMonitors = async (req, res, next) => {
   try {
     const monitors = await req.db.getAllMonitors();
-    return res.json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MONITOR_GET_ALL,
       data: monitors,
@@ -63,7 +63,7 @@ const getMonitorStatsById = async (req, res, next) => {
 
   try {
     const monitorStats = await req.db.getMonitorStatsById(req);
-    return res.json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MONITOR_STATS_BY_ID,
       data: monitorStats,
@@ -86,7 +86,7 @@ const getMonitorCertificate = async (req, res, next) => {
     const monitorUrl = new URL(monitor.url);
     const certificate = await sslChecker(monitorUrl.hostname);
     if (certificate && certificate.validTo) {
-      return res.json({
+      return res.status(200).json({
         success: true,
         msg: successMessages.MONITOR_CERTIFICATE,
         data: {
@@ -94,7 +94,7 @@ const getMonitorCertificate = async (req, res, next) => {
         },
       });
     } else {
-      return res.json({
+      return res.status(200).json({
         success: true,
         msg: successMessages.MONITOR_CERTIFICATE,
         data: { certificateDate: "N/A" },
@@ -130,9 +130,10 @@ const getMonitorById = async (req, res, next) => {
     if (!monitor) {
       const error = new Error(errorMessages.MONITOR_GET_BY_ID);
       error.status = 404;
+      throw error;
     }
 
-    return res.json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MONITOR_GET_BY_ID,
       data: monitor,
@@ -207,7 +208,7 @@ const getMonitorsByTeamId = async (req, res, next) => {
   try {
     const teamId = req.params.teamId;
     const monitors = await req.db.getMonitorsByTeamId(req, res);
-    return res.json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
       data: monitors,
@@ -324,14 +325,23 @@ const deleteAllMonitors = async (req, res, next) => {
     const { jwtSecret } = req.settingsService.getSettings();
     const { teamId } = jwt.verify(token, jwtSecret);
     const { monitors, deletedCount } = await req.db.deleteAllMonitors(teamId);
-    await monitors.forEach(async (monitor) => {
-      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);
-    });
-
+    await Promise.all(
+      monitors.map(async (monitor) => {
+        try {
+          await req.jobQueue.deleteJob(monitor);
+          await req.db.deleteChecks(monitor._id);
+          await req.db.deletePageSpeedChecksByMonitorId(monitor._id);
+          await req.db.deleteNotificationsByMonitorId(monitor._id);
+        } catch (error) {
+          logger.error(
+            `Error deleting associated records for monitor ${monitor._id} with name ${monitor.name}`,
+            {
+              method: "deleteAllMonitors",
+            }
+          );
+        }
+      })
+    );
     return res
       .status(200)
       .json({ success: true, msg: `Deleted ${deletedCount} monitors` });
@@ -459,7 +469,7 @@ const addDemoMonitors = async (req, res, next) => {
 
     return res.status(200).json({
       success: true,
-      message: successMessages.MONITOR_DEMO_ADDED,
+      msg: successMessages.MONITOR_DEMO_ADDED,
       data: demoMonitors.length,
     });
   } catch (error) {

Server/package-lock.json

@@ -36,6 +36,7 @@
       "devDependencies": {
         "nodemon": "3.1.0",
         "nyc": "17.1.0",
+        "proxyquire": "2.1.3",
         "sinon": "19.0.2"
       }
     },
@@ -2802,6 +2803,20 @@
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
     },
+    "node_modules/fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -3535,6 +3550,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -3575,6 +3606,16 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -4968,6 +5009,13 @@
         "node": ">=10"
       }
     },
+    "node_modules/module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/mongodb": {
       "version": "6.6.2",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.6.2.tgz",
@@ -5833,6 +5881,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -6545,6 +6600,18 @@
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
+    "node_modules/proxyquire": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
+      "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.1",
+        "resolve": "^1.11.1"
+      }
+    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -6683,6 +6750,24 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -7242,6 +7327,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/svgo": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",

Server/package.json

@@ -38,6 +38,7 @@
   "devDependencies": {
     "nodemon": "3.1.0",
     "nyc": "17.1.0",
+    "proxyquire": "2.1.3",
     "sinon": "19.0.2"
   }
 }

Server/tests/controllers/controllerUtils.test.js

@@ -45,22 +45,22 @@ describe("controllerUtils - handleValidationError", () => {
 });
 
 describe("handleError", () => {
-  it("should set code to the provided code if error.code is undefined", () => {
+  it("should set stats to the provided status if error.code is undefined", () => {
     const error = {};
     const serviceName = "TestService";
     const method = "testMethod";
-    const code = 400;
-    const result = handleError(error, serviceName, method, code);
-    expect(result.code).to.equal(code);
+    const status = 400;
+    const result = handleError(error, serviceName, method, status);
+    expect(result.status).to.equal(status);
   });
 
   it("should not overwrite error.code if it is already defined", () => {
-    const error = { code: 404 };
+    const error = { status: 404 };
     const serviceName = "TestService";
     const method = "testMethod";
-    const code = 400;
-    const result = handleError(error, serviceName, method, code);
-    expect(result.code).to.equal(404);
+    const status = 400;
+    const result = handleError(error, serviceName, method, status);
+    expect(result.status).to.equal(404);
   });
 
   it("should set service to the provided serviceName if error.service is undefined", () => {
@@ -100,6 +100,6 @@ describe("handleError", () => {
     const serviceName = "TestService";
     const method = "testMethod";
     const result = handleError(error, serviceName, method);
-    expect(result.code).to.equal(500);
+    expect(result.status).to.equal(500);
   });
 });