From 4e659072f2887d20b3aa9df5d91d34fa10c9d5b4 Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Wed, 17 Jul 2024 15:00:06 -0700
Subject: [PATCH] Fixed pagespeedcheck route.

---
 .../controllers/pageSpeedCheckController.js   | 20 +++++++-
 Server/routes/pageSpeedCheckRoute.js          | 48 ++-----------------
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js
index 29cc10f95..c561ff02e 100644
--- a/Server/controllers/pageSpeedCheckController.js
+++ b/Server/controllers/pageSpeedCheckController.js
@@ -1,6 +1,7 @@
 const PageSpeedCheck = require("../models/PageSpeedCheck");
 const { successMessages } = require("../utils/messages");
 const SERVICE_NAME = "pagespeed";
+const { getMonitorByIdValidation } = require("../validation/joi");
 
 /**
  * Gets all PageSpeedChecks for a monitor
@@ -12,9 +13,14 @@ const SERVICE_NAME = "pagespeed";
  */
 const getPageSpeedChecks = async (req, res, next) => {
   try {
+    // Validate monitorId parameter
+    const { error } = getMonitorByIdValidation.validate(req.params);
+    if (error) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
+
     return res.status(200).json({ msg: "Hit getPageSpeedChecks" });
   } catch (error) {
-    error.service = SERVICE_NAME;
     next(error);
   }
 };
@@ -29,6 +35,12 @@ const getPageSpeedChecks = async (req, res, next) => {
  */
 const createPageSpeedCheck = async (req, res, next) => {
   try {
+    // Validate monitorId parameter
+    const { error } = getMonitorByIdValidation.validate(req.params);
+    if (error) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
+
     return res.status(200).json({ msg: "Hit createPageSpeedCheck" });
   } catch (error) {
     error.service = SERVICE_NAME;
@@ -46,6 +58,12 @@ const createPageSpeedCheck = async (req, res, next) => {
  */
 const deletePageSpeedCheck = async (req, res, next) => {
   try {
+    // Validate monitorId parameter
+    const { error } = getMonitorByIdValidation.validate(req.params);
+    if (error) {
+      return res.status(400).json({ error: error.details[0].message });
+    }
+
     return res.status(200).json({ msg: "Hit deletePageSpeedCheck" });
   } catch (error) {
     error.service = SERVICE_NAME;
diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js
index e62c45439..803012d95 100644
--- a/Server/routes/pageSpeedCheckRoute.js
+++ b/Server/routes/pageSpeedCheckRoute.js
@@ -1,9 +1,8 @@
 const router = require("express").Router();
-const Joi = require("joi");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
 const Monitor = require("../models/Monitor");
 const { createPageSpeedCheck, getPageSpeedChecks, deletePageSpeedCheck } = require("../controllers/pageSpeedCheckController");
-const { getMonitorByIdValidation } = require("../validation/joi"); 
+ 
 
 /**
  * @route POST /pagespeed/:monitorId
@@ -15,20 +14,7 @@ const { getMonitorByIdValidation } = require("../validation/joi");
 router.post(
   "/pagespeed/:monitorId",
   verifyOwnership(Monitor, "monitorId"), 
-  async (req, res, next) => {
-    try {
-      // Validate monitorId parameter
-      const { error } = getMonitorByIdValidation.validate(req.params);
-      if (error) {
-        return res.status(400).json({ error: error.details[0].message });
-      }
-
-      next();
-    } catch (error) {
-      next(error);
-    }
-  },
-  createPageSpeedCheck 
+  createPageSpeedCheck
 );
 
 /**
@@ -41,20 +27,7 @@ router.post(
 router.get(
   "/pagespeed/:monitorId",
   verifyOwnership(Monitor, "monitorId"), 
-  async (req, res, next) => {
-    try {
-      // Validate monitorId parameter
-      const { error } = getMonitorByIdValidation.validate(req.params);
-      if (error) {
-        return res.status(400).json({ error: error.details[0].message });
-      }
-
-      next();
-    } catch (error) {
-      next(error);
-    }
-  },
-  getPageSpeedChecks 
+  getPageSpeedChecks
 );
 
 /**
@@ -67,20 +40,7 @@ router.get(
 router.delete(
   "/pagespeed/:monitorId",
   verifyOwnership(Monitor, "monitorId"),
-  async (req, res, next) => {
-    try {
-      // Validate monitorId parameter
-      const { error } = getMonitorByIdValidation.validate(req.params);
-      if (error) {
-        return res.status(400).json({ error: error.details[0].message });
-      }
-
-      next();
-    } catch (error) {
-      next(error);
-    }
-  },
-  deletePageSpeedCheck 
+  deletePageSpeedCheck
 );
 
 module.exports = router;