Fixed bug discovered by unit tests

Signed-off-by: pietfried <pietgoempel@gmail.com> Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
EVerest · Oct 5, 2024 · 65ab880 · 65ab880
1 parent bbc8c0b
commit 65ab880
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/ocpp/v16/smart_charging.cpp b/lib/ocpp/v16/smart_charging.cpp
@@ -385,7 +385,7 @@ SmartChargingHandler::get_valid_profiles(const ocpp::DateTime& start_time, const
         std::lock_guard<std::mutex> lk(charge_point_max_profiles_map_mutex);
 
         if (std::find(std::begin(purposes_to_ignore), std::end(purposes_to_ignore),
-                      ChargingProfilePurposeType::ChargePointMaxProfile) != std::end(purposes_to_ignore)) {
+                      ChargingProfilePurposeType::ChargePointMaxProfile) == std::end(purposes_to_ignore)) {
             for (const auto& [stack_level, profile] : stack_level_charge_point_max_profiles_map) {
                 valid_profiles.push_back(profile);
             }
@@ -407,7 +407,8 @@ SmartChargingHandler::get_valid_profiles(const ocpp::DateTime& start_time, const
             std::lock_guard<std::mutex> lk_txd(tx_default_profiles_map_mutex);
             std::lock_guard<std::mutex> lk_tx(tx_profiles_map_mutex);
 
-            if (not purposes_to_ignore.count(ChargingProfilePurposeType::TxProfile)) {
+            if (std::find(std::begin(purposes_to_ignore), std::end(purposes_to_ignore),
+                          ChargingProfilePurposeType::TxProfile) == std::end(purposes_to_ignore)) {
                 for (const auto& [stack_level, profile] : itt->second->stack_level_tx_profiles_map) {
                     // only include profiles that match the transactionId (when there is one)
                     bool b_add{false};
@@ -427,7 +428,8 @@ SmartChargingHandler::get_valid_profiles(const ocpp::DateTime& start_time, const
                     }
                 }
             }
-            if (not purposes_to_ignore.count(ChargingProfilePurposeType::TxDefaultProfile)) {
+            if (std::find(std::begin(purposes_to_ignore), std::end(purposes_to_ignore),
+                          ChargingProfilePurposeType::TxDefaultProfile) == std::end(purposes_to_ignore)) {
                 for (const auto& [stack_level, profile] : itt->second->stack_level_tx_default_profiles_map) {
                     valid_profiles.push_back(profile);
                 }

diff --git a/lib/ocpp/v201/smart_charging.cpp b/lib/ocpp/v201/smart_charging.cpp
@@ -466,7 +466,8 @@ SmartChargingHandler::get_valid_profiles_for_evse(int32_t evse_id,
     auto evse_profiles = this->database_handler->get_charging_profiles_for_evse(evse_id);
     for (auto profile : evse_profiles) {
         if (this->validate_profile(profile, evse_id) == ProfileValidationResultEnum::Valid and
-            not purposes_to_ignore.count(profile.chargingProfilePurpose)) {
+            std::find(std::begin(purposes_to_ignore), std::end(purposes_to_ignore), profile.chargingProfilePurpose) ==
+                std::end(purposes_to_ignore)) {
             valid_profiles.push_back(profile);
         }
     }