Fix UpdateKey and GetKeyValue errors

mrognor · Nov 30, 2024 · 9de22b7 · 9de22b7
1 parent 7e59c62
commit 9de22b7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 4 deletions.
diff --git a/Source/Vault.hpp b/Source/Vault.hpp
@@ -328,6 +328,9 @@ namespace mvlt
         // Set proper key order
         vaultRecordSet.KeysOrder = KeysOrder;
 
+        // Set unique keys
+        vaultRecordSet.UniqueKeys = UniqueKeys;
+
         res = RequestRecordsSet(requestType, key, beginKeyValue, endKeyValue, vaultRecordSet.RecordsSet, isIncludeBeginKeyValue, isIncludeEndKeyValue, amountOfRecords, requestPredicat);
 
         for (VaultRecord* record : vaultRecordSet.RecordsSet)
@@ -527,7 +530,10 @@ namespace mvlt
         {
             for (VaultRecordSet* set : RecordSetsSet)
             {
-                set->AddUniqueKey(key, uniqueKeyFunction);
+                if (isUniqueKey)
+                    set->AddUniqueKey(key, uniqueKeyFunction);
+                else
+                    set->AddKey(key, defaultKeyValue);
                 set->KeysOrder.emplace_back(key);
             }
         }
@@ -569,12 +575,21 @@ namespace mvlt
         // Check it is trying to set coorect type 
         if (res.RequestedType != keyTypeIt->second)
         {
-            res.RequestedType = keyTypeIt->second;
+            res.SavedType = keyTypeIt->second;
             res.IsOperationSuccess = false;
             res.ResultCode = VaultOperationResultCode::WrongType;
             return res;
         }
 
+        // Check if it is unique key
+        if (UniqueKeys.find(key) != UniqueKeys.end())
+        {
+            res.SavedType = keyTypeIt->second;
+            res.IsOperationSuccess = false;
+            res.ResultCode = VaultOperationResultCode::TryToUpdateUniqueKey;
+            return res;
+        }
+
         // Change data in template
         RecordTemplate.SetData(key, defaultKeyValue);
 
@@ -607,6 +622,19 @@ namespace mvlt
             return res;
         }
 
+        for (auto& it : UniqueKeys)
+        {
+            std::cout << it << std::endl;
+        }
+
+        // Check if it is unique key
+        if (UniqueKeys.find(key) != UniqueKeys.end())
+        {
+            res.IsOperationSuccess = false;
+            res.ResultCode = VaultOperationResultCode::TryToUpdateUniqueKey;
+            return res;
+        }
+
         RecordTemplate.GetData(key, defaultKeyValue);
 
         res.IsOperationSuccess = true;
@@ -800,6 +828,9 @@ namespace mvlt
         // Set key proper key order
         vaultRecordSet.KeysOrder = KeysOrder;
 
+        // Set unique keys
+        vaultRecordSet.UniqueKeys = UniqueKeys;
+
         // Copy keys from this to vaultRecordSet
         for (auto& keyCopierIt : VaultKeyCopiers)
             keyCopierIt.second(vaultRecordSet);

diff --git a/Source/VaultOperationResult.cpp b/Source/VaultOperationResult.cpp
@@ -7,6 +7,9 @@ namespace mvlt
         switch (ResultCode)
         {
         default:
+        case VaultOperationResultCode::TryToUpdateUniqueKey:
+            return "The key is unique and you can not update it default value.";
+
         case VaultOperationResultCode::DataRecordNotValid:
             return "The record referenced by VaultRecordRef is not valid.";
 

diff --git a/Source/VaultOperationResult.h b/Source/VaultOperationResult.h
@@ -16,6 +16,7 @@ namespace mvlt
     /// \brief Enum with all error handling codes
     enum class VaultOperationResultCode
     {
+        TryToUpdateUniqueKey = -7,     ///< This code is returned when trying to update default value in an unique key
         RecordAlredyInSet = -6,        ///< This code is returned when trying to add an record to the set when it is already in it
         ParentVaultNotMatch = -5,      ///< This code is returned during operations on VaultRecordSet when objects depend on different Vaults
         ParentVaultNotValid = -4,      ///< This code is returned when calling VaultRecordSet operations when the parent Vault is not valid

diff --git a/Tests/VaultRecordSetUnitTest.cpp b/Tests/VaultRecordSetUnitTest.cpp
@@ -160,7 +160,8 @@ void VaultRecordSet_GetKeyValue_Test()
     // Dynamic key add
     vlt.AddKey("B", -1);
 
-    TEST_ASSERT(vrs.GetKeyValue("B", keyValue).ResultCode == VaultOperationResultCode::Success, "Failed to get not existed key value");
+    VaultOperationResult vrss = vrs.GetKeyValue("B", keyValue);
+    TEST_ASSERT(vrss.ResultCode == VaultOperationResultCode::Success, "Failed to get not existed key value");
 }
 
 void VaultRecordSet_GetKeyType_Test()

diff --git a/Tests/VaultUnitTest.cpp b/Tests/VaultUnitTest.cpp
@@ -63,15 +63,20 @@ void Vault_UpdateKey_Test()
 
     vlt.AddKey("A", -1);
     vlt.AddKey<std::string>("B", "none");
+    vlt.AddUniqueKey<std::size_t>("C", {[](std::size_t counter, const VaultRecordRef& vrf) -> bool { return counter; }});
 
     // Correct key update
     TEST_ASSERT(vlt.UpdateKey("A", 0).IsOperationSuccess == true, "Failed to update key");
 
     // Wrong key update
-    TEST_ASSERT(vlt.UpdateKey("C", -1).ResultCode == VaultOperationResultCode::WrongKey, "Cannot update not existing key");
+    TEST_ASSERT(vlt.UpdateKey("D", -1).ResultCode == VaultOperationResultCode::WrongKey, "Cannot update not existing key");
 
     // Wrong key type
     TEST_ASSERT(vlt.UpdateKey("B", -1).ResultCode == VaultOperationResultCode::WrongType, "Cannot set incorrect type to new key value");
+
+    // Try to update unique key
+    VaultOperationResult vrs = vlt.UpdateKey<std::size_t>("C", 250);
+    TEST_ASSERT(vrs.ResultCode == VaultOperationResultCode::TryToUpdateUniqueKey, "Cannot update unique key");
 }
 
 void Vault_IsKeyExist_Test()