refactor: cleanup status notification sending code

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/e-mobility-charging-stations-simulator.code-workspace b/e-mobility-charging-stations-simulator.code-workspace
index 65d1c8efa3a19c5f4e970909e2bdf18a4895a027..e8a70ddd46153f13b7e1fb2022835a3c402b2ebb 100644 (file)
--- a/e-mobility-charging-stations-simulator.code-workspace
+++ b/e-mobility-charging-stations-simulator.code-workspace
@@ -9,5 +9,5 @@
     {
       "path": "tests/ocpp-server",
     },
-  ]
+  ],
 }

diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts
index 69a3e5d6ca3761d933ade4eab4e9d6a32d328073..c7ccb90522765733044afb5ce28317c4827ae40a 100644 (file)
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -176,6 +176,10 @@ export const sendAndSetConnectorStatus = async (
   options?: { send: boolean }
 ): Promise<void> => {
   options = { send: true, ...options }
+  const connectorStatus = chargingStation.getConnectorStatus(connectorId)
+  if (connectorStatus == null) {
+    return
+  }
   if (options.send) {
     checkConnectorStatusTransition(chargingStation, connectorId, status)
     await chargingStation.ocppRequestService.requestHandler<
@@ -187,11 +191,10 @@ export const sendAndSetConnectorStatus = async (
       buildStatusNotificationRequest(chargingStation, connectorId, status, evseId)
     )
   }
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  chargingStation.getConnectorStatus(connectorId)!.status = status
+  connectorStatus.status = status
   chargingStation.emit(ChargingStationEvents.connectorStatusChanged, {
     connectorId,
-    ...chargingStation.getConnectorStatus(connectorId),
+    ...connectorStatus,
   })
 }