From 8d51fd8bf3c9737a80ed97e9dd7f1315b1764602 Mon Sep 17 00:00:00 2001 From: M M Date: Thu, 18 Jul 2024 23:02:05 -0700 Subject: [PATCH 1/5] Updated joi validation schema. --- Server/validation/joi.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Server/validation/joi.js b/Server/validation/joi.js index b559479e9..2947406bd 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -154,6 +154,10 @@ const getPageSpeedCheckParamValidation = joi.object({ const createPageSpeedCheckParamValidation = joi.object({ monitorId: joi.string().required(), + accessibility: joi.number().required().min(0).max(100), + bestPractices: joi.number().required().min(0).max(100), + seo: joi.number().required().min(0).max(100), + performance: joi.number().required().min(0).max(100), }); const deletePageSpeedCheckParamValidation = joi.object({ From 73ec86e6e310883a9729f6232506d25b66d1f0a9 Mon Sep 17 00:00:00 2001 From: M M Date: Thu, 18 Jul 2024 23:05:33 -0700 Subject: [PATCH 2/5] Updated route handler function for the speed check controller. --- .../controllers/pageSpeedCheckController.js | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js index 8da1b39d2..937b63ebf 100644 --- a/Server/controllers/pageSpeedCheckController.js +++ b/Server/controllers/pageSpeedCheckController.js @@ -39,10 +39,26 @@ const getPageSpeedChecks = async (req, res, next) => { */ const createPageSpeedCheck = async (req, res, next) => { try { - // Validate monitorId parameter - await createPageSpeedCheckParamValidation.validateAsync(req.params); + // Validate monitorId parameter and request body + const { monitorId } = req.params; + const { accessibility, bestPractices, seo, performance } = req.body; + + await createPageSpeedCheckParamValidation.validateAsync({ monitorId, accessibility, bestPractices, seo, performance }); - return res.status(200).json({ msg: "Hit createPageSpeedCheck" }); + const newPageSpeedCheck = new PageSpeedCheck({ + monitorId, + accessibility, + bestPractices, + seo, + performance, + }); + + await newPageSpeedCheck.save(); + + return res.status(201).json({ + msg: successMessages.CREATED, + data: newPageSpeedCheck, + }); } catch (error) { if (error.isJoi) { return res.status(400).json({ error: error.details[0].message }); From 83a837d236ab2e340033a8d68e54eb39ef7967a9 Mon Sep 17 00:00:00 2001 From: M M Date: Thu, 18 Jul 2024 23:21:28 -0700 Subject: [PATCH 3/5] Updated router module. --- Server/routes/pageSpeedCheckRoute.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js index 803012d95..bb140e575 100644 --- a/Server/routes/pageSpeedCheckRoute.js +++ b/Server/routes/pageSpeedCheckRoute.js @@ -1,8 +1,7 @@ const router = require("express").Router(); const { verifyOwnership } = require("../middleware/verifyOwnership"); const Monitor = require("../models/Monitor"); -const { createPageSpeedCheck, getPageSpeedChecks, deletePageSpeedCheck } = require("../controllers/pageSpeedCheckController"); - +const checkController = require("../controllers/pageSpeedCheckController"); /** * @route POST /pagespeed/:monitorId @@ -14,7 +13,7 @@ const { createPageSpeedCheck, getPageSpeedChecks, deletePageSpeedCheck } = requi router.post( "/pagespeed/:monitorId", verifyOwnership(Monitor, "monitorId"), - createPageSpeedCheck + checkController.createPageSpeedCheck ); /** @@ -27,7 +26,7 @@ router.post( router.get( "/pagespeed/:monitorId", verifyOwnership(Monitor, "monitorId"), - getPageSpeedChecks + checkController.getPageSpeedChecks ); /** @@ -40,7 +39,7 @@ router.get( router.delete( "/pagespeed/:monitorId", verifyOwnership(Monitor, "monitorId"), - deletePageSpeedCheck + checkController.deletePageSpeedCheck ); module.exports = router; From ab816ce176ae49ae0621e0478e57203b183e8e89 Mon Sep 17 00:00:00 2001 From: M M Date: Fri, 19 Jul 2024 12:46:11 -0700 Subject: [PATCH 4/5] moved body validation to a separate validation schema. --- Server/validation/joi.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 1d2adc084..3ee67a12b 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -182,12 +182,19 @@ const deleteChecksParamValidation = joi.object({ //**************************************** // PageSpeedCheckValidation //**************************************** + const getPageSpeedCheckParamValidation = joi.object({ monitorId: joi.string().required(), }); +//Validation schema for the monitorId parameter const createPageSpeedCheckParamValidation = joi.object({ monitorId: joi.string().required(), +}); + +//Validation schema for the monitorId body +const createPageSpeedCheckBodyValidation = joi.object({ + monitorId: joi.string().required(), accessibility: joi.number().required().min(0).max(100), bestPractices: joi.number().required().min(0).max(100), seo: joi.number().required().min(0).max(100), @@ -225,4 +232,5 @@ module.exports = { getPageSpeedCheckParamValidation, createPageSpeedCheckParamValidation, deletePageSpeedCheckParamValidation, + createPageSpeedCheckBodyValidation, }; From e1228a01430413e9f87d6dd0c3b86701277a8035 Mon Sep 17 00:00:00 2001 From: M M Date: Fri, 19 Jul 2024 12:52:16 -0700 Subject: [PATCH 5/5] updated validation schema for the controller. --- Server/controllers/pageSpeedCheckController.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js index 937b63ebf..c9f5873bc 100644 --- a/Server/controllers/pageSpeedCheckController.js +++ b/Server/controllers/pageSpeedCheckController.js @@ -4,6 +4,7 @@ const SERVICE_NAME = "pagespeed"; const { getPageSpeedCheckParamValidation, createPageSpeedCheckParamValidation, + createPageSpeedCheckBodyValidation, deletePageSpeedCheckParamValidation, } = require("../validation/joi"); @@ -39,11 +40,14 @@ const getPageSpeedChecks = async (req, res, next) => { */ const createPageSpeedCheck = async (req, res, next) => { try { - // Validate monitorId parameter and request body + // Validate monitorId parameter + await createPageSpeedCheckParamValidation.validateAsync(req.params); + + // Validate request body + await createPageSpeedCheckBodyValidation.validateAsync(req.body); + const { monitorId } = req.params; const { accessibility, bestPractices, seo, performance } = req.body; - - await createPageSpeedCheckParamValidation.validateAsync({ monitorId, accessibility, bestPractices, seo, performance }); const newPageSpeedCheck = new PageSpeedCheck({ monitorId,