refactor: cleanup date handling

[e-mobility-charging-stations-simulator.git] / src / charging-station / ChargingStation.ts

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index dfe6737713da6ab12964352884ec03d512e0e377..b44bf75d0d735c16eb1db19ce550548c8341925b 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -689,9 +689,9 @@ export class ChargingStation {
                 // Initialize
                 this.initialize();
                 this.idTagsCache.deleteIdTags(getIdTagsFile(this.stationInfo)!);
-                delete this.automaticTransactionGeneratorConfiguration;
                 // Restart the ATG
                 this.stopAutomaticTransactionGenerator();
+                delete this.automaticTransactionGeneratorConfiguration;
                 if (this.getAutomaticTransactionGeneratorConfiguration()?.enable === true) {
                   this.startAutomaticTransactionGenerator();
                 }
@@ -1031,11 +1031,11 @@ export class ChargingStation {
     );
     if (interval > 0) {
       this.reservationExpirationSetInterval = setInterval((): void => {
-        const now = new Date();
+        const dateNow = new Date();
         if (this.hasEvses) {
           for (const evseStatus of this.evses.values()) {
             for (const connectorStatus of evseStatus.connectors.values()) {
-              if (connectorStatus.reservation && connectorStatus.reservation.expiryDate < now) {
+              if (connectorStatus.reservation && connectorStatus.reservation.expiryDate < dateNow) {
                 this.removeReservation(
                   connectorStatus.reservation,
                   ReservationTerminationReason.EXPIRED,
@@ -1045,7 +1045,7 @@ export class ChargingStation {
           }
         } else {
           for (const connectorStatus of this.connectors.values()) {
-            if (connectorStatus.reservation && connectorStatus.reservation.expiryDate < now) {
+            if (connectorStatus.reservation && connectorStatus.reservation.expiryDate < dateNow) {
               this.removeReservation(
                 connectorStatus.reservation,
                 ReservationTerminationReason.EXPIRED,