Merge pull request #2626 from Northeastern-Electric-Racing/blocked-by

reflect blocked by changes

Author: Peyton-McKee

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

@@ -57,7 +57,8 @@ export const getProjectQueryArgs = (organizationId: string) =>
               assemblies: {
                 where: { dateDeleted: null },
                 ...getAssemblyQueryArgs(organizationId)
-              }
+              },
+              blocking: { where: { wbsElement: { dateDeleted: null } }, include: { wbsElement: true } }
             }
           },
           blockedBy: { where: { dateDeleted: null } }

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

@@ -1,5 +1,6 @@
 import { Prisma } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args';
+import { getWorkPackageQueryArgs } from './work-packages.query-args';
 
 export type TeamQueryArgs = ReturnType<typeof getTeamQueryArgs>;
 
@@ -19,11 +20,7 @@ export const getTeamQueryArgs = (organizationId: string) =>
         },
         include: {
           wbsElement: true,
-          workPackages: {
-            include: {
-              wbsElement: true
-            }
-          }
+          workPackages: getWorkPackageQueryArgs(organizationId)
         }
       }
     }

src/backend/src/prisma-query-args/work-packages.query-args.ts

@@ -27,7 +27,7 @@ export const getWorkPackageQueryArgs = (organizationId: string) =>
             include: { implementer: getUserQueryArgs(organizationId) },
             orderBy: { dateImplemented: 'asc' }
           },
-          blocking: true,
+          blocking: { where: { wbsElement: { dateDeleted: null } }, include: { wbsElement: true } },
           tasks: { where: { dateDeleted: null }, ...getTaskQueryArgs(organizationId) },
           descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) }
         }

src/backend/src/services/change-requests.services.ts

@@ -4,6 +4,7 @@ import {
   isGuest,
   isLeadership,
   isNotLeadership,
+  isProject,
   ProjectProposedChangesCreateArgs,
   ProposedSolution,
   ProposedSolutionCreateArgs,
@@ -670,7 +671,11 @@ export default class ChangeRequestsService {
       throw new DeletedException('WBS Element', wbsPipe({ carNumber, projectNumber, workPackageNumber }));
     if (wbsElement.organizationId !== organizationId) throw new InvalidOrganizationException('WBS Element');
     // we don't want to have merge conflicts on the wbs element thus we check if there are unreviewed or open CRs on the wbs element
-    if (projectNumber !== 0 && !(projectProposedChanges && projectProposedChanges.workPackageProposedChanges.length === 0)) {
+    if (
+      projectNumber !== 0 && // Excluding Cars
+      !(projectProposedChanges && projectProposedChanges.workPackageProposedChanges.length === 0) && // Excluding new projects with work packages
+      !(isProject(wbsElement) && workPackageProposedChanges) // Excluding Creating Work Package on Project
+    ) {
       await validateNoUnreviewedOpenCRs(wbsElement.wbsElementId);
     }
 

src/backend/src/transformers/projects.transformer.ts

@@ -84,7 +84,8 @@ const projectTransformer = (project: Prisma.ProjectGetPayload<ProjectQueryArgs>)
         projectName: wbsElement.name,
         stage: (workPackage.stage || undefined) as WorkPackageStage,
         materials: workPackage.wbsElement?.materials.map(materialTransformer),
-        assemblies: workPackage.wbsElement?.assemblies.map(assemblyTransformer)
+        assemblies: workPackage.wbsElement?.assemblies.map(assemblyTransformer),
+        blocking: workPackage.wbsElement.blocking.map((blocking) => wbsNumOf(blocking.wbsElement))
       };
     })
   };

src/backend/src/transformers/teams.transformer.ts

@@ -4,6 +4,7 @@ import { TeamQueryArgs } from '../prisma-query-args/teams.query-args';
 import { calculateProjectStatus } from '../utils/projects.utils';
 import { wbsNumOf } from '../utils/utils';
 import { userTransformer } from './user.transformer';
+import workPackageTransformer from './work-packages.transformer';
 
 const teamTransformer = (team: Prisma.TeamGetPayload<TeamQueryArgs>): Team => {
   return {
@@ -17,7 +18,8 @@ const teamTransformer = (team: Prisma.TeamGetPayload<TeamQueryArgs>): Team => {
       id: project.projectId,
       wbsNum: wbsNumOf(project.wbsElement),
       name: project.wbsElement.name,
-      status: calculateProjectStatus(project)
+      status: calculateProjectStatus(project),
+      workPackages: project.workPackages.map(workPackageTransformer)
     })),
     leads: team.leads.map(userTransformer),
     userArchived: team.userArchived ? userTransformer(team.userArchived) : undefined,

src/backend/src/transformers/work-packages.transformer.ts

@@ -35,7 +35,8 @@ const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<WorkPacka
     })),
     teamTypes: wpInput.project.teams.flatMap((team) => team.teamType ?? []),
     projectName: wpInput.project.wbsElement.name,
-    stage: (wpInput.stage as WorkPackageStage) || undefined
+    stage: (wpInput.stage as WorkPackageStage) || undefined,
+    blocking: wpInput.wbsElement.blocking.map((wp) => wbsNumOf(wp.wbsElement))
   };
 };
 

src/backend/src/utils/change-requests.utils.ts

@@ -378,7 +378,7 @@ export const applyProjectProposedChanges = async (
       projectWbsElmeId = proj.wbsElementId;
     }
 
-    const promises = projectProposedChanges.workPackageProposedChanges.map(async (proposedChange) => {
+    for (const proposedChange of projectProposedChanges.workPackageProposedChanges) {
       await applyWorkPackageProposedChanges(
         wbsProposedChanges,
         proposedChange,
@@ -388,9 +388,7 @@ export const applyProjectProposedChanges = async (
         crId,
         organizationId
       );
-    });
-
-    await Promise.all(promises);
+    }
   }
 };
 

src/backend/src/utils/changes.utils.ts

@@ -163,10 +163,10 @@ export const getWorkPackageChanges = async (
   newDuration: number,
   oldBlockedBy: WBS_Element[],
   newBlockedBy: WBS_Element[],
-  oldManagerId: string | null,
-  newManagerId: string | null,
   oldLeadId: string | null,
   newLeadId: string | null,
+  oldManagerId: string | null,
+  newManagerId: string | null,
   oldDescriptionBullets: DescriptionBulletWithType[],
   newDescriptionBullets: DescriptionBulletPreview[],
   crId: string,

src/frontend/src/apis/teams.api.ts

@@ -7,16 +7,17 @@ import axios from '../utils/axios';
 import { Team } from 'shared';
 import { apiUrls } from '../utils/urls';
 import { CreateTeamPayload } from '../hooks/teams.hooks';
+import { teamTransformer } from './transformers/teams.transformers';
 
 export const getAllTeams = () => {
   return axios.get<Team[]>(apiUrls.teams(), {
-    transformResponse: (data) => JSON.parse(data)
+    transformResponse: (data) => JSON.parse(data).map(teamTransformer)
   });
 };
 
 export const getSingleTeam = (id: string) => {
   return axios.get<Team>(apiUrls.teamsById(id), {
-    transformResponse: (data) => JSON.parse(data)
+    transformResponse: (data) => teamTransformer(JSON.parse(data))
   });
 };