added columns to database and updated equality checks

Signed-off-by: Coury Richards <[email protected]>

config/v201/core_migrations/5_up-charging_profiles_db.sql

@@ -1,5 +1,7 @@
 CREATE TABLE CHARGING_PROFILES (
     ID INT PRIMARY KEY NOT NULL,
     EVSE_ID INT NOT NULL,
+    STACK_LEVEL INT NOT NULL,
+    CHARGING_PROFILE_PURPOSE TEXT NOT NULL,
     PROFILE TEXT NOT NULL
 );

include/ocpp/v201/profile_utils.hpp

@@ -0,0 +1,6 @@
+#include "ocpp/v201/ocpp_types.hpp"
+namespace ocpp::v201 {
+
+bool operator==(const ChargingProfile& lhs, const ChargingProfile& rhs);
+
+} // namespace ocpp::v201

lib/CMakeLists.txt

@@ -74,6 +74,7 @@ if(LIBOCPP_ENABLE_V201)
             ocpp/v201/types.cpp
             ocpp/v201/utils.cpp
             ocpp/v201/component_state_manager.cpp
+            ocpp/v201/profile_utils.cpp
     )
     add_subdirectory(ocpp/v201/messages)
 endif()

lib/ocpp/v201/database_handler.cpp

@@ -722,14 +722,18 @@ void DatabaseHandler::transaction_delete(const std::string& transaction_id) {
 
 void DatabaseHandler::insert_or_update_charging_profile(const int evse_id, const v201::ChargingProfile& profile) {
     // add or replace
-    std::string sql = "INSERT OR REPLACE INTO CHARGING_PROFILES (ID, EVSE_ID, PROFILE) VALUES "
-                      "(@id, @evse_id, @profile)";
+    std::string sql =
+        "INSERT OR REPLACE INTO CHARGING_PROFILES (ID, EVSE_ID, STACK_LEVEL, CHARGING_PROFILE_PURPOSE, PROFILE) VALUES "
+        "(@id, @evse_id, @stack_level, @charging_profile_purpose, @profile)";
     auto stmt = this->database->new_statement(sql);
 
     json json_profile(profile);
 
     stmt->bind_int("@id", profile.id);
     stmt->bind_int("@evse_id", evse_id);
+    stmt->bind_int("@stack_level", profile.stackLevel);
+    stmt->bind_text("@charging_profile_purpose",
+                    conversions::charging_profile_purpose_enum_to_string(profile.chargingProfilePurpose));
     stmt->bind_text("@profile", json_profile.dump(), SQLiteString::Transient);
 
     if (stmt->step() != SQLITE_DONE) {

lib/ocpp/v201/profile_utils.cpp

@@ -0,0 +1,11 @@
+#include "ocpp/v201/profile_utils.hpp"
+#include "ocpp/v201/ocpp_types.hpp"
+
+namespace ocpp::v201 {
+
+bool operator==(const ChargingProfile& lhs, const ChargingProfile& rhs) {
+    return lhs.chargingProfileKind == rhs.chargingProfileKind &&
+           lhs.chargingProfilePurpose == rhs.chargingProfilePurpose && lhs.id == rhs.id &&
+           lhs.stackLevel == rhs.stackLevel;
+}
+} // namespace ocpp::v201

tests/lib/ocpp/v201/test_database_handler.cpp

@@ -2,6 +2,8 @@
 // Copyright 2020 - 2024 Pionix GmbH and Contributors to EVerest
 
 #include "database_testing_utils.hpp"
+#include "ocpp/v201/enums.hpp"
+#include "ocpp/v201/profile_utils.hpp"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <ocpp/v201/database_handler.hpp>
@@ -147,7 +149,9 @@ TEST_F(DatabaseHandlerTest, TransactionDeleteNotFound) {
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithNoData_InsertProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     auto sut = this->database_handler.get_all_charging_profiles_by_evse();
 
@@ -158,8 +162,12 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithNoData_InsertProfile) {
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_UpdateProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 2});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 2, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 2, .stackLevel = 2, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     std::string sql = "SELECT COUNT(*) FROM CHARGING_PROFILES";
     auto select_stmt = this->database->new_statement(sql);
@@ -171,8 +179,12 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_UpdateProfile) {
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_InsertNewProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 1});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 2, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     std::string sql = "SELECT COUNT(*) FROM CHARGING_PROFILES";
     auto select_stmt = this->database->new_statement(sql);
@@ -184,8 +196,12 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_InsertNewProfile) {
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_DeleteRemovesSpecifiedProfiles) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 1});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 2, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     auto sql = "SELECT COUNT(*) FROM CHARGING_PROFILES";
 
@@ -208,8 +224,12 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_DeleteRemovesSpecif
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithProfileData_DeleteAllRemovesAllProfiles) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 1});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 2, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     auto sql = "SELECT COUNT(*) FROM CHARGING_PROFILES";
 
@@ -250,7 +270,9 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithNoProfileData_DeleteAllDoesNotF
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithSingleProfileData_LoadsCharingProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
+    this->database_handler.insert_or_update_charging_profile(
+        1, ChargingProfile{
+               .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile});
 
     auto sut = this->database_handler.get_all_charging_profiles_by_evse();
 
