From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Mon, 24 Jul 2023 10:41:15 +0000 (+0200)
Subject: fix: ensure daily recurring charging profiles are adjusted on a day
X-Git-Tag: v1.2.20~159^2~9
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=de3272506539665b7ae509b7c056423af1332fb2;p=e-mobility-charging-stations-simulator.git

fix: ensure daily recurring charging profiles are adjusted on a day
granularity

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

diff --git a/src/charging-station/ChargingStationUtils.ts b/src/charging-station/ChargingStationUtils.ts
index 1d1119d3..7865eb1f 100644
--- a/src/charging-station/ChargingStationUtils.ts
+++ b/src/charging-station/ChargingStationUtils.ts
@@ -4,7 +4,7 @@ import { basename, dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 import chalk from 'chalk';
-import { addSeconds, isAfter, isBefore } from 'date-fns';
+import { addSeconds, isAfter, isTomorrow, isYesterday } from 'date-fns';
 
 import type { ChargingStation } from './ChargingStation';
 import { BaseError } from '../exception';
@@ -678,25 +678,21 @@ const getLimitFromChargingProfiles = (
       chargingSchedule.startSchedule = convertToDate(chargingSchedule.startSchedule)!;
     }
     // Check type (recurring) and if it is already active
-    // Adjust the daily recurring schedule
+    // Adjust the daily recurring schedule to today
     if (
       chargingProfile.chargingProfileKind === ChargingProfileKindType.RECURRING &&
       chargingProfile.recurrencyKind === RecurrencyKindType.DAILY
     ) {
-      if (isBefore(chargingSchedule.startSchedule, currentDate)) {
+      if (isYesterday(chargingSchedule.startSchedule)) {
         chargingSchedule.startSchedule.setFullYear(
           currentDate.getFullYear(),
           currentDate.getMonth(),
           currentDate.getDate(),
         );
-        // Check if the start of the schedule must be set to yesterday
-      } else if (isAfter(chargingSchedule.startSchedule, currentDate)) {
+      } else if (isTomorrow(chargingSchedule.startSchedule)) {
         chargingSchedule.startSchedule.setDate(currentDate.getDate() - 1);
       }
     }
-    // if (isAfter(chargingSchedule.startSchedule, currentDate)) {
-    //   return null;
-    // }
     // Check if the charging profile is active
     if (
       isAfter(addSeconds(chargingSchedule.startSchedule, chargingSchedule.duration!), currentDate)