Feature/global car filtering

src/backend/custom.d.ts

@@ -1,11 +1,12 @@
-import { Organization } from '@prisma/client';
+import { Organization, Prisma } from '@prisma/client';
 import { User as SharedUser } from 'shared';
 
 declare global {
   namespace Express {
     export interface Request {
       currentUser: SharedUser;
       organization: Organization;
+      currentCar?: Prisma.CarGetPayload<{ include: { wbsElement: true } }>;
     }
   }
 }

src/backend/index.ts

@@ -3,6 +3,7 @@ import cors from 'cors';
 import cookieParser from 'cookie-parser';
 import { getUserAndOrganization, prodHeaders, requireJwtDev, requireJwtProd } from './src/utils/auth.utils.js';
 import { errorHandler } from './src/utils/errors.utils.js';
+import { getCurrentCar } from './src/utils/car.utils.js';
 import userRouter from './src/routes/users.routes.js';
 import projectRouter from './src/routes/projects.routes.js';
 import teamsRouter from './src/routes/teams.routes.js';
@@ -90,6 +91,9 @@ app.use(isProd ? requireJwtProd : requireJwtDev);
 // get user and organization
 app.use(getUserAndOrganization);
 
+// get current car
+app.use(getCurrentCar);
+
 // routes
 app.use('/users', userRouter);
 app.use('/projects', projectRouter);

src/backend/src/controllers/change-requests.controllers.ts