@@ -265,9 +287,18 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithSingleProfileData_LoadsCharingP
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithMultipleProfileSameEvse_LoadsCharingProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 2});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 3, .stackLevel = 3});
+    auto p1 = ChargingProfile{
+        .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+
+    this->database_handler.insert_or_update_charging_profile(1, p1);
+
+    auto p2 = ChargingProfile{
+        .id = 2, .stackLevel = 2, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+    this->database_handler.insert_or_update_charging_profile(1, p2);
+
+    auto p3 = ChargingProfile{
+        .id = 3, .stackLevel = 3, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+    this->database_handler.insert_or_update_charging_profile(1, p3);
 
     auto sut = this->database_handler.get_all_charging_profiles_by_evse();
 
@@ -279,15 +310,34 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithMultipleProfileSameEvse_LoadsCh
     auto profiles = sut[1];
 
     EXPECT_EQ(profiles.size(), 3);
+    EXPECT_EQ(profiles[0], p1);
+    EXPECT_EQ(profiles[1], p2);
+    EXPECT_EQ(profiles[2], p3);
 }
 
 TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithMultipleProfileDiffEvse_LoadsCharingProfile) {
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 1, .stackLevel = 1});
-    this->database_handler.insert_or_update_charging_profile(1, ChargingProfile{.id = 2, .stackLevel = 2});
-    this->database_handler.insert_or_update_charging_profile(2, ChargingProfile{.id = 3, .stackLevel = 3});
-    this->database_handler.insert_or_update_charging_profile(2, ChargingProfile{.id = 4, .stackLevel = 4});
-    this->database_handler.insert_or_update_charging_profile(3, ChargingProfile{.id = 5, .stackLevel = 5});
-    this->database_handler.insert_or_update_charging_profile(3, ChargingProfile{.id = 6, .stackLevel = 6});
+    auto p1 = ChargingProfile{
+        .id = 1, .stackLevel = 1, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+    this->database_handler.insert_or_update_charging_profile(1, p1);
+
+    auto p2 =
+        ChargingProfile{.id = 2, .stackLevel = 2, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxProfile};
+    this->database_handler.insert_or_update_charging_profile(1, p2);
+
+    auto p3 = ChargingProfile{
+        .id = 3, .stackLevel = 3, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+    this->database_handler.insert_or_update_charging_profile(2, p3);
+    auto p4 =
+        ChargingProfile{.id = 4, .stackLevel = 4, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxProfile};
+    this->database_handler.insert_or_update_charging_profile(2, p4);
+
+    auto p5 = ChargingProfile{
+        .id = 5, .stackLevel = 5, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxDefaultProfile};
+    this->database_handler.insert_or_update_charging_profile(3, p5);
+
+    auto p6 =
+        ChargingProfile{.id = 6, .stackLevel = 6, .chargingProfilePurpose = ChargingProfilePurposeEnum::TxProfile};
+    this->database_handler.insert_or_update_charging_profile(3, p6);
 
     auto sut = this->database_handler.get_all_charging_profiles_by_evse();
 
@@ -302,20 +352,14 @@ TEST_F(DatabaseHandlerTest, KO1_FR27_DatabaseWithMultipleProfileDiffEvse_LoadsCh
     auto profiles3 = sut[3];
 
     EXPECT_EQ(profiles1.size(), 2);
-    EXPECT_EQ(profiles1[0].id, 1);
-    EXPECT_EQ(profiles1[0].stackLevel, 1);
-    EXPECT_EQ(profiles1[1].id, 2);
-    EXPECT_EQ(profiles1[1].stackLevel, 2);
+    EXPECT_EQ(profiles1[0], p1);
+    EXPECT_EQ(profiles1[1], p2);
 
     EXPECT_EQ(profiles2.size(), 2);
-    EXPECT_EQ(profiles2[0].id, 3);
-    EXPECT_EQ(profiles2[0].stackLevel, 3);
-    EXPECT_EQ(profiles2[1].id, 4);
-    EXPECT_EQ(profiles2[1].stackLevel, 4);
+    EXPECT_EQ(profiles2[0], p3);
+    EXPECT_EQ(profiles2[1], p4);
 
     EXPECT_EQ(profiles3.size(), 2);
-    EXPECT_EQ(profiles3[0].id, 5);
-    EXPECT_EQ(profiles3[0].stackLevel, 5);
-    EXPECT_EQ(profiles3[1].id, 6);
-    EXPECT_EQ(profiles3[1].stackLevel, 6);
+    EXPECT_EQ(profiles3[0], p5);
+    EXPECT_EQ(profiles3[1], p6);
 }

tests/lib/ocpp/v201/test_smart_charging_handler.cpp

@@ -28,17 +28,12 @@
 #include <ocpp/v201/smart_charging.hpp>
 #include <optional>
 
+#include "ocpp/v201/profile_utils.hpp"
 #include <sstream>
 #include <vector>
 
 namespace ocpp::v201 {
 
-bool operator==(const ChargingProfile& lhs, const ChargingProfile& rhs) {
-    return lhs.chargingProfileKind == rhs.chargingProfileKind &&
-           lhs.chargingProfilePurpose == rhs.chargingProfilePurpose && lhs.id == rhs.id &&
-           lhs.stackLevel == rhs.stackLevel;
-}
-
 static const int NR_OF_EVSES = 1;
 static const int STATION_WIDE_ID = 0;
 static const int DEFAULT_EVSE_ID = 1;