#1528 - fix tests

Author: RChandler234

src/backend/src/routes/projects.routes.ts

@@ -62,12 +62,12 @@ projectRouter.post('/bom/material-type/create', nonEmptyString(body('name')), Pr
 projectRouter.post(
   '/bom/assembly/:wbsNum/create',
   nonEmptyString(body('name')),
-  nonEmptyString(body('pdmFileName')).optional(),
+  nonEmptyString(body('pdmFileName').optional()),
   ProjectsController.createAssembly
 );
 projectRouter.post(
   '/bom/material/:materialId/assign-assembly',
-  nonEmptyString(body('assemblyId')),
+  nonEmptyString(body('assemblyId').optional()),
   validateInputs,
   ProjectsController.assignMaterialAssembly
 );

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

@@ -887,9 +887,10 @@ export default class ProjectsService {
    * @throws if the submitter does not have the relevant positions
    * @returns the updated material
    */
-  static async assignMaterialAssembly(submitter: User, materialId: string, assemblyId: undefined | string) {
+  static async assignMaterialAssembly(submitter: User, materialId: string, assemblyId?: string) {
     const material = await prisma.material.findUnique({ where: { materialId } });
     if (!material) throw new NotFoundException('Material', materialId);
+
     const project = await prisma.project.findFirst({
       where: {
         wbsElementId: material.wbsElementId
@@ -902,26 +903,22 @@ 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 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;
-    }
+      throw new AccessDeniedException('Only leadership or above can assign materials to assemblies');
 
-    const assembly = await prisma.assembly.findUnique({
-      where: { assemblyId },
-      include: { wbsElement: true }
-    });
-    if (!assembly) throw new NotFoundException('Assembly', assemblyId);
+    if (assemblyId) {
+      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)
-      throw new HttpException(
-        400,
-        `The WBS element of the material (${material.wbsElementId}) and assembly (${assembly.wbsElementId}) do not match`
-      );
+      // Confirm that the assembly's wbsElement is the same as the material's wbsElement
+      if (material.wbsElementId !== assembly.wbsElementId)
+        throw new HttpException(
+          400,
+          `The WBS element of the material (${material.wbsElementId}) and assembly (${assembly.wbsElementId}) do not match`
+        );
+    }
 
     // Assign a material on a project to a different assembly
     const updatedMaterial = await prisma.material.update({ where: { materialId }, data: { assemblyId } });

src/backend/tests/projects.test.ts

@@ -734,7 +734,7 @@ 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 create a material type')
+        new AccessDeniedException('Only leadership or above can assign materials to assemblies')
       );
     });
 
@@ -798,6 +798,8 @@ describe('Projects', () => {
     });
 
     test('Deleting assembly fails if assembly does not exist', async () => {
+      vi.spyOn(prisma.assembly, 'findUnique').mockResolvedValue(null);
+
       await expect(ProjectsService.deleteAssembly('New Assembly', batman)).rejects.toThrow(
         new NotFoundException('Assembly', 'New Assembly')
       );