merge with current develop

Author: chpy04

devContainerization/Dockerfile.backend.dev

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:20-slim
 WORKDIR /base
 
 COPY package.json tsconfig.build.json ./

package.json

@@ -44,7 +44,7 @@
     "istart": "yarn i && yarn start",
     "reset": "rimraf yarn.lock; rimraf src/frontend/node_modules; rimraf src/backend/node_modules; rimraf src/shared/node_modules; rimraf ./node_modules; ",
     "install:hard": "yarn reset; yarn install; yarn prisma:generate",
-    "tsc-check": "tsc --noEmit --project src/backend/tsconfig.json && tsc --noEmit --project src/frontend/tsconfig.json",
+    "tsc-check": "tsc --noEmit --project src/frontend/tsconfig.json && tsc --noEmit --project src/backend/tsconfig.json",
     "docker:dev": "docker stop finishline; cd devContainerization; docker compose -f docker-compose.dev.yml down && docker compose -f docker-compose.dev.yml build && docker compose -f docker-compose.dev.yml up --watch",
     "exec:frontend": "docker exec -it frontend /bin/sh",
     "exec:backend": "docker exec -it backend /bin/sh"
@@ -54,6 +54,7 @@
     "@types/react-dom": "17.0.1"
   },
   "dependencies": {
+    "@types/multer": "^1.4.12",
     "mitt": "^3.0.1",
     "typescript": "^5.7.3"
   },

src/backend/index.ts

@@ -13,7 +13,7 @@ import tasksRouter from './src/routes/tasks.routes';
 import reimbursementRequestsRouter from './src/routes/reimbursement-requests.routes';
 import notificationsRouter from './src/routes/notifications.routes';
 import designReviewsRouter from './src/routes/design-reviews.routes';
-import workPackageTemplatesRouter from './src/routes/work-package-templates.routes';
+import wbsElementTemplatesRouter from './src/routes/wbs-element-templates.routes';
 import carsRouter from './src/routes/cars.routes';
 import organizationRouter from './src/routes/organizations.routes';
 import recruitmentRouter from './src/routes/recruitment.routes';
@@ -22,6 +22,7 @@ import announcementsRouter from './src/routes/announcements.routes';
 import onboardingRouter from './src/routes/onboarding.routes';
 import popUpsRouter from './src/routes/pop-up.routes';
 import statisticsRouter from './src/routes/statistics.routes';
+import retrospectiveRouter from './src/routes/retrospective.routes';
 import partsRouter from './src/routes/parts.routes';
 
 const app = express();
@@ -74,14 +75,15 @@ app.use('/tasks', tasksRouter);
 app.use('/reimbursement-requests', reimbursementRequestsRouter);
 app.use('/design-reviews', designReviewsRouter);
 app.use('/notifications', notificationsRouter);
-app.use('/templates', workPackageTemplatesRouter);
+app.use('/templates', wbsElementTemplatesRouter);
 app.use('/cars', carsRouter);
 app.use('/organizations', organizationRouter);
 app.use('/recruitment', recruitmentRouter);
 app.use('/pop-ups', popUpsRouter);
 app.use('/announcements', announcementsRouter);
 app.use('/onboarding', onboardingRouter);
 app.use('/statistics', statisticsRouter);
