Merge branch 'feature/Change-Request-Redesign' into #1640-change-request-stage-gate-details-page-redesign-pt2

Author: RChandler234

.github/workflows/run-tests.yml

@@ -20,6 +20,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Set env variables
+        run: touch .env && echo "FINANCE_TEAM_ID=0" >> .env
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:

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

@@ -75,18 +75,19 @@ export default class ChangeRequestsController {
 
   static async createStandardChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { wbsNum, type, what, why } = req.body;
+      const { wbsNum, type, what, why, proposedSolutions } = req.body;
       const submitter = await getCurrentUser(res);
-      const id = await ChangeRequestsService.createStandardChangeRequest(
+      const createdCR = await ChangeRequestsService.createStandardChangeRequest(
         submitter,
         wbsNum.carNumber,
         wbsNum.projectNumber,
         wbsNum.workPackageNumber,
         type,
         what,
-        why
+        why,
+        proposedSolutions
       );
-      return res.status(200).json({ message: `${id}` });
+      return res.status(200).json(createdCR);
     } catch (error: unknown) {
       next(error);
     }

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

@@ -1,4 +1,4 @@
-import { Project, validateWBS, WbsNumber, wbsPipe } from 'shared';
+import { Manufacturer, MaterialType, Project, validateWBS, WbsNumber, wbsPipe } from 'shared';
 import { NextFunction, Request, Response } from 'express';
 import { User } from '@prisma/client';
 import { getCurrentUser } from '../utils/auth.utils';
@@ -29,11 +29,38 @@ export default class ProjectsController {
   static async createProject(req: Request, res: Response, next: NextFunction) {
     try {
       const user: User = await getCurrentUser(res);
-      const { crId, carNumber, name, summary, teamId } = req.body;
+      const {
+        name,
+        crId,
+        carNumber,
+        teamIds,
+        budget,
+        summary,
+        projectLeadId,
+        projectManagerId,
+        links,
+        goals,
+        features,
+        otherConstraints,
+        rules
+      } = req.body;
 
-      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(user, crId, carNumber, name, summary, [
-        teamId
-      ]);
+      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(
+        user,
+        crId,
+        carNumber,
+        name,
+        summary,
+        teamIds,
+        budget,
+        links,
+        rules,
+        goals,
+        features,
+        otherConstraints,
+        projectLeadId,
+        projectManagerId
+      );
 
       return res.status(200).json(wbsPipe(createdWbsNumber));
     } catch (error: unknown) {
@@ -128,6 +155,60 @@ export default class ProjectsController {
     }
   }
 
+  static async createAssembly(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user: User = await getCurrentUser(res);
+      const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
+      const { name, pdmFileName } = req.body;
+      const createAssembly = await ProjectsService.createAssembly(name, user, wbsNum, pdmFileName);
+      res.status(200).json(createAssembly);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createMaterial(req: Request, res: Response, next: NextFunction) {
+    try {
+      const {
+        name,
+        assemblyId,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        pdmFileName,
+        quantity,
+        unitName,
+        price,
+        subtotal,
+        linkUrl,
+        notes
+      } = req.body;
+      const creator = await getCurrentUser(res);
+      const wbsNum = validateWBS(req.params.wbsNum);
+      const material = await ProjectsService.createMaterial(
+        creator,
+        name,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        quantity,
+        price,
+        subtotal,
+        linkUrl,
+        notes,
+        wbsNum,
+        assemblyId,
+        pdmFileName,
+        unitName
+      );
+      return res.status(200).json(material);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -139,6 +220,37 @@ export default class ProjectsController {
     }
   }
 
+  static async deleteManufacturer(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user: User = await getCurrentUser(res);
+      const { manufacturerName } = req.params;
+      const deletedManufacturer = await ProjectsService.deleteManufacturer(user, manufacturerName);
+      res.status(200).json(deletedManufacturer);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllManufacturers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = await getCurrentUser(res);
+      const manufacturers: Manufacturer[] = await ProjectsService.getAllManufacturers(user);
+      return res.status(200).json(manufacturers);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllMaterialTypes(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = await getCurrentUser(res);
+      const materialTypes: MaterialType[] = await ProjectsService.getAllMaterialTypes(user);
+      return res.status(200).json(materialTypes);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createMaterialType(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -149,4 +261,112 @@ export default class ProjectsController {
       next(error);
     }
   }
+
+  static async assignMaterialAssembly(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { materialId } = req.params;
+      const { assemblyId } = req.body;
+      const user = await getCurrentUser(res);
+      const updatedMaterial = await ProjectsService.assignMaterialAssembly(user, materialId, assemblyId);
+      res.status(200).json(updatedMaterial);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteAssemblyType(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { assemblyId } = req.params;
+      const user = await getCurrentUser(res);
+      const deletedAssembly = await ProjectsService.deleteAssembly(assemblyId, user);
+      res.status(200).json(deletedAssembly);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteMaterialType(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { materialTypeId } = req.params;
+      const user = await getCurrentUser(res);
+      const deletedMaterial = await ProjectsService.deleteMaterialType(materialTypeId, user);
+      res.status(200).json(deletedMaterial);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async deleteMaterial(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { materialId } = req.params;
+      const user: User = await getCurrentUser(res);
+      const updatedMaterial = await ProjectsService.deleteMaterial(user, materialId);
+      res.status(200).json(updatedMaterial);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async editMaterial(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = await getCurrentUser(res);
+      const { materialId } = req.params;
+      const {
+        name,
+        assemblyId,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        pdmFileName,
+        quantity,
+        unitName,
+        price,
+        subtotal,
+        linkUrl,
+        notes
+      } = req.body;
+      const updatedMaterial = await ProjectsService.editMaterial(
+        user,
+        materialId,
+        name,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        quantity,
+        price,
+        subtotal,
+        linkUrl,
+        notes,
+        unitName,
+        assemblyId,
+        pdmFileName
+      );
+      res.status(200).json(updatedMaterial);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getAllUnits(_req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = await getCurrentUser(res);
+      const units = await ProjectsService.getAllUnits(user);
+      res.status(200).json(units);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createUnit(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { name } = req.body;
+      const user = await getCurrentUser(res);
+      const createdUnit = await ProjectsService.createUnit(name, user);
+      res.status(200).json(createdUnit);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -52,14 +52,23 @@ export default class ReimbursementRequestsController {
 
   static async createReimbursementRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { dateOfExpense, vendorId, account, reimbursementProducts, expenseTypeId, totalCost } = req.body;
+      const {
+        dateOfExpense,
+        vendorId,
+        account,
+        otherReimbursementProducts,
+        wbsReimbursementProducts,
+        expenseTypeId,
+        totalCost
+      } = req.body;
       const user = await getCurrentUserWithUserSettings(res);
       const createdReimbursementRequest = await ReimbursementRequestService.createReimbursementRequest(
         user,
         dateOfExpense,
         vendorId,
         account,
-        reimbursementProducts,
+        otherReimbursementProducts,
+        wbsReimbursementProducts,
         expenseTypeId,
         totalCost
       );
@@ -84,8 +93,16 @@ export default class ReimbursementRequestsController {
   static async editReimbursementRequest(req: Request, res: Response, next: NextFunction) {
     try {
       const { requestId } = req.params;
-      const { dateOfExpense, vendorId, account, expenseTypeId, totalCost, reimbursementProducts, receiptPictures } =
-        req.body;
+      const {
+        dateOfExpense,
+        vendorId,
+        account,
+        expenseTypeId,
+        totalCost,
+        otherReimbursementProducts,
+        wbsReimbursementProducts,
+        receiptPictures
+      } = req.body;
       const user = await getCurrentUser(res);
       const updatedReimbursementRequestId = await ReimbursementRequestService.editReimbursementRequest(
         requestId,
@@ -94,7 +111,8 @@ export default class ReimbursementRequestsController {
         account,
         expenseTypeId,
         totalCost,
-        reimbursementProducts,
+        otherReimbursementProducts,
+        wbsReimbursementProducts,
         receiptPictures,
         user
       );
@@ -230,6 +248,17 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async denyReimbursementRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { requestId } = req.params;
+      const user = await getCurrentUser(res);
+      const reimbursementStatus = await ReimbursementRequestService.denyReimbursementRequest(requestId, user);
+      res.status(200).json(reimbursementStatus);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async markReimbursementRequestAsDelivered(req: Request, res: Response, next: NextFunction) {
     try {
       const { requestId } = req.params;
@@ -290,4 +319,16 @@ export default class ReimbursementRequestsController {
       next(error);
     }
   }
+
+  static async editVendor(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { vendorId } = req.params;
+      const { name } = req.body;
+      const submitter = await getCurrentUser(res);
+      const editVendors = await ReimbursementRequestService.editVendors(name, vendorId, submitter);
+      res.status(200).json(editVendors);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }