fix: use configured case with single item property names (#89)

Author: ttu

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### [Unreleased]
 * FIXED: Duplicate collection data to JSON on save when configured case was not used with collection name
+* FIXED: Duplicate single item data to JSON on save when configured case was not used with item name
 
 ### [2.4.1] - 2023-01-15
 * FIXED: Ignore OperationCanceledException during dispose

JsonFlatFileDataStore.Test/DataStoreTests.cs

@@ -604,6 +604,22 @@ public void File_Has_Correct_PropertyNames_TypedCollection()
  var assertCollection = store.GetCollection<Employee>();
  Assert.Equal(3, assertCollection.Count);
  }
+ 
+ [Fact]
+ public void File_Has_Correct_PropertyNames_Single_Item()
+ {
+ var path = UTHelpers.GetFullFilePath($"CreateNewFile_{DateTime.UtcNow.Ticks}");
+
+ var store = new DataStore(path);
+
+ store.ReplaceItem("TestOkIsThis1", 1, true);
+ store.ReplaceItem("TestOkIsThis2", 2, true);
+ store.ReplaceItem("TestOkIsThis2", 3, true);
+
+ var content = UTHelpers.GetFileContent(path);
+ var propCount = Regex.Matches(content, "testOkIsThis2").Count;
+ Assert.Equal(1, propCount);
+ }
 
  public class Employee
  {

JsonFlatFileDataStore/DataStore.cs

@@ -132,8 +132,10 @@ public T GetItem<T>(string key)
  // This might be a bad idea especially if the file is in use, as this can take a long time
  _jsonData = GetJsonObjectFromFile();
  }
+ 
+ var convertedKey = _convertPathToCorrectCamelCase(key);
 
- var token = _jsonData[key];
+ var token = _jsonData[convertedKey];
 
  if (token == null)
  {
@@ -156,7 +158,9 @@ public dynamic GetItem(string key)
  _jsonData = GetJsonObjectFromFile();
  }
 
- var token = _jsonData[key];
+ var convertedKey = _convertPathToCorrectCamelCase(key);
+
+ var token = _jsonData[convertedKey];
 
  if (token == null)
  return null;
@@ -170,12 +174,14 @@ public dynamic GetItem(string key)
 
  private Task<bool> Insert<T>(string key, T item, bool isAsync = false)
  {
+ var convertedKey = _convertPathToCorrectCamelCase(key);
+
  (bool, JObject) UpdateAction()
  {
- if (_jsonData[key] != null)
+ if (_jsonData[convertedKey] != null)
  return (false, _jsonData);
 
- _jsonData[key] = JToken.FromObject(item);
+ _jsonData[convertedKey] = JToken.FromObject(item);
  return (true, _jsonData);
  }
 
@@ -188,12 +194,14 @@ private Task<bool> Insert<T>(string key, T item, bool isAsync = false)
 
  private Task<bool> Replace<T>(string key, T item, bool upsert = false, bool isAsync = false)
  {
+ var convertedKey = _convertPathToCorrectCamelCase(key);
+ 
  (bool, JObject) UpdateAction()
  {
- if (_jsonData[key] == null && upsert == false)
+ if (_jsonData[convertedKey] == null && upsert == false)
  return (false, _jsonData);
 
- _jsonData[key] = JToken.FromObject(item);
+ _jsonData[convertedKey] = JToken.FromObject(item);
  return (true, _jsonData);
  }
 
@@ -206,21 +214,23 @@ private Task<bool> Replace<T>(string key, T item, bool upsert = false, bool isAs
 
  private Task<bool> Update(string key, dynamic item, bool isAsync = false)
  {
+ var convertedKey = _convertPathToCorrectCamelCase(key);
+
  (bool, JObject) UpdateAction()
  {
- if (_jsonData[key] == null)
+ if (_jsonData[convertedKey] == null)
  return (false, _jsonData);
 
- var toUpdate = SingleDynamicItemReadConverter(_jsonData[key]);
+ var toUpdate = SingleDynamicItemReadConverter(_jsonData[convertedKey]);
 
  if (ObjectExtensions.IsReferenceType(item) && ObjectExtensions.IsReferenceType(toUpdate))
  {
  ObjectExtensions.CopyProperties(item, toUpdate);
- _jsonData[key] = JToken.FromObject(toUpdate);
+ _jsonData[convertedKey] = JToken.FromObject(toUpdate);
  }
  else
  {
- _jsonData[key] = JToken.FromObject(item);
+ _jsonData[convertedKey] = JToken.FromObject(item);
  }
 
  return (true, _jsonData);
@@ -235,9 +245,11 @@ private Task<bool> Update(string key, dynamic item, bool isAsync = false)
 
  private Task<bool> Delete(string key, bool isAsync = false)
  {
+ var convertedKey = _convertPathToCorrectCamelCase(key);
+
  (bool, JObject) UpdateAction()
  {
- var result = _jsonData.Remove(key);
+ var result = _jsonData.Remove(convertedKey);
  return (result, _jsonData);
  }