Merge branch 'main' into feature/ocpp2.1-public-draft-messages

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>

Author: Pietfried

include/ocpp/v201/charge_point.hpp

@@ -195,6 +195,11 @@ class ChargePointInterface {
     on_charging_state_changed(const uint32_t evse_id, const ChargingStateEnum charging_state,
                               const TriggerReasonEnum trigger_reason = TriggerReasonEnum::ChargingStateChanged) = 0;
 
+    /// \brief Gets the transaction id for a certain \p evse_id if there is an active transaction
+    /// \param evse_id The evse to get the transaction for
+    /// \return The transaction id if a transaction is active, otherwise nullopt
+    virtual std::optional<std::string> get_evse_transaction_id(int32_t evse_id) = 0;
+
     /// \brief Event handler that can be called to trigger a NotifyEvent.req with the given \p events
     /// \param events
     virtual void on_event(const std::vector<EventData>& events) = 0;
@@ -402,14 +407,6 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
 
     void message_callback(const std::string& message);
 
-    ///
-    /// \brief Check if the connector exists on the given evse id.
-    /// \param evse_id          The evse id to check for.
-    /// \param connector_type   The connector type.
-    /// \return False if evse id does not exist or evse does not have the given connector type.
-    ///
-    bool does_connector_exist(const uint32_t evse_id, std::optional<CiString<20>> connector_type);
-
     /// \brief Get the value optional offline flag
     /// \return true if the charge point is offline. std::nullopt if it is online;
     bool is_offline();
@@ -561,6 +558,8 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
         const uint32_t evse_id, const ChargingStateEnum charging_state,
         const TriggerReasonEnum trigger_reason = TriggerReasonEnum::ChargingStateChanged) override;
 
+    std::optional<std::string> get_evse_transaction_id(int32_t evse_id) override;
+
     AuthorizeResponse validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                      const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) override;
 

lib/ocpp/v201/charge_point.cpp

@@ -336,6 +336,16 @@ bool ChargePoint::on_charging_state_changed(const uint32_t evse_id, const Chargi
     return true;
 }
 
+std::optional<std::string> ChargePoint::get_evse_transaction_id(int32_t evse_id) {
+    const auto& tx = this->evse_manager->get_evse(evse_id).get_transaction();
+
+    if (tx != nullptr) {
+        return tx->transactionId.get();
+    }
+
+    return std::nullopt;
+}
+
 AuthorizeResponse ChargePoint::validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate,
                                               const std::optional<std::vector<OCSPRequestData>>& ocsp_request_data) {
     return this->authorization->validate_token(id_token, certificate, ocsp_request_data);