Reservation Handling in EvseManager (#1067)

Changed reservation handling in EvseManager:
* Signaling reservation end after Signaling Disabled event. This allows OCPPs state machine to move from Reserved->Unavailable instead of Reserved->Available->Unavailable
* Fixed issue that reservation was cancelled on every SessionFinished event: Canceling reservation in handle_withdraw_authorization when charger was authorized before
* When a reservation is cancelled and it is a global reservation, all evse's that were reserved because of global reservations should go to available again.
---------
Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>
Co-authored-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Change libocpp dependency version to 0.23.2 which includes associated fixes for this release branch

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>

Author: hikinggrass

dependencies.yaml

@@ -67,7 +67,7 @@ libevse-security:
 # OCPP
 libocpp:
   git: https://github.com/EVerest/libocpp.git
-  git_tag: v0.23.1
+  git_tag: v0.23.2
   cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP"
 # Josev
 Josev:

modules/Auth/lib/AuthHandler.cpp

@@ -602,6 +602,10 @@ void AuthHandler::call_reservation_cancelled(const int32_t reservation_id,
     }
 
     this->reservation_cancelled_callback(evse_id, reservation_id, reason, send_reservation_update);
+
+    // If this was a global reservation or there are global reservations which made evse's go to reserved because of
+    // this reservation, they should be cancelled.
+    this->check_evse_reserved_and_send_updates();
 }
 
 void AuthHandler::handle_permanent_fault_raised(const int evse_id, const int32_t connector_id) {
@@ -734,7 +738,7 @@ void AuthHandler::handle_session_event(const int evse_id, const SessionEvent& ev
     // When reservation is started or ended, check if the number of reservations match the number of evses and
     // send 'reserved' notifications to the evse manager accordingly if needed.
     if (check_reservations) {
-        check_evse_reserved_and_send_updates();
+        this->check_evse_reserved_and_send_updates();
     }
 }
 

modules/Auth/tests/reservation_tests.cpp

@@ -1415,4 +1415,41 @@ TEST_F(ReservationHandlerTest, check_evses_to_reserve_scenario_5) {
     EXPECT_TRUE(s.reserved.empty());
 }
 
+TEST_F(ReservationHandlerTest, check_evses_to_reserve_scenario_6) {
+    add_connector(0, 0, types::evse_manager::ConnectorTypeEnum::cCCS2, this->evses);
+    add_connector(0, 1, types::evse_manager::ConnectorTypeEnum::cType2, this->evses);
+    add_connector(1, 0, types::evse_manager::ConnectorTypeEnum::cCCS2, this->evses);
+    add_connector(1, 1, types::evse_manager::ConnectorTypeEnum::cType2, this->evses);
+
+    ReservationEvseStatus s = r.check_number_global_reservations_match_number_available_evses();
+
+    EXPECT_TRUE(s.available.empty());
+    EXPECT_TRUE(s.reserved.empty());
+
+    Reservation reservation1 = create_reservation(types::evse_manager::ConnectorTypeEnum::cCCS2);
+    EXPECT_EQ(r.make_reservation(std::nullopt, reservation1), ReservationResult::Accepted);
+
+    s = r.check_number_global_reservations_match_number_available_evses();
+
+    EXPECT_TRUE(s.available.empty());
+    EXPECT_TRUE(s.reserved.empty());
+
+    EXPECT_EQ(r.make_reservation(std::nullopt, create_reservation(types::evse_manager::ConnectorTypeEnum::cCCS2)),
+              ReservationResult::Accepted);
+
+    s = r.check_number_global_reservations_match_number_available_evses();
+
+    EXPECT_TRUE(s.available.empty());
+    ASSERT_EQ(s.reserved.size(), 2);
+    EXPECT_EQ(s.reserved.count(0), 1);
+    EXPECT_EQ(s.reserved.count(1), 1);
+
+    r.cancel_reservation(reservation1.reservation_id, false, types::reservation::ReservationEndReason::Cancelled);
+
+    s = r.check_number_global_reservations_match_number_available_evses();
+
+    EXPECT_EQ(s.available.size(), 2);
+    EXPECT_EQ(s.reserved.size(), 0);
+}
+
 } // namespace module

modules/EvseManager/EvseManager.cpp

@@ -837,10 +837,6 @@ void EvseManager::ready() {
     error_handling->signal_error.connect([this](bool prevents_charging) { cancel_reservation(true); });
 
     charger->signal_simple_event.connect([this](types::evse_manager::SessionEventEnum s) {
-        // Cancel reservations if charger is disabled
-        if (s == types::evse_manager::SessionEventEnum::Disabled) {
-            cancel_reservation(true);
-        }
         if (s == types::evse_manager::SessionEventEnum::SessionFinished) {
             // Reset EV information on Session start and end
             ev_info = types::evse_manager::EVInfo();

modules/EvseManager/evse/evse_managerImpl.cpp

@@ -292,11 +292,6 @@ void evse_managerImpl::ready() {
             session_finished.meter_value = mod->get_latest_powermeter_data_billing();
             se.session_finished = session_finished;
             session_log.evse(false, fmt::format("Session Finished"));
-            // Cancel reservation, reservation might be stored when swiping rfid, but timed out, so we should not
-            // set the reservation id here.
-            if (mod->is_reserved()) {
-                mod->cancel_reservation(true);
-            }
             session_log.stopSession();
             mod->telemetry.publish("session", "events",
                                    {{"timestamp", Everest::Date::to_rfc3339(date::utc_clock::now())},
@@ -332,6 +327,11 @@ void evse_managerImpl::ready() {
             this->mod->selected_protocol = "Unknown";
         }
 
+        // Cancel reservations if charger is disabled
+        if (mod->is_reserved() and e == types::evse_manager::SessionEventEnum::Disabled) {
+            mod->cancel_reservation(true);
+        }
+
         publish_selected_protocol(this->mod->selected_protocol);
     });
 
@@ -421,6 +421,11 @@ void evse_managerImpl::handle_authorize_response(types::authorization::ProvidedI
 };
 
 void evse_managerImpl::handle_withdraw_authorization() {
+    // reservation_id might have been stored when reserved id token has been authorized, but timed out, so
+    //  we can consider the reservation as consumed
+    if (mod->charger->get_authorized_eim() and mod->is_reserved()) {
+        mod->cancel_reservation(true);
+    }
     this->mod->charger->deauthorize();
 };