#1528 Allow unassigning material from assembly

Author: ninest

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

@@ -816,27 +816,37 @@ export default class ProjectsService {
    * Assign a material on a project to a different assembly
    * @param submitter the submitter
    * @param materialId the material that will be moved
-   * @param assemblyId the assembly to change the material to
+   * @param assemblyId the assembly to change the material to, or undefined to unassign the material
    * @throws if the submitter does not have the relevant positions
    * @returns the updated material
    */
-  static async assignMaterialAssembly(submitter: User, materialId: string, assemblyId: string) {
+  static async assignMaterialAssembly(submitter: User, materialId: string, assemblyId: undefined | string) {
     const material = await prisma.material.findUnique({ where: { materialId } });
     if (!material) throw new NotFoundException('Material', materialId);
 
-    const assembly = await prisma.assembly.findUnique({
-      where: { assemblyId },
-      include: { wbsElement: true }
-    });
-    if (!assembly) throw new NotFoundException('Assembly', assemblyId);
-
     const project = await prisma.project.findFirst({
       where: {
-        wbsElement: assembly.wbsElement
+        wbsElementId: material.wbsElementId
       },
       ...projectQueryArgs
     });
-    if (!project) throw new NotFoundException('Project', assembly.wbsElementId);
+    if (!project) throw new NotFoundException('Project', material.wbsElementId);
+
+    // Permission: leadership and up, anyone on project team
+    if (!(isLeadership(submitter.role) || isUserPartOfTeams(project.teams, submitter)))
+      throw new AccessDeniedException('Only leadership or above can create a material type');
+
+    if (assemblyId === undefined) {
+      // Unassign material from current assembly if assembly id is undefined
+      const updatedMaterial = await prisma.material.update({ where: { materialId }, data: { assemblyId: undefined } });
+      return updatedMaterial;
+    }
+
+    const assembly = await prisma.assembly.findUnique({
+      where: { assemblyId },
+      include: { wbsElement: true }
+    });
+    if (!assembly) throw new NotFoundException('Assembly', assemblyId);
 
     // Confirm that the assembly's wbsElement is the same as the material's wbsElement
     if (material.wbsElementId !== assembly.wbsElementId)
@@ -845,10 +855,6 @@ export default class ProjectsService {
         `The WBS element of the material (${material.wbsElementId}) and assembly (${assembly.wbsElementId}) do not match`
       );
 
-    // Permission: leadership and up, anyone on project team
-    if (!(isLeadership(submitter.role) || isUserPartOfTeams(project.teams, submitter)))
-      throw new AccessDeniedException('Only leadership or above can create a material type');
-
     // Assign a material on a project to a different assembly
     const updatedMaterial = await prisma.material.update({ where: { materialId }, data: { assemblyId } });
     return updatedMaterial;

src/backend/tests/projects.test.ts

@@ -717,5 +717,19 @@ describe('Projects', () => {
       const updatedMaterial = await ProjectsService.assignMaterialAssembly(aquaman, 'mid', 'updated-aid');
       expect(updatedMaterial).toBe(expectedUpdatedToolMaterial);
     });
+
+    test('unassigning material from assebly works', async () => {
+      vi.spyOn(prisma.material, 'findUnique').mockResolvedValue(prismaMaterial1);
+      vi.spyOn(prisma.project, 'findFirst').mockResolvedValue(prismaProject1);
+
+      const expectedUpdatedToolMaterial: Material = {
+        ...prismaMaterial1,
+        assemblyId: null
+      };
+      vi.spyOn(prisma.material, 'update').mockResolvedValue(expectedUpdatedToolMaterial);
+
+      const updatedMaterial = await ProjectsService.assignMaterialAssembly(aquaman, 'mid', undefined);
+      expect(updatedMaterial).toBe(expectedUpdatedToolMaterial);
+    });
   });
 });