From b8b66d5f55e1b0e3826e212463bbd81aca19c1e8 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:11:43 -0700 Subject: [PATCH 1/8] Made the routes for the speedcheck route. --- Server/routes/pageSpeedCheckRoute.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Server/routes/pageSpeedCheckRoute.js diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js new file mode 100644 index 000000000..193f1a9d9 --- /dev/null +++ b/Server/routes/pageSpeedCheckRoute.js @@ -0,0 +1,24 @@ +const router = require("express").Router(); +const pageSpeedCheckController = require("../controllers/pageSpeedCheckController"); +const { verifyOwnership } = require("../middleware/verifyOwnership"); +const PageSpeedCheck = require("../models/PageSpeedCheck"); + +router.post( + "/:monitorId", + verifyOwnership(PageSpeedCheck, "monitorId"), + pageSpeedCheckController.createCheck +); + +router.get( + "/:monitorId", + verifyOwnership(PageSpeedCheck, "monitorId"), + pageSpeedCheckController.getChecks +); + +router.post( + "/delete/:monitorId", + verifyOwnership(PageSpeedCheck, "monitorId"), + pageSpeedCheckController.deleteChecks +); + +module.exports = router; From cebab6669d8fa0c20c02e6dc3b654059441f6260 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:14:09 -0700 Subject: [PATCH 2/8] Added docs. --- Server/routes/pageSpeedCheckRoute.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js index 193f1a9d9..f5b155fcf 100644 --- a/Server/routes/pageSpeedCheckRoute.js +++ b/Server/routes/pageSpeedCheckRoute.js @@ -3,18 +3,42 @@ const pageSpeedCheckController = require("../controllers/pageSpeedCheckControlle const { verifyOwnership } = require("../middleware/verifyOwnership"); const PageSpeedCheck = require("../models/PageSpeedCheck"); +/** + * @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 + * @controller pageSpeedCheckController.createCheck + */ router.post( "/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), pageSpeedCheckController.createCheck ); +/** + * @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 + * @controller pageSpeedCheckController.getChecks + */ router.get( "/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), pageSpeedCheckController.getChecks ); +/** + * @route POST /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 + * @controller pageSpeedCheckController.deleteChecks + */ router.post( "/delete/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), From 6dbc40db8e88f9bd0307575777149c787fdc1ad4 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:24:10 -0700 Subject: [PATCH 3/8] Added some stub funcs until controller is complete. --- Server/routes/pageSpeedCheckRoute.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js index f5b155fcf..e3b591ecc 100644 --- a/Server/routes/pageSpeedCheckRoute.js +++ b/Server/routes/pageSpeedCheckRoute.js @@ -1,5 +1,4 @@ const router = require("express").Router(); -const pageSpeedCheckController = require("../controllers/pageSpeedCheckController"); const { verifyOwnership } = require("../middleware/verifyOwnership"); const PageSpeedCheck = require("../models/PageSpeedCheck"); @@ -9,12 +8,13 @@ const PageSpeedCheck = require("../models/PageSpeedCheck"); * @access Private * @param {string} monitorId - The ID of the monitor * @middleware verifyOwnership - Ensures the user owns the monitor - * @controller pageSpeedCheckController.createCheck */ router.post( "/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), - pageSpeedCheckController.createCheck + () => { + console.log("Create check"); + } ); /** @@ -23,12 +23,13 @@ router.post( * @access Private * @param {string} monitorId - The ID of the monitor * @middleware verifyOwnership - Ensures the user owns the monitor - * @controller pageSpeedCheckController.getChecks */ router.get( "/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), - pageSpeedCheckController.getChecks + () => { + console.log("Get checks"); + } ); /** @@ -37,12 +38,13 @@ router.get( * @access Private * @param {string} monitorId - The ID of the monitor * @middleware verifyOwnership - Ensures the user owns the monitor - * @controller pageSpeedCheckController.deleteChecks */ router.post( "/delete/:monitorId", verifyOwnership(PageSpeedCheck, "monitorId"), - pageSpeedCheckController.deleteChecks + () => { + console.log("Delete checks"); + } ); module.exports = router; From 9be79a99b6229bafde05ff4c7db05e2db23e49c8 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:27:05 -0700 Subject: [PATCH 4/8] Added route in index.js --- Server/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Server/index.js b/Server/index.js index eab64e36d..da511ba63 100644 --- a/Server/index.js +++ b/Server/index.js @@ -12,6 +12,7 @@ const { verifyJWT } = require("./middleware/verifyJWT"); const { handleErrors } = require("./middleware/handleErrors"); const queueRouter = require("./routes/queueRoute"); const JobQueue = require("./service/jobQueue"); +const pageSpeedCheckRoutes = require("./routes/pageSpeedCheckRoutes"); // Need to wrap server setup in a function to handle async nature of JobQueue const startApp = async () => { @@ -71,6 +72,7 @@ const startApp = async () => { app.use("/api/v1/monitors", verifyJWT, monitorRouter); app.use("/api/v1/checks", verifyJWT, checkRouter); app.use("/api/v1/alerts", verifyJWT, alertRouter); + app.use("/api/v1/pagespeed", verifyJWT, pageSpeedRouter); //Temporary route for testing, remove later app.use("/api/v1/job", queueRouter); From 6259b89b94fd5021ccc9bf73add761b21d62ce38 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:43:20 -0700 Subject: [PATCH 5/8] Fixed import issues and some naming. --- Server/index.js | 2 +- Server/models/{Metrics.js => PageSpeedCheck.js} | 0 Server/routes/pageSpeedCheckRoute.js | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename Server/models/{Metrics.js => PageSpeedCheck.js} (100%) diff --git a/Server/index.js b/Server/index.js index da511ba63..eac3c0022 100644 --- a/Server/index.js +++ b/Server/index.js @@ -72,7 +72,7 @@ const startApp = async () => { app.use("/api/v1/monitors", verifyJWT, monitorRouter); app.use("/api/v1/checks", verifyJWT, checkRouter); app.use("/api/v1/alerts", verifyJWT, alertRouter); - app.use("/api/v1/pagespeed", verifyJWT, pageSpeedRouter); + app.use("/api/v1/pagespeed", verifyJWT, pageSpeedCheckRouter); //Temporary route for testing, remove later app.use("/api/v1/job", queueRouter); diff --git a/Server/models/Metrics.js b/Server/models/PageSpeedCheck.js similarity index 100% rename from Server/models/Metrics.js rename to Server/models/PageSpeedCheck.js diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js index e3b591ecc..e2b80d182 100644 --- a/Server/routes/pageSpeedCheckRoute.js +++ b/Server/routes/pageSpeedCheckRoute.js @@ -1,6 +1,6 @@ const router = require("express").Router(); const { verifyOwnership } = require("../middleware/verifyOwnership"); -const PageSpeedCheck = require("../models/PageSpeedCheck"); +const pageSpeedCheckRouter = require("./routes/pageSpeedCheckRoute") /** * @route POST /:monitorId @@ -11,7 +11,7 @@ const PageSpeedCheck = require("../models/PageSpeedCheck"); */ router.post( "/:monitorId", - verifyOwnership(PageSpeedCheck, "monitorId"), + verifyOwnership(Monitor, "monitorId"), () => { console.log("Create check"); } @@ -26,7 +26,7 @@ router.post( */ router.get( "/:monitorId", - verifyOwnership(PageSpeedCheck, "monitorId"), + verifyOwnership(Monitor, "monitorId"), () => { console.log("Get checks"); } @@ -41,7 +41,7 @@ router.get( */ router.post( "/delete/:monitorId", - verifyOwnership(PageSpeedCheck, "monitorId"), + verifyOwnership(Monitor, "monitorId"), () => { console.log("Delete checks"); } From b508efcb00737ced26ade297d54a89284ebf8a65 Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:43:55 -0700 Subject: [PATCH 6/8] Fixed import. --- Server/routes/pageSpeedCheckRoute.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/routes/pageSpeedCheckRoute.js b/Server/routes/pageSpeedCheckRoute.js index e2b80d182..0881a3bd5 100644 --- a/Server/routes/pageSpeedCheckRoute.js +++ b/Server/routes/pageSpeedCheckRoute.js @@ -1,6 +1,6 @@ const router = require("express").Router(); const { verifyOwnership } = require("../middleware/verifyOwnership"); -const pageSpeedCheckRouter = require("./routes/pageSpeedCheckRoute") +const Monitor = require("../models/Monitor"); /** * @route POST /:monitorId From f8bfe5d675e0b5a7362f85589569209f347f227e Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:51:24 -0700 Subject: [PATCH 7/8] Fixed import. --- Server/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/index.js b/Server/index.js index eac3c0022..dbaafe150 100644 --- a/Server/index.js +++ b/Server/index.js @@ -12,7 +12,7 @@ const { verifyJWT } = require("./middleware/verifyJWT"); const { handleErrors } = require("./middleware/handleErrors"); const queueRouter = require("./routes/queueRoute"); const JobQueue = require("./service/jobQueue"); -const pageSpeedCheckRoutes = require("./routes/pageSpeedCheckRoutes"); +const pageSpeedCheckRoutes = require("./routes/pageSpeedCheckRoute"); // Need to wrap server setup in a function to handle async nature of JobQueue const startApp = async () => { From 29dbba9002d19d226dc01738541e9d32e8eb9acc Mon Sep 17 00:00:00 2001 From: M M Date: Mon, 15 Jul 2024 22:53:15 -0700 Subject: [PATCH 8/8] Fix imports --- Server/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/index.js b/Server/index.js index dbaafe150..9cd8d57ec 100644 --- a/Server/index.js +++ b/Server/index.js @@ -12,7 +12,7 @@ const { verifyJWT } = require("./middleware/verifyJWT"); const { handleErrors } = require("./middleware/handleErrors"); const queueRouter = require("./routes/queueRoute"); const JobQueue = require("./service/jobQueue"); -const pageSpeedCheckRoutes = require("./routes/pageSpeedCheckRoute"); +const pageSpeedCheckRouter = require("./routes/pageSpeedCheckRoute"); // Need to wrap server setup in a function to handle async nature of JobQueue const startApp = async () => {