Merge branch 'main' into doc/ocpp-modules

EVerest · Oct 15, 2024 · 12b16b1 · 12b16b1
2 parents d2379fc + dce296f
commit 12b16b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/modules/Auth/lib/AuthHandler.cpp b/modules/Auth/lib/AuthHandler.cpp
@@ -493,10 +493,11 @@ void AuthHandler::notify_evse(int connector_id, const ProvidedIdToken& provided_
         this->connectors.at(connector_id)->timeout_timer.stop();
         this->connectors.at(connector_id)
             ->timeout_timer.timeout(
-                [this, evse_index, connector_id]() {
+                [this, evse_index, connector_id, provided_token]() {
                     EVLOG_info << "Authorization timeout for evse#" << evse_index;
                     this->connectors.at(connector_id)->connector.identifier.reset();
                     this->withdraw_authorization_callback(evse_index);
+                    this->publish_token_validation_status_callback(provided_token, TokenValidationStatus::TimedOut);
                 },
                 std::chrono::seconds(this->connection_timeout));
         std::lock_guard<std::mutex> plug_in_lk(this->plug_in_queue_mutex);

diff --git a/modules/Auth/tests/auth_tests.cpp b/modules/Auth/tests/auth_tests.cpp
@@ -975,6 +975,9 @@ TEST_F(AuthTest, test_authorization_without_transaction) {
     ASSERT_TRUE(result == TokenHandlingResult::ALREADY_IN_PROCESS);
     ASSERT_TRUE(this->auth_receiver->get_authorization(0));
 
+    EXPECT_CALL(mock_publish_token_validation_status_callback,
+                Call(Field(&ProvidedIdToken::id_token, provided_token.id_token), TokenValidationStatus::TimedOut));
+
     // wait for timeout
     std::this_thread::sleep_for(std::chrono::seconds(CONNECTION_TIMEOUT + 1));
 

diff --git a/modules/EnergyManager/EnergyManager.cpp b/modules/EnergyManager/EnergyManager.cpp
@@ -185,8 +185,8 @@ std::vector<types::energy::EnforcedLimits> EnergyManager::run_optimizer(types::e
     std::vector<types::energy::EnforcedLimits> optimized_values;
     optimized_values.reserve(brokers.size());
 
-    for (auto broker : brokers) {
-        auto local_market = broker->get_local_market();
+    for (auto& broker : brokers) {
+        auto& local_market = broker->get_local_market();
         const auto sold_energy = local_market.get_sold_energy();
 
         if (sold_energy.size() > 0) {

diff --git a/modules/EnergyManager/Market.cpp b/modules/EnergyManager/Market.cpp
@@ -249,10 +249,6 @@ Market::Market(types::energy::EnergyFlowRequest& _energy_flow_request, const flo
     }
 }
 
-const std::vector<Market>& Market::children() {
-    return _children;
-}
-
 ScheduleRes Market::get_sold_energy() {
     return sold_root;
 }

diff --git a/modules/EnergyManager/Market.hpp b/modules/EnergyManager/Market.hpp
@@ -68,7 +68,6 @@ class Market {
     ScheduleRes get_sold_energy();
 
     Market* parent();
-    const std::vector<Market>& children();
 
     float nominal_ac_voltage();
 
@@ -77,7 +76,7 @@ class Market {
 
 private:
     Market* _parent;
-    std::vector<Market> _children;
+    std::list<Market> _children;
     float _nominal_ac_voltage;
 
     // main data structures