Merge pull request #26 from c-jimenez/fix/clear_charing_profiles_crash

[smart charging] Fix crash when receiving empty ClearChargingProfile …

Author: c-jimenez

src/chargepoint/smartcharging/ProfileDatabase.cpp

@@ -63,18 +63,23 @@ bool ProfileDatabase::clear(ocpp::types::Optional<int>
     // Clear all ?
     if (!id.isSet() && !connector_id.isSet() && !purpose.isSet() && !level.isSet())
     {
-        // Clear lists
-        m_chargepoint_max_profiles.clear();
-        m_txdefault_profiles.clear();
-        m_tx_profiles.clear();
-
-        // Clear database
-        auto query = m_database.query("DELETE FROM ChargingProfiles WHERE TRUE;");
-        if (query)
+        // Check existing profiles
+        if (!m_chargepoint_max_profiles.empty() || !m_txdefault_profiles.empty() || !m_tx_profiles.empty())
         {
-            query->exec();
+            // Clear lists
+            m_chargepoint_max_profiles.clear();
+            m_txdefault_profiles.clear();
+            m_tx_profiles.clear();
+
+            // Clear database
+            auto query = m_database.query("DELETE FROM ChargingProfiles WHERE TRUE;");
+            if (query)
+            {
+                query->exec();
+            }
+
+            ret = true;
         }
-        ret = true;
     }
     else if (id.isSet())
     {

src/messages/ClearChargingProfile.cpp

@@ -47,9 +47,12 @@ bool ClearChargingProfileReqConverter::fromJson(const rapidjson::Value&  json,
                                                 std::string&             error_message)
 {
     extract(json, "id", data.id);
-    bool ret                    = extract(json, "connectorId", data.connectorId, error_message);
-    data.chargingProfilePurpose = ChargingProfilePurposeTypeHelper.fromString(json["chargingProfilePurpose"].GetString());
-    ret                         = ret && extract(json, "stackLevel", data.stackLevel, error_message);
+    bool ret = extract(json, "connectorId", data.connectorId, error_message);
+    if (json.HasMember("chargingProfilePurpose"))
+    {
+        data.chargingProfilePurpose = ChargingProfilePurposeTypeHelper.fromString(json["chargingProfilePurpose"].GetString());
+    }
+    ret = ret && extract(json, "stackLevel", data.stackLevel, error_message);
     if (!ret)
     {
         error_code = ocpp::rpc::IRpc::RPC_ERROR_TYPE_CONSTRAINT_VIOLATION;
@@ -62,7 +65,10 @@ bool ClearChargingProfileReqConverter::toJson(const ClearChargingProfileReq& dat
 {
     fill(json, "id", data.id);
     fill(json, "connectorId", data.connectorId);
-    fill(json, "chargingProfilePurpose", ChargingProfilePurposeTypeHelper.toString(data.chargingProfilePurpose));
+    if (data.chargingProfilePurpose.isSet())
+    {
+        fill(json, "chargingProfilePurpose", ChargingProfilePurposeTypeHelper.toString(data.chargingProfilePurpose));
+    }
     fill(json, "stackLevel", data.stackLevel);
     return true;
 }