X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fbroadcast-channel%2FChargingStationWorkerBroadcastChannel.ts;h=20f347fc48e2e920c342be8d920e5668206cc49a;hb=48c7e1d6db4b3cbf82d17e191b2255066c462a71;hp=06f847c5a8b3990ed66fa0fe01d3d7769914418d;hpb=cc6845fc431ddf5cd37d70b750abae3c313a3589;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/broadcast-channel/ChargingStationWorkerBroadcastChannel.ts b/src/charging-station/broadcast-channel/ChargingStationWorkerBroadcastChannel.ts index 06f847c5..20f347fc 100644 --- a/src/charging-station/broadcast-channel/ChargingStationWorkerBroadcastChannel.ts +++ b/src/charging-station/broadcast-channel/ChargingStationWorkerBroadcastChannel.ts @@ -129,8 +129,7 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne RequestCommand.STOP_TRANSACTION, { meterStop: this.chargingStation.getEnergyActiveImportRegisterByTransactionId( - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - requestPayload!.transactionId!, + requestPayload?.transactionId, true ), ...requestPayload @@ -174,12 +173,7 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne await this.chargingStation.ocppRequestService.requestHandler< StatusNotificationRequest, StatusNotificationResponse - >( - this.chargingStation, - RequestCommand.STATUS_NOTIFICATION, - requestPayload, - requestParams - ) + >(this.chargingStation, RequestCommand.STATUS_NOTIFICATION, requestPayload, requestParams) ], [ BroadcastChannelProcedureName.HEARTBEAT, @@ -273,7 +267,8 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne const [uuid, command, requestPayload] = validatedMessageEvent.data as BroadcastChannelRequest if ( requestPayload.hashIds != null && - !requestPayload.hashIds.includes(this.chargingStation.stationInfo.hashId) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + !requestPayload.hashIds.includes(this.chargingStation.stationInfo!.hashId) ) { return } @@ -290,7 +285,7 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne commandResponse = await this.commandHandler(command, requestPayload) if (commandResponse == null || isEmptyObject(commandResponse)) { responsePayload = { - hashId: this.chargingStation.stationInfo.hashId, + hashId: this.chargingStation.stationInfo?.hashId, status: ResponseStatus.SUCCESS } } else { @@ -306,7 +301,7 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne error ) responsePayload = { - hashId: this.chargingStation.stationInfo.hashId, + hashId: this.chargingStation.stationInfo?.hashId, status: ResponseStatus.FAILURE, command, requestPayload, @@ -362,12 +357,12 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne const responseStatus = this.commandResponseToResponseStatus(command, commandResponse) if (responseStatus === ResponseStatus.SUCCESS) { return { - hashId: this.chargingStation.stationInfo.hashId, + hashId: this.chargingStation.stationInfo?.hashId, status: responseStatus } } return { - hashId: this.chargingStation.stationInfo.hashId, + hashId: this.chargingStation.stationInfo?.hashId, status: responseStatus, command, requestPayload, @@ -389,18 +384,18 @@ export class ChargingStationWorkerBroadcastChannel extends WorkerBroadcastChanne | StartTransactionResponse | StopTransactionResponse | AuthorizeResponse - )?.idTagInfo?.status === AuthorizationStatus.ACCEPTED + ).idTagInfo?.status === AuthorizationStatus.ACCEPTED ) { return ResponseStatus.SUCCESS } return ResponseStatus.FAILURE case BroadcastChannelProcedureName.BOOT_NOTIFICATION: - if (commandResponse?.status === RegistrationStatusEnumType.ACCEPTED) { + if (commandResponse.status === RegistrationStatusEnumType.ACCEPTED) { return ResponseStatus.SUCCESS } return ResponseStatus.FAILURE case BroadcastChannelProcedureName.DATA_TRANSFER: - if (commandResponse?.status === DataTransferStatus.ACCEPTED) { + if (commandResponse.status === DataTransferStatus.ACCEPTED) { return ResponseStatus.SUCCESS } return ResponseStatus.FAILURE