X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=12cf7ee4b3fdd495f1dd8bbbbb9b72033e1abbac;hb=041365be4e6cfcec381c895a203815dd933afff5;hp=3d1e8b1ccf2319dd694831d3792b337e60b7333d;hpb=60400e2350178b24e06fc98e6f52cdb7317e03a3;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index 3d1e8b1c..12cf7ee4 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -7,12 +7,11 @@ import { hoursToMilliseconds, secondsToMilliseconds } from 'date-fns'; import type { ChargingStation } from './ChargingStation'; import { checkChargingStation } from './Helpers'; import { IdTagsCache } from './IdTagsCache'; -import { OCPPServiceUtils } from './ocpp'; +import { isIdTagAuthorized } from './ocpp'; import { BaseError } from '../exception'; import { PerformanceStatistics } from '../performance'; import { AuthorizationStatus, - ConnectorStatusEnum, RequestCommand, type StartTransactionRequest, type StartTransactionResponse, @@ -305,17 +304,6 @@ export class AutomaticTransactionGenerator extends AsyncResource { ); return false; } - if ( - this.chargingStation.getConnectorStatus(connectorId)?.status === - ConnectorStatusEnum.Unavailable - ) { - logger.info( - `${this.logPrefix( - connectorId, - )} entered in transaction loop while the connector ${connectorId} status is unavailable`, - ); - return false; - } return true; } @@ -410,16 +398,19 @@ export class AutomaticTransactionGenerator extends AsyncResource { } private resetConnectorStatus(connectorStatus: Status | undefined): void { + if (connectorStatus === undefined) { + return; + } delete connectorStatus?.startDate; delete connectorStatus?.lastRunDate; delete connectorStatus?.stopDate; delete connectorStatus?.stoppedDate; if ( !this.started && - (connectorStatus?.start === true || + (connectorStatus.start === true || this.chargingStation.getAutomaticTransactionGeneratorConfiguration().enable === false) ) { - connectorStatus!.start = false; + connectorStatus.start = false; } } @@ -440,7 +431,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { )} start transaction with an idTag '${idTag}'`; if (this.getRequireAuthorize()) { ++this.connectorsStatus.get(connectorId)!.authorizeRequests!; - if (await OCPPServiceUtils.isIdTagAuthorized(this.chargingStation, connectorId, idTag)) { + if (await isIdTagAuthorized(this.chargingStation, connectorId, idTag)) { ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests!; logger.info(startTransactionLogMsg); // Start transaction