Merge pull request #3833 from Northeastern-Electric-Racing/#3832--maintenance-multi-project-RRs-deduct-total-cost

#3832: fixed backend over-calculating budget deductions from RRs that a project has an item on

Author: chpy04

src/backend/src/services/finance.services.ts

@@ -434,13 +434,31 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              wbsElement: {
+                project: {
+                  projectId
+                }
+              }
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
     const { pendingFinance, pendingLeadership, submittedToSabo, reimbursed } = computeRRTotals(reimbursementRequests);
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0) / 100;
+    const totalBalance =
+      reimbursementRequests.reduce((acc, curr) => {
+        const projectProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        return acc + projectProductsCost;
+      }, 0) / 100;
 
     const available = project.budget - totalBalance;
 
@@ -507,15 +525,37 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              wbsElement: {
+                project: {
+                  teams: {
+                    some: {
+                      teamId
+                    }
+                  }
+                }
+              }
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
     const totalBudget = team.projects.reduce((acc, curr) => acc + curr.budget, 0);
 
     const { pendingFinance, pendingLeadership, submittedToSabo, reimbursed } = computeRRTotals(reimbursementRequests);
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0) / 100;
+    const totalBalance =
+      reimbursementRequests.reduce((acc, curr) => {
+        const teamProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        return acc + teamProductsCost;
+      }, 0) / 100;
 
     const available = totalBudget - totalBalance;
 
@@ -910,7 +950,17 @@ export default class FinanceServices {
       },
       select: {
         reimbursementStatuses: true,
-        totalCost: true
+        totalCost: true,
+        reimbursementProducts: {
+          where: {
+            reimbursementProductReason: {
+              otherReasonId
+            }
+          },
+          select: {
+            cost: true
+          }
+        }
       }
     });
 
@@ -935,7 +985,8 @@ export default class FinanceServices {
       const lastStatus = req.reimbursementStatuses.at(-1)?.type;
 
       if (lastStatus && totals[lastStatus] !== undefined) {
-        totals[lastStatus] += req.totalCost;
+        const categoryProductsCost = req.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+        totals[lastStatus] += categoryProductsCost;
       }
     });
 
@@ -944,7 +995,10 @@ export default class FinanceServices {
     const submittedToSabo = totals[Reimbursement_Status_Type.SABO_SUBMITTED] ?? 0;
     const reimbursed = totals[Reimbursement_Status_Type.REIMBURSED] ?? 0;
 
-    const totalBalance = reimbursementRequests.reduce((acc, curr) => acc + curr.totalCost, 0);
+    const totalBalance = reimbursementRequests.reduce((acc, curr) => {
+      const categoryProductsCost = curr.reimbursementProducts.reduce((prodAcc, prod) => prodAcc + prod.cost, 0);
+      return acc + categoryProductsCost;
+    }, 0);
 
     const available = totalBudget - totalBalance;
 

src/backend/src/utils/finance.utils.ts

@@ -114,6 +114,7 @@ export const computeRRTotals = (
       reimbursementStatusId: string;
       userId: string;
     }[];
+    reimbursementProducts?: { cost: number }[];
   }[]
 ): {
   pendingFinance: number;
@@ -132,7 +133,11 @@ export const computeRRTotals = (
     const lastStatus = req.reimbursementStatuses.at(-1)?.type;
 
     if (lastStatus && totals[lastStatus] !== undefined) {
-      totals[lastStatus] += req.totalCost;
+      // If reimbursementProducts are provided, sum their costs; otherwise use totalCost
+      const costToAdd = req.reimbursementProducts
+        ? req.reimbursementProducts.reduce((acc, prod) => acc + prod.cost, 0)
+        : req.totalCost;
+      totals[lastStatus] += costToAdd;
     }
   });