From f2407ac5fa7ea04ee729f63966009ba3e5494e97 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 25 Sep 2024 11:52:39 +0800 Subject: [PATCH] Remove unused pagespeed modules --- .../controllers/pageSpeedCheckController.js | 129 ------------------ Server/index.js | 2 - Server/routes/pageSpeedCheckRoute.js | 45 ------ 3 files changed, 176 deletions(-) delete mode 100644 Server/controllers/pageSpeedCheckController.js delete mode 100644 Server/routes/pageSpeedCheckRoute.js diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js deleted file mode 100644 index b07fac4d7..000000000 --- a/Server/controllers/pageSpeedCheckController.js +++ /dev/null @@ -1,129 +0,0 @@ -const PageSpeedService = require("../service/pageSpeedService"); -const { successMessages } = require("../utils/messages"); -const pageSpeedService = new PageSpeedService(); -const SERVICE_NAME = "pagespeedCheckController"; -const { - getPageSpeedCheckParamValidation, - createPageSpeedCheckParamValidation, - createPageSpeedCheckBodyValidation, - deletePageSpeedCheckParamValidation, -} = require("../validation/joi"); - -/** - * Gets all PageSpeedChecks for a monitor - * @async - * @param {Express.Request} req - The request object - * @param {Express.Response} res - The response object - * @param {Function} next - The next middleware function - * @returns {Promise} - */ -const getPageSpeedChecks = async (req, res, next) => { - try { - // Validate monitorId parameter - await getPageSpeedCheckParamValidation.validateAsync(req.params); - } catch (error) { - error.status = 422; - error.service = SERVICE_NAME; - error.message = - error.details?.[0]?.message || error.message || "Validation Error"; - next(error); - return; - } - - try { - return res.status(200).json({ msg: "Hit getPageSpeedChecks" }); - } catch (error) { - error.service === undefined ? (error.service = SERVICE_NAME) : null; - error.method === undefined ? (error.method = "getPageSpeedChecks") : null; - next(error); - } -}; - -/** - * Creates a new PageSpeedCheck for a monitor - * @async - * @param {Express.Request} req - The request object - * @param {Express.Response} res - The response object - * @param {Function} next - The next middleware function - * @returns {Promise} - */ -const createPageSpeedCheck = async (req, res, next) => { - try { - await createPageSpeedCheckParamValidation.validateAsync(req.params); - await createPageSpeedCheckBodyValidation.validateAsync(req.body); - } catch (error) { - error.status = 422; - error.service = SERVICE_NAME; - error.message = - error.details?.[0]?.message || error.message || "Validation Error"; - next(error); - return; - } - - try { - const { monitorId } = req.params; - const { url } = req.body; - - // Run the PageSpeed check - const pageSpeedResults = await pageSpeedService.runPageSpeedCheck(url); - - // Extract categories scores - const categories = pageSpeedResults.lighthouseResult?.categories; - - if (!categories) { - throw new Error("Categories not found in PageSpeed results"); - } - - const newPageSpeedCheck = await pageSpeedService.createPageSpeedCheck({ - monitorId, - accessibility: (categories.accessibility?.score || 0) * 100, - bestPractices: (categories["best-practices"]?.score || 0) * 100, - seo: (categories.seo?.score || 0) * 100, - performance: (categories.performance?.score || 0) * 100, - }); - - return res.status(201).json({ - msg: successMessages.CREATED, - data: newPageSpeedCheck, - }); - } catch (error) { - error.service === undefined ? (error.service = SERVICE_NAME) : null; - error.method === undefined ? (error.method = "createPageSpeedCheck") : null; - next(error); - } -}; - -/** - * Deletes all PageSpeedChecks for a monitor - * @async - * @param {Express.Request} req - The request object - * @param {Express.Response} res - The response object - * @param {Function} next - The next middleware function - * @returns {Promise} - */ -const deletePageSpeedCheck = async (req, res, next) => { - try { - // Validate monitorId parameter - await deletePageSpeedCheckParamValidation.validateAsync(req.params); - } catch (error) { - error.status = 422; - error.service = SERVICE_NAME; - error.message = - error.details?.[0]?.message || error.message || "Validation Error"; - next(error); - return; - } - try { - return res.status(200).json({ msg: "Hit deletePageSpeedCheck" }); - } catch (error) { - error.service === undefined ? (error.service = SERVICE_NAME) : null; - error.method === undefined ? (error.method = "deletePageSpeedCheck") : null; - next(error); - } -}; - -module.exports = { - getPageSpeedChecks, - createPageSpeedCheck, - deletePageSpeedCheck, -}; diff --git a/Server/index.js b/Server/index.js index e665f21d2..25f70a532 100644 --- a/Server/index.js +++ b/Server/index.js @@ -14,7 +14,6 @@ const authRouter = require("./routes/authRoute"); const inviteRouter = require("./routes/inviteRoute"); const monitorRouter = require("./routes/monitorRoute"); const checkRouter = require("./routes/checkRoute"); -const pageSpeedCheckRouter = require("./routes/pageSpeedCheckRoute"); const maintenanceWindowRouter = require("./routes/maintenanceWindowRoute"); const { connectDbAndRunServer } = require("./configs/db"); @@ -84,7 +83,6 @@ const startApp = async () => { app.use("/api/v1/invite", inviteRouter); app.use("/api/v1/monitors", verifyJWT, monitorRouter); app.use("/api/v1/checks", verifyJWT, checkRouter); - app.use("/api/v1/pagespeed", verifyJWT, pageSpeedCheckRouter); app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRouter); //Temporary route for testing, remove later app.use("/api/v1/job", queueRouter); diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js deleted file mode 100644 index 4b1de49bc..000000000 --- a/Server/routes/pageSpeedCheckRoute.js +++ /dev/null @@ -1,45 +0,0 @@ -const router = require("express").Router(); -const { verifyOwnership } = require("../middleware/verifyOwnership"); -const Monitor = require("../models/Monitor"); -const pageSpeedCheckController = require("../controllers/pageSpeedCheckController"); - -/** - * @route POST /:monitorId - * @description Create a new PageSpeedCheck for a monitor - * @access Private - * @param {string} monitorId - The ID of the monitor - * @middleware verifyOwnership - Ensures the user owns the monitor - */ -router.post( - "/:monitorId", - verifyOwnership(Monitor, "monitorId"), - pageSpeedCheckController.createPageSpeedCheck -); - -/** - * @route GET /:monitorId - * @description Get all PageSpeedChecks for a monitor - * @access Private - * @param {string} monitorId - The ID of the monitor - * @middleware verifyOwnership - Ensures the user owns the monitor - */ -router.get( - "/:monitorId", - verifyOwnership(Monitor, "monitorId"), - pageSpeedCheckController.getPageSpeedChecks -); - -/** - * @route DELETE /:monitorId - * @description Delete all PageSpeedChecks for a monitor - * @access Private - * @param {string} monitorId - The ID of the monitor - * @middleware verifyOwnership - Ensures the user owns the monitor - */ -router.delete( - "/:monitorId", - verifyOwnership(Monitor, "monitorId"), - pageSpeedCheckController.deletePageSpeedCheck -); - -module.exports = router;