#1528 - get unassign working

Author: RChandler234

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

@@ -44,6 +44,7 @@ import { linkTypeTransformer } from '../transformers/links.transformer';
 import { updateLinks, linkToChangeListValue } from '../utils/links.utils';
 import { manufacturerTransformer } from '../transformers/manufacturer.transformer';
 import { isUserPartOfTeams } from '../utils/teams.utils';
+import { disconnect } from 'process';
 
 export default class ProjectsService {
   /**
@@ -888,7 +889,10 @@ export default class ProjectsService {
    * @returns the updated material
    */
   static async assignMaterialAssembly(submitter: User, materialId: string, assemblyId?: string) {
-    const material = await prisma.material.findUnique({ where: { materialId } });
+    const material = await prisma.material.findUnique({
+      where: { materialId },
+      include: { wbsElement: true, assembly: true }
+    });
     if (!material) throw new NotFoundException('Material', materialId);
 
     const project = await prisma.project.findFirst({
@@ -903,7 +907,9 @@ export default class ProjectsService {
 
     // Permission: leadership and up, anyone on project team
     if (!(isLeadership(submitter.role) || isUserPartOfTeams(project.teams, submitter)))
-      throw new AccessDeniedException('Only leadership or above can assign materials to assemblies');
+      throw new AccessDeniedException(
+        `Only leadership or above, or someone on the project's team can assign materials to assemblies`
+      );
 
     if (assemblyId) {
       const assembly = await prisma.assembly.findUnique({
@@ -916,14 +922,33 @@ export default class ProjectsService {
       if (material.wbsElementId !== assembly.wbsElementId)
         throw new HttpException(
           400,
-          `The WBS element of the material (${material.wbsElementId}) and assembly (${assembly.wbsElementId}) do not match`
+          `The WBS element of the material (${wbsPipe(material.wbsElement)}) and assembly (${wbsPipe(
+            assembly.wbsElement
+          )}) do not match`
         );
+      const updatedMaterial = await prisma.material.update({
+        where: { materialId },
+        data: { assemblyId }
+      });
+
+      return updatedMaterial;
     }
+    if (material.assemblyId) {
+      // Assign a material on a project to a different assembly
+      await prisma.assembly.update({
+        where: { assemblyId: material.assemblyId },
+        data: { materials: { disconnect: { materialId } } },
+        include: { materials: true }
+      });
 
-    // Assign a material on a project to a different assembly
-    const updatedMaterial = await prisma.material.update({ where: { materialId }, data: { assemblyId } });
+      const updatedMaterial = await prisma.material.findUnique({
+        where: { materialId },
+        include: { wbsElement: true, assembly: true }
+      });
 
-    return updatedMaterial;
+      return updatedMaterial;
+    }
+    return material;
   }
 
   /**

src/backend/tests/projects.test.ts

@@ -734,7 +734,9 @@ describe('Projects', () => {
       vi.spyOn(prisma.project, 'findFirst').mockResolvedValue(project);
 
       await expect(ProjectsService.assignMaterialAssembly(theVisitor, 'mid', 'aid')).rejects.toThrow(
-        new AccessDeniedException('Only leadership or above can assign materials to assemblies')
+        new AccessDeniedException(
+          `Only leadership or above, or someone on the project's team can assign materials to assemblies`
+        )
       );
     });
 
@@ -754,10 +756,18 @@ describe('Projects', () => {
     });
 
     test('assignment fails because the wbsElements do not match', async () => {
-      vi.spyOn(prisma.material, 'findUnique').mockResolvedValue({ ...prismaMaterial1, wbsElementId: 1 });
-      vi.spyOn(prisma.assembly, 'findUnique').mockResolvedValue({ ...prismaAssembly1, wbsElementId: 2 });
+      vi.spyOn(prisma.material, 'findUnique').mockResolvedValue({
+        ...prismaMaterial1,
+        wbsElementId: 1,
+        wbsElement: prismaWbsElement1
+      });
+      vi.spyOn(prisma.assembly, 'findUnique').mockResolvedValue({
+        ...prismaAssembly1,
+        wbsElementId: 2,
+        wbsElement: { ...prismaWbsElement1, wbsElementId: 2, projectNumber: 1 }
+      });
       await expect(ProjectsService.assignMaterialAssembly(superman, 'mid', 'aid')).rejects.toThrow(
-        new HttpException(400, `The WBS element of the material (1) and assembly (2) do not match`)
+        new HttpException(400, `The WBS element of the material (1.2.0) and assembly (1.1.0) do not match`)
       );
     });
 
@@ -775,20 +785,6 @@ 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);
-    });
   });
   describe('Delete Assembly', () => {
     test('Deleteing assembly fails because user is not an admin or head', async () => {