Merge branch 'develop' of https://github.com/Northeastern-Electric-Racing/FinishLine into develop

trying to fix messed up local repo

Author: Megan Liu

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';
 
@@ -127,4 +127,90 @@ export default class ProjectsController {
       next(error);
     }
   }
+
+  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;
+      const user = await getCurrentUser(res);
+      const createdManufacturer = await ProjectsService.createManufacturer(user, name);
+      res.status(200).json(createdManufacturer);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  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;
+      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/reimbursement-requests.controllers.ts

@@ -162,9 +162,15 @@ export default class ReimbursementRequestsController {
 
   static async createExpenseType(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, code, allowed } = req.body;
+      const { name, code, allowed, allowedRefundSources } = req.body;
       const user = await getCurrentUser(res);
-      const createdExpenseType = await ReimbursementRequestService.createExpenseType(user, name, code, allowed);
+      const createdExpenseType = await ReimbursementRequestService.createExpenseType(
+        user,
+        name,
+        code,
+        allowed,
+        allowedRefundSources
+      );
       res.status(200).json(createdExpenseType);
     } catch (error: unknown) {
       next(error);
@@ -224,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;
@@ -269,14 +286,15 @@ export default class ReimbursementRequestsController {
   static async editExpenseTypeCode(req: Request, res: Response, next: NextFunction) {
     try {
       const { expenseTypeId } = req.params;
-      const { name, code, allowed } = req.body;
+      const { name, code, allowed, allowedRefundSources } = req.body;
       const submitter = await getCurrentUser(res);
       const expenseTypeUpdated = await ReimbursementRequestService.editExpenseType(
         expenseTypeId,
         code,
         name,
         allowed,
-        submitter
+        submitter,
+        allowedRefundSources
       );
       res.status(200).json(expenseTypeUpdated);
     } catch (error: unknown) {

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 {
@@ -72,8 +82,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       } = req.body;
 
       let { stage } = req.body;
@@ -94,8 +104,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;

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/20230829222742_add_allowed_refund_sources/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Expense_Type" ADD COLUMN     "allowedRefundSources" "Club_Accounts"[];

src/backend/src/prisma/migrations/20231010194436_integration_to_install/migration.sql

@@ -0,0 +1,10 @@
+-- AlterEnum
+CREATE TYPE "Work_Package_Stage_new" AS ENUM ('RESEARCH', 'DESIGN', 'MANUFACTURING', 'INSTALL');
+ALTER TABLE "Work_Package" ALTER COLUMN "stage" TYPE "Work_Package_Stage_new" USING (
+  CASE "stage"::text
+    WHEN 'INTEGRATION' THEN 'INSTALL'::"Work_Package_Stage_new"
+    ELSE "stage"::text::"Work_Package_Stage_new"
+  END);
+ALTER TYPE "Work_Package_Stage" RENAME TO "Work_Package_Stage_old";
+ALTER TYPE "Work_Package_Stage_new" RENAME TO "Work_Package_Stage";
+DROP TYPE "Work_Package_Stage_old";

…ons/20231005145708_add_bom/migration.sql …ons/20231024124220_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231005145708_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql src/backend/src/prisma/migrations/20231005145708_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,
@@ -25,14 +25,14 @@ CREATE TABLE "Assembly" (
 -- CreateTable
 CREATE TABLE "Material" (
     "materialId" TEXT NOT NULL,
-    "assembyId" TEXT,
+    "assemblyId" TEXT,
     "name" TEXT NOT NULL,
     "wbsElementId" INTEGER NOT NULL,
     "dateDeleted" TIMESTAMP(3),
     "userDeletedId" INTEGER,
     "dateCreated" TIMESTAMP(3) NOT NULL,
     "userCreatedId" INTEGER NOT NULL,
-    "staus" "Material_Status" NOT NULL,
+    "status" "Material_Status" NOT NULL,
     "materialTypeName" TEXT NOT NULL,
     "manufacturerName" TEXT NOT NULL,
     "manufacturerPartNumber" TEXT NOT NULL,
@@ -81,7 +81,7 @@ ALTER TABLE "Assembly" ADD CONSTRAINT "Assembly_userCreatedId_fkey" FOREIGN KEY
 ALTER TABLE "Assembly" ADD CONSTRAINT "Assembly_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "Material" ADD CONSTRAINT "Material_assembyId_fkey" FOREIGN KEY ("assembyId") REFERENCES "Assembly"("assemblyId") ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE "Material" ADD CONSTRAINT "Material_assemblyId_fkey" FOREIGN KEY ("assemblyId") REFERENCES "Assembly"("assemblyId") ON DELETE SET NULL ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "Material" ADD CONSTRAINT "Material_wbsElementId_fkey" FOREIGN KEY ("wbsElementId") REFERENCES "WBS_Element"("wbsElementId") ON DELETE RESTRICT ON UPDATE CASCADE;

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

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