Merge branch 'develop' into #1519-get-all-manufacturers-endpoint

Author: RChandler234

src/backend/src/controllers/change-requests.controllers.ts

@@ -75,18 +75,19 @@ export default class ChangeRequestsController {
 
   static async createStandardChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { wbsNum, type, what, why } = req.body;
+      const { wbsNum, type, what, why, proposedSolutions } = req.body;
       const submitter = await getCurrentUser(res);
-      const id = await ChangeRequestsService.createStandardChangeRequest(
+      const createdCR = await ChangeRequestsService.createStandardChangeRequest(
         submitter,
         wbsNum.carNumber,
         wbsNum.projectNumber,
         wbsNum.workPackageNumber,
         type,
         what,
-        why
+        why,
+        proposedSolutions
       );
-      return res.status(200).json({ message: `${id}` });
+      return res.status(200).json(createdCR);
     } catch (error: unknown) {
       next(error);
     }

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

@@ -128,6 +128,60 @@ export default class ProjectsController {
     }
   }
 
+  static async createAssembly(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user: User = await getCurrentUser(res);
+      const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
+      const { name, pdmFileName } = req.body;
+      const createAssembly = await ProjectsService.createAssembly(name, user, wbsNum, pdmFileName);
+      res.status(200).json(createAssembly);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createMaterial(req: Request, res: Response, next: NextFunction) {
+    try {
+      const {
+        name,
+        assemblyId,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        pdmFileName,
+        quantity,
+        unitName,
+        price,
+        subtotal,
+        linkUrl,
+        notes
+      } = req.body;
+      const creator = await getCurrentUser(res);
+      const wbsNum = validateWBS(req.params.wbsNum);
+      const material = await ProjectsService.createMaterial(
+        creator,
+        name,
+        status,
+        materialTypeName,
+        manufacturerName,
+        manufacturerPartNumber,
+        quantity,
+        unitName,
+        price,
+        subtotal,
+        linkUrl,
+        notes,
+        wbsNum,
+        assemblyId,
+        pdmFileName
+      );
+      return res.status(200).json(material);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -147,5 +201,16 @@ export default class ProjectsController {
     } catch (error: unknown) {
       next(error);
     }
+  }      
+
+  static async createMaterialType(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { name } = req.body;
+      const user = await getCurrentUser(res);
+      const createdMaterialType = await ProjectsService.createMaterialType(name, user);
+      res.status(200).json(createdMaterialType);
+    } catch (error: unknown) {
+      next(error);
+    }
   }
 }

src/backend/src/controllers/work-packages.controllers.ts

@@ -72,8 +72,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       } = req.body;
 
       let { stage } = req.body;
@@ -94,8 +94,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       );
       return res.status(200).json({ message: 'Work package updated successfully' });
     } catch (error: unknown) {

src/backend/src/integrations/slack.ts

@@ -1,4 +1,5 @@
 import { WebClient } from '@slack/web-api';
+import { HttpException } from '../utils/errors.utils';
 
 const slack = new WebClient(process.env.SLACK_BOT_TOKEN);
 
@@ -40,13 +41,17 @@ export const sendMessage = async (slackId: string, message: string, link?: strin
           }
         };
 
-  await slack.chat.postMessage({
-    token: SLACK_BOT_TOKEN,
-    channel: slackId,
-    text: message,
-    blocks: [block],
-    unfurl_links: false
-  });
+  try {
+    await slack.chat.postMessage({
+      token: SLACK_BOT_TOKEN,
+      channel: slackId,
+      text: message,
+      blocks: [block],
+      unfurl_links: false
+    });
+  } catch (error) {
+    throw new HttpException(500, 'Error sending slack message, reason: ' + (error as any).data.error);
+  }
 };
 
 export default slack;

…ons/20231019013832_add_bom/migration.sql …ons/20231024124220_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql src/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql

@@ -12,7 +12,7 @@ CREATE TABLE "Unit" (
 CREATE TABLE "Assembly" (
     "assemblyId" TEXT NOT NULL,
     "name" TEXT NOT NULL,
-    "pdmFileName" TEXT NOT NULL,
+    "pdmFileName" TEXT,
     "dateDeleted" TIMESTAMP(3),
     "userDeletedId" INTEGER,
     "dateCreated" TIMESTAMP(3) NOT NULL,

src/backend/src/prisma/schema.prisma

@@ -474,7 +474,7 @@ model Unit {
 model Assembly {
   assemblyId    String      @id @default(uuid())
   name          String      @unique
-  pdmFileName   String
+  pdmFileName   String?
   dateDeleted   DateTime?
   userDeleted   User?       @relation(fields: [userDeletedId], references: [userId], name: "assemblyDeleter")
   userDeletedId Int?

src/backend/src/prisma/seed-data/teams.seed.ts

@@ -48,6 +48,26 @@ const justiceLeague = (headId: number): Prisma.TeamCreateArgs => {
   };
 };
 
+const avatarBenders = (headId: number): Prisma.TeamCreateArgs => {
+  return {
+    data: {
+      teamName: 'Avatar: The Last Airbender',
+      slackId: 'avatar',
+      headId
+    }
+  };
+};
+
+const plLegends = (headId: number): Prisma.TeamCreateArgs => {
+  return {
+    data: {
+      teamName: 'PlTeams',
+      slackId: 'Pl',
+      headId
+    }
+  };
+};
+
 const huskies = (headId: number): Prisma.TeamCreateArgs => {
   return {
     data: {
@@ -60,4 +80,4 @@ const huskies = (headId: number): Prisma.TeamCreateArgs => {
   };
 };
 
-export const dbSeedAllTeams = { ravens, orioles, justiceLeague, huskies };
+export const dbSeedAllTeams = { ravens, orioles, justiceLeague, huskies, avatarBenders, plLegends };