fix: issue with grand plan recalculation

Grand plan recalculation was using the start date of the grand plan instead of today's date, which was leading to incorrect results. - Update recalculateGrandPlanPacerPlanProperties to use a dateProvider.
kkartch0 · Feb 7, 2025 · 94456e0 · 94456e0
1 parent 69ba154
commit 94456e0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/commands/recalculateActiveGrandPlan.ts b/src/commands/recalculateActiveGrandPlan.ts
@@ -38,7 +38,7 @@ export const recalculateActiveGrandPlan = async (app: App, settings: PacerPlanPl
 			return;
 		} 
 
-		recalculateGrandPlanPacerPlanProperties(grandPlan);
+		recalculateGrandPlanPacerPlanProperties(grandPlan, dateProvider);
 
 		grandPlan.pacerPlans.forEach((pacerPlan: PacerPlan) => {
 			pacerPlan.tasks = generateTasksForPacerPlan(pacerPlan, dateProvider);

diff --git a/src/commands/recalculateAllPacerPlans.ts b/src/commands/recalculateAllPacerPlans.ts
@@ -26,7 +26,7 @@ export const recalculateAllPacerPlans = async (app: App, settings: PacerPlanPlug
 					return;
 				}
 
-				recalculateGrandPlanPacerPlanProperties(grandPlan);
+				recalculateGrandPlanPacerPlanProperties(grandPlan, dateProvider);
 
 			} catch (error) {
 				console.error("Error recalculating grand plan: " + fileTitle);

diff --git a/src/grandPlans/GrandPlan.helper.ts b/src/grandPlans/GrandPlan.helper.ts
@@ -3,13 +3,15 @@ import { calculateAvailableActionDates } from "../dateHelpers";
 import { GrandPlan } from "../grandPlans/GrandPlan";
 import { PacerPlan } from "../PacerPlan";
 import { getQuantitiesRemaining } from "../getQuantitiesRemaining";
+import { IDateProvider } from "../../src/dateProvider";
 
-export function recalculateGrandPlanPacerPlanProperties(grandPlan: GrandPlan) {
+export function recalculateGrandPlanPacerPlanProperties(grandPlan: GrandPlan, dateProvider: IDateProvider) {
     if (grandPlan.pacerPlans.length === 0) return;
 
     const totalRemainingQuantity = grandPlan.pacerPlans.reduce((acc: number, plan: PacerPlan) => acc + getQuantitiesRemaining(plan).length, 0);
 
-    const availableActionDates = calculateAvailableActionDates(grandPlan.startDate, grandPlan.endDate, grandPlan.actionDays);
+    const today = dateProvider.today();
+    const availableActionDates = calculateAvailableActionDates(today, grandPlan.endDate, grandPlan.actionDays);
 
     for (let i = 0; i < grandPlan.pacerPlans.length; i++) {
         grandPlan.pacerPlans[i].actionDays = grandPlan.actionDays;
@@ -21,14 +23,14 @@ export function recalculateGrandPlanPacerPlanProperties(grandPlan: GrandPlan) {
             grandPlan.pacerPlans[i].startDate = grandPlan.endDate;
             grandPlan.pacerPlans[i].endDate = grandPlan.endDate;
         }
-        grandPlan.pacerPlans[0].startDate = grandPlan.startDate;
+        grandPlan.pacerPlans[0].startDate = today;
         return;
     }
 
     const quantityPerDay = Math.ceil(totalRemainingQuantity / availableActionDates.length);
 
     let currentPlan = grandPlan.pacerPlans[0];
-    currentPlan.startDate = grandPlan.startDate;
+    currentPlan.startDate = today;
     currentPlan.endDate = calculatePacerPlanEndDate(grandPlan.pacerPlans[0], quantityPerDay);
 
 

diff --git a/test/GrandPlan.helper.test.ts b/test/GrandPlan.helper.test.ts
@@ -14,7 +14,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
             pacerPlans: []
         };
 
-        recalculateGrandPlanPacerPlanProperties(grandPlan);
+        recalculateGrandPlanPacerPlanProperties(grandPlan, { today: () => new Date() });
 
         expect(grandPlan.pacerPlans.length).toBe(0);
     });
@@ -31,7 +31,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
             ]
         };
 
-        recalculateGrandPlanPacerPlanProperties(grandPlan);
+        recalculateGrandPlanPacerPlanProperties(grandPlan, { today: () => new Date("2023-01-01") });
 
         expect(grandPlan.pacerPlans[0].startDate).toEqual(new Date("2023-01-01"));
         expect(grandPlan.pacerPlans[0].endDate).toEqual(new Date("2023-01-08"));
@@ -56,7 +56,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
             ]
         };
 
-        recalculateGrandPlanPacerPlanProperties(grandPlan);
+        recalculateGrandPlanPacerPlanProperties(grandPlan, { today: () => new Date("2025-01-18") });
 
         expect(grandPlan.pacerPlans[0].startDate).toEqual(new Date("2025-01-18"));
         expect(grandPlan.pacerPlans[0].endDate).toEqual(new Date("2025-01-18"));
@@ -67,7 +67,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
     it("plans should adjust properly when there are less quantities remaining than days left", () => {
         const grandPlan: GrandPlan = {
             title: "Grand Plan",
-            startDate: new Date("2025-01-18"),
+            startDate: new Date("2025-01-17"),
             endDate: new Date("2025-01-26"),
             actionDays: Days.Everyday,
             pacerPlans: [
@@ -76,7 +76,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
             ]
         };
 
-        recalculateGrandPlanPacerPlanProperties(grandPlan);
+        recalculateGrandPlanPacerPlanProperties(grandPlan, { today: () => new Date("2025-01-18") });
 
         expect(grandPlan.pacerPlans[0].startDate).toEqual(new Date("2025-01-18"));
         expect(grandPlan.pacerPlans[0].endDate).toEqual(new Date("2025-01-18"));
@@ -97,7 +97,7 @@ describe("adjustGrandPlanPacerPlanDates", () => {
             ]
         };
 
-        recalculateGrandPlanPacerPlanProperties(grandPlan);
+        recalculateGrandPlanPacerPlanProperties(grandPlan, { today: () => new Date("2025-01-18") });
 
         expect(grandPlan.pacerPlans[0].startDate).toEqual(new Date("2025-01-18"));
         expect(grandPlan.pacerPlans[0].endDate).toEqual(new Date("2025-01-19"));