From dbdf07ae6d70efc7ec12ddebbb13bd94c49e6f9a Mon Sep 17 00:00:00 2001
From: "Maaike Zijderveld, iolar" <git.mail@iolar.nl>
Date: Fri, 8 Nov 2024 18:04:51 +0100
Subject: [PATCH] Review comment: change parameters of reserve now callback.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>
---
 include/ocpp/v201/charge_point_callbacks.hpp | 7 ++-----
 lib/ocpp/v201/charge_point.cpp               | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/ocpp/v201/charge_point_callbacks.hpp b/include/ocpp/v201/charge_point_callbacks.hpp
index 6a25a99bd5..5d1637ef6c 100644
--- a/include/ocpp/v201/charge_point_callbacks.hpp
+++ b/include/ocpp/v201/charge_point_callbacks.hpp
@@ -12,6 +12,7 @@
 #include <ocpp/v201/messages/GetDisplayMessages.hpp>
 #include <ocpp/v201/messages/GetLog.hpp>
 #include <ocpp/v201/messages/RequestStartTransaction.hpp>
+#include <ocpp/v201/messages/ReserveNow.hpp>
 #include <ocpp/v201/messages/SetDisplayMessage.hpp>
 #include <ocpp/v201/messages/TransactionEvent.hpp>
 #include <ocpp/v201/messages/UnlockConnector.hpp>
@@ -153,11 +154,7 @@ struct Callbacks {
         set_running_cost_callback;
 
     /// \brief Callback function is called when a reservation request is received from the CSMS
-    std::optional<std::function<ReserveNowStatusEnum(
-        const int32_t id, const ocpp::DateTime& expiry_date_time, const IdToken& id_token,
-        const std::optional<ConnectorEnum> connector_type, const std::optional<uint32_t> evse_id,
-        const std::optional<IdToken>& group_id_token)>>
-        reserve_now_callback;
+    std::optional<std::function<ReserveNowStatusEnum(const ReserveNowRequest& request)>> reserve_now_callback;
     /// \brief Callback function is called when a cancel reservation request is received from the CSMS
     std::optional<std::function<bool(const int32_t reservationId)>> cancel_reservation_callback;
 };
diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
index eae580e08d..f2211f4e66 100644
--- a/lib/ocpp/v201/charge_point.cpp
+++ b/lib/ocpp/v201/charge_point.cpp
@@ -3416,10 +3416,8 @@ void ChargePoint::handle_reserve_now_request(Call<ReserveNowRequest> call) {
     // should be overwritten.
 
     // Call reserve now callback and wait for the response.
-    ReserveNowRequest reservation_request = call.msg;
-    response.status = this->callbacks.reserve_now_callback.value()(
-        reservation_request.id, reservation_request.expiryDateTime, reservation_request.idToken,
-        reservation_request.connectorType, reservation_request.evseId, reservation_request.groupIdToken);
+    const ReserveNowRequest reservation_request = call.msg;
+    response.status = this->callbacks.reserve_now_callback.value()(reservation_request);
 
     // Reply with the response from the callback.
     const ocpp::CallResult<ReserveNowResponse> call_result(response, call.uniqueId);