#1509 fixed merge conflicts from develop

Author: jackturner106

src/backend/src/controllers/projects.controllers.ts

@@ -135,9 +135,11 @@ export default class ProjectsController {
     try {
       const createAssembly = await ProjectsService.createAssembly(name, pdmFileName, user, wbsNum);
       res.status(200).json(createAssembly);
+    } catch (error: unknown) {
+      next(error);
     }
   }
-  
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;

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

@@ -7,7 +7,6 @@ import { validateChangeRequestAccepted } from '../utils/change-requests.utils';
 import {
   AccessDeniedAdminOnlyException,
   AccessDeniedGuestException,
-  AccessDeniedException,
   HttpException,
   NotFoundException,
   DeletedException,
@@ -657,7 +656,8 @@ export default class ProjectsService {
 
     return assembly;
   }
-  
+
+  /*
    * Creates a new Manufacturer
    * @param submitter the user who's creating the manufacturer
    * @param name the name of the manufacturer

src/backend/tests/projects.test.ts

@@ -2,7 +2,13 @@ import prisma from '../src/prisma/prisma';
 import { getHighestProjectNumber } from '../src/utils/projects.utils';
 import * as changeRequestUtils from '../src/utils/change-requests.utils';
 import { aquaman, batman, wonderwoman, superman } from './test-data/users.test-data';
-import { prismaProject1, sharedProject1, prismaAssembly1, toolMaterial } from './test-data/projects.test-data';
+import {
+  prismaProject1,
+  sharedProject1,
+  prismaAssembly1,
+  toolMaterial,
+  prismaManufacturer1
+} from './test-data/projects.test-data';
 import { prismaChangeRequest1 } from './test-data/change-requests.test-data';
 import { justiceLeague, prismaTeam1 } from './test-data/teams.test-data';
 import * as projectTransformer from '../src/transformers/projects.transformer';

src/backend/tests/test-data/projects.test-data.ts

@@ -114,6 +114,7 @@ export const prismaAssembly1: Assembly = {
   dateDeleted: null,
   userDeletedId: null,
   assemblyId: '1'
+};
 
 export const prismaManufacturer1: Manufacturer = {
   name: 'Manufacturer1',