Merge pull request #4045 from Northeastern-Electric-Racing/remove_rr_material_link

removed rr link on materials

Author: chpy04

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

@@ -207,8 +207,7 @@ export default class ProjectsController {
         price,
         subtotal,
         linkUrl,
-        notes,
-        reimbursementRequestId
+        notes
       } = req.body;
       const wbsNum = validateWBS(req.params.wbsNum as string);
       const material = await BillOfMaterialsService.createMaterial(
@@ -227,8 +226,7 @@ export default class ProjectsController {
         notes,
         assemblyId,
         pdmFileName,
-        unitName,
-        reimbursementRequestId
+        unitName
       );
       res.status(200).json(material);
     } catch (error: unknown) {
@@ -386,8 +384,7 @@ export default class ProjectsController {
         price,
         subtotal,
         linkUrl,
-        notes,
-        reimbursementRequestId
+        notes
       } = req.body;
       const updatedMaterial = await BillOfMaterialsService.editMaterial(
         req.currentUser,
@@ -405,8 +402,7 @@ export default class ProjectsController {
         notes,
         unitName,
         assemblyId,
-        pdmFileName,
-        reimbursementRequestId
+        pdmFileName
       );
       res.status(200).json(updatedMaterial);
     } catch (error: unknown) {

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

@@ -1,6 +1,5 @@
 import { Prisma } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args.js';
-import { getReimbursementRequestQueryArgs } from './reimbursement-requests.query-args.js';
 
 export type AssemblyQueryArgs = ReturnType<typeof getAssemblyQueryArgs>;
 
@@ -25,20 +24,42 @@ export const getMaterialQueryArgs = (organizationId: string) =>
       materialType: true,
       unit: true,
       manufacturer: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        where: { dateDeleted: null },
+        select: {
+          dateDeleted: true,
+          reimbursementRequest: {
+            select: {
+              reimbursementRequestId: true,
+              identifier: true,
+              dateDeleted: true
+            }
+          }
+        }
+      }
     }
   });
 
 export type MaterialPreviewQueryArgs = ReturnType<typeof getMaterialPreviewQueryArgs>;
 
-export const getMaterialPreviewQueryArgs = (organizationId: string) =>
+export const getMaterialPreviewQueryArgs = (_organizationId: string) =>
   Prisma.validator<Prisma.MaterialDefaultArgs>()({
     include: {
       unit: true,
       manufacturer: true,
       materialType: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        where: { dateDeleted: null },
+        select: {
+          dateDeleted: true,
+          reimbursementRequest: {
+            select: {
+              reimbursementRequestId: true,
+              identifier: true,
+              dateDeleted: true
+            }
+          }
+        }
+      }
     }
   });

src/backend/src/prisma/migrations/20260313162334_remove_material_reimbursement_request_link/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `reimbursementRequestId` on the `Material` table. All the data in the column will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Material" DROP CONSTRAINT "Material_reimbursementRequestId_fkey";
+
+-- DropIndex
+DROP INDEX "Material_reimbursementRequestId_idx";
+
+-- AlterTable
+ALTER TABLE "Material" DROP COLUMN "reimbursementRequestId";

src/backend/src/prisma/schema.prisma

@@ -756,7 +756,6 @@ model Reimbursement_Request {
   organizationId           String
   organization             Organization                    @relation(fields: [organizationId], references: [organizationId])
   notificationSlackThreads Message_Info[]
-  materials                Material[]
   reimbursementComments    Reimbursement_Request_Comment[]
   assigneeId               String?
   assignee                 User?                           @relation(name: "reimbursementRequestAssignee", fields: [assigneeId], references: [userId])
@@ -1016,14 +1015,11 @@ model Material {
   subtotal               Int?
   linkUrl                String
   notes                  String?
-  reimbursementRequest   Reimbursement_Request?  @relation(fields: [reimbursementRequestId], references: [reimbursementRequestId])
-  reimbursementRequestId String?
   reimbursementProducts  Reimbursement_Product[]
 
   @@index([assemblyId])
   @@index([materialTypeId])
   @@index([manufacturerId])
-  @@index([reimbursementRequestId])
   @@index([wbsElementId])
 }
 

src/backend/src/prisma/seed.ts

@@ -2312,7 +2312,6 @@ const performSeed: () => Promise<void> = async () => {
     'Here are some notes',
     assembly1.assemblyId,
     undefined,
-    undefined,
     undefined
   );
 
@@ -2336,7 +2335,6 @@ const performSeed: () => Promise<void> = async () => {
     'Here are some more notes',
     undefined,
     undefined,
-    undefined,
     undefined
   );
 
@@ -2359,9 +2357,7 @@ const performSeed: () => Promise<void> = async () => {
     50,
     undefined,
     undefined,
-    undefined,
-    undefined,
-    seededReimbursementRequests[0]?.reimbursementRequestId
+    undefined
   );
 
   // Need to do this because the design review cannot be scheduled for a past day

src/backend/src/services/boms.services.ts

@@ -61,7 +61,6 @@ export default class BillOfMaterialsService {
    * @param assemblyId the id of the Assembly for the material (optional)
    * @param pdmFileName the name of the pdm file for the material (optional)
    * @param unitName the name of the Quantity Unit the quantity is measured in (optional)
-   * @param reimbursementRequestId the id of the Reimbursement Request for the material (optional)
    * @returns the created material
    */
   static async createMaterial(
@@ -80,8 +79,7 @@ export default class BillOfMaterialsService {
     notes?: string,
     assemblyId?: string,
     pdmFileName?: string,
-    unitName?: string,
-    reimbursementRequestId?: string
+    unitName?: string
   ): Promise<Material> {
     const project = await ProjectsService.getSingleProjectWithQueryArgs(wbsNumber, organization);
 
@@ -115,16 +113,6 @@ export default class BillOfMaterialsService {
       if (!unit) throw new NotFoundException('Unit', unitName);
     }
 
-    if (reimbursementRequestId) {
-      const reimbursementRequest = await prisma.reimbursement_Request.findUnique({
-        where: { reimbursementRequestId, dateDeleted: null }
-      });
-
-      if (!reimbursementRequest) {
-        throw new NotFoundException('Reimbursement Request', reimbursementRequestId);
-      }
-    }
-
     const perms =
       (await userHasPermission(creator.userId, organization.organizationId, isLeadership)) ||
       isUserPartOfTeams(project.teams, creator);
@@ -148,8 +136,7 @@ export default class BillOfMaterialsService {
         linkUrl,
         notes,
         dateCreated: new Date(),
-        wbsElementId: project.wbsElementId,
-        reimbursementRequestId
+        wbsElementId: project.wbsElementId
       },
       ...getMaterialQueryArgs(organization.organizationId)
     });
@@ -628,7 +615,6 @@ export default class BillOfMaterialsService {
    * @param unitName the unit name of the edited material (optional)
    * @param assemblyId the assembly id of the edited material (optional)
    * @param pdmFileName the pdm file name of the edited material (optional)
-   * @param reimbursementRequestId the id of the Reimbursement Request for the material (optional)
    * @throws if permission denied or material's wbsElement is undefined/deleted
    * @returns the updated material
    */
@@ -648,8 +634,7 @@ export default class BillOfMaterialsService {
     notes?: string,
     unitName?: string,
     assemblyId?: string,
-    pdmFileName?: string,
-    reimbursementRequestId?: string
+    pdmFileName?: string
   ): Promise<Material> {
     const material = await BillOfMaterialsService.getSingleMaterialWithQueryArgs(materialId, organization);
 
@@ -679,16 +664,6 @@ export default class BillOfMaterialsService {
       if (!unit) throw new NotFoundException('Unit', unitName);
     }
 
-    if (reimbursementRequestId) {
-      const reimbursementRequest = await prisma.reimbursement_Request.findUnique({
-        where: { reimbursementRequestId, dateDeleted: null }
-      });
-
-      if (!reimbursementRequest) {
-        throw new NotFoundException('Reimbursement Request', reimbursementRequestId);
-      }
-    }
-
     let manufacturer = null;
     if (manufacturerName) {
       manufacturer = await BillOfMaterialsService.getSingleManufacturerWithQueryArgs(manufacturerName, organization);
@@ -710,8 +685,7 @@ export default class BillOfMaterialsService {
         notes,
         wbsElementId: project.wbsElementId,
         assemblyId,
-        pdmFileName,
-        reimbursementRequestId
+        pdmFileName
       },
       ...getMaterialQueryArgs(organization.organizationId)
     });

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

@@ -2,7 +2,6 @@ import { Prisma } from '@prisma/client';
 import { Assembly, Material, MaterialPreview, MaterialStatus } from 'shared';
 import { AssemblyQueryArgs, MaterialPreviewQueryArgs, MaterialQueryArgs } from '../prisma-query-args/bom.query-args.js';
 import { userTransformer } from './user.transformer.js';
-import { reimbursementRequestTransformer } from './reimbursement-requests.transformer.js';
 
 export const assemblyTransformer = (assembly: Prisma.AssemblyGetPayload<AssemblyQueryArgs>): Assembly => {
   return {
@@ -43,9 +42,13 @@ export const materialTransformer = (material: Prisma.MaterialGetPayload<Material
         }
       : undefined,
     notes: material.notes ?? undefined,
-    reimbursementRequest: material.reimbursementRequest
-      ? reimbursementRequestTransformer(material.reimbursementRequest)
-      : undefined
+    reimbursementRequests: Array.from(
+      new Map(
+        material.reimbursementProducts
+          .filter((p) => p.reimbursementRequest && !p.reimbursementRequest.dateDeleted)
+          .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
+      ).values()
+    )
   };
 };
 
@@ -66,8 +69,12 @@ export const materialPreviewTransformer = (
     quantity: material.quantity ?? undefined,
     price: material.price ?? undefined,
     subtotal: material.subtotal ?? undefined,
-    reimbursementRequest: material.reimbursementRequest
-      ? reimbursementRequestTransformer(material.reimbursementRequest)
-      : undefined
+    reimbursementRequests: Array.from(
+      new Map(
+        material.reimbursementProducts
+          .filter((p) => p.reimbursementRequest && !p.reimbursementRequest.dateDeleted)
+          .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
+      ).values()
+    )
   };
 };