Merge branch 'develop' into #1509-Create-Assembly-Endpoint

Author: jackturner106

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

@@ -135,6 +135,26 @@ export default class ProjectsController {
     try {
       const createAssembly = await ProjectsService.createAssembly(name, pdmFileName, user, wbsNum);
       res.status(200).json(createAssembly);
+    }
+  }
+  
+  static async createManufacturer(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { name } = req.body;
+      const user = await getCurrentUser(res);
+      const createdManufacturer = await ProjectsService.createManufacturer(user, name);
+      res.status(200).json(createdManufacturer);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createMaterialType(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { name } = req.body;
+      const user = await getCurrentUser(res);
+      const createdMaterialType = await ProjectsService.createMaterialType(name, user);
+      res.status(200).json(createdMaterialType);
     } catch (error: unknown) {
       next(error);
     }

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

@@ -162,9 +162,15 @@ export default class ReimbursementRequestsController {
 
   static async createExpenseType(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, code, allowed } = req.body;
+      const { name, code, allowed, allowedRefundSources } = req.body;
       const user = await getCurrentUser(res);
-      const createdExpenseType = await ReimbursementRequestService.createExpenseType(user, name, code, allowed);
+      const createdExpenseType = await ReimbursementRequestService.createExpenseType(
+        user,
+        name,
+        code,
+        allowed,
+        allowedRefundSources
+      );
       res.status(200).json(createdExpenseType);
     } catch (error: unknown) {
       next(error);
@@ -269,14 +275,15 @@ export default class ReimbursementRequestsController {
   static async editExpenseTypeCode(req: Request, res: Response, next: NextFunction) {
     try {
       const { expenseTypeId } = req.params;
-      const { name, code, allowed } = req.body;
+      const { name, code, allowed, allowedRefundSources } = req.body;
       const submitter = await getCurrentUser(res);
       const expenseTypeUpdated = await ReimbursementRequestService.editExpenseType(
         expenseTypeId,
         code,
         name,
         allowed,
-        submitter
+        submitter,
+        allowedRefundSources
       );
       res.status(200).json(expenseTypeUpdated);
     } catch (error: unknown) {

src/backend/src/prisma/migrations/20230829222742_add_allowed_refund_sources/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Expense_Type" ADD COLUMN     "allowedRefundSources" "Club_Accounts"[];

src/backend/src/prisma/migrations/20231010194436_integration_to_install/migration.sql

@@ -0,0 +1,10 @@
+-- AlterEnum
+CREATE TYPE "Work_Package_Stage_new" AS ENUM ('RESEARCH', 'DESIGN', 'MANUFACTURING', 'INSTALL');
+ALTER TABLE "Work_Package" ALTER COLUMN "stage" TYPE "Work_Package_Stage_new" USING (
+  CASE "stage"::text
+    WHEN 'INTEGRATION' THEN 'INSTALL'::"Work_Package_Stage_new"
+    ELSE "stage"::text::"Work_Package_Stage_new"
+  END);
+ALTER TYPE "Work_Package_Stage" RENAME TO "Work_Package_Stage_old";
+ALTER TYPE "Work_Package_Stage_new" RENAME TO "Work_Package_Stage";
+DROP TYPE "Work_Package_Stage_old";

…ons/20231011234802_add_bom/migration.sql …ons/20231019013832_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231011234802_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql src/backend/src/prisma/migrations/20231011234802_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql

@@ -25,7 +25,7 @@ CREATE TABLE "Assembly" (
 -- CreateTable
 CREATE TABLE "Material" (
     "materialId" TEXT NOT NULL,
-    "assembyId" TEXT,
+    "assemblyId" TEXT,
     "name" TEXT NOT NULL,
     "wbsElementId" INTEGER NOT NULL,
     "dateDeleted" TIMESTAMP(3),
@@ -81,7 +81,7 @@ ALTER TABLE "Assembly" ADD CONSTRAINT "Assembly_userCreatedId_fkey" FOREIGN KEY
 ALTER TABLE "Assembly" ADD CONSTRAINT "Assembly_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "Material" ADD CONSTRAINT "Material_assembyId_fkey" FOREIGN KEY ("assembyId") REFERENCES "Assembly"("assemblyId") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "Material" ADD CONSTRAINT "Material_assemblyId_fkey" FOREIGN KEY ("assemblyId") REFERENCES "Assembly"("assemblyId") ON DELETE SET NULL ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "Material" ADD CONSTRAINT "Material_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE RESTRICT ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

@@ -67,7 +67,7 @@ enum Work_Package_Stage {
   RESEARCH
   DESIGN
   MANUFACTURING
-  INTEGRATION
+  INSTALL
 }
 
 model User {
@@ -256,7 +256,7 @@ model WBS_Element {
   tasks                 Task[]
   reimbursementProducts Reimbursement_Product[]
   links                 Link[]                  @relation(name: "links")
-  assembies             Assembly[]
+  assemblies            Assembly[]
   materials             Material[]
 
   @@unique([carNumber, projectNumber, workPackageNumber], name: "wbsNumber")
@@ -429,11 +429,12 @@ model Vendor {
 }
 
 model Expense_Type {
-  expenseTypeId String                  @id @default(uuid())
-  name          String
-  code          Int
-  allowed       Boolean
-  requests      Reimbursement_Request[]
+  expenseTypeId        String                  @id @default(uuid())
+  name                 String
+  code                 Int
+  allowed              Boolean
+  allowedRefundSources Club_Accounts[]
+  requests             Reimbursement_Request[]
 }
 
 model Reimbursement {
@@ -487,8 +488,8 @@ model Assembly {
 
 model Material {
   materialId             String          @id @default(uuid())
-  assemby                Assembly?       @relation(fields: [assembyId], references: [assemblyId])
-  assembyId              String?
+  assembly               Assembly?       @relation(fields: [assemblyId], references: [assemblyId])
+  assemblyId             String?
   name                   String          @unique
   wbsElement             WBS_Element     @relation(fields: [wbsElementId], references: [wbsElementId])
   wbsElementId           Int

src/backend/src/prisma/seed.ts

@@ -7,6 +7,7 @@
 
 import {
   CR_Type,
+  Club_Accounts,
   PrismaClient,
   Scope_CR_Why_Type,
   Task_Priority,
@@ -447,6 +448,24 @@ const performSeed: () => Promise<void> = async () => {
   );
   const workPackage3WbsNumber = validateWBS(workPackage3WbsString);
 
+  /** Work Package 4 */
+  const { workPackageWbsNumber: workPackage4WbsNumber, workPackage: workPackage4 } = await seedWorkPackage(
+    thomasEmrax,
+    project5WbsNumber,
+    'Install Wiring Harness',
+    changeRequest1Id,
+    WorkPackageStage.Install,
+    '04/01/2023',
+    7,
+    [],
+    ['Assemble and install wiring harness', 'Confirm the installation was successful'],
+    ['Wiring harness is functional and installed in the car'],
+    thomasEmrax,
+    WbsElementStatus.Active,
+    joeShmoe.userId,
+    thomasEmrax.userId
+  );
+
   /**
    * Change Requests
    */
@@ -732,7 +751,10 @@ const performSeed: () => Promise<void> = async () => {
 
   const vendors: Vendor[] = [vendor, vendor2, vendor3];
 
-  const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true);
+  const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true, [
+    Club_Accounts.CASH,
+    Club_Accounts.BUDGET
+  ]);
 
   await ReimbursementRequestService.createReimbursementRequest(
     thomasEmrax,

src/backend/src/routes/projects.routes.ts

@@ -55,4 +55,13 @@ projectRouter.post('/:wbsNum/set-team', nonEmptyString(body('teamId')), validate
 projectRouter.delete('/:wbsNum/delete', ProjectsController.deleteProject);
 projectRouter.post('/:wbsNum/favorite', ProjectsController.toggleFavorite);
 
+/**************** BOM Section ****************/
+projectRouter.post(
+  '/bom/manufacturer/create',
+  nonEmptyString(body('name')),
+  validateInputs,
+  ProjectsController.createManufacturer
+);
+projectRouter.post('/bom/material-type/create', nonEmptyString(body('name')), ProjectsController.createMaterialType);
+
 export default projectRouter;

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

@@ -86,6 +86,8 @@ reimbursementRequestsRouter.post(
 reimbursementRequestsRouter.post(
   '/vendors/create',
   nonEmptyString(body('name')),
+  body('allowedRefundSources').isArray(),
+  isAccount(body('allowedRefundSources.*')),
   validateInputs,
   ReimbursementRequestController.createVendor
 );
@@ -95,6 +97,8 @@ reimbursementRequestsRouter.post(
   nonEmptyString(body('name')),
   intMinZero(body('code')),
   body('allowed').isBoolean(),
+  body('allowedRefundSources').isArray(),
+  isAccount(body('allowedRefundSources.*')),
   validateInputs,
   ReimbursementRequestController.createExpenseType
 );

src/backend/src/services/projects.services.ts

@@ -1,5 +1,5 @@
-import { User, Assembly } from '@prisma/client';
-import { isAdmin, isGuest, isProject, LinkCreateArgs, LinkType, Project, WbsNumber, wbsPipe } from 'shared';
+import { Material_Type, User, Assembly } from '@prisma/client';
+import { isAdmin, isGuest, isLeadership, isProject, LinkCreateArgs, LinkType, Project, WbsNumber, wbsPipe } from 'shared';
 import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import prisma from '../prisma/prisma';
 import projectTransformer from '../transformers/projects.transformer';
@@ -10,7 +10,8 @@ import {
   AccessDeniedException,
   HttpException,
   NotFoundException,
-  DeletedException
+  DeletedException,
+  AccessDeniedException
 } from '../utils/errors.utils';
 import {
   addDescriptionBullets,
@@ -656,4 +657,57 @@ export default class ProjectsService {
 
     return assembly;
   }
+  
+   * Creates a new Manufacturer
+   * @param submitter the user who's creating the manufacturer
+   * @param name the name of the manufacturer
+   * @returns the newly created manufacturer
+   * @throws if the submitter is a guest or the given manufacturer name already exists
+   */
+  static async createManufacturer(submitter: User, name: string) {
+    if (isGuest(submitter.role)) throw new AccessDeniedGuestException('create manufacturers');
+
+    const manufacturer = await prisma.manufacturer.findUnique({
+      where: {
+        name
+      }
+    });
+
+    if (manufacturer) throw new HttpException(400, `${name} already exists as a manufacturer!`);
+
+    const newManufacturer = await prisma.manufacturer.create({
+      data: { name, dateCreated: new Date(), creatorId: submitter.userId }
+    });
+
+    return newManufacturer;
+  }
+
+  /**
+   * Create a new material type
+   * @param name the name of the new material type
+   * @param submitter the user who is creating the material type
+   * @throws if the submitter is not a leader or the material type with the given name already exists
+   */
+  static async createMaterialType(name: string, submitter: User): Promise<Material_Type> {
+    if (!isLeadership(submitter.role))
+      throw new AccessDeniedException('Only leadership or above can create a material type');
+
+    const materialType = await prisma.material_Type.findUnique({
+      where: {
+        name
+      }
+    });
+
+    if (!!materialType) throw new HttpException(400, `The following material type already exists: ${name}`);
+
+    const newMaterialType = await prisma.material_Type.create({
+      data: {
+        name,
+        dateCreated: new Date(),
+        creatorId: submitter.userId
+      }
+    });
+
+    return newMaterialType;
+  }
 }