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

@@ -25,8 +25,11 @@ export const getMaterialQueryArgs = (organizationId: string) =>
       materialType: true,
       unit: true,
       manufacturer: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        include: {
+          reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+        }
+      }
     }
   });
 
@@ -38,7 +41,10 @@ export const getMaterialPreviewQueryArgs = (organizationId: string) =>
       unit: true,
       manufacturer: true,
       materialType: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        include: {
+          reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+        }
+      }
     }
   });

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

@@ -0,0 +1,23 @@
+/*
+  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";
+
+-- 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/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

@@ -43,9 +43,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.dateDeleted && p.reimbursementRequest)
+          .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
+      ).values()
+    ).map(reimbursementRequestTransformer)
   };
 };
 
@@ -66,8 +70,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.dateDeleted && p.reimbursementRequest)
+          .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
+      ).values()
+    ).map(reimbursementRequestTransformer)
   };
 };

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

@@ -104,10 +104,6 @@ export const validateReimbursementProducts = async (
         if (material.wbsElementId !== wbsElement.wbsElementId) {
           throw new HttpException(400, `Material does not belong to project ${wbsPipe(wbsNum)}`);
         }
-
-        if (!product.id && material.reimbursementRequestId) {
-          throw new HttpException(400, `Material is already linked to another reimbursement request`);
-        }
       }
 
       return {
@@ -185,22 +181,27 @@ export const updateReimbursementProducts = async (
 };
 
 /**
- * Unlinks materials from products that are being deleted
+ * Unlinks materials from products that are being deleted, reverting status if no other active products remain
  * @param products the products being deleted
  */
 const unlinkMaterialsFromDeletedProducts = async (products: Reimbursement_Product[]) => {
+  const deletedProductIds = products.map((p) => p.reimbursementProductId);
   const materialIds = products.filter((p) => p.materialId).map((p) => p.materialId!);
 
-  if (materialIds.length > 0) {
-    await prisma.material.updateMany({
+  for (const materialId of materialIds) {
+    const otherProductCount = await prisma.reimbursement_Product.count({
       where: {
-        materialId: { in: materialIds }
-      },
-      data: {
-        reimbursementRequestId: null,
-        status: 'NOT_READY_TO_ORDER'
+        materialId,
+        dateDeleted: null,
+        reimbursementProductId: { notIn: deletedProductIds }
       }
     });
+    if (otherProductCount === 0) {
+      await prisma.material.update({
+        where: { materialId },
+        data: { status: 'NOT_READY_TO_ORDER' }
+      });
+    }
   }
 };
 
@@ -237,15 +238,24 @@ const updateExistingProducts = async (
       });
 
       if (currentProduct?.materialId && currentProduct.materialId !== product.materialId) {
-        await prisma.material.update({
-          where: { materialId: currentProduct.materialId },
-          data: { reimbursementRequestId: null, status: 'NOT_READY_TO_ORDER' }
+        const otherProductCount = await prisma.reimbursement_Product.count({
+          where: {
+            materialId: currentProduct.materialId,
+            dateDeleted: null,
+            reimbursementProductId: { not: product.id }
+          }
         });
+        if (otherProductCount === 0) {
+          await prisma.material.update({
+            where: { materialId: currentProduct.materialId },
+            data: { status: 'NOT_READY_TO_ORDER' }
+          });
+        }
       }
 
       await prisma.material.update({
         where: { materialId: product.materialId },
-        data: { status: 'READY_TO_ORDER', reimbursementRequestId: currentProduct?.reimbursementRequestId }
+        data: { status: 'READY_TO_ORDER' }
       });
     } else {
       await prisma.reimbursement_Product.update({
@@ -262,10 +272,19 @@ const updateExistingProducts = async (
       });
 
       if (currentProduct?.materialId) {
-        await prisma.material.update({
-          where: { materialId: currentProduct.materialId },
-          data: { reimbursementRequestId: null, status: 'NOT_READY_TO_ORDER' }
+        const otherProductCount = await prisma.reimbursement_Product.count({
+          where: {
+            materialId: currentProduct.materialId,
+            dateDeleted: null,
+            reimbursementProductId: { not: product.id }
+          }
         });
+        if (otherProductCount === 0) {
+          await prisma.material.update({
+            where: { materialId: currentProduct.materialId },
+            data: { status: 'NOT_READY_TO_ORDER' }
+          });
+        }
       }
     }
   }
@@ -400,10 +419,7 @@ export const createReimbursementProducts = async (
     if (product.materialId) {
       await prisma.material.update({
         where: { materialId: product.materialId },
-        data: {
-          status: 'READY_TO_ORDER',
-          reimbursementRequestId
-        }
+        data: { status: 'READY_TO_ORDER' }
       });
     }
     return reimbursementProduct;
@@ -606,13 +622,16 @@ export const validateRefund = async (user: User, refundAmount: number, organizat
  * @param reimbursementRequestId the id of the reimbursement request
  */
 export const updateMaterialStatusesOnPayment = async (reimbursementRequestId: string): Promise<void> => {
-  await prisma.material.updateMany({
-    where: {
-      reimbursementRequestId,
-      dateDeleted: null
-    },
-    data: {
-      status: 'ORDERED'
-    }
+  const products = await prisma.reimbursement_Product.findMany({
+    where: { reimbursementRequestId, dateDeleted: null, materialId: { not: null } }
   });
+
+  const materialIds = products.map((p) => p.materialId!);
+
+  if (materialIds.length > 0) {
+    await prisma.material.updateMany({
+      where: { materialId: { in: materialIds }, dateDeleted: null, status: 'READY_TO_ORDER' },
+      data: { status: 'ORDERED' }
+    });
+  }
 };