X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=2380c967beada92d179262a2c71abc30640758f6;hb=2665ed1ef62a9fc9b6eec417f3ec7c33305789cf;hp=6158d7b05435f3a067a2963e859403095c2bfe32;hpb=5dc7c990eff43659bd48589cfc5afe09f9ec6664;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 6158d7b0..2380c967 100644
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -1,4 +1,4 @@
-// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
 
 import { hoursToMilliseconds, secondsToMilliseconds } from 'date-fns'
 
@@ -19,7 +19,7 @@ import {
 } from '../types/index.js'
 import {
   Constants,
-  cloneObject,
+  clone,
   convertToDate,
   formatDurationMilliSeconds,
   getRandomInteger,
@@ -66,7 +66,7 @@ export class AutomaticTransactionGenerator {
     return AutomaticTransactionGenerator.instances.get(chargingStation.stationInfo!.hashId)
   }
 
-  public start (): void {
+  public start (stopAbsoluteDuration?: boolean): void {
     if (!checkChargingStation(this.chargingStation, this.logPrefix())) {
       return
     }
@@ -79,7 +79,7 @@ export class AutomaticTransactionGenerator {
       return
     }
     this.starting = true
-    this.startConnectors()
+    this.startConnectors(stopAbsoluteDuration)
     this.started = true
     this.starting = false
   }
@@ -99,7 +99,7 @@ export class AutomaticTransactionGenerator {
     this.stopping = false
   }
 
-  public startConnector (connectorId: number): void {
+  public startConnector (connectorId: number, stopAbsoluteDuration?: boolean): void {
     if (!checkChargingStation(this.chargingStation, this.logPrefix(connectorId))) {
       return
     }
@@ -108,7 +108,7 @@ export class AutomaticTransactionGenerator {
       throw new BaseError(`Connector ${connectorId} does not exist`)
     }
     if (this.connectorsStatus.get(connectorId)?.start === false) {
-      this.internalStartConnector(connectorId).catch(Constants.EMPTY_FUNCTION)
+      this.internalStartConnector(connectorId, stopAbsoluteDuration).catch(Constants.EMPTY_FUNCTION)
     } else if (this.connectorsStatus.get(connectorId)?.start === true) {
       logger.warn(`${this.logPrefix(connectorId)} is already started on connector`)
     }
@@ -127,7 +127,7 @@ export class AutomaticTransactionGenerator {
     }
   }
 
-  private startConnectors (): void {
+  private startConnectors (stopAbsoluteDuration?: boolean): void {
     if (
       this.connectorsStatus.size > 0 &&
       this.connectorsStatus.size !== this.chargingStation.getNumberOfConnectors()
@@ -139,14 +139,14 @@ export class AutomaticTransactionGenerator {
       for (const [evseId, evseStatus] of this.chargingStation.evses) {
         if (evseId > 0) {
           for (const connectorId of evseStatus.connectors.keys()) {
-            this.startConnector(connectorId)
+            this.startConnector(connectorId, stopAbsoluteDuration)
           }
         }
       }
     } else {
       for (const connectorId of this.chargingStation.connectors.keys()) {
         if (connectorId > 0) {
-          this.startConnector(connectorId)
+          this.startConnector(connectorId, stopAbsoluteDuration)
         }
       }
     }
@@ -170,8 +170,11 @@ export class AutomaticTransactionGenerator {
     }
   }
 
-  private async internalStartConnector (connectorId: number): Promise<void> {
-    this.setStartConnectorStatus(connectorId)
+  private async internalStartConnector (
+    connectorId: number,
+    stopAbsoluteDuration?: boolean
+  ): Promise<void> {
+    this.setStartConnectorStatus(connectorId, stopAbsoluteDuration)
     logger.info(
       `${this.logPrefix(
         connectorId
@@ -257,12 +260,15 @@ export class AutomaticTransactionGenerator {
     )
   }
 
-  private setStartConnectorStatus (connectorId: number): void {
+  private setStartConnectorStatus (
+    connectorId: number,
+    stopAbsoluteDuration = this.chargingStation.getAutomaticTransactionGeneratorConfiguration()
+      ?.stopAbsoluteDuration
+  ): void {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     this.connectorsStatus.get(connectorId)!.startDate = new Date()
     if (
-      this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.stopAbsoluteDuration ===
-        false ||
+      stopAbsoluteDuration === false ||
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       !isValidDate(this.connectorsStatus.get(connectorId)!.stopDate)
     ) {
@@ -369,22 +375,23 @@ export class AutomaticTransactionGenerator {
   }
 
   private getConnectorStatus (connectorId: number): Status {
-    const connectorStatus =
-      this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[connectorId - 1] != null
-        ? cloneObject<Status>(
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId - 1]
-        )
-        : undefined
+    const statusIndex = connectorId - 1
+    let connectorStatus: Status | undefined
+    if (this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[statusIndex] != null) {
+      connectorStatus = clone<Status>(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        this.chargingStation.getAutomaticTransactionGeneratorStatuses()![statusIndex]
+      )
+    } else if (this.chargingStation.getAutomaticTransactionGeneratorStatuses() != null) {
+      logger.warn(
+        `${this.logPrefix(connectorId)} no status found for connector #${connectorId} in charging station configuration file. New status will be created`
+      )
+    }
     if (connectorStatus != null) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      connectorStatus.startDate = convertToDate(connectorStatus.startDate)!
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      connectorStatus.lastRunDate = convertToDate(connectorStatus.lastRunDate)!
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      connectorStatus.stopDate = convertToDate(connectorStatus.stopDate)!
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      connectorStatus.stoppedDate = convertToDate(connectorStatus.stoppedDate)!
+      connectorStatus.startDate = convertToDate(connectorStatus.startDate)
+      connectorStatus.lastRunDate = convertToDate(connectorStatus.lastRunDate)
+      connectorStatus.stopDate = convertToDate(connectorStatus.stopDate)
+      connectorStatus.stoppedDate = convertToDate(connectorStatus.stoppedDate)
       if (
         !this.started &&
         (connectorStatus.start ||