X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=4bff9031eb1f401a216e58e1a0f2032929b20e76;hb=298be10c5c800e43b0b9dcd6c50f6d49e2cb786b;hp=38efbf51a22ce5c19390a0219702ddb81c9dfd2c;hpb=5199f9fdf202eb534948f165a0994e1993675aa8;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 38efbf51..4bff9031 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,9 +19,11 @@ import {
 } from '../types/index.js'
 import {
   Constants,
-  cloneObject,
+  clone,
+  convertToDate,
   formatDurationMilliSeconds,
   getRandomInteger,
+  isValidDate,
   logPrefix,
   logger,
   secureRandom,
@@ -216,24 +218,22 @@ export class AutomaticTransactionGenerator {
             )
           )
           logger.info(
-            `${this.logPrefix(
-              connectorId
-            )} transaction started with id ${this.chargingStation.getConnectorStatus(connectorId)
-              ?.transactionId} and will stop in ${formatDurationMilliSeconds(waitTrxEnd)}`
+            `${this.logPrefix(connectorId)} transaction started with id ${
+              this.chargingStation.getConnectorStatus(connectorId)?.transactionId
+            } and will stop in ${formatDurationMilliSeconds(waitTrxEnd)}`
           )
           await sleep(waitTrxEnd)
           await this.stopTransaction(connectorId)
         }
       } else {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions!
+        ++this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.skippedTransactions!
+        ++this.connectorsStatus.get(connectorId)!.skippedTransactions
         logger.info(
-          `${this.logPrefix(connectorId)} skipped consecutively ${this.connectorsStatus.get(
-            connectorId
-          )?.skippedConsecutiveTransactions}/${this.connectorsStatus.get(connectorId)
-            ?.skippedTransactions} transaction(s)`
+          `${this.logPrefix(connectorId)} skipped consecutively ${
+            this.connectorsStatus.get(connectorId)?.skippedConsecutiveTransactions
+          }/${this.connectorsStatus.get(connectorId)?.skippedTransactions} transaction(s)`
         )
       }
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -259,27 +259,26 @@ export class AutomaticTransactionGenerator {
 
   private setStartConnectorStatus (connectorId: number): void {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0
-    const previousRunDuration =
-      this.connectorsStatus.get(connectorId)?.startDate != null &&
-      this.connectorsStatus.get(connectorId)?.lastRunDate != null
-        ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        this.connectorsStatus.get(connectorId)!.lastRunDate!.getTime() -
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          this.connectorsStatus.get(connectorId)!.startDate!.getTime()
-        : 0
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     this.connectorsStatus.get(connectorId)!.startDate = new Date()
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    this.connectorsStatus.get(connectorId)!.stopDate = new Date(
+    if (
+      this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.stopAbsoluteDuration ===
+        false ||
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      this.connectorsStatus.get(connectorId)!.startDate!.getTime() +
-        hoursToMilliseconds(
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.stopAfterHours
-        ) -
-        previousRunDuration
-    )
+      !isValidDate(this.connectorsStatus.get(connectorId)!.stopDate)
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      this.connectorsStatus.get(connectorId)!.stopDate = new Date(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        this.connectorsStatus.get(connectorId)!.startDate!.getTime() +
+          hoursToMilliseconds(
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.stopAfterHours
+          )
+      )
+    }
+    delete this.connectorsStatus.get(connectorId)?.stoppedDate
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     this.connectorsStatus.get(connectorId)!.start = true
   }
@@ -287,6 +286,11 @@ export class AutomaticTransactionGenerator {
   private canStartConnector (connectorId: number): boolean {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     if (new Date() > this.connectorsStatus.get(connectorId)!.stopDate!) {
+      logger.info(
+        `${this.logPrefix(
+          connectorId
+        )} entered in transaction loop while the ATG stop date has been reached`
+      )
       return false
     }
     if (!this.chargingStation.inAcceptedState()) {
@@ -365,14 +369,31 @@ export class AutomaticTransactionGenerator {
   }
 
   private getConnectorStatus (connectorId: number): Status {
-    const connectorStatus =
-      this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[connectorId] != null
-        ? cloneObject<Status>(
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId]
-        )
-        : undefined
-    this.resetConnectorStatus(connectorStatus)
+    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) {
+      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 ||
+          this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.enable !== true)
+      ) {
+        connectorStatus.start = false
+      }
+    }
     return (
       connectorStatus ?? {
         start: false,
@@ -391,23 +412,6 @@ export class AutomaticTransactionGenerator {
     )
   }
 
-  private resetConnectorStatus (connectorStatus: Status | undefined): void {
-    if (connectorStatus == null) {
-      return
-    }
-    delete connectorStatus.startDate
-    delete connectorStatus.lastRunDate
-    delete connectorStatus.stopDate
-    delete connectorStatus.stoppedDate
-    if (
-      !this.started &&
-      (connectorStatus.start ||
-        this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.enable !== true)
-    ) {
-      connectorStatus.start = false
-    }
-  }
-
   private async startTransaction (
     connectorId: number
   ): Promise<StartTransactionResponse | undefined> {
@@ -426,10 +430,10 @@ export class AutomaticTransactionGenerator {
       )} start transaction with an idTag '${idTag}'`
       if (this.getRequireAuthorize()) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.authorizeRequests!
+        ++this.connectorsStatus.get(connectorId)!.authorizeRequests
         if (await isIdTagAuthorized(this.chargingStation, connectorId, idTag)) {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests!
+          ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests
           logger.info(startTransactionLogMsg)
           // Start transaction
           startResponse = await this.chargingStation.ocppRequestService.requestHandler<
@@ -444,7 +448,7 @@ export class AutomaticTransactionGenerator {
           return startResponse
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.rejectedAuthorizeRequests!
+        ++this.connectorsStatus.get(connectorId)!.rejectedAuthorizeRequests
         PerformanceStatistics.endMeasure(measureId, beginId)
         return startResponse
       }
@@ -480,20 +484,19 @@ export class AutomaticTransactionGenerator {
     let stopResponse: StopTransactionResponse | undefined
     if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
       logger.info(
-        `${this.logPrefix(
-          connectorId
-        )} stop transaction with id ${this.chargingStation.getConnectorStatus(connectorId)
-          ?.transactionId}`
+        `${this.logPrefix(connectorId)} stop transaction with id ${
+          this.chargingStation.getConnectorStatus(connectorId)?.transactionId
+        }`
       )
       stopResponse = await this.chargingStation.stopTransactionOnConnector(connectorId, reason)
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ++this.connectorsStatus.get(connectorId)!.stopTransactionRequests!
+      ++this.connectorsStatus.get(connectorId)!.stopTransactionRequests
       if (stopResponse.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.acceptedStopTransactionRequests!
+        ++this.connectorsStatus.get(connectorId)!.acceptedStopTransactionRequests
       } else {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        ++this.connectorsStatus.get(connectorId)!.rejectedStopTransactionRequests!
+        ++this.connectorsStatus.get(connectorId)!.rejectedStopTransactionRequests
       }
     } else {
       const transactionId = this.chargingStation.getConnectorStatus(connectorId)?.transactionId
@@ -526,14 +529,14 @@ export class AutomaticTransactionGenerator {
     startResponse: StartTransactionResponse
   ): void {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    ++this.connectorsStatus.get(connectorId)!.startTransactionRequests!
+    ++this.connectorsStatus.get(connectorId)!.startTransactionRequests
     if (startResponse.idTagInfo.status === AuthorizationStatus.ACCEPTED) {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ++this.connectorsStatus.get(connectorId)!.acceptedStartTransactionRequests!
+      ++this.connectorsStatus.get(connectorId)!.acceptedStartTransactionRequests
     } else {
       logger.warn(`${this.logPrefix(connectorId)} start transaction rejected`)
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ++this.connectorsStatus.get(connectorId)!.rejectedStartTransactionRequests!
+      ++this.connectorsStatus.get(connectorId)!.rejectedStartTransactionRequests
     }
   }
 }