From 8946ba9db13e225292a62b8f4bdcd1419792697a Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@piment-noir.org>
Date: Wed, 5 Jun 2024 17:29:50 +0200
Subject: [PATCH] fix: pickup not reserved connector at remote start
 transaction
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---
 .../ocpp/1.6/OCPP16IncomingRequestService.ts              | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index fc519046..d92d526e 100644
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -1169,7 +1169,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       do {
         commandPayload.connectorId = randomInt(1, chargingStation.getNumberOfConnectors())
       } while (
-        chargingStation.getConnectorStatus(commandPayload.connectorId)?.transactionStarted === true
+        chargingStation.getConnectorStatus(commandPayload.connectorId)?.transactionStarted ===
+          true &&
+        OCPP16ServiceUtils.hasReservation(
+          chargingStation,
+          commandPayload.connectorId,
+          commandPayload.idTag
+        )
       )
     }
     const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload
-- 
2.34.1