Merge branch 'feature/Change-Request-Redesign' into #1637-Change-Request-Overview-Page-Redesign

Author: bderbs30

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

@@ -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) {
@@ -321,4 +348,25 @@ export default class ProjectsController {
       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
       );
@@ -301,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);
+    }
+  }
 }

src/backend/src/controllers/work-packages.controllers.ts

@@ -42,7 +42,7 @@ export default class WorkPackagesController {
   // Create a work package with the given details
   static async createWorkPackage(req: Request, res: Response, next: NextFunction) {
     try {
-      const { projectWbsNum, name, crId, startDate, duration, blockedBy, expectedActivities, deliverables } = req.body;
+      const { name, crId, startDate, duration, blockedBy, expectedActivities, deliverables } = req.body;
 
       let { stage } = req.body;
       if (stage === 'NONE') {
@@ -53,7 +53,6 @@ export default class WorkPackagesController {
 
       const wbsString: string = await WorkPackagesService.createWorkPackage(
         user,
-        projectWbsNum,
         name,
         crId,
         stage,

src/backend/src/prisma-query-args/bom.query-args.ts

@@ -0,0 +1,21 @@
+export const assemblyQueryArgs = {
+  include: {
+    userCreated: true,
+    userDeleted: true,
+    materials: true
+  }
+};
+
+export const materialQueryArgs = {
+  include: {
+    assembly: {
+      ...assemblyQueryArgs
+    },
+    wbsElement: true,
+    userCreated: true,
+    userDeleted: true,
+    materialType: true,
+    quantityUnit: true,
+    manufacturer: true
+  }
+};

src/backend/src/prisma-query-args/manufacturers.query-args.ts

@@ -7,7 +7,8 @@ import { Prisma } from '@prisma/client';
 
 const manufacturerQueryArgs = Prisma.validator<Prisma.ManufacturerArgs>()({
   include: {
-    materials: true
+    materials: true,
+    userCreated: true
   }
 });
 

src/backend/src/prisma-query-args/material-type.query-args.ts

@@ -7,7 +7,8 @@ import { Prisma } from '@prisma/client';
 
 const materialTypeQueryArgs = Prisma.validator<Prisma.Material_TypeArgs>()({
   include: {
-    materials: true
+    materials: true,
+    userCreated: true
   }
 });
 

src/backend/src/prisma-query-args/projects.query-args.ts

@@ -1,6 +1,7 @@
 import { Prisma } from '@prisma/client';
 import taskQueryArgs from './tasks.query-args';
 import linkQueryArgs from './links.query-args';
+import { assemblyQueryArgs, materialQueryArgs } from './bom.query-args';
 
 const projectQueryArgs = Prisma.validator<Prisma.ProjectArgs>()({
   include: {
@@ -10,7 +11,15 @@ const projectQueryArgs = Prisma.validator<Prisma.ProjectArgs>()({
         projectManager: true,
         tasks: { where: { dateDeleted: null }, ...taskQueryArgs },
         links: { ...linkQueryArgs },
-        changes: { where: { changeRequest: { dateDeleted: null } }, include: { implementer: true } }
+        changes: { where: { changeRequest: { dateDeleted: null } }, include: { implementer: true } },
+        materials: {
+          where: { dateDeleted: null },
+          ...materialQueryArgs
+        },
+        assemblies: {
+          where: { dateDeleted: null },
+          ...assemblyQueryArgs
+        }
       }
     },
     teams: { include: { members: true, head: true, leads: true } },
@@ -29,7 +38,13 @@ const projectQueryArgs = Prisma.validator<Prisma.ProjectArgs>()({
             projectLead: true,
             projectManager: true,
             links: { ...linkQueryArgs },
-            changes: { where: { changeRequest: { dateDeleted: null } }, include: { implementer: true } }
+            changes: { where: { changeRequest: { dateDeleted: null } }, include: { implementer: true } },
+            materials: {
+              ...materialQueryArgs
+            },
+            assemblies: {
+              ...assemblyQueryArgs
+            }
           }
         },
         blockedBy: { where: { dateDeleted: null } },

src/backend/src/prisma-query-args/reimbursement-products.query-args.ts

@@ -1,9 +1,13 @@
 import { Prisma } from '@prisma/client';
 
-const reimbursementProductQueryArgs = Prisma.validator<Prisma.Reimbursement_ProductArgs>()({
+export const reimbursementProductReasonQueryArgs = Prisma.validator<Prisma.Reimbursement_Product_ReasonArgs>()({
   include: {
     wbsElement: true
   }
 });
 
-export default reimbursementProductQueryArgs;
+export const reimbursementProductQueryArgs = Prisma.validator<Prisma.Reimbursement_ProductArgs>()({
+  include: {
+    reimbursementProductReason: { ...reimbursementProductReasonQueryArgs }
+  }
+});

src/backend/src/prisma-query-args/reimbursement-requests.query-args.ts

@@ -1,7 +1,7 @@
 import { Prisma } from '@prisma/client';
-import reimbursementProductQueryArgs from './reimbursement-products.query-args';
 import reimbursementStatusQueryArgs from './reimbursement-statuses.query-args';
 import receiptQueryArgs from './receipt-query.args';
+import { reimbursementProductQueryArgs } from './reimbursement-products.query-args';
 
 const reimbursementRequestQueryArgs = Prisma.validator<Prisma.Reimbursement_RequestArgs>()({
   include: {

src/backend/src/prisma/migrations/20231112060254_other_option_product_rr/migration.sql

@@ -0,0 +1,56 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `wbsElementId` on the `Reimbursement_Product` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[reimbursementProductReasonId]` on the table `Reimbursement_Product` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `reimbursementProductReasonId` to the `Reimbursement_Product` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- CreateEnum
+CREATE TYPE "Other_Reimbursement_Product_Reason" AS ENUM ('TOOLS_AND_EQUIPMENT', 'COMPETITION', 'CONSUMABLES', 'GENERAL_STOCK', 'SUBSCRIPTIONS_AND_MEMBERSHIPS');
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product"
+ADD COLUMN "reimbursementProductReasonId" TEXT;
+
+-- CreateTable
+CREATE TABLE "Reimbursement_Product_Reason" (
+    "reimbursementProductReasonId" TEXT NOT NULL,
+    "wbsElementId" INTEGER,
+    "otherReason" "Other_Reimbursement_Product_Reason",
+    "reimbursementProductId" TEXT,
+
+    CONSTRAINT "Reimbursement_Product_Reason_pkey" PRIMARY KEY ("reimbursementProductReasonId")
+);
+
+INSERT INTO "Reimbursement_Product_Reason" ("reimbursementProductReasonId", "wbsElementId", "reimbursementProductId") SELECT gen_random_uuid(), "wbsElementId", "reimbursementProductId" FROM "Reimbursement_Product";
+
+UPDATE "Reimbursement_Product"
+SET "reimbursementProductReasonId" = (
+    SELECT "reimbursementProductReasonId"
+    FROM "Reimbursement_Product_Reason"
+    WHERE "Reimbursement_Product_Reason"."reimbursementProductId" = "Reimbursement_Product"."reimbursementProductId"
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reimbursement_Product_reimbursementProductReasonId_key" ON "Reimbursement_Product"("reimbursementProductReasonId");
+
+
+-- DropForeignKey
+ALTER TABLE "Reimbursement_Product" DROP CONSTRAINT "Reimbursement_Product_wbsElementId_fkey";
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product" DROP COLUMN "wbsElementId";
+
+-- AddForeignKey
+ALTER TABLE "Reimbursement_Product_Reason" ADD CONSTRAINT "Reimbursement_Product_Reason_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product" ALTER COLUMN "reimbursementProductReasonId" SET NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Reimbursement_Product" ADD CONSTRAINT "Reimbursement_Product_reimbursementProductReasonId_fkey" FOREIGN KEY ("reimbursementProductReasonId") REFERENCES "Reimbursement_Product_Reason"("reimbursementProductReasonId") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product_Reason"
+DROP COLUMN "reimbursementProductId";