[chargepoint - connectors] Add transaction parent id tag to connector data

Author: c-jimenez

src/chargepoint/connector/Connector.h

@@ -93,6 +93,8 @@ struct Connector
     ocpp::types::DateTime transaction_start;
     /** @brief Id tag associated with the transaction */
     std::string transaction_id_tag;
+    /** @brief Parent id tag associated with the transaction */
+    std::string transaction_parent_id_tag;
 
     // Reservation data
 

src/chargepoint/connector/Connectors.cpp

@@ -80,6 +80,7 @@ void Connectors::initDatabaseTable()
                                   "[transaction_id_offline] INT,"
                                   "[transaction_start] BIGINT,"
                                   "[transaction_id_tag] VARCHAR(20),"
+                                  "[transaction_parent_id_tag] VARCHAR(20),"
                                   "[reservation_id] INT,"
                                   "[reservation_id_tag] VARCHAR(20),"
                                   "[reservation_parent_id_tag] VARCHAR(20),"
@@ -95,10 +96,11 @@ void Connectors::initDatabaseTable()
 
     // Create parametrized queries
     m_find_query   = m_database.query("SELECT * FROM Connectors WHERE id=?;");
-    m_insert_query = m_database.query("INSERT INTO Connectors VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
+    m_insert_query = m_database.query("INSERT INTO Connectors VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
     m_update_query = m_database.query("UPDATE Connectors SET [status]=?, [last_notified_status]=?, [transaction_id]=?, "
-                                      "[transaction_id_offline]=?, [transaction_start]=?, [transaction_id_tag]=?, [reservation_id]=?, "
-                                      "[reservation_id_tag]=?, [reservation_parent_id_tag]=?, [reservation_expiry_date]=? WHERE id=?;");
+                                      "[transaction_id_offline]=?, [transaction_start]=?, [transaction_id_tag]=?, "
+                                      "[transaction_parent_id_tag]=?, [reservation_id]=?, [reservation_id_tag]=?, "
+                                      "[reservation_parent_id_tag]=?, [reservation_expiry_date]=? WHERE id=?;");
 
     // Load the connector state
     loadConnectors();
@@ -231,10 +233,11 @@ bool Connectors::loadConnector(Connector& connector)
                 connector.transaction_id_offline    = m_find_query->getInt32(4u);
                 connector.transaction_start         = static_cast<std::time_t>(m_find_query->getInt64(5u));
                 connector.transaction_id_tag        = m_find_query->getString(6u);
-                connector.reservation_id            = m_find_query->getInt32(7u);
-                connector.reservation_id_tag        = m_find_query->getString(8u);
-                connector.reservation_parent_id_tag = m_find_query->getString(9u);
-                connector.reservation_expiry_date   = static_cast<std::time_t>(m_find_query->getInt64(10u));
+                connector.transaction_parent_id_tag = m_find_query->getString(7u);
+                connector.reservation_id            = m_find_query->getInt32(8u);
+                connector.reservation_id_tag        = m_find_query->getString(9u);
+                connector.reservation_parent_id_tag = m_find_query->getString(10u);
+                connector.reservation_expiry_date   = static_cast<std::time_t>(m_find_query->getInt64(11u));
 
                 LOG_DEBUG << "Connector " << connector.id << " loaded from database : "
                           << "status = " << ChargePointStatusHelper.toString(connector.status)
@@ -243,6 +246,7 @@ bool Connectors::loadConnector(Connector& connector)
                           << " - transaction_id_offline = " << connector.transaction_id_offline
                           << " - transaction_start = " << connector.transaction_start.str()
                           << " - transaction_id_tag = " << connector.transaction_id_tag
+                          << " - transaction_parent_id_tag = " << connector.transaction_parent_id_tag
                           << " - reservation_id = " << connector.reservation_id
                           << " - reservation_id_tag = " << connector.reservation_id_tag
                           << " - reservation_parent_id_tag = " << connector.reservation_parent_id_tag
@@ -276,11 +280,12 @@ bool Connectors::saveConnector(const Connector& connector)
         m_update_query->bind(3u, connector.transaction_id_offline);
         m_update_query->bind(4u, connector.transaction_start);
         m_update_query->bind(5u, connector.transaction_id_tag);
-        m_update_query->bind(6u, connector.reservation_id);
-        m_update_query->bind(7u, connector.reservation_id_tag);
-        m_update_query->bind(8u, connector.reservation_parent_id_tag);
-        m_update_query->bind(9u, connector.reservation_expiry_date);
-        m_update_query->bind(10u, connector.id);
+        m_update_query->bind(6u, connector.transaction_parent_id_tag);
+        m_update_query->bind(7u, connector.reservation_id);
+        m_update_query->bind(8u, connector.reservation_id_tag);
+        m_update_query->bind(9u, connector.reservation_parent_id_tag);
+        m_update_query->bind(10u, connector.reservation_expiry_date);
+        m_update_query->bind(11u, connector.id);
         ret = m_update_query->exec();
         if (ret)
         {
@@ -310,10 +315,11 @@ bool Connectors::createConnector(const Connector& connector)
         m_insert_query->bind(4u, connector.transaction_id_offline);
         m_insert_query->bind(5u, connector.transaction_start);
         m_insert_query->bind(6u, connector.transaction_id_tag);
-        m_insert_query->bind(7u, connector.reservation_id);
-        m_insert_query->bind(8u, connector.reservation_id_tag);
-        m_insert_query->bind(9u, connector.reservation_parent_id_tag);
-        m_insert_query->bind(10u, connector.reservation_expiry_date);
+        m_insert_query->bind(7u, connector.transaction_parent_id_tag);
+        m_insert_query->bind(8u, connector.reservation_id);
+        m_insert_query->bind(9u, connector.reservation_id_tag);
+        m_insert_query->bind(10u, connector.reservation_parent_id_tag);
+        m_insert_query->bind(11u, connector.reservation_expiry_date);
         ret = m_insert_query->exec();
         if (ret)
         {

src/chargepoint/transaction/TransactionManager.cpp

@@ -158,9 +158,10 @@ ocpp::types::AuthorizationStatus TransactionManager::startTransaction(unsigned i
                     // Update status from response
                     {
                         std::lock_guard<std::mutex> lock(connector->mutex);
-                        connector->transaction_id     = start_transaction_conf.transactionId;
-                        connector->transaction_start  = start_transaction_req.timestamp;
-                        connector->transaction_id_tag = id_tag;
+                        connector->transaction_id            = start_transaction_conf.transactionId;
+                        connector->transaction_start         = start_transaction_req.timestamp;
+                        connector->transaction_id_tag        = id_tag;
+                        connector->transaction_parent_id_tag = start_transaction_conf.idTagInfo.parentIdTag.value().str();
                         m_connectors.saveConnector(connector->id);
                     }
 
@@ -223,9 +224,10 @@ bool TransactionManager::stopTransaction(unsigned int connector_id, const std::s
             // Reset transaction id
             {
                 std::lock_guard<std::mutex> lock(connector->mutex);
-                connector->transaction_id     = 0;
-                connector->transaction_id_tag = "";
-                connector->transaction_start  = 0;
+                connector->transaction_id            = 0;
+                connector->transaction_id_tag        = "";
+                connector->transaction_parent_id_tag = "";
+                connector->transaction_start         = 0;
                 m_connectors.saveConnector(connector->id);
             }