#1520 get it compiling

Author: RChandler234

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

@@ -197,7 +197,7 @@ export default class ProjectsController {
     try {
       const user: User = await getCurrentUser(res);
       const { manufacturerName } = req.params;
-      const deletedManufacturer: Manufacturer = await ProjectsService.deleteManufacturer(user, manufacturerName);
+      const deletedManufacturer = await ProjectsService.deleteManufacturer(user, manufacturerName);
       res.status(200).json(deletedManufacturer);
     } catch (error: unknown) {
       next(error);

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

@@ -1,31 +1,18 @@
-<<<<<<< HEAD
 import { Role, Material_Type, User, Assembly, Material_Status, Material } from '@prisma/client';
-import {
-  isAdmin,
-  isGuest,
-=======
 import {
   isAdmin,
   isGuest,
   isHead,
->>>>>>> develop
   isLeadership,
   isProject,
   LinkCreateArgs,
   LinkType,
-<<<<<<< HEAD
   Manufacturer,
   MaterialType,
-=======
->>>>>>> develop
   Project,
   WbsNumber,
   wbsPipe
 } from 'shared';
-<<<<<<< HEAD
-=======
-import { Manufacturer, Role, Material_Type, User, Assembly, Material_Status, Material } from '@prisma/client';
->>>>>>> develop
 import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import prisma from '../prisma/prisma';
 import projectTransformer from '../transformers/projects.transformer';

src/backend/src/transformers/manufacturer.transformer.ts

@@ -14,6 +14,6 @@ export const manufacturerTransformer = (
     name: manufacturer.name,
     dateCreated: manufacturer.dateCreated,
     creatorId: manufacturer.creatorId,
-    dateDeleted: manufacturer.dateDeleted
+    dateDeleted: manufacturer.dateDeleted ?? undefined
   };
 };

src/backend/src/transformers/material-type.transformer.ts

@@ -13,6 +13,7 @@ export const materialTypeTransformer = (
   return {
     name: materialType.name,
     dateCreated: materialType.dateCreated,
-    creatorId: materialType.creatorId
+    creatorId: materialType.creatorId,
+    dateDeleted: materialType.dateDeleted ?? undefined
   };
 };

src/shared/src/types/project-types.ts

@@ -118,12 +118,14 @@ export interface Manufacturer {
   name: string;
   dateCreated: Date;
   creatorId: number;
+  dateDeleted?: Date;
 }
 
 export interface MaterialType {
   name: string;
   dateCreated: Date;
   creatorId: number;
+  dateDeleted?: Date;
 }
 
 export enum MaterialStatus {