@@ -16,7 +16,7 @@ export default class ChangeRequestsController {
 
   static async getAllChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getAllChangeRequests(req.organization);
+      const changeRequests = await ChangeRequestsService.getAllChangeRequests(req.organization, req.currentCar?.carId);
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);
@@ -34,7 +34,11 @@ export default class ChangeRequestsController {
 
   static async getToReviewChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getToReviewChangeRequests(req.currentUser, req.organization);
+      const changeRequests = await ChangeRequestsService.getToReviewChangeRequests(
+        req.currentUser,
+        req.organization,
+        req.currentCar?.carId
+      );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);
@@ -50,7 +54,8 @@ export default class ChangeRequestsController {
       const changeRequests = await ChangeRequestsService.getUnreviewedChangeRequests(
         req.currentUser,
         validatedWbs,
-        req.organization
+        req.organization,
+        req.currentCar?.carId
       );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
@@ -67,7 +72,8 @@ export default class ChangeRequestsController {
       const changeRequests = await ChangeRequestsService.getApprovedChangeRequests(
         req.currentUser,
         validatedWbs,
-        req.organization
+        req.organization,
+        req.currentCar?.carId
       );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {

src/backend/src/controllers/finance.controllers.ts

@@ -172,17 +172,17 @@ export default class FinanceController {
   static async getReimbursementRequestTeamData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const rrData = await FinanceServices.getReimbursementRequestTeamData(
         req.organization,
         teamId,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -193,17 +193,17 @@ export default class FinanceController {
   static async getReimbursementRequestTeamTypeData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamTypeId } = req.params as Record<string, string>;
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const rrData = await FinanceServices.getReimbursementRequestTeamTypeData(
         req.organization,
         teamTypeId,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -214,17 +214,17 @@ export default class FinanceController {
   static async getSpendingBarTeamData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const spendingBarData = await FinanceServices.getSpendingBarTeamData(
         req.organization,
         teamId,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
@@ -235,17 +235,17 @@ export default class FinanceController {
   static async getSpendingBarTeamTypeData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamTypeId } = req.params as Record<string, string>;
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const spendingBarData = await FinanceServices.getSpendingBarTeamTypeData(
         req.organization,
         teamTypeId,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
@@ -255,16 +255,16 @@ export default class FinanceController {
 
   static async getAllReimbursementRequestData(req: Request, res: Response, next: NextFunction) {
     try {
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const rrData = await FinanceServices.getAllReimbursementRequestData(
         req.organization,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -275,17 +275,17 @@ export default class FinanceController {
   static async getReimbursementRequestCategoryData(req: Request, res: Response, next: NextFunction) {
     try {
       const { otherReasonId } = req.params as Record<string, string>;
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const rrData = await FinanceServices.getReimbursementRequestCategoryData(
         otherReasonId,
         req.organization,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -295,16 +295,16 @@ export default class FinanceController {
 
   static async getAllSpendingBarData(req: Request, res: Response, next: NextFunction) {
     try {
-      const { startDate, endDate, carNumber } = req.query;
+      const { startDate, endDate } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
-      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
 
       const spendingBarData = await FinanceServices.getAllSpendingBarData(
         req.organization,
         parsedStartDate,
         parsedEndDate,
-        parsedCarNumber
+        carNumber
       );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
@@ -314,7 +314,17 @@ export default class FinanceController {
 
   static async getSpendingBarCategoryData(req: Request, res: Response, next: NextFunction) {
     try {
-      const spendingBarData = await FinanceServices.getSpendingBarCategoryData(req.organization);
+      const { startDate, endDate } = req.query;
+      const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
+      const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const carNumber = req.currentCar?.wbsElement.carNumber;
+
+      const spendingBarData = await FinanceServices.getSpendingBarCategoryData(
+        req.organization,
+        parsedStartDate,
+        parsedEndDate,
+        carNumber
+      );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/projects.controllers.ts

@@ -16,7 +16,7 @@ import BillOfMaterialsService from '../services/boms.services.js';
 export default class ProjectsController {
   static async getAllProjectsGantt(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectGantt[] = await ProjectsService.getAllProjectsGantt(req.organization);
+      const projects: ProjectGantt[] = await ProjectsService.getAllProjectsGantt(req.organization, req.currentCar?.carId);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -25,7 +25,7 @@ export default class ProjectsController {
 
   static async getAllProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectPreview[] = await ProjectsService.getAllProjects(req.organization);
+      const projects: ProjectPreview[] = await ProjectsService.getAllProjects(req.organization, req.currentCar?.carId);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -34,7 +34,11 @@ export default class ProjectsController {
 
   static async getUsersTeamsProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectOverview[] = await ProjectsService.getUsersTeamsProjects(req.currentUser, req.organization);
+      const projects: ProjectOverview[] = await ProjectsService.getUsersTeamsProjects(
+        req.currentUser,
+        req.organization,
+        req.currentCar?.carId
+      );
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -43,7 +47,11 @@ export default class ProjectsController {
 
   static async getUsersLeadingProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectOverview[] = await ProjectsService.getUsersLeadingProjects(req.currentUser, req.organization);
+      const projects: ProjectOverview[] = await ProjectsService.getUsersLeadingProjects(
+        req.currentUser,
+        req.organization,
+        req.currentCar?.carId
+      );
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -53,7 +61,7 @@ export default class ProjectsController {
   static async getTeamsProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;
-      const projects: Project[] = await ProjectsService.getTeamsProjects(req.organization, teamId);
+      const projects: Project[] = await ProjectsService.getTeamsProjects(req.organization, teamId, req.currentCar?.carId);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -13,9 +13,11 @@ import { HttpException } from '../utils/errors.utils.js';
 export default class ReimbursementRequestsController {
   static async getCurrentUserReimbursementRequests(req: Request, res: Response, next: NextFunction) {
     try {
+      const carNumber = req.currentCar?.wbsElement.carNumber;
       const userReimbursementRequests = await ReimbursementRequestService.getUserReimbursementRequests(
         req.currentUser,
-        req.organization
+        req.organization,
+        carNumber
       );
       res.status(200).json(userReimbursementRequests);
     } catch (error: unknown) {
@@ -25,9 +27,11 @@ export default class ReimbursementRequestsController {
 
   static async getCurrentUserAssignedReimbursementRequests(req: Request, res: Response, next: NextFunction) {
     try {
+      const carNumber = req.currentCar?.wbsElement.carNumber;
       const assignedReimbursementRequests = await ReimbursementRequestService.getUserAssignedReimbursementRequests(
         req.currentUser,
-        req.organization
+        req.organization,
+        carNumber
       );
       res.status(200).json(assignedReimbursementRequests);
     } catch (error: unknown) {
@@ -46,9 +50,11 @@ export default class ReimbursementRequestsController {
 
   static async getCurrentUsersTeamsReimbursementRequests(req: Request, res: Response, next: NextFunction) {
     try {
+      const carNumber = req.currentCar?.wbsElement.carNumber;
       const userTeamsReimbursementRequests = await ReimbursementRequestService.getUsersTeamsReimbursementRequests(
         req.currentUser,
-        req.organization
+        req.organization,
+        carNumber
       );
       res.status(200).json(userTeamsReimbursementRequests);
     } catch (error: unknown) {
@@ -208,9 +214,11 @@ export default class ReimbursementRequestsController {
 
   static async getPendingAdvisorList(req: Request, res: Response, next: NextFunction) {
     try {
+      const carNumber = req.currentCar?.wbsElement.carNumber;
       const requestsPendingAdvisors: ReimbursementRequest[] = await ReimbursementRequestService.getPendingAdvisorList(
         req.currentUser,
-        req.organization
+        req.organization,
+        carNumber
       );
       res.status(200).json(requestsPendingAdvisors);
     } catch (error: unknown) {
@@ -308,9 +316,11 @@ export default class ReimbursementRequestsController {
 
   static async getAllReimbursementRequests(req: Request, res: Response, next: NextFunction) {
     try {
+      const carNumber = req.currentCar?.wbsElement.carNumber;
       const reimbursementRequests: ReimbursementRequest[] = await ReimbursementRequestService.getAllReimbursementRequests(
         req.currentUser,
-        req.organization
+        req.organization,
+        carNumber
       );
       res.status(200).json(reimbursementRequests);
     } catch (error: unknown) {

src/backend/src/controllers/users.controllers.ts

@@ -74,7 +74,11 @@ export default class UsersController {
 
   static async getUsersFavoriteProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects = await UsersService.getUsersFavoriteProjects(req.currentUser.userId, req.organization);
+      const projects = await UsersService.getUsersFavoriteProjects(
+        req.currentUser.userId,
+        req.organization,
+        req.currentCar?.carId
+      );
 
       res.status(200).json(projects);
     } catch (error: unknown) {