Merge branch 'develop' into #1528-material-to-assembly

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/projects.controllers.ts

@@ -1,6 +1,6 @@
 import { Project, validateWBS, WbsNumber, wbsPipe } from 'shared';
 import { NextFunction, Request, Response } from 'express';
-import { User } from '@prisma/client';
+import { Manufacturer, User } from '@prisma/client';
 import { getCurrentUser } from '../utils/auth.utils';
 import ProjectsService from '../services/projects.services';
 
@@ -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) {
@@ -193,6 +193,27 @@ 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: Manufacturer = 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 createMaterialType(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -215,4 +236,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/20231119081759_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231119081759_add_bom/migration.sql src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231119081759_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")
@@ -61,16 +62,14 @@ CREATE TABLE "Manufacturer" (
     "name" TEXT NOT NULL,
     "dateCreated" TIMESTAMP(3) NOT NULL,
     "creatorId" INTEGER NOT NULL,
+    "dateDeleted" TIMESTAMP(3),
 
     CONSTRAINT "Manufacturer_pkey" PRIMARY KEY ("name")
 );
 
 -- 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

@@ -364,6 +364,7 @@ enum Reimbursement_Status_Type {
   SABO_SUBMITTED
   ADVISOR_APPROVED
   REIMBURSED
+  DENIED
 }
 
 model Reimbursement_Status {
@@ -490,7 +491,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?
@@ -518,6 +519,7 @@ model Material {
 model Material_Type {
   name        String     @id
   dateCreated DateTime
+  dateDeleted DateTime?
   creatorId   Int
   materials   Material[]
 }
@@ -526,5 +528,6 @@ model Manufacturer {
   name        String     @id
   dateCreated DateTime
   creatorId   Int
+  dateDeleted DateTime?
   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',
@@ -643,6 +707,14 @@ export const dbSeedAllUsers = {
   wonderwoman,
   flash,
   aquaman,
+  lexLuther,
+  hawkgirl,
+  elongatedMan,
+  zatanna,
+  phantomStranger,
+  redTornado,
+  firestorm,
+  hankHeywood,
   robin,
   batman,
   superman,

src/backend/src/prisma/seed.ts

@@ -22,7 +22,7 @@ import ChangeRequestsService from '../services/change-requests.services';
 import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import TeamsService from '../services/teams.services';
 import WorkPackagesService from '../services/work-packages.services';
-import { ChangeRequest, ClubAccount, StandardChangeRequest, validateWBS, WbsElementStatus, WorkPackageStage } from 'shared';
+import { ClubAccount, StandardChangeRequest, validateWBS, WbsElementStatus, WorkPackageStage } from 'shared';
 import TasksService from '../services/tasks.services';
 import DescriptionBulletsService from '../services/description-bullets.services';
 import { seedProject } from './seed-data/projects.seed';
@@ -39,6 +39,14 @@ const performSeed: () => Promise<void> = async () => {
   });
   const joeShmoe = await prisma.user.create({ data: dbSeedAllUsers.joeShmoe });
   const joeBlow = await prisma.user.create({ data: dbSeedAllUsers.joeBlow });
+  const lexLuther = await prisma.user.create({ data: dbSeedAllUsers.lexLuther });
+  const hawkgirl = await prisma.user.create({ data: dbSeedAllUsers.hawkgirl });
+  const elongatedMan = await prisma.user.create({ data: dbSeedAllUsers.elongatedMan });
+  const zatanna = await prisma.user.create({ data: dbSeedAllUsers.zatanna });
+  const phantomStranger = await prisma.user.create({ data: dbSeedAllUsers.phantomStranger });
+  const redTornado = await prisma.user.create({ data: dbSeedAllUsers.redTornado });
+  const firestorm = await prisma.user.create({ data: dbSeedAllUsers.firestorm });
+  const hankHeywood = await prisma.user.create({ data: dbSeedAllUsers.hankHeywood });
   const wonderwoman = await prisma.user.create({ data: dbSeedAllUsers.wonderwoman });
   const flash = await prisma.user.create({ data: dbSeedAllUsers.flash });
   const aquaman = await prisma.user.create({ data: dbSeedAllUsers.aquaman });
@@ -199,9 +207,27 @@ const performSeed: () => Promise<void> = async () => {
   await TeamsService.setTeamMembers(
     batman,
     justiceLeague.teamId,
-    [wonderwoman, flash, aquaman, superman, hawkMan, hawkWoman, cyborg, greenLantern, martianManhunter].map(
-      (user) => user.userId
-    )
+    [
+      flash,
+      aquaman,
+      superman,
+      hawkMan,
+      hawkWoman,
+      greenLantern,
+      lexLuther,
+      hawkgirl,
+      elongatedMan,
+      zatanna,
+      phantomStranger,
+      redTornado,
+      firestorm,
+      hankHeywood
+    ].map((user) => user.userId)
+  );
+  await TeamsService.setTeamLeads(
+    batman,
+    justiceLeague.teamId,
+    [wonderwoman, cyborg, martianManhunter].map((user) => user.userId)
   );
   await TeamsService.setTeamMembers(
     aang,