Merge pull request #1722 from Northeastern-Electric-Racing/feature/Workpackage-Form-Redesign

Feature/workpackage form redesign

Author: RChandler234

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/seed-data/work-packages.seed.ts

@@ -18,7 +18,6 @@ import { descBulletConverter } from '../../utils/description-bullets.utils';
  */
 export const seedWorkPackage = async (
   creator: User,
-  projectWbsNumber: WbsNumber,
   name: string,
   changeRequestId: number,
   stage: WorkPackageStage | null,
@@ -37,7 +36,6 @@ export const seedWorkPackage = async (
 }> => {
   const workPackage1WbsString = await WorkPackagesService.createWorkPackage(
     creator,
-    projectWbsNumber,
     name,
     changeRequestId,
     stage,

src/backend/src/prisma/seed.ts

@@ -450,15 +450,98 @@ const performSeed: () => Promise<void> = async () => {
     joeBlow.userId
   );
 
+  /**
+   * Change Requests for Creating Work Packages
+   */
+
+  const changeRequestWP1 = await ChangeRequestsService.createStandardChangeRequest(
+    cyborg,
+    project1WbsNumber.carNumber,
+    project1WbsNumber.projectNumber,
+    project1WbsNumber.workPackageNumber,
+    CR_Type.OTHER,
+    'Initial Change Request',
+    [
+      {
+        type: Scope_CR_Why_Type.INITIALIZATION,
+        explain: 'need this to initialize work packages'
+      }
+    ],
+    [
+      {
+        budgetImpact: 0,
+        description: 'Initializing seed data',
+        timelineImpact: 0,
+        scopeImpact: 'no scope impact'
+      }
+    ]
+  );
+
+  const changeRequestWP1Id = changeRequestWP1.crId;
+
+  // make a proposed solution for it
+  const proposedSolution2 = await ChangeRequestsService.addProposedSolution(
+    cyborg,
+    changeRequestWP1Id,
+    0,
+    'Initializing seed data',
+    0,
+    'no scope impact'
+  );
+
+  const proposedSolution2Id = proposedSolution2.id;
+
+  // approve the change request
+  await ChangeRequestsService.reviewChangeRequest(batman, changeRequestWP1Id, 'LGTM', true, proposedSolution2Id);
+
+  const changeRequestWP5 = await ChangeRequestsService.createStandardChangeRequest(
+    cyborg,
+    project5WbsNumber.carNumber,
+    project5WbsNumber.projectNumber,
+    project5WbsNumber.workPackageNumber,
+    CR_Type.OTHER,
+    'Initial Change Request',
+    [
+      {
+        type: Scope_CR_Why_Type.INITIALIZATION,
+        explain: 'need this to initialize work packages'
+      }
+    ],
+    [
+      {
+        budgetImpact: 0,
+        description: 'Initializing seed data',
+        timelineImpact: 0,
+        scopeImpact: 'no scope impact'
+      }
+    ]
+  );
+
+  const changeRequestWP5Id = changeRequestWP5.crId;
+
+  // make a proposed solution for it
+  const proposedSolution5 = await ChangeRequestsService.addProposedSolution(
+    cyborg,
+    changeRequestWP5Id,
+    0,
+    'Initializing seed data',
+    0,
+    'no scope impact'
+  );
+
+  const proposedSolution5Id = proposedSolution5.id;
+
+  // approve the change request
+  await ChangeRequestsService.reviewChangeRequest(batman, changeRequestWP5Id, 'LGTM', true, proposedSolution5Id);
+
   /**
    * Work Packages
    */
   /** Work Package 1 */
   const { workPackageWbsNumber: workPackage1WbsNumber, workPackage: workPackage1 } = await seedWorkPackage(
     joeShmoe,
-    project1WbsNumber,
     'Bodywork Concept of Design',
-    changeRequest1.crId,
+    changeRequestWP1Id,
     WorkPackageStage.Design,
     '01/01/2023',
     3,
@@ -497,9 +580,8 @@ const performSeed: () => Promise<void> = async () => {
   /** Work Package 2 */
   const { workPackageWbsNumber: workPackage2WbsNumber, workPackage: workPackage2 } = await seedWorkPackage(
     thomasEmrax,
-    project1WbsNumber,
     'Adhesive Shear Strength Test',
-    changeRequest1.crId,
+    changeRequestWP1Id,
     WorkPackageStage.Research,
     '01/22/2023',
     5,
@@ -521,9 +603,8 @@ const performSeed: () => Promise<void> = async () => {
   /** Work Package 3 */
   const workPackage3WbsString = await WorkPackagesService.createWorkPackage(
     thomasEmrax,
-    project5WbsNumber,
     'Manufacture Wiring Harness',
-    changeRequest1.crId,
+    changeRequestWP5Id,
     WorkPackageStage.Manufacturing,
     '02/01/2023',
     3,
@@ -541,7 +622,6 @@ const performSeed: () => Promise<void> = async () => {
   /** Work Package 4 */
   const { workPackageWbsNumber: workPackage4WbsNumber, workPackage: workPackage4 } = await seedWorkPackage(
     thomasEmrax,
-    project5WbsNumber,
     'Install Wiring Harness',
     changeRequest1.crId,
     WorkPackageStage.Install,

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

@@ -20,12 +20,10 @@ workPackagesRouter.post(
   '/create',
   intMinZero(body('crId')),
   nonEmptyString(body('name')),
-  intMinZero(body('projectWbsNum.carNumber')),
-  intMinZero(body('projectWbsNum.projectNumber')),
-  intMinZero(body('projectWbsNum.workPackageNumber')),
   isWorkPackageStageOrNone(body('stage')),
   isDate(body('startDate')),
   intMinZero(body('duration')),
+  body('blockedBy').isArray(),
   intMinZero(body('blockedBy.*.carNumber')),
   intMinZero(body('blockedBy.*.projectNumber')),
   intMinZero(body('blockedBy.*.workPackageNumber')),

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

@@ -158,7 +158,6 @@ export default class WorkPackagesService {
   /**
    * Creates a Work_Package in the database
    * @param user the user creating the work package
-   * @param projectWbsNum the WBS number of the attached project
    * @param name the name of the new work package
    * @param crId the id of the change request creating this work package
    * @param stage the stage of the work package
@@ -172,7 +171,6 @@ export default class WorkPackagesService {
    */
   static async createWorkPackage(
     user: User,
-    projectWbsNum: WbsNumber,
     name: string,
     crId: number,
     stage: WorkPackageStage | null,
@@ -184,22 +182,7 @@ export default class WorkPackagesService {
   ): Promise<string> {
     if (isGuest(user.role)) throw new AccessDeniedGuestException('create work packages');
 
-    await validateChangeRequestAccepted(crId);
-
-    // get the corresponding project so we can find the next wbs number
-    // and what number work package this should be
-    const { carNumber, projectNumber, workPackageNumber } = projectWbsNum;
-
-    if (workPackageNumber !== 0) {
-      throw new HttpException(
-        400,
-        `Given WBS Number ${carNumber}.${projectNumber}.${workPackageNumber} is not for a project.`
-      );
-    }
-
-    if (blockedBy.find((dep: WbsNumber) => equalsWbsNumber(dep, projectWbsNum))) {
-      throw new HttpException(400, 'A Work Package cannot have its own project as a blocker');
-    }
+    const changeRequest = await validateChangeRequestAccepted(crId);
 
     blockedBy.forEach((dep: WbsNumber) => {
       if (dep.workPackageNumber === 0) {
@@ -209,11 +192,7 @@ export default class WorkPackagesService {
 
     const wbsElem = await prisma.wBS_Element.findUnique({
       where: {
-        wbsNumber: {
-          carNumber,
-          projectNumber,
-          workPackageNumber
-        }
+        wbsElementId: changeRequest.wbsElementId
       },
       include: {
         project: {
@@ -224,10 +203,32 @@ export default class WorkPackagesService {
       }
     });
 
-    if (!wbsElem) throw new NotFoundException('WBS Element', `${carNumber}.${projectNumber}.${workPackageNumber}`);
+    if (!wbsElem) throw new NotFoundException('WBS Element', changeRequest.wbsElementId);
+
+    // get the corresponding project so we can find the next wbs number
+    // and what number work package this should be
+    const { carNumber, projectNumber, workPackageNumber } = wbsElem;
+
+    const projectWbsNum: WbsNumber = {
+      carNumber,
+      projectNumber,
+      workPackageNumber
+    };
+
     if (wbsElem.dateDeleted)
       throw new DeletedException('WBS Element', wbsPipe({ carNumber, projectNumber, workPackageNumber }));
 
+    if (workPackageNumber !== 0) {
+      throw new HttpException(
+        400,
+        `Given WBS Number ${carNumber}.${projectNumber}.${workPackageNumber} is not for a project.`
+      );
+    }
+
+    if (blockedBy.find((dep: WbsNumber) => equalsWbsNumber(dep, projectWbsNum))) {
+      throw new HttpException(400, 'A Work Package cannot have its own project as a blocker');
+    }
+
     const { project } = wbsElem;
 
     if (!project) throw new NotFoundException('Project', `${carNumber}.${projectNumber}.${workPackageNumber}`);

src/backend/tests/test-data/wbs-element.test-data.ts

@@ -13,3 +13,17 @@ export const prismaWbsElement1: PrismaWbsElement = {
   projectLeadId: 4,
   projectManagerId: 5
 };
+
+export const prismaWbsElement2: PrismaWbsElement = {
+  wbsElementId: 1,
+  status: PrismaWBSElementStatus.ACTIVE,
+  carNumber: 1,
+  projectNumber: 2,
+  workPackageNumber: 2,
+  dateCreated: new Date(),
+  dateDeleted: null,
+  name: 'car',
+  deletedByUserId: null,
+  projectLeadId: 4,
+  projectManagerId: 5
+};