X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=2b40ad4165556f510ec83d09628ea526ea29b8fa;hb=72092cfcf8a31c06e4592b25e060e2d74d2ed99c;hp=330f6672542c67151d54f4666da19e0f20753ec0;hpb=293aaa3118bbd8c6a6e7933f049d51031c134fa6;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 330f6672..2b40ad41 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -400,65 +400,65 @@ export default class OCPP16ResponseService extends OCPPResponseService { break; } } - if (!transactionConnectorId) { + if (Utils.isNullOrUndefined(transactionConnectorId)) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector Id ${connectorId.toString()}` ); return; } if ( - chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true && + chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && chargingStation.getAuthorizeRemoteTxRequests() === true && chargingStation.getLocalAuthListEnabled() === true && chargingStation.hasAuthorizedTags() && - chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false + chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${ - chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag } on connector Id ${connectorId.toString()}` ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true && + chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && chargingStation.getAuthorizeRemoteTxRequests() === true && chargingStation.getMustAuthorizeAtRemoteStart() === true && - chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false && - chargingStation.getConnectorStatus(connectorId).idTagAuthorized === false + chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false && + chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized === false ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${ - chargingStation.getConnectorStatus(connectorId).authorizeIdTag + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag } on connector Id ${connectorId.toString()}` ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId).idTagAuthorized && - chargingStation.getConnectorStatus(connectorId).authorizeIdTag !== requestPayload.idTag + chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized && + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag } different from the authorize request one ${ - chargingStation.getConnectorStatus(connectorId).authorizeIdTag + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag } on connector Id ${connectorId.toString()}` ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized && - chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag !== requestPayload.idTag + chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized && + chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag } different from the local authorized one ${ - chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag } on connector Id ${connectorId.toString()}` ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); @@ -558,7 +558,7 @@ export default class OCPP16ResponseService extends OCPPResponseService { ): Promise { chargingStation.resetConnectorStatus(connectorId); if ( - chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE + chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.AVAILABLE ) { await chargingStation.ocppRequestService.requestHandler< OCPP16StatusNotificationRequest,