+app.use('/retrospective', retrospectiveRouter);
 app.use('/parts', partsRouter);
 app.use('/', (_req, res) => {
   res.status(200).json('Welcome to FinishLine');

src/backend/src/controllers/announcements.controllers.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import AnnouncementService from '../services/announcement.service';
+import AnnouncementService from '../services/announcement.services';
 
 export default class AnnouncementController {
   static async getUserUnreadAnnouncements(req: Request, res: Response, next: NextFunction) {

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

@@ -1,5 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import ChangeRequestsService from '../services/change-requests.services';
+import { validateWBS, WbsNumber } from 'shared';
 
 export default class ChangeRequestsController {
   static async getChangeRequestByID(req: Request, res: Response, next: NextFunction) {
@@ -33,7 +34,15 @@ export default class ChangeRequestsController {
 
   static async getUnreviewedChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getUnreviewedChangeRequests(req.currentUser, req.organization);
+      const { wbsnum } = req.query;
+      let validatedWbs: WbsNumber | undefined;
+      if (wbsnum) validatedWbs = validateWBS(wbsnum as string);
+
+      const changeRequests = await ChangeRequestsService.getUnreviewedChangeRequests(
+        req.currentUser,
+        validatedWbs,
+        req.organization
+      );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);
@@ -42,7 +51,15 @@ export default class ChangeRequestsController {
 
   static async getApprovedChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
-      const changeRequests = await ChangeRequestsService.getApprovedChangeRequests(req.currentUser, req.organization);
+      const { wbsnum } = req.query;
+      let validatedWbs: WbsNumber | undefined;
+      if (wbsnum) validatedWbs = validateWBS(wbsnum as string);
+
+      const changeRequests = await ChangeRequestsService.getApprovedChangeRequests(
+        req.currentUser,
+        validatedWbs,
+        req.organization
+      );
       res.status(200).json(changeRequests);
     } catch (error: unknown) {
       next(error);

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

@@ -1,4 +1,4 @@
-import { Manufacturer, MaterialType, Project, validateWBS, WbsNumber, wbsPipe } from 'shared';
+import { Manufacturer, MaterialType, Project, ProjectPreview, validateWBS, WbsNumber, wbsPipe } from 'shared';
 import { NextFunction, Request, Response } from 'express';
 import ProjectsService from '../services/projects.services';
 import BillOfMaterialsService from '../services/boms.services';
@@ -7,7 +7,25 @@ export default class ProjectsController {
   static async getAllProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const includeDeleted = req.params.deleted === 'true';
-      const projects: Project[] = await ProjectsService.getAllProjects(req.organization, includeDeleted);
+      const projects: ProjectPreview[] = await ProjectsService.getAllProjects(req.organization, includeDeleted);
+      res.status(200).json(projects);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getUsersTeamsProjects(req: Request, res: Response, next: NextFunction) {
+    try {
+      const projects: ProjectPreview[] = await ProjectsService.getUsersTeamsProjects(req.currentUser, req.organization);
+      res.status(200).json(projects);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getUsersLeadingProjects(req: Request, res: Response, next: NextFunction) {
+    try {
+      const projects: ProjectPreview[] = await ProjectsService.getUsersLeadingProjects(req.currentUser, req.organization);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -109,27 +127,6 @@ export default class ProjectsController {
     }
   }
 
-  static async setAbbreviation(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { abbreviation } = req.body;
-      const wbsNum: WbsNumber = validateWBS(req.body.wbsNum);
-      const updatedProject = await ProjectsService.setAbbreviation(wbsNum, req.currentUser, req.organization, abbreviation);
-      res.status(200).json(updatedProject);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
-  static async deleteAbbreviation(req: Request, res: Response, next: NextFunction) {
-    try {
-      const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
-      await ProjectsService.deleteAbbreviation(wbsNum, req.currentUser, req.organization);
-      res.status(200).json({ message: `Project ${wbsPipe(wbsNum)}'s abbreviation was successfully deleted.` });
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async getAllLinkTypes(req: Request, res: Response, next: NextFunction) {
     try {
       const linkTypes = await ProjectsService.getAllLinkTypes(req.organization);
@@ -421,4 +418,47 @@ export default class ProjectsController {
       next(error);
     }
   }
+
+  static async getAssembliesForWbsElement(req: Request, res: Response, next: NextFunction) {
+    try {
+      const wbsNumber: WbsNumber = validateWBS(req.params.wbsNum);
+
+      const assemblies = await BillOfMaterialsService.getAssembliesForWbsElement(wbsNumber, req.organization);
+      res.status(200).json(assemblies);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getMaterialsForWbsElement(req: Request, res: Response, next: NextFunction) {
+    try {
+      const wbsNumber: WbsNumber = validateWBS(req.params.wbsNum);
+
+      const assemblies = await BillOfMaterialsService.getMaterialsForWbsElement(wbsNumber, req.organization);
+      res.status(200).json(assemblies);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async setAbbreviation(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { abbreviation } = req.body;
+      const wbsNum: WbsNumber = validateWBS(req.body.wbsNum);
+      const updatedProject = await ProjectsService.setAbbreviation(wbsNum, req.currentUser, req.organization, abbreviation);
+      res.status(200).json(updatedProject);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteAbbreviation(req: Request, res: Response, next: NextFunction) {
+    try {
+      const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
+      await ProjectsService.deleteAbbreviation(wbsNum, req.currentUser, req.organization);
+      res.status(200).json({ message: `Project ${wbsPipe(wbsNum)}'s abbreviation was successfully deleted.` });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/controllers/retrospectives.controllers.ts

@@ -0,0 +1,27 @@
+import { NextFunction, Request, Response } from 'express';
+import RetrospectiveService from '../services/retrospective.services';
+
+export default class RetrospectiveController {
+  static async getRetrospectiveTimelines(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { start, end } = req.query;
+      const projects = await RetrospectiveService.getRetrospectiveTimelines(
+        req.organization.organizationId,
+        start ? new Date(start as string) : undefined,
+        end ? new Date(end as string) : undefined
+      );
+      res.json(projects);
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  static async getRetrospectiveBudgets(req: Request, res: Response, next: NextFunction) {
+    try {
+      const projects = await RetrospectiveService.getRetrospectiveBudgets(req.organization.organizationId);
+      res.json(projects);
+    } catch (error) {
+      next(error);
+    }
+  }
+}

src/backend/src/controllers/tasks.controllers.ts

@@ -12,7 +12,7 @@ export default class TasksController {
         req.currentUser,
         wbsNum,
         title,
-        notes,
+        notes ?? '',
         priority,
         status,
         assignees,

src/backend/src/controllers/teams.controllers.ts

@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 import TeamsService from '../services/teams.services';
 import { HttpException } from '../utils/errors.utils';
+import { WorkPackage } from 'shared';
 
 export default class TeamsController {
   static async getAllTeams(req: Request, res: Response, next: NextFunction) {
@@ -237,4 +238,13 @@ export default class TeamsController {
       next(error);
     }
   }
+
+  static async getMyTeamsWorkpackages(req: Request, res: Response, next: NextFunction) {
+    try {
+      const workPackages: WorkPackage[] = await TeamsService.getMyTeamsWorkpackages(req.currentUser, req.organization);
+      res.json(workPackages);
+    } catch (error) {
+      next(error);
+    }
+  }
 }