Merge branch '#1524-Delete-Material-Type-Endpoint' of https://github.com/Northeastern-Electric-Racing/FinishLine into #1524-Delete-Material-Type-Endpoint

Author: Aaryan1203

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

@@ -1,6 +1,6 @@
 import { Project, validateWBS, WbsNumber, wbsPipe } from 'shared';
 import { NextFunction, Request, Response } from 'express';
-import { User } from '@prisma/client';
+import { Manufacturer, User } from '@prisma/client';
 import { getCurrentUser } from '../utils/auth.utils';
 import ProjectsService from '../services/projects.services';
 
@@ -193,6 +193,16 @@ export default class ProjectsController {
     }
   }
 
+  static async getAllManufacturers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user = await getCurrentUser(res);
+      const manufacturers: Manufacturer[] = await ProjectsService.getAllManufacturers(user);
+      return res.status(200).json(manufacturers);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createMaterialType(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;

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

@@ -230,6 +230,17 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async denyReimbursementRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { requestId } = req.params;
+      const user = await getCurrentUser(res);
+      const reimbursementStatus = await ReimbursementRequestService.denyReimbursementRequest(requestId, user);
+      res.status(200).json(reimbursementStatus);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async markReimbursementRequestAsDelivered(req: Request, res: Response, next: NextFunction) {
     try {
       const { requestId } = req.params;

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

@@ -29,6 +29,16 @@ export default class WorkPackagesController {
     }
   }
 
+  static async getManyWorkPackages(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { wbsNums } = req.body;
+      const workPackages: WorkPackage[] = await WorkPackagesService.getManyWorkPackages(wbsNums);
+      res.status(200).json(workPackages);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   // Create a work package with the given details
   static async createWorkPackage(req: Request, res: Response, next: NextFunction) {
     try {

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;

src/backend/src/prisma-query-args/manufacturers.query-args.ts

@@ -0,0 +1,14 @@
+/*
+ * This file is part of NER's FinishLine and licensed under GNU AGPLv3.
+ * See the LICENSE file in the repository root folder for details.
+ */
+
+import { Prisma } from '@prisma/client';
+
+const manufacturerQueryArgs = Prisma.validator<Prisma.ManufacturerArgs>()({
+  include: {
+    materials: true
+  }
+});
+
+export default manufacturerQueryArgs;

src/backend/src/prisma/migrations/20231109224241_deny_rr/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "Reimbursement_Status_Type" ADD VALUE 'DENIED';

src/backend/src/prisma/schema.prisma

@@ -364,6 +364,7 @@ enum Reimbursement_Status_Type {
   SABO_SUBMITTED
   ADVISOR_APPROVED
   REIMBURSED
+  DENIED
 }
 
 model Reimbursement_Status {

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

@@ -69,6 +69,70 @@ const wonderwoman: Prisma.UserCreateInput = {
   googleAuthId: 'wonderwoman'
 };
 
+const lexLuther: Prisma.UserCreateInput = {
+  firstName: 'Alexander',
+  lastName: 'Luther',
+  email: 'lexluther@justiceleague.com',
+  googleAuthId: 'hjkklo',
+  role: Role.MEMBER
+};
+
+const hawkgirl: Prisma.UserCreateInput = {
+  firstName: 'Shiera',
+  lastName: 'Hall',
+  email: 'hawkgirl@justiceleague.com',
+  googleAuthId: 'bhuujki',
+  role: Role.MEMBER
+};
+
+const elongatedMan: Prisma.UserCreateInput = {
+  firstName: 'Randolph',
+  lastName: 'Dibney',
+  email: 'elongatedmangit @justiceleague.com',
+  googleAuthId: 'joigiug',
+  role: Role.MEMBER
+};
+
+const zatanna: Prisma.UserCreateInput = {
+  firstName: 'Zatanna',
+  lastName: 'Zatara',
+  email: 'zatanna@justiceleague.com',
+  googleAuthId: 'cawwww',
+  role: Role.MEMBER
+};
+
+const phantomStranger: Prisma.UserCreateInput = {
+  firstName: 'Judas',
+  lastName: 'Iscariot',
+  email: 'phantomstranger@justiceleague.com',
+  googleAuthId: 'bnhjiuy',
+  role: Role.MEMBER
+};
+
+const redTornado: Prisma.UserCreateInput = {
+  firstName: 'Red',
+  lastName: 'Tornado',
+  email: 'redtornado@justiceleague.com',
+  googleAuthId: 'vbnhught',
+  role: Role.MEMBER
+};
+
+const firestorm: Prisma.UserCreateInput = {
+  firstName: 'Ronnie',
+  lastName: 'Raymond',
+  email: 'firestorm@justiceleague.com',
+  googleAuthId: 'fghttyu',
+  role: Role.MEMBER
+};
+
+const hankHeywood: Prisma.UserCreateInput = {
+  firstName: 'Hank',
+  lastName: 'Heywood III',
+  email: 'hankheywood@justiceleague.com',
+  googleAuthId: 'hudhsgf',
+  role: Role.MEMBER
+};
+
 const flash: Prisma.UserCreateInput = {
   firstName: 'Barry',
   lastName: 'Allen',
@@ -572,13 +636,85 @@ const babyDollJacobson: Prisma.UserCreateInput = {
   role: Role.LEADERSHIP
 };
 
+const frostBite: Prisma.UserCreateInput = {
+  firstName: 'Frost',
+  lastName: 'Bite',
+  googleAuthId: 'husky1',
+  email: 'frostbite@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const winter: Prisma.UserCreateInput = {
+  firstName: 'Winter',
+  lastName: 'Warrior',
+  googleAuthId: 'husky2',
+  email: 'winterwarrior@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const paws: Prisma.UserCreateInput = {
+  firstName: 'Paws',
+  lastName: 'The-Dog',
+  googleAuthId: 'husky3',
+  email: 'paws@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const snowPaws: Prisma.UserCreateInput = {
+  firstName: 'Snow',
+  lastName: 'Paws',
+  googleAuthId: 'husky4',
+  email: 'snowpaws@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const whiteTail: Prisma.UserCreateInput = {
+  firstName: 'White',
+  lastName: 'Tail',
+  googleAuthId: 'husky5',
+  email: 'whitetail@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const husky: Prisma.UserCreateInput = {
+  firstName: 'Husky',
+  lastName: 'Dog',
+  googleAuthId: 'husky6',
+  email: 'huskydog@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const howler: Prisma.UserCreateInput = {
+  firstName: 'Howler',
+  lastName: 'Husky',
+  googleAuthId: 'husky7',
+  email: 'howler@northeastern.edu',
+  role: Role.MEMBER
+};
+
+const snowBite: Prisma.UserCreateInput = {
+  firstName: 'Snow',
+  lastName: 'Bite',
+  googleAuthId: 'husky8',
+  email: 'SnowBite@northeastern.edu',
+  role: Role.MEMBER
+};
+
 export const dbSeedAllUsers = {
   thomasEmrax,
   joeShmoe,
   joeBlow,
   wonderwoman,
   flash,
   aquaman,
+  lexLuther,
+  hawkgirl,
+  elongatedMan,
+  zatanna,
+  phantomStranger,
+  redTornado,
+  firestorm,
+  hankHeywood,
   robin,
   batman,
   superman,
@@ -637,5 +773,13 @@ export const dbSeedAllUsers = {
   kenWilliams,
   boogPowell,
   mannyMachado,
-  babyDollJacobson
+  babyDollJacobson,
+  frostBite,
+  winter,
+  snowPaws,
+  paws,
+  whiteTail,
+  husky,
+  howler,
+  snowBite
 };