simplified query args and updated migration

Author: chpy04

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>;
 
@@ -26,24 +25,40 @@ export const getMaterialQueryArgs = (organizationId: string) =>
       unit: true,
       manufacturer: true,
       reimbursementProducts: {
-        include: {
-          reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+        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: {
-        include: {
-          reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+        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

@@ -7,17 +7,8 @@
 -- DropForeignKey
 ALTER TABLE "Material" DROP CONSTRAINT "Material_reimbursementRequestId_fkey";
 
--- DropForeignKey
-ALTER TABLE "Sponsor" DROP CONSTRAINT "Sponsor_sponsorTierId_fkey";
-
 -- DropIndex
 DROP INDEX "Material_reimbursementRequestId_idx";
 
 -- AlterTable
 ALTER TABLE "Material" DROP COLUMN "reimbursementRequestId";
-
--- AlterTable
-ALTER TABLE "Sponsor" ALTER COLUMN "valueTypes" DROP DEFAULT;
-
--- AddForeignKey
-ALTER TABLE "Sponsor" ADD CONSTRAINT "Sponsor_sponsorTierId_fkey" FOREIGN KEY ("sponsorTierId") REFERENCES "Sponsor_Tier"("sponsorTierId") ON DELETE SET NULL ON UPDATE CASCADE;

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 {
@@ -46,10 +45,10 @@ export const materialTransformer = (material: Prisma.MaterialGetPayload<Material
     reimbursementRequests: Array.from(
       new Map(
         material.reimbursementProducts
-          .filter((p) => !p.dateDeleted && p.reimbursementRequest)
+          .filter((p) => p.reimbursementRequest && !p.reimbursementRequest.dateDeleted)
           .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
       ).values()
-    ).map(reimbursementRequestTransformer)
+    )
   };
 };
 
@@ -73,9 +72,9 @@ export const materialPreviewTransformer = (
     reimbursementRequests: Array.from(
       new Map(
         material.reimbursementProducts
-          .filter((p) => !p.dateDeleted && p.reimbursementRequest)
+          .filter((p) => p.reimbursementRequest && !p.reimbursementRequest.dateDeleted)
           .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
       ).values()
-    ).map(reimbursementRequestTransformer)
+    )
   };
 };

src/backend/tests/unmocked/reimbursement-requests.test.ts

@@ -1349,7 +1349,6 @@ describe('Reimbursement Requests', () => {
       expect(updatedMaterial1!.status).toBe('ORDERED');
       expect(updatedMaterial2!.status).toBe('ORDERED');
     });
-
   });
 
   describe('Editing a reimbursement request', () => {

src/frontend/src/utils/bom.utils.ts

@@ -1,11 +1,11 @@
-import { Material, ReimbursementRequest } from 'shared';
+import { Material, MaterialReimbursementRequest } from 'shared';
 import { GridColDefStyle } from './tables';
 import { centsToDollar } from './pipes';
 import { DataGrid, GridValidRowModel } from '@mui/x-data-grid';
 import { styled } from '@mui/system';
 
 export interface BomRow extends GridValidRowModel {
-  reimbursementRequests: ReimbursementRequest[];
+  reimbursementRequests: MaterialReimbursementRequest[];
   id: string;
   materialId: string;
   status: string;

src/shared/src/types/bom-types.ts

@@ -1,6 +1,10 @@
 import { Decimal } from 'decimal.js';
 import { User } from './user-types.js';
-import { ReimbursementRequest } from './reimbursement-requests-types.js';
+
+export interface MaterialReimbursementRequest {
+  reimbursementRequestId: string;
+  identifier: number;
+}
 
 export enum MaterialStatus {
   Ordered = 'ORDERED',
@@ -72,7 +76,7 @@ export interface Material {
   subtotal?: number;
   linkUrl: string;
   notes?: string;
-  reimbursementRequests: ReimbursementRequest[];
+  reimbursementRequests: MaterialReimbursementRequest[];
 }
 
 export type MaterialPreview = Omit<