From abf0b5856b7c11f5fdc1ef467f0a3c60bb3957f8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 30 Jul 2024 13:55:22 -0700 Subject: [PATCH] CheckController error handling --- Server/controllers/checkController.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Server/controllers/checkController.js b/Server/controllers/checkController.js index 391ae2700..3379f5d17 100644 --- a/Server/controllers/checkController.js +++ b/Server/controllers/checkController.js @@ -14,9 +14,9 @@ const createCheck = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { @@ -37,9 +37,9 @@ const getChecks = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { @@ -59,20 +59,18 @@ const deleteChecks = async (req, res, next) => { } catch (error) { error.status = 422; error.service = SERVICE_NAME; - error.message = error.details[0].message; + error.message = + error.details?.[0]?.message || error.message || "Validation Error"; next(error); - return; } try { const deletedCount = await req.db.deleteChecks(req.params.monitorId); - return res - .status(200) - .json({ - success: true, - msg: successMessages.CHECK_DELETE, - data: { deletedCount }, - }); + return res.status(200).json({ + success: true, + msg: successMessages.CHECK_DELETE, + data: { deletedCount }, + }); } catch (error) { error.service = SERVICE_NAME; next(error);