fix: update functionality for collection with nested collection (#100)

Author: ttu

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ### [Unreleased]
+* FIXED: Update functionality when objects has collections with nested collections
 
 ### [2.4.2] - 2023-06-25
 * FIXED: Duplicate collection data to JSON on save when configured case was not used with collection name

JsonFlatFileDataStore.Test/CollectionModificationTests.cs

@@ -294,6 +294,55 @@ public async Task UpdateOneAsync_TypedModel_InnerSimpleIntArray()
             UTHelpers.Down(newFilePath);
         }
 
+        [Fact]
+        public async Task UpdateOneAsync_TypedModel_NestedArrays()
+        {
+            var newFilePath = UTHelpers.Up();
+
+            var store = new DataStore(newFilePath);
+
+            var collection = store.GetCollection<TestModelWithNestedArray>();
+            Assert.Equal(0, collection.Count);
+
+            var newModel = new TestModelWithNestedArray
+            {
+                Id = Guid.NewGuid().ToString(),
+                Type = "empty",
+                NestedLists = new List<List<int>> { new List<int> { 1 }, new List<int> { 2 }, new List<int> { 3 } }
+            };
+
+            var insertResult = collection.InsertOne(newModel);
+            Assert.True(insertResult);
+            Assert.Equal(1, collection.Count);
+
+            var store2 = new DataStore(newFilePath);
+            var collection2 = store2.GetCollection<TestModelWithNestedArray>();
+            Assert.Equal(1, collection2.Count);
+
+            var updateData = new
+            {
+                Type = "filled",
+                NestedLists = new List<List<int>>
+                {
+                    null,
+                    new List<int> { 4 },
+                }
+            };
+
+            await collection2.UpdateOneAsync(e => e.Id == newModel.Id, updateData);
+
+            var store3 = new DataStore(newFilePath);
+            var collection3 = store3.GetCollection<TestModelWithNestedArray>();
+            var updated = collection3.Find(e => e.Id == newModel.Id).First();
+            Assert.Equal(3, updated.NestedLists.Count());
+            Assert.Equal(1, updated.NestedLists[0].First());
+            Assert.Equal(4, updated.NestedLists[1].First());
+            Assert.Equal(3, updated.NestedLists[2].First());
+            Assert.Equal("filled", updated.Type);
+
+            UTHelpers.Down(newFilePath);
+        }
+
         [Fact]
         public async Task UpdateOneAsync_Predicate_Id_DynamicUser()
         {
@@ -988,5 +1037,43 @@ public async Task UpdateInnerFloatArray_TypedWorld()
 
             UTHelpers.Down(newFilePath);
         }
+
+        [Fact]
+        public async Task UpdateComplexObject_Dynamic()
+        {
+            var newFilePath = UTHelpers.Up();
+
+            var store = new DataStore(newFilePath);
+
+            var collection = store.GetCollection("employee");
+
+            var ja = new JArray { "Hello World!" };
+
+            var jObj = new JObject()
+            {
+                ["custom_id"] = 11,
+                ["nestedArray"] = new JArray { ja },
+            };
+
+            await collection.InsertOneAsync(jObj);
+
+            var original = collection.Find(e => e.custom_id == 11).First();
+            Assert.Equal(0, original.id);
+            Assert.Equal(11, original.custom_id);
+            Assert.Equal("Hello World!", original.nestedArray[0][0]);
+
+            var update = new JObject()
+            {
+                ["custom_id"] = 12,
+                ["nestedArray"] = new JArray { new JArray { "Other text" } },
+            };
+
+            await collection.UpdateOneAsync(e => e.custom_id == 11, update);
+
+            var updated = collection.Find(e => e.custom_id == 12).First();
+            Assert.Equal("Other text", updated.nestedArray[0][0]);
+
+            UTHelpers.Down(newFilePath);
+        }
     }
 }

JsonFlatFileDataStore.Test/TestModels.cs

@@ -17,6 +17,13 @@ public class TestModelWithIntArray
         public List<int> Fragments { get; set; }
     }
 
+    public class TestModelWithNestedArray
+    {
+        public string Id { get; set; }
+        public string Type { get; set; }
+        public List<List<int>> NestedLists { get; set; }
+    }
+
     public class User
     {
         public int Id { get; set; }

JsonFlatFileDataStore/ObjectExtensions.cs

@@ -223,7 +223,7 @@ private static void HandleTypedEnumerable(object source, object destination, dyn
             }
 
             var targetPropertyType = targetProperty.PropertyType;
-            var type = IsGenericListOrCollection(targetPropertyType) ? targetPropertyType.GetGenericArguments()[0] : targetPropertyType.GetElementType();
+            var targetType = IsGenericListOrCollection(targetPropertyType) ? targetPropertyType.GetGenericArguments()[0] : targetPropertyType.GetElementType();
 
             for (var i = 0; i < sourceArray.Count; i++)
             {
@@ -234,11 +234,11 @@ private static void HandleTypedEnumerable(object source, object destination, dyn
 
                 if (targetArray.Count - 1 < i)
                 {
-                    var newTargetItem = CreateInstance(type);
+                    var newTargetItem = CreateInstance(targetType);
                     targetArray.Add(newTargetItem);
                 }
 
-                if (type.GetTypeInfo().IsValueType || type == typeof(string))
+                if (targetType.GetTypeInfo().IsValueType || targetType == typeof(string) || IsDictionary(targetType) || IsEnumerable(targetType))
                     targetArray[i] = sourceValue;
                 else
                     CopyProperties(sourceValue, targetArray[i]);
@@ -340,7 +340,7 @@ Type GetTypeFromTargetItem(IList target, int index)
                         targetArray.Add(CreateInstance(targetType));
                     }
 
-                    if (targetType.GetTypeInfo().IsValueType || targetType == typeof(string))
+                    if (targetType.GetTypeInfo().IsValueType || targetType == typeof(string) || IsDictionary(targetType) || IsEnumerable(targetType))
                         targetArray[i] = sourceValue;
                     else
                         CopyProperties(sourceValue, targetArray[i]);