#1522: resolved merge conflict from develop branch

Author: callmejim1226

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

@@ -128,6 +128,17 @@ export default class ProjectsController {
     }
   }
 
+  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 createMaterialType(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;

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);
@@ -269,14 +275,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/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/schema.prisma

@@ -429,11 +429,12 @@ model Vendor {
 }
 
 model Expense_Type {
-  expenseTypeId String                  @id @default(uuid())
-  name          String
-  code          Int
-  allowed       Boolean
-  requests      Reimbursement_Request[]
+  expenseTypeId        String                  @id @default(uuid())
+  name                 String
+  code                 Int
+  allowed              Boolean
+  allowedRefundSources Club_Accounts[]
+  requests             Reimbursement_Request[]
 }
 
 model Reimbursement {

src/backend/src/prisma/seed.ts

@@ -7,6 +7,7 @@
 
 import {
   CR_Type,
+  Club_Accounts,
   PrismaClient,
   Scope_CR_Why_Type,
   Task_Priority,
@@ -750,7 +751,10 @@ const performSeed: () => Promise<void> = async () => {
 
   const vendors: Vendor[] = [vendor, vendor2, vendor3];
 
-  const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true);
+  const expenseType = await ReimbursementRequestService.createExpenseType(thomasEmrax, 'Equipment', 123, true, [
+    Club_Accounts.CASH,
+    Club_Accounts.BUDGET
+  ]);
 
   await ReimbursementRequestService.createReimbursementRequest(
     thomasEmrax,

src/backend/src/routes/projects.routes.ts

@@ -49,6 +49,12 @@ projectRouter.delete('/:wbsNum/delete', ProjectsController.deleteProject);
 projectRouter.post('/:wbsNum/favorite', ProjectsController.toggleFavorite);
 
 /**************** BOM Section ****************/
+projectRouter.post(
+  '/bom/manufacturer/create',
+  nonEmptyString(body('name')),
+  validateInputs,
+  ProjectsController.createManufacturer
+);
 projectRouter.post('/bom/material-type/create', nonEmptyString(body('name')), ProjectsController.createMaterialType);
 
 export default projectRouter;

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

@@ -86,6 +86,8 @@ reimbursementRequestsRouter.post(
 reimbursementRequestsRouter.post(
   '/vendors/create',
   nonEmptyString(body('name')),
+  body('allowedRefundSources').isArray(),
+  isAccount(body('allowedRefundSources.*')),
   validateInputs,
   ReimbursementRequestController.createVendor
 );
@@ -95,6 +97,8 @@ reimbursementRequestsRouter.post(
   nonEmptyString(body('name')),
   intMinZero(body('code')),
   body('allowed').isBoolean(),
+  body('allowedRefundSources').isArray(),
+  isAccount(body('allowedRefundSources.*')),
   validateInputs,
   ReimbursementRequestController.createExpenseType
 );

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

@@ -604,6 +604,31 @@ export default class ProjectsService {
     ).map(linkTypeTransformer);
   }
 
+  /**
+   * Creates a new Manufacturer
+   * @param submitter the user who's creating the manufacturer
+   * @param name the name of the manufacturer
+   * @returns the newly created manufacturer
+   * @throws if the submitter is a guest or the given manufacturer name already exists
+   */
+  static async createManufacturer(submitter: User, name: string) {
+    if (isGuest(submitter.role)) throw new AccessDeniedGuestException('create manufacturers');
+
+    const manufacturer = await prisma.manufacturer.findUnique({
+      where: {
+        name
+      }
+    });
+
+    if (manufacturer) throw new HttpException(400, `${name} already exists as a manufacturer!`);
+
+    const newManufacturer = await prisma.manufacturer.create({
+      data: { name, dateCreated: new Date(), creatorId: submitter.userId }
+    });
+
+    return newManufacturer;
+  }
+
   /**
    * Create a new material type
    * @param name the name of the new material type

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

@@ -5,7 +5,7 @@
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { Multer } from 'multer';
-import { Reimbursement_Request, Reimbursement_Status_Type, User } from '@prisma/client';
+import { Club_Accounts, Reimbursement_Request, Reimbursement_Status_Type, User } from '@prisma/client';
 import {
   ClubAccount,
   ExpenseType,
@@ -131,6 +131,10 @@ export default class ReimbursementRequestService {
 
     if (!expenseType.allowed) throw new HttpException(400, `The expense type ${expenseType.name} is not allowed!`);
 
+    if (!expenseType.allowedRefundSources.includes(account)) {
+      throw new HttpException(400, 'The submitted refund source is not allowed to be used with the submitted expense type');
+    }
+
     const validatedReimbursementProudcts = await validateReimbursementProducts(reimbursementProducts);
 
     const createdReimbursementRequest = await prisma.reimbursement_Request.create({
@@ -268,6 +272,9 @@ export default class ReimbursementRequestService {
 
     if (!expenseType) throw new NotFoundException('Expense Type', expenseTypeId);
     if (!expenseType.allowed) throw new HttpException(400, 'Expense Type Not Allowed');
+    if (!expenseType.allowedRefundSources.includes(account)) {
+      throw new HttpException(400, 'The submitted refund source is not allowed to be used with the submitted expense type');
+    }
 
     await updateReimbursementProducts(
       oldReimbursementRequest.reimbursementProducts,
@@ -463,15 +470,23 @@ export default class ReimbursementRequestService {
    * @param name The name of the expense type
    * @param code the expense type's SABO code
    * @param allowed whether or not this expense type is allowed
+   * @param allowedRefundSources an array of Club_Accounts representing allowed refund sources
    * @returns the created expense type
    */
-  static async createExpenseType(submitter: User, name: string, code: number, allowed: boolean) {
+  static async createExpenseType(
+    submitter: User,
+    name: string,
+    code: number,
+    allowed: boolean,
+    allowedRefundSources: Club_Accounts[]
+  ) {
     if (!isAdmin(submitter.role)) throw new AccessDeniedAdminOnlyException('create expense types');
     const expense = await prisma.expense_Type.create({
       data: {
         name,
         allowed,
-        code
+        code,
+        allowedRefundSources
       }
     });
 
@@ -487,7 +502,14 @@ export default class ReimbursementRequestService {
    * @param submitter the person editing expense type code number
    * @returns the updated expense type
    */
-  static async editExpenseType(expenseTypeId: string, code: number, name: string, allowed: boolean, submitter: User) {
+  static async editExpenseType(
+    expenseTypeId: string,
+    code: number,
+    name: string,
+    allowed: boolean,
+    submitter: User,
+    allowedRefundSources: Club_Accounts[]
+  ) {
     if (!isHead(submitter.role))
       throw new AccessDeniedException('Only the head or admin can update account code number and name');
 
@@ -502,7 +524,8 @@ export default class ReimbursementRequestService {
       data: {
         name,
         code,
-        allowed
+        allowed,
+        allowedRefundSources
       }
     });
 

src/backend/src/transformers/reimbursement-requests.transformer.ts

@@ -83,7 +83,8 @@ export const expenseTypeTransformer = (expenseType: Prisma.Expense_TypeGetPayloa
     expenseTypeId: expenseType.expenseTypeId,
     name: expenseType.name,
     code: expenseType.code,
-    allowed: expenseType.allowed
+    allowed: expenseType.allowed,
+    allowedRefundSources: expenseType.allowedRefundSources as ClubAccount[]
   };
 };