Add ocpp_transaction_id. Fix OCPP 1.6 session cost message conversion.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Author: maaikez

include/ocpp/common/types.hpp

@@ -372,6 +372,7 @@ enum class IdentifierType {
 };
 
 struct SessionCostMessage {
+    std::optional<std::string> ocpp_transaction_id;
     std::optional<std::string> identifier_id;
     std::optional<IdentifierType> identifier_type;
     std::vector<DisplayMessageContent> message;

lib/ocpp/v16/charge_point_impl.cpp

@@ -3136,6 +3136,10 @@ DataTransferResponse ChargePointImpl::handle_set_user_price(const std::optional<
     } else {
         identifier_id = t->get_session_id();
         identifier_type = IdentifierType::SessionId;
+        const std::optional<int32_t> transaction_id = t->get_transaction_id();
+        if (transaction_id != std::nullopt) {
+            session_cost_message.ocpp_transaction_id = std::to_string(transaction_id.value());
+        }
     }
 
     session_cost_message.identifier_id = identifier_id;
@@ -3153,7 +3157,7 @@ DataTransferResponse ChargePointImpl::handle_set_user_price(const std::optional<
         data.at("priceTextExtra").is_array()) {
         for (const json& j : data.at("priceTextExtra")) {
             DisplayMessageContent message;
-            message.message = j;
+            message = j;
 
             messages.push_back(message);
         }

lib/ocpp/v2/functional_blocks/tariff_and_cost.cpp

@@ -55,6 +55,7 @@ void TariffAndCost::handle_cost_and_tariff(const TransactionEventResponse& respo
             this->session_cost_message_callback != nullptr) {
             SessionCostMessage session_cost_message;
             session_cost_message.message = cost_messages;
+            session_cost_message.ocpp_transaction_id = original_message.transactionInfo.transactionId;
             session_cost_message.identifier_id = original_message.transactionInfo.transactionId;
             session_cost_message.identifier_type = IdentifierType::TransactionId;
             this->session_cost_message_callback.value()({session_cost_message});