updated: added optional evse_id to handler and passed

Signed-off-by: Coury Richards <146002925+couryrr-afs@users.noreply.github.com>

Author: Coury Richards

include/ocpp/v201/smart_charging.hpp

@@ -127,7 +127,8 @@ class SmartChargingHandlerInterface {
                                    std::optional<int32_t> evse_id) const = 0;
 
     virtual std::pair<ClearedChargingLimitRequest, std::vector<TransactionEventRequest>>
-    handle_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) const = 0;
+    handle_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                  ChargingLimitSourceEnum source) const = 0;
 };
 
 /// \brief This class handles and maintains incoming ChargingProfiles and contains the logic
@@ -201,7 +202,7 @@ class SmartChargingHandler : public SmartChargingHandlerInterface {
                                                    std::optional<ChargingRateUnitEnum> charging_rate_unit) override;
 
     ///
-    /// \brief Determines whether or not we should notify the CSMS of a change to our limits
+    /// \brief Determines whether or not we should notify the CSMS of a cleared external limit
     /// based on \p percentage_delta and builds the notification.
     ///
     std::optional<NotifyChargingLimitRequest>
@@ -210,7 +211,8 @@ class SmartChargingHandler : public SmartChargingHandlerInterface {
                                    std::optional<int32_t> evse_id) const override;
 
     virtual std::pair<ClearedChargingLimitRequest, std::vector<TransactionEventRequest>>
-    handle_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) const override;
+    handle_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                  ChargingLimitSourceEnum source) const override;
 
 protected:
     ///

lib/ocpp/v201/charge_point.cpp

@@ -1114,7 +1114,7 @@ void ChargePoint::on_external_limits_changed(const std::variant<ConstantCharging
 
 void ChargePoint::on_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
                                             ChargingLimitSourceEnum source) {
-    auto request = this->smart_charging_handler->handle_external_limit_cleared(percentage_delta, source);
+    auto request = this->smart_charging_handler->handle_external_limit_cleared(evse_id, percentage_delta, source);
 
     auto [cleared_charging_limit_request, transaction_event_requests] = request;
 

lib/ocpp/v201/smart_charging.cpp

@@ -807,7 +807,8 @@ SmartChargingHandler::handle_external_limits_changed(const std::variant<Constant
 }
 
 std::pair<ClearedChargingLimitRequest, std::vector<TransactionEventRequest>>
-SmartChargingHandler::handle_external_limit_cleared(double percentage_delta, ChargingLimitSourceEnum source) const {
+SmartChargingHandler::handle_external_limit_cleared(std::optional<int32_t> evse_id, double percentage_delta,
+                                                    ChargingLimitSourceEnum source) const {
     // K13.FR.02
     ClearedChargingLimitRequest cleared_charging_limit_request = {};
     cleared_charging_limit_request.chargingLimitSource = source;

tests/lib/ocpp/v201/mocks/smart_charging_handler_mock.hpp

@@ -34,7 +34,8 @@ class SmartChargingHandlerMock : public SmartChargingHandlerInterface {
                  std::optional<int32_t> evse_id),
                 (const, override));
     MOCK_METHOD((std::pair<ClearedChargingLimitRequest, std::vector<TransactionEventRequest>>),
-                handle_external_limit_cleared, (double percentage_delta, ChargingLimitSourceEnum source),
+                handle_external_limit_cleared,
+                (std::optional<int32_t> evse_id, double percentage_delta, ChargingLimitSourceEnum source),
                 (const, override));
 };
 } // namespace ocpp::v201

tests/lib/ocpp/v201/test_charge_point.cpp

@@ -980,10 +980,12 @@ TEST_F(ChargepointTestFixtureV201, K13_OnExternalLimitsCleared_CallsHandler) {
         .limit = 100.0,
         .charging_rate_unit = ChargingRateUnitEnum::A,
     };
+
+    std::optional<int32_t> evse_id;
     double deltaChanged = 0.2;
     auto source = ChargingLimitSourceEnum::Other;
 
-    EXPECT_CALL(*smart_charging_handler, handle_external_limit_cleared(deltaChanged, source));
+    EXPECT_CALL(*smart_charging_handler, handle_external_limit_cleared(evse_id, deltaChanged, source));
 
     charge_point->on_external_limit_cleared(std::nullopt, deltaChanged, source);
 }

tests/lib/ocpp/v201/test_smart_charging_handler.cpp

@@ -1840,7 +1840,7 @@ TEST_F(SmartChargingHandlerTestFixtureV201,
     double deltaChanged = 0.2;
     auto source = ChargingLimitSourceEnum::Other;
 
-    auto resp = handler.handle_external_limit_cleared(deltaChanged, source);
+    auto resp = handler.handle_external_limit_cleared(std::nullopt, deltaChanged, source);
 
     auto [cleared_charging_limit_request, transaction_event_requests] = resp;
 
@@ -1861,7 +1861,7 @@ TEST_F(SmartChargingHandlerTestFixtureV201,
     double deltaChanged = 0.2;
     auto source = ChargingLimitSourceEnum::Other;
 
-    auto resp = handler.handle_external_limit_cleared(deltaChanged, source);
+    auto resp = handler.handle_external_limit_cleared(std::nullopt, deltaChanged, source);
 
     auto [cleared_charging_limit_request, transaction_event_requests] = resp;
 
@@ -1883,7 +1883,7 @@ TEST_F(
     double deltaChanged = 0.2;
     auto source = ChargingLimitSourceEnum::Other;
 
-    auto resp = handler.handle_external_limit_cleared(deltaChanged, source);
+    auto resp = handler.handle_external_limit_cleared(std::nullopt, deltaChanged, source);
 
     auto [cleared_charging_limit_request, transaction_event_requests] = resp;