From 38a9fbf0418f1f29438b7e9225fc9cf278cdf37a Mon Sep 17 00:00:00 2001 From: Courtney Myers Date: Wed, 27 Nov 2024 16:14:31 -0500 Subject: [PATCH] Rename the middleware function storeBapComboKeys() to fetchBapComboKeys() --- app/server/app/middleware.js | 4 +-- app/server/app/routes/bap.js | 4 +-- app/server/app/routes/formio2022.js | 32 +++++++++++------------ app/server/app/routes/formio2023.js | 40 ++++++++++++++--------------- app/server/app/routes/formio2024.js | 40 ++++++++++++++--------------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/app/server/app/middleware.js b/app/server/app/middleware.js index 7be03972..6c90b647 100644 --- a/app/server/app/middleware.js +++ b/app/server/app/middleware.js @@ -193,7 +193,7 @@ function checkClientRouteExists(req, res, next) { * @param {express.Response} res * @param {express.NextFunction} next */ -function storeBapComboKeys(req, res, next) { +function fetchBapComboKeys(req, res, next) { const { mail } = req.user; getBapComboKeys(req, mail) @@ -230,6 +230,6 @@ module.exports = { ensureHelpdesk, protectClientRoutes, checkClientRouteExists, - storeBapComboKeys, + fetchBapComboKeys, verifyMongoObjectId, }; diff --git a/app/server/app/routes/bap.js b/app/server/app/routes/bap.js index 3b336f07..0f820b8f 100644 --- a/app/server/app/routes/bap.js +++ b/app/server/app/routes/bap.js @@ -1,6 +1,6 @@ const express = require("express"); // --- -const { ensureAuthenticated, storeBapComboKeys } = require("../middleware"); +const { ensureAuthenticated, fetchBapComboKeys } = require("../middleware"); const { // checkForBapDuplicates, getSamEntities, @@ -75,7 +75,7 @@ router.get("/sam", (req, res) => { }); // --- get user's form submissions statuses from the BAP -router.get("/submissions", storeBapComboKeys, (req, res) => { +router.get("/submissions", fetchBapComboKeys, (req, res) => { const { mail } = req.user; const { adminOrHelpdeskUser, noBapComboKeys } = checkUserData({ req }); diff --git a/app/server/app/routes/formio2022.js b/app/server/app/routes/formio2022.js index f0459a9d..2316b65c 100644 --- a/app/server/app/routes/formio2022.js +++ b/app/server/app/routes/formio2022.js @@ -2,7 +2,7 @@ const express = require("express"); // --- const { ensureAuthenticated, - storeBapComboKeys, + fetchBapComboKeys, verifyMongoObjectId, } = require("../middleware"); const { @@ -34,7 +34,7 @@ router.use(ensureAuthenticated); // --- download Formio S3 file metadata router.get( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { downloadS3FileMetadata({ rebateYear, req, res }); }, @@ -43,19 +43,19 @@ router.get( // --- upload Formio S3 file metadata router.post( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { uploadS3FileMetadata({ rebateYear, req, res }); }, ); // --- get user's 2022 FRF submissions from Formio -router.get("/frf-submissions", storeBapComboKeys, (req, res) => { +router.get("/frf-submissions", fetchBapComboKeys, (req, res) => { fetchFRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2022 FRF submission to Formio -router.post("/frf-submission", storeBapComboKeys, (req, res) => { +router.post("/frf-submission", fetchBapComboKeys, (req, res) => { createFRFSubmission({ rebateYear, req, res }); }); @@ -63,7 +63,7 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => { router.get( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { fetchFRFSubmission({ rebateYear, req, res }); }, @@ -73,54 +73,54 @@ router.get( router.post( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { updateFRFSubmission({ rebateYear, req, res }); }, ); // --- get user's 2022 PRF submissions from Formio -router.get("/prf-submissions", storeBapComboKeys, (req, res) => { +router.get("/prf-submissions", fetchBapComboKeys, (req, res) => { fetchPRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2022 PRF submission to Formio -router.post("/prf-submission", storeBapComboKeys, (req, res) => { +router.post("/prf-submission", fetchBapComboKeys, (req, res) => { createPRFSubmission({ rebateYear, req, res }); }); // --- get an existing 2022 PRF's schema and submission data from Formio -router.get("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.get("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { fetchPRFSubmission({ rebateYear, req, res }); }); // --- post an update to an existing draft 2022 PRF submission to Formio -router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.post("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { updatePRFSubmission({ rebateYear, req, res }); }); // --- delete an existing 2022 PRF submission from Formio -router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => { +router.post("/delete-prf-submission", fetchBapComboKeys, (req, res) => { deletePRFSubmission({ rebateYear, req, res }); }); // --- get user's 2022 CRF submissions from Formio -router.get("/crf-submissions", storeBapComboKeys, (req, res) => { +router.get("/crf-submissions", fetchBapComboKeys, (req, res) => { fetchCRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2022 CRF submission to Formio -router.post("/crf-submission", storeBapComboKeys, (req, res) => { +router.post("/crf-submission", fetchBapComboKeys, (req, res) => { createCRFSubmission({ rebateYear, req, res }); }); // --- get an existing 2022 CRF's schema and submission data from Formio -router.get("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.get("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { fetchCRFSubmission({ rebateYear, req, res }); }); // --- post an update to an existing draft 2022 CRF submission to Formio -router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.post("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { updateCRFSubmission({ rebateYear, req, res }); }); diff --git a/app/server/app/routes/formio2023.js b/app/server/app/routes/formio2023.js index d5a226fb..dab98372 100644 --- a/app/server/app/routes/formio2023.js +++ b/app/server/app/routes/formio2023.js @@ -2,7 +2,7 @@ const express = require("express"); // --- const { ensureAuthenticated, - storeBapComboKeys, + fetchBapComboKeys, verifyMongoObjectId, } = require("../middleware"); const { @@ -46,7 +46,7 @@ router.get("/nces/:searchText?", (req, res) => { // --- download Formio S3 file metadata router.get( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { downloadS3FileMetadata({ rebateYear, req, res }); }, @@ -55,19 +55,19 @@ router.get( // --- upload Formio S3 file metadata router.post( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { uploadS3FileMetadata({ rebateYear, req, res }); }, ); // --- get user's 2023 FRF submissions from Formio -router.get("/frf-submissions", storeBapComboKeys, (req, res) => { +router.get("/frf-submissions", fetchBapComboKeys, (req, res) => { fetchFRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2023 FRF submission to Formio -router.post("/frf-submission", storeBapComboKeys, (req, res) => { +router.post("/frf-submission", fetchBapComboKeys, (req, res) => { createFRFSubmission({ rebateYear, req, res }); }); @@ -75,7 +75,7 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => { router.get( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { fetchFRFSubmission({ rebateYear, req, res }); }, @@ -85,74 +85,74 @@ router.get( router.post( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { updateFRFSubmission({ rebateYear, req, res }); }, ); // --- get user's 2023 PRF submissions from Formio -router.get("/prf-submissions", storeBapComboKeys, (req, res) => { +router.get("/prf-submissions", fetchBapComboKeys, (req, res) => { fetchPRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2023 PRF submission to Formio -router.post("/prf-submission", storeBapComboKeys, (req, res) => { +router.post("/prf-submission", fetchBapComboKeys, (req, res) => { createPRFSubmission({ rebateYear, req, res }); }); // --- get an existing 2023 PRF's schema and submission data from Formio -router.get("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.get("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { fetchPRFSubmission({ rebateYear, req, res }); }); // --- post an update to an existing draft 2023 PRF submission to Formio -router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.post("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { updatePRFSubmission({ rebateYear, req, res }); }); // --- delete an existing 2023 PRF submission from Formio -router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => { +router.post("/delete-prf-submission", fetchBapComboKeys, (req, res) => { deletePRFSubmission({ rebateYear, req, res }); }); // --- get user's 2023 CRF submissions from Formio -router.get("/crf-submissions", storeBapComboKeys, (req, res) => { +router.get("/crf-submissions", fetchBapComboKeys, (req, res) => { res.json([]); // TODO: replace with `fetchCRFSubmissions({ rebateYear, req, res })` when CRF is ready }); // --- post a new 2023 CRF submission to Formio -// router.post("/crf-submission", storeBapComboKeys, (req, res) => { +// router.post("/crf-submission", fetchBapComboKeys, (req, res) => { // createCRFSubmission({ rebateYear, req, res }); // }); // --- get an existing 2023 CRF's schema and submission data from Formio -// router.get("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +// router.get("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { // fetchCRFSubmission({ rebateYear, req, res }); // }); // --- post an update to an existing draft 2023 CRF submission to Formio -// router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +// router.post("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { // updateCRFSubmission({ rebateYear, req, res }); // }); // --- get user's 2023 Change Request form submissions from Formio -router.get("/changes", storeBapComboKeys, (req, res) => { +router.get("/changes", fetchBapComboKeys, (req, res) => { fetchChangeRequests({ rebateYear, req, res }); }); // --- get the 2023 Change Request form's schema from Formio -router.get("/change", storeBapComboKeys, (req, res) => { +router.get("/change", fetchBapComboKeys, (req, res) => { fetchChangeRequestSchema({ rebateYear, req, res }); }); // --- post a new 2023 Change Request form submission to Formio -router.post("/change", storeBapComboKeys, (req, res) => { +router.post("/change", fetchBapComboKeys, (req, res) => { createChangeRequest({ rebateYear, req, res }); }); // --- get an existing 2023 Change Request form's schema and submission data from Formio -router.get("/change/:mongoId", storeBapComboKeys, (req, res) => { +router.get("/change/:mongoId", fetchBapComboKeys, (req, res) => { fetchChangeRequest({ rebateYear, req, res }); }); diff --git a/app/server/app/routes/formio2024.js b/app/server/app/routes/formio2024.js index e4ab6cf8..88ef5b22 100644 --- a/app/server/app/routes/formio2024.js +++ b/app/server/app/routes/formio2024.js @@ -2,7 +2,7 @@ const express = require("express"); // --- const { ensureAuthenticated, - storeBapComboKeys, + fetchBapComboKeys, verifyMongoObjectId, } = require("../middleware"); const { @@ -46,7 +46,7 @@ router.get("/nces/:searchText?", (req, res) => { // --- download Formio S3 file metadata router.get( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { downloadS3FileMetadata({ rebateYear, req, res }); }, @@ -55,19 +55,19 @@ router.get( // --- upload Formio S3 file metadata router.post( "/s3/:formType/:mongoId/:comboKey/storage/s3", - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { uploadS3FileMetadata({ rebateYear, req, res }); }, ); // --- get user's 2024 FRF submissions from Formio -router.get("/frf-submissions", storeBapComboKeys, (req, res) => { +router.get("/frf-submissions", fetchBapComboKeys, (req, res) => { fetchFRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2024 FRF submission to Formio -router.post("/frf-submission", storeBapComboKeys, (req, res) => { +router.post("/frf-submission", fetchBapComboKeys, (req, res) => { createFRFSubmission({ rebateYear, req, res }); }); @@ -75,7 +75,7 @@ router.post("/frf-submission", storeBapComboKeys, (req, res) => { router.get( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { fetchFRFSubmission({ rebateYear, req, res }); }, @@ -85,74 +85,74 @@ router.get( router.post( "/frf-submission/:mongoId", verifyMongoObjectId, - storeBapComboKeys, + fetchBapComboKeys, (req, res) => { updateFRFSubmission({ rebateYear, req, res }); }, ); // --- get user's 2024 PRF submissions from Formio -router.get("/prf-submissions", storeBapComboKeys, (req, res) => { +router.get("/prf-submissions", fetchBapComboKeys, (req, res) => { fetchPRFSubmissions({ rebateYear, req, res }); }); // --- post a new 2024 PRF submission to Formio -router.post("/prf-submission", storeBapComboKeys, (req, res) => { +router.post("/prf-submission", fetchBapComboKeys, (req, res) => { createPRFSubmission({ rebateYear, req, res }); }); // --- get an existing 2024 PRF's schema and submission data from Formio -router.get("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.get("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { fetchPRFSubmission({ rebateYear, req, res }); }); // --- post an update to an existing draft 2024 PRF submission to Formio -router.post("/prf-submission/:rebateId", storeBapComboKeys, (req, res) => { +router.post("/prf-submission/:rebateId", fetchBapComboKeys, (req, res) => { updatePRFSubmission({ rebateYear, req, res }); }); // --- delete an existing 2024 PRF submission from Formio -router.post("/delete-prf-submission", storeBapComboKeys, (req, res) => { +router.post("/delete-prf-submission", fetchBapComboKeys, (req, res) => { deletePRFSubmission({ rebateYear, req, res }); }); // --- get user's 2024 CRF submissions from Formio -router.get("/crf-submissions", storeBapComboKeys, (req, res) => { +router.get("/crf-submissions", fetchBapComboKeys, (req, res) => { res.json([]); // TODO: replace with `fetchCRFSubmissions({ rebateYear, req, res })` when CRF is ready }); // --- post a new 2024 CRF submission to Formio -// router.post("/crf-submission", storeBapComboKeys, (req, res) => { +// router.post("/crf-submission", fetchBapComboKeys, (req, res) => { // createCRFSubmission({ rebateYear, req, res }); // }); // --- get an existing 2024 CRF's schema and submission data from Formio -// router.get("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +// router.get("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { // fetchCRFSubmission({ rebateYear, req, res }); // }); // --- post an update to an existing draft 2024 CRF submission to Formio -// router.post("/crf-submission/:rebateId", storeBapComboKeys, (req, res) => { +// router.post("/crf-submission/:rebateId", fetchBapComboKeys, (req, res) => { // updateCRFSubmission({ rebateYear, req, res }); // }); // --- get user's 2024 Change Request form submissions from Formio -router.get("/changes", storeBapComboKeys, (req, res) => { +router.get("/changes", fetchBapComboKeys, (req, res) => { fetchChangeRequests({ rebateYear, req, res }); }); // --- get the 2024 Change Request form's schema from Formio -router.get("/change", storeBapComboKeys, (req, res) => { +router.get("/change", fetchBapComboKeys, (req, res) => { fetchChangeRequestSchema({ rebateYear, req, res }); }); // --- post a new 2024 Change Request form submission to Formio -router.post("/change", storeBapComboKeys, (req, res) => { +router.post("/change", fetchBapComboKeys, (req, res) => { createChangeRequest({ rebateYear, req, res }); }); // --- get an existing 2024 Change Request form's schema and submission data from Formio -router.get("/change/:mongoId", storeBapComboKeys, (req, res) => { +router.get("/change/:mongoId", fetchBapComboKeys, (req, res) => { fetchChangeRequest({ rebateYear, req, res }); });