From 7f27fa2507874aca4c4e762e973c328dccf4d72a Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Wed, 17 Jul 2024 15:23:06 -0700
Subject: [PATCH] Updated controller with proper names.

---
 .../controllers/pageSpeedCheckController.js   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js
index 68303e8d9..8da1b39d2 100644
--- a/Server/controllers/pageSpeedCheckController.js
+++ b/Server/controllers/pageSpeedCheckController.js
@@ -1,7 +1,11 @@
 const PageSpeedCheck = require("../models/PageSpeedCheck");
 const { successMessages } = require("../utils/messages");
 const SERVICE_NAME = "pagespeed";
-const { pageSpeedCheckValidation } = require("../validation/joi");
+const {
+  getPageSpeedCheckParamValidation,
+  createPageSpeedCheckParamValidation,
+  deletePageSpeedCheckParamValidation,
+} = require("../validation/joi");
 
 /**
  * Gets all PageSpeedChecks for a monitor
@@ -14,13 +18,13 @@ const { pageSpeedCheckValidation } = require("../validation/joi");
 const getPageSpeedChecks = async (req, res, next) => {
   try {
     // Validate monitorId parameter
-    const { error } = pageSpeedCheckValidation.validateAsync(req.params);
-    if (error) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
+    await getPageSpeedCheckParamValidation.validateAsync(req.params);
 
     return res.status(200).json({ msg: "Hit getPageSpeedChecks" });
   } catch (error) {
+    if (error.isJoi) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
     next(error);
   }
 };
@@ -36,13 +40,13 @@ const getPageSpeedChecks = async (req, res, next) => {
 const createPageSpeedCheck = async (req, res, next) => {
   try {
     // Validate monitorId parameter
-    const { error } = pageSpeedCheckValidation.validateAsync(req.params);
-    if (error) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
+    await createPageSpeedCheckParamValidation.validateAsync(req.params);
 
     return res.status(200).json({ msg: "Hit createPageSpeedCheck" });
   } catch (error) {
+    if (error.isJoi) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
     error.service = SERVICE_NAME;
     next(error);
   }
@@ -59,13 +63,13 @@ const createPageSpeedCheck = async (req, res, next) => {
 const deletePageSpeedCheck = async (req, res, next) => {
   try {
     // Validate monitorId parameter
-    const { error } = pageSpeedCheckValidation.validateAsync(req.params);
-    if (error) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
+    await deletePageSpeedCheckParamValidation.validateAsync(req.params);
 
     return res.status(200).json({ msg: "Hit deletePageSpeedCheck" });
   } catch (error) {
+    if (error.isJoi) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
     error.service = SERVICE_NAME;
     next(error);
   }