🚧 Update req.query to res.locals.query

Author: AJR07

interapp-backend/api/routes/endpoints/announcement/announcement.ts

@@ -41,7 +41,7 @@ announcementRouter.get(
   validateRequiredFields(AnnouncementIdFields),
   verifyJWT,
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof AnnouncementIdFields>;
+    const query = res.locals.query as unknown as z.infer<typeof AnnouncementIdFields>;
     const announcement = await AnnouncementModel.getAnnouncement(Number(query.announcement_id));
     res.status(200).json(announcement);
   },
@@ -52,7 +52,7 @@ announcementRouter.get(
   validateRequiredFields(PaginationFields),
   verifyJWT,
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof PaginationFields>;
+    const query = res.locals.query as unknown as z.infer<typeof PaginationFields>;
     const announcements = await AnnouncementModel.getAnnouncements(
       Number(query.page),
       Number(query.page_size),
@@ -94,7 +94,7 @@ announcementRouter.get(
   verifyJWT,
   async (req, res) => {
     const completions = await AnnouncementModel.getAnnouncementCompletions(
-      Number(req.query.announcement_id),
+      Number(res.locals.query.announcement_id),
     );
 
     res.status(200).send(completions);

interapp-backend/api/routes/endpoints/exports/exports.ts

@@ -15,7 +15,7 @@ exportsRouter.get(
   verifyJWT,
   verifyRequiredPermission(Permissions.ATTENDANCE_MANAGER),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof AttendanceExportsFields>;
+    const query = res.locals.query as unknown as z.infer<typeof AttendanceExportsFields>;
 
     const exports = await AttendanceExportsModel.packXLSX(
       query.id,
@@ -35,7 +35,7 @@ exportsRouter.get(
   verifyJWT,
   verifyRequiredPermission(Permissions.ATTENDANCE_MANAGER),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof ServiceHoursExportsFields>;
+    const query = res.locals.query as unknown as z.infer<typeof ServiceHoursExportsFields>;
 
     const exports = await ServiceHoursExportsModel.packXLSX(query.type, query.order);
 

interapp-backend/api/routes/endpoints/service/service.ts

@@ -41,7 +41,7 @@ serviceRouter.post(
 );
 
 serviceRouter.get('/', validateRequiredFields(ServiceIdFields), async (req, res) => {
-  const query = req.query as unknown as z.infer<typeof ServiceIdFields>;
+  const query = res.locals.query as unknown as z.infer<typeof ServiceIdFields>;
 
   const service = await ServiceModel.getService(Number(query.service_id));
   res.status(200).send(service);
@@ -85,7 +85,7 @@ serviceRouter.get(
   verifyJWT,
   verifyRequiredPermission(Permissions.EXCO),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof ServiceIdFields>;
+    const query = res.locals.query as unknown as z.infer<typeof ServiceIdFields>;
     const users = await UserModel.getAllUsersByService(Number(query.service_id));
 
     res.status(200).send(users);
@@ -107,7 +107,7 @@ serviceRouter.post(
 );
 
 serviceRouter.get('/session', validateRequiredFields(ServiceSessionIdFields), async (req, res) => {
-  const query = req.query as unknown as z.infer<typeof ServiceSessionIdFields>;
+  const query = res.locals.query as unknown as z.infer<typeof ServiceSessionIdFields>;
   const session = await ServiceModel.getServiceSession(Number(query.service_session_id));
   res.status(200).send(session);
 });
@@ -141,7 +141,7 @@ serviceRouter.get(
   '/session/all',
   validateRequiredFields(AllServiceSessionsFields),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof AllServiceSessionsFields>;
+    const query = res.locals.query as unknown as z.infer<typeof AllServiceSessionsFields>;
     let sessions;
     if (query.service_id) {
       sessions = await ServiceModel.getAllServiceSessions(
@@ -192,7 +192,7 @@ serviceRouter.get(
   '/session_user',
   validateRequiredFields(FindServiceSessionUserFields),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof FindServiceSessionUserFields>;
+    const query = res.locals.query as unknown as z.infer<typeof FindServiceSessionUserFields>;
 
     const session_user = await ServiceModel.getServiceSessionUser(
       Number(query.service_session_id),
@@ -207,14 +207,14 @@ serviceRouter.get(
   '/session_user_bulk',
   validateRequiredFields(ServiceSessionUserBulkFields),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof ServiceSessionUserBulkFields>;
+    const query = res.locals.query as unknown as z.infer<typeof ServiceSessionUserBulkFields>;
 
     if (Object.prototype.hasOwnProperty.call(query, 'username')) {
-      const session_users = await UserModel.getAllServiceSessionsByUser(String(req.query.username));
+      const session_users = await UserModel.getAllServiceSessionsByUser(String(res.locals.query.username));
       res.status(200).send(session_users);
     } else if (Object.prototype.hasOwnProperty.call(query, 'service_session_id')) {
       const session_users = await ServiceModel.getServiceSessionUsers(
-        Number(req.query.service_session_id),
+        Number(res.locals.query.service_session_id),
       );
       res.status(200).send(session_users);
     } else

interapp-backend/api/routes/endpoints/user/user.ts

@@ -21,7 +21,7 @@ import { Permissions } from '@utils/permissions';
 const userRouter = Router();
 
 userRouter.get('/', validateRequiredFields(OptionalUsername), verifyJWT, async (req, res) => {
-  const query: z.infer<typeof OptionalUsername> = req.query;
+  const query: z.infer<typeof OptionalUsername> = res.locals.query;
   const username = query.username;
 
   if (username !== undefined) {
@@ -153,7 +153,7 @@ userRouter.get(
   validateRequiredFields(OptionalUsername),
   verifyJWT,
   async (req, res) => {
-    const query: z.infer<typeof OptionalUsername> = req.query;
+    const query: z.infer<typeof OptionalUsername> = res.locals.query;
     const username = query.username;
     const permissions = await UserModel.getPermissions(username);
     res.status(200).send(permissions);
@@ -165,7 +165,7 @@ userRouter.get(
   verifyJWT,
   validateRequiredFields(RequiredUsername),
   async (req, res) => {
-    const query = req.query as unknown as z.infer<typeof RequiredUsername>;
+    const query = res.locals.query as unknown as z.infer<typeof RequiredUsername>;
     const services = await UserModel.getAllServicesByUser(query.username as string);
     res.status(200).send(services);
   },

interapp-backend/api/routes/middleware.ts

@@ -23,7 +23,7 @@ export function validateRequiredFields<T extends z.ZodType<ReqBody | ReqQuery>>(
       );
     }
     if (req.method === 'GET') {
-      req.query = validationResult.data as ReqQuery;
+      res.locals.query = validationResult.data as ReqQuery;
     } else {
       req.body = validationResult.data as ReqBody;
     }