Merge branch 'feat/ttl' into feat/be/error-handling
This commit is contained in:
commit
7bbbc78139
8 files changed
+74
-11
No files matched your search
@@ -7,9 +7,10 @@ const {
|
|||||||
getTeamChecksQueryValidation,
|
getTeamChecksQueryValidation,
|
||||||
deleteChecksParamValidation,
|
deleteChecksParamValidation,
|
||||||
deleteChecksByTeamIdParamValidation,
|
deleteChecksByTeamIdParamValidation,
|
||||||
|
updateChecksTTLBodyValidation,
|
||||||
} = require("../validation/joi");
|
} = require("../validation/joi");
|
||||||
const { successMessages } = require("../utils/messages");
|
const { successMessages } = require("../utils/messages");
|
||||||
const SERVICE_NAME = "check";
|
const SERVICE_NAME = "checkController";
|
||||||
|
|
||||||
const createCheck = async (req, res, next) => {
|
const createCheck = async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
@@ -31,7 +32,8 @@ const createCheck = async (req, res, next) => {
|
|||||||
.status(200)
|
.status(200)
|
||||||
.json({ success: true, msg: successMessages.CHECK_CREATE, data: check });
|
.json({ success: true, msg: successMessages.CHECK_CREATE, data: check });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.serivce = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "createCheck") : null;
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -58,7 +60,8 @@ const getChecks = async (req, res, next) => {
|
|||||||
data: { checksCount, checks },
|
data: { checksCount, checks },
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.serivce = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "getChecks") : null;
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -83,7 +86,8 @@ const getTeamChecks = async (req, res, next) => {
|
|||||||
data: checkData,
|
data: checkData,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.serivce = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "getTeamChecks") : null;
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -108,7 +112,8 @@ const deleteChecks = async (req, res, next) => {
|
|||||||
data: { deletedCount },
|
data: { deletedCount },
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.serivce = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "deleteChecks") : null;
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -117,10 +122,11 @@ const deleteChecksByTeamId = async (req, res, next) => {
|
|||||||
try {
|
try {
|
||||||
await deleteChecksByTeamIdParamValidation.validateAsync(req.params);
|
await deleteChecksByTeamIdParamValidation.validateAsync(req.params);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.service = SERVICE_NAME) : null;
|
||||||
error.method = "deleteChecksByTeam";
|
error.method === undefined ? (error.method = "deleteChecksByTeam") : null;
|
||||||
error.status = 422;
|
error.status = 422;
|
||||||
next(error);
|
next(error);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -131,8 +137,35 @@ const deleteChecksByTeamId = async (req, res, next) => {
|
|||||||
data: { deletedCount },
|
data: { deletedCount },
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.service = SERVICE_NAME;
|
error.service === undefined ? (error.service = SERVICE_NAME) : null;
|
||||||
error.method = "deleteChecksByTeamId";
|
error.method === undefined ? (error.method = "deleteChecksByTeamId") : null;
|
||||||
|
next(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateChecksTTL = async (req, res, next) => {
|
||||||
|
try {
|
||||||
|
await updateChecksTTLBodyValidation.validateAsync(req.body);
|
||||||
|
} catch (error) {
|
||||||
|
error.status = 422;
|
||||||
|
error.service === undefined ? (error.service = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "updateChecksTTL") : null;
|
||||||
|
error.message =
|
||||||
|
error.details?.[0]?.message || error.message || "Validation Error";
|
||||||
|
next(error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const ttl = req.body.ttl;
|
||||||
|
await req.db.updateChecksTTL(1, ttl);
|
||||||
|
return res.status(200).json({
|
||||||
|
success: true,
|
||||||
|
msg: successMessages.CHECK_UPDATE_TTL,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
error.service === undefined ? (error.service = SERVICE_NAME) : null;
|
||||||
|
error.method === undefined ? (error.method = "updateTTL") : null;
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -143,4 +176,5 @@ module.exports = {
|
|||||||
getTeamChecks,
|
getTeamChecks,
|
||||||
deleteChecks,
|
deleteChecks,
|
||||||
deleteChecksByTeamId,
|
deleteChecksByTeamId,
|
||||||
|
updateChecksTTL,
|
||||||
};
|
};
|
||||||
@@ -97,6 +97,7 @@ const {
|
|||||||
getTeamChecks,
|
getTeamChecks,
|
||||||
deleteChecks,
|
deleteChecks,
|
||||||
deleteChecksByTeamId,
|
deleteChecksByTeamId,
|
||||||
|
updateChecksTTL,
|
||||||
} = require("./modules/checkModule");
|
} = require("./modules/checkModule");
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
@@ -161,6 +162,7 @@ module.exports = {
|
|||||||
getTeamChecks,
|
getTeamChecks,
|
||||||
deleteChecks,
|
deleteChecks,
|
||||||
deleteChecksByTeamId,
|
deleteChecksByTeamId,
|
||||||
|
updateChecksTTL,
|
||||||
createAlert,
|
createAlert,
|
||||||
getAlertsByUserId,
|
getAlertsByUserId,
|
||||||
getAlertsByMonitorId,
|
getAlertsByMonitorId,
|
||||||
|
|||||||
@@ -239,6 +239,20 @@ const deleteChecksByTeamId = async (teamId) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const updateChecksTTL = async (teamId, ttl) => {
|
||||||
|
try {
|
||||||
|
await Check.collection.dropIndex("expiry_1");
|
||||||
|
await Check.collection.createIndex(
|
||||||
|
{ expiry: 1 },
|
||||||
|
{ expireAfterSeconds: ttl } // TTL in seconds, adjust as necessary
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
error.service = SERVICE_NAME;
|
||||||
|
error.method = "updateChecksTTL";
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
createCheck,
|
createCheck,
|
||||||
getChecksCount,
|
getChecksCount,
|
||||||
@@ -246,4 +260,5 @@ module.exports = {
|
|||||||
getTeamChecks,
|
getTeamChecks,
|
||||||
deleteChecks,
|
deleteChecks,
|
||||||
deleteChecksByTeamId,
|
deleteChecksByTeamId,
|
||||||
|
updateChecksTTL,
|
||||||
};
|
};
|
||||||
@@ -262,7 +262,7 @@ const getMonitorStatsById = async (req) => {
|
|||||||
|
|
||||||
return monitorStats;
|
return monitorStats;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.methodName = "getMonitorStatsById";
|
error.method = "getMonitorStatsById";
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const handleErrors = (error, req, res, next) => {
|
|||||||
const service = error.service || errorMessages.UNKNOWN_SERVICE;
|
const service = error.service || errorMessages.UNKNOWN_SERVICE;
|
||||||
logger.error(error.message, {
|
logger.error(error.message, {
|
||||||
service: service,
|
service: service,
|
||||||
methodName: error.methodName,
|
method: error.method,
|
||||||
});
|
});
|
||||||
res.status(status).json({ success: false, msg: message });
|
res.status(status).json({ success: false, msg: message });
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,4 +26,10 @@ router.delete(
|
|||||||
checkController.deleteChecksByTeamId
|
checkController.deleteChecksByTeamId
|
||||||
);
|
);
|
||||||
|
|
||||||
|
router.put(
|
||||||
|
"/ttl",
|
||||||
|
isAllowed(["admin", "superadmin"]),
|
||||||
|
checkController.updateChecksTTL
|
||||||
|
);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
@@ -73,6 +73,7 @@ const successMessages = {
|
|||||||
CHECK_CREATE: "Check created successfully",
|
CHECK_CREATE: "Check created successfully",
|
||||||
CHECK_GET: "Got checks successfully",
|
CHECK_GET: "Got checks successfully",
|
||||||
CHECK_DELETE: "Checks deleted successfully",
|
CHECK_DELETE: "Checks deleted successfully",
|
||||||
|
CHECK_UPDATE_TTL: "Checks TTL updated successfully",
|
||||||
|
|
||||||
//Monitor Controller
|
//Monitor Controller
|
||||||
MONITOR_GET_ALL: "Got all monitors successfully",
|
MONITOR_GET_ALL: "Got all monitors successfully",
|
||||||
|
|||||||
@@ -335,6 +335,10 @@ const deleteChecksByTeamIdParamValidation = joi.object({
|
|||||||
teamId: joi.string().required(),
|
teamId: joi.string().required(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const updateChecksTTLBodyValidation = joi.object({
|
||||||
|
ttl: joi.number().required(),
|
||||||
|
});
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
// PageSpeedCheckValidation
|
// PageSpeedCheckValidation
|
||||||
//****************************************
|
//****************************************
|
||||||
@@ -423,6 +427,7 @@ module.exports = {
|
|||||||
getTeamChecksQueryValidation,
|
getTeamChecksQueryValidation,
|
||||||
deleteChecksParamValidation,
|
deleteChecksParamValidation,
|
||||||
deleteChecksByTeamIdParamValidation,
|
deleteChecksByTeamIdParamValidation,
|
||||||
|
updateChecksTTLBodyValidation,
|
||||||
deleteUserParamValidation,
|
deleteUserParamValidation,
|
||||||
getPageSpeedCheckParamValidation,
|
getPageSpeedCheckParamValidation,
|
||||||
createPageSpeedCheckParamValidation,
|
createPageSpeedCheckParamValidation,
|
||||||
|
|||||||
Reference in new issue
Block a user