X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=dfab482ab2d63af90f06a7011e2e2bbf7ab5c205;hb=0a0da58d95d81782d92cd9a03c80ea6d3945aef6;hp=bdeffbd25489dae3f2e7169ea4a51eef5292afc7;hpb=08b58f0020986c0ad1b55e562aaf325a47b9d58c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index bdeffbd2..dfab482a 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 { BaseError } from '../exception'; import { PerformanceStatistics } from '../performance'; import { AuthorizationStatus, - type AuthorizeRequest, - type AuthorizeResponse, ConnectorStatusEnum, RequestCommand, type StartTransactionRequest, @@ -354,7 +353,9 @@ export class AutomaticTransactionGenerator extends AsyncResource { } private getConnectorStatus(connectorId: number): Status { - const connectorStatus = this.chargingStation.getAutomaticTransactionGeneratorStatuses() + const connectorStatus = this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[ + connectorId + ] ? cloneObject(this.chargingStation.getAutomaticTransactionGeneratorStatuses()!)[ connectorId ] @@ -397,17 +398,8 @@ export class AutomaticTransactionGenerator extends AsyncResource { connectorId, )} start transaction with an idTag '${idTag}'`; if (this.getRequireAuthorize()) { - this.chargingStation.getConnectorStatus(connectorId)!.authorizeIdTag = idTag; - // Authorize idTag - const authorizeResponse: AuthorizeResponse = - await this.chargingStation.ocppRequestService.requestHandler< - AuthorizeRequest, - AuthorizeResponse - >(this.chargingStation, RequestCommand.AUTHORIZE, { - idTag, - }); ++this.connectorsStatus.get(connectorId)!.authorizeRequests!; - if (authorizeResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { + if (await OCPPServiceUtils.isIdTagAuthorized(this.chargingStation, connectorId, idTag)) { ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests!; logger.info(startTransactionLogMsg); // Start transaction