fix(trackerSelector): fix computation of remainingDays

Clm-Roig · Mar 18, 2022 · 5a54f9c · 5a54f9c
1 parent a8c0116
commit 5a54f9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/store/trackers/trackers.selectors.spec.ts b/src/store/trackers/trackers.selectors.spec.ts
@@ -1,3 +1,4 @@
+import { subDays } from 'date-fns';
 import { v4 } from 'uuid';
 import SliceStatus from '../../models/SliceStatus';
 import Tracker from '../../models/Tracker';
@@ -31,14 +32,14 @@ describe('trackers selector', () => {
               {
                 quantity: 15,
                 unit: 'squats'
-              },
+              }
             ],
             status: TrackerStatus.active
           },
           {
             id: v4(),
-            beginDate: new Date().toString(),
-            duration: 10,
+            beginDate: subDays(new Date(), 10).toString(),
+            duration: 70,
             entries: [],
             name: 'Eat',
             requiredCompletions: [
@@ -57,6 +58,8 @@ describe('trackers selector', () => {
     expect(status).toEqual(SliceStatus.idle);
     expect(trackers?.length).toEqual(2);
     const tracker2 = trackers?.[1] as Tracker;
-    expect(tracker2.remainingDays).toEqual(10);
+    // begun 10 days ago, duration of 70 days = 60 days remaining but can be 59 depending on the hour of the day
+    expect(tracker2.remainingDays).toBeGreaterThanOrEqual(59);
+    expect(tracker2.remainingDays).toBeLessThanOrEqual(60);
   });
 });
diff --git a/src/store/trackers/trackers.selectors.ts b/src/store/trackers/trackers.selectors.ts
@@ -1,25 +1,18 @@
 import { RootState } from '../store';
 import Tracker from '../../models/Tracker';
-import { formatDuration, intervalToDuration } from 'date-fns';
+import { addDays, differenceInDays } from 'date-fns';
 
 const selectTrackers = (state: RootState) => {
   const prevTrackers = state.trackers.trackers;
   const newTrackers = prevTrackers?.map((t) => {
     let trackerObj = t as Tracker;
     const { beginDate, duration } = trackerObj;
     if (beginDate && duration) {
-      const beginDateObj = new Date(beginDate);
-      const estimatedEndDateObj = new Date(beginDate);
-      estimatedEndDateObj.setDate(estimatedEndDateObj.getDate() + duration);
-
-      const remainingDuration = intervalToDuration({
-        start: beginDateObj,
-        end: estimatedEndDateObj
-      });
-
+      const estimatedEndDateObj = addDays(new Date(beginDate), duration);
+      const difference = differenceInDays(estimatedEndDateObj, new Date());
       trackerObj = {
         ...trackerObj,
-        remainingDays: Number(formatDuration(remainingDuration, { format: ['days'] }).split(' ')[0])
+        remainingDays: difference
       };
     }
     return trackerObj;