Merge pull request #761 from bluewave-labs/feat/clear-checks

Feat/clear checks, resolves #759
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-30 11:48:38 -07:00
commit 66efa39d37
9 files changed
+190 -31

No files matched your search

+26
View File
@@ -6,6 +6,7 @@ const {
getTeamChecksParamValidation,
getTeamChecksQueryValidation,
deleteChecksParamValidation,
deleteChecksByTeamIdParamValidation,
} = require("../validation/joi");
const { successMessages } = require("../utils/messages");
const SERVICE_NAME = "check";
@@ -112,9 +113,34 @@ const deleteChecks = async (req, res, next) => {
}
};
const deleteChecksByTeamId = async (req, res, next) => {
try {
await deleteChecksByTeamIdParamValidation.validateAsync(req.params);
} catch (error) {
error.service = SERVICE_NAME;
error.method = "deleteChecksByTeam";
error.status = 422;
next(error);
}
try {
const deletedCount = await req.db.deleteChecksByTeamId(req.params.teamId);
return res.status(200).json({
success: true,
msg: successMessages.CHECK_DELETE,
data: { deletedCount },
});
} catch (error) {
error.service = SERVICE_NAME;
error.method = "deleteChecksByTeamId";
next(error);
}
};
module.exports = {
createCheck,
getChecks,
getTeamChecks,
deleteChecks,
deleteChecksByTeamId,
};
+2
View File
@@ -94,6 +94,7 @@ const {
getChecks,
getTeamChecks,
deleteChecks,
deleteChecksByTeamId,
} = require("./modules/checkModule");
//****************************************
@@ -155,6 +156,7 @@ module.exports = {
getChecks,
getTeamChecks,
deleteChecks,
deleteChecksByTeamId,
createAlert,
getAlertsByUserId,
getAlertsByMonitorId,
+31 -1
View File
@@ -170,7 +170,7 @@ const getTeamChecks = async (req) => {
};
/**
* Delete all checks for a user
* Delete all checks for a monitor
* @async
* @param {string} monitorId
* @returns {number}
@@ -185,10 +185,40 @@ const deleteChecks = async (monitorId) => {
throw error;
}
};
/**
* Delete all checks for a team
* @async
* @param {string} monitorId
* @returns {number}
* @throws {Error}
*/
const deleteChecksByTeamId = async (teamId) => {
try {
const teamMonitors = await Monitor.find({ teamId: teamId });
let totalDeletedCount = 0;
await Promise.all(
teamMonitors.map(async (monitor) => {
const result = await Check.deleteMany({ monitorId: monitor._id });
totalDeletedCount += result.deletedCount;
monitor.status = true;
await monitor.save();
})
);
return totalDeletedCount;
} catch (error) {
throw error;
}
};
module.exports = {
createCheck,
getChecksCount,
getChecks,
getTeamChecks,
deleteChecks,
deleteChecksByTeamId,
};
+7
View File
@@ -1,6 +1,7 @@
const router = require("express").Router();
const checkController = require("../controllers/checkController");
const { verifyOwnership } = require("../middleware/verifyOwnership");
const { isAllowed } = require("../middleware/isAllowed");
const Monitor = require("../models/Monitor");
router.post(
@@ -19,4 +20,10 @@ router.delete(
checkController.deleteChecks
);
router.delete(
"/team/:teamId",
isAllowed(["admin", "superadmin"]),
checkController.deleteChecksByTeamId
);
module.exports = router;
+5
View File
@@ -292,6 +292,10 @@ const deleteChecksParamValidation = joi.object({
monitorId: joi.string().required(),
});
const deleteChecksByTeamIdParamValidation = joi.object({
teamId: joi.string().required(),
});
//****************************************
// PageSpeedCheckValidation
//****************************************
@@ -372,6 +376,7 @@ module.exports = {
getTeamChecksParamValidation,
getTeamChecksQueryValidation,
deleteChecksParamValidation,
deleteChecksByTeamIdParamValidation,
deleteUserParamValidation,
getPageSpeedCheckParamValidation,
createPageSpeedCheckParamValidation,