Merge branch 'develop' into 1523-bom-delete-manufacturer-endpoint

Author: RChandler234

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

@@ -167,14 +167,14 @@ export default class ProjectsController {
         manufacturerName,
         manufacturerPartNumber,
         quantity,
-        unitName,
         price,
         subtotal,
         linkUrl,
         notes,
         wbsNum,
         assemblyId,
-        pdmFileName
+        pdmFileName,
+        unitName
       );
       return res.status(200).json(material);
     } catch (error: unknown) {
@@ -204,6 +204,16 @@ export default class ProjectsController {
     }
   }
 
+  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 createMaterialType(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -214,4 +224,68 @@ export default class ProjectsController {
       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 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);
+    }
+  }
 }

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

@@ -230,6 +230,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;

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

@@ -29,6 +29,16 @@ export default class WorkPackagesController {
     }
   }
 
+  static async getManyWorkPackages(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { wbsNums } = req.body;
+      const workPackages: WorkPackage[] = await WorkPackagesService.getManyWorkPackages(wbsNums);
+      res.status(200).json(workPackages);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   // Create a work package with the given details
   static async createWorkPackage(req: Request, res: Response, next: NextFunction) {
     try {

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

@@ -0,0 +1,14 @@
+/*
+ * This file is part of NER's FinishLine and licensed under GNU AGPLv3.
+ * See the LICENSE file in the repository root folder for details.
+ */
+
+import { Prisma } from '@prisma/client';
+
+const manufacturerQueryArgs = Prisma.validator<Prisma.ManufacturerArgs>()({
+  include: {
+    materials: true
+  }
+});
+
+export default manufacturerQueryArgs;

src/backend/src/prisma/migrations/20231109224241_deny_rr/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "Reimbursement_Status_Type" ADD VALUE 'DENIED';

…ons/20231024124220_add_bom/migration.sql …ons/20231119054311_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231119054311_add_bom/migration.sql src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231119054311_add_bom/migration.sql

@@ -51,6 +51,7 @@ CREATE TABLE "Material" (
 CREATE TABLE "Material_Type" (
     "name" TEXT NOT NULL,
     "dateCreated" TIMESTAMP(3) NOT NULL,
+    "dateDeleted" TIMESTAMP(3),
     "creatorId" INTEGER NOT NULL,
 
     CONSTRAINT "Material_Type_pkey" PRIMARY KEY ("name")
@@ -68,9 +69,6 @@ CREATE TABLE "Manufacturer" (
 -- CreateIndex
 CREATE UNIQUE INDEX "Assembly_name_key" ON "Assembly"("name");
 
--- CreateIndex
-CREATE UNIQUE INDEX "Material_name_key" ON "Material"("name");
-
 -- AddForeignKey
 ALTER TABLE "Assembly" ADD CONSTRAINT "Assembly_userDeletedId_fkey" FOREIGN KEY ("userDeletedId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;
 

src/backend/src/prisma/schema.prisma

@@ -365,6 +365,7 @@ enum Reimbursement_Status_Type {
   SABO_SUBMITTED
   ADVISOR_APPROVED
   REIMBURSED
+  DENIED
 }
 
 model Reimbursement_Status {
@@ -491,7 +492,7 @@ model Material {
   materialId             String          @id @default(uuid())
   assembly               Assembly?       @relation(fields: [assemblyId], references: [assemblyId])
   assemblyId             String?
-  name                   String          @unique
+  name                   String
   wbsElement             WBS_Element     @relation(fields: [wbsElementId], references: [wbsElementId])
   wbsElementId           Int
   dateDeleted            DateTime?
@@ -519,6 +520,7 @@ model Material {
 model Material_Type {
   name        String     @id
   dateCreated DateTime
+  dateDeleted DateTime?
   creatorId   Int
   materials   Material[]
 }

src/backend/src/prisma/seed-data/users.seed.ts

@@ -69,6 +69,70 @@ const wonderwoman: Prisma.UserCreateInput = {
   googleAuthId: 'wonderwoman'
 };
 
+const lexLuther: Prisma.UserCreateInput = {
+  firstName: 'Alexander',
+  lastName: 'Luther',
+  email: 'lexluther@justiceleague.com',
+  googleAuthId: 'hjkklo',
+  role: Role.MEMBER
+};
+
+const hawkgirl: Prisma.UserCreateInput = {
+  firstName: 'Shiera',
+  lastName: 'Hall',
+  email: 'hawkgirl@justiceleague.com',
+  googleAuthId: 'bhuujki',
+  role: Role.MEMBER
+};
+
+const elongatedMan: Prisma.UserCreateInput = {
+  firstName: 'Randolph',
+  lastName: 'Dibney',
+  email: 'elongatedmangit @justiceleague.com',
+  googleAuthId: 'joigiug',
+  role: Role.MEMBER
+};
+
+const zatanna: Prisma.UserCreateInput = {
+  firstName: 'Zatanna',
+  lastName: 'Zatara',
+  email: 'zatanna@justiceleague.com',
+  googleAuthId: 'cawwww',
+  role: Role.MEMBER
+};
+
+const phantomStranger: Prisma.UserCreateInput = {
+  firstName: 'Judas',
+  lastName: 'Iscariot',
+  email: 'phantomstranger@justiceleague.com',
+  googleAuthId: 'bnhjiuy',
+  role: Role.MEMBER
+};
+
+const redTornado: Prisma.UserCreateInput = {
+  firstName: 'Red',
+  lastName: 'Tornado',
+  email: 'redtornado@justiceleague.com',
+  googleAuthId: 'vbnhught',
+  role: Role.MEMBER
+};
+
+const firestorm: Prisma.UserCreateInput = {
+  firstName: 'Ronnie',
+  lastName: 'Raymond',
+  email: 'firestorm@justiceleague.com',
+  googleAuthId: 'fghttyu',
+  role: Role.MEMBER
+};
+
+const hankHeywood: Prisma.UserCreateInput = {
+  firstName: 'Hank',
+  lastName: 'Heywood III',
+  email: 'hankheywood@justiceleague.com',
+  googleAuthId: 'hudhsgf',
+  role: Role.MEMBER
+};
+
 const flash: Prisma.UserCreateInput = {
   firstName: 'Barry',
   lastName: 'Allen',
@@ -572,13 +636,85 @@ const babyDollJacobson: Prisma.UserCreateInput = {
   role: Role.LEADERSHIP
 };
 
+const frostBite: Prisma.UserCreateInput = {
+  firstName: 'Frost',
+  lastName: 'Bite',
+  googleAuthId: 'husky1',
+  email: 'frostbite@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const winter: Prisma.UserCreateInput = {
+  firstName: 'Winter',
+  lastName: 'Warrior',
+  googleAuthId: 'husky2',
+  email: 'winterwarrior@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const paws: Prisma.UserCreateInput = {
+  firstName: 'Paws',
+  lastName: 'The-Dog',
+  googleAuthId: 'husky3',
+  email: 'paws@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const snowPaws: Prisma.UserCreateInput = {
+  firstName: 'Snow',
+  lastName: 'Paws',
+  googleAuthId: 'husky4',
+  email: 'snowpaws@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const whiteTail: Prisma.UserCreateInput = {
+  firstName: 'White',
+  lastName: 'Tail',
+  googleAuthId: 'husky5',
+  email: 'whitetail@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const husky: Prisma.UserCreateInput = {
+  firstName: 'Husky',
+  lastName: 'Dog',
+  googleAuthId: 'husky6',
+  email: 'huskydog@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const howler: Prisma.UserCreateInput = {
+  firstName: 'Howler',
+  lastName: 'Husky',
+  googleAuthId: 'husky7',
+  email: 'howler@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const snowBite: Prisma.UserCreateInput = {
+  firstName: 'Snow',
+  lastName: 'Bite',
+  googleAuthId: 'husky8',
+  email: 'SnowBite@northeastern.edu',
+  role: Role.MEMBER
+};
+
 export const dbSeedAllUsers = {
   thomasEmrax,
   joeShmoe,
   joeBlow,
   wonderwoman,
   flash,
   aquaman,
+  lexLuther,
+  hawkgirl,
+  elongatedMan,
+  zatanna,
+  phantomStranger,
+  redTornado,
+  firestorm,
+  hankHeywood,
   robin,
   batman,
   superman,
@@ -637,5 +773,13 @@ export const dbSeedAllUsers = {
   kenWilliams,
   boogPowell,
   mannyMachado,
-  babyDollJacobson
+  babyDollJacobson,
+  frostBite,
+  winter,
+  snowPaws,
+  paws,
+  whiteTail,
+  husky,
+  howler,
+  snowBite
 };