- 修复聚合根仓储 InsertOrUpdate OneToMany 只插入一条记录的 bug；

dotnetcore · Feb 27, 2024 · c5b1488 · c5b1488
1 parent b18f9a5
commit c5b1488
Show file tree

Hide file tree

Showing 8 changed files with 779 additions and 308 deletions.
diff --git a/.../FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs b/.../FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs
@@ -53,7 +53,7 @@ async Task<List<T1>> InsertWithinBoundaryStaticAsync<T1>(string boundaryName, IB
             bool LocalCanInsert(Type entityType, object entity, bool isadd)
             {
                 var stateKey = rootRepository.Orm.GetEntityKeyString(entityType, entity, false);
-                if (stateKey == null) return true;
+                if (string.IsNullOrEmpty(stateKey)) return true;
                 if (ignores.TryGetValue(entityType, out var stateKeys) == false)
                 {
                     if (isadd)

diff --git a/...s/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs b/...s/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs
@@ -106,7 +106,7 @@ static List<T1> InsertWithinBoundaryStatic<T1>(string boundaryName, IBaseReposit
             bool LocalCanInsert(Type entityType, object entity, bool isadd)
             {
                 var stateKey = rootRepository.Orm.GetEntityKeyString(entityType, entity, false);
-                if (stateKey == null) return true;
+                if (string.IsNullOrEmpty(stateKey)) return true;
                 if (ignores.TryGetValue(entityType, out var stateKeys) == false)
                 {
                     if (isadd)

diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs b/Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs
@@ -151,12 +151,12 @@ void LocalCompareEntityValueCollection(Type elementType, IEnumerable collectionB
                 foreach (var item in collectionBefore)
                 {
                     var key = fsql.GetEntityKeyString(elementType, item, false);
-                    if (key != null) dictBefore.Add(key, item);
+                    if (!string.IsNullOrEmpty(key)) dictBefore.Add(key, item);
                 }
                 foreach (var item in collectionAfter)
                 {
                     var key = fsql.GetEntityKeyString(elementType, item, false);
-                    if (key != null)
+                    if (!string.IsNullOrEmpty(key))
                     {
                         if (dictAfter.ContainsKey(key) == false) 
                             dictAfter.Add(key, item);

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext2/AggregateRootRepositoryTest2.cs b/FreeSql.Tests/FreeSql.Tests.DbContext2/AggregateRootRepositoryTest2.cs
@@ -21,6 +21,38 @@ public OrderRepository(IFreeSql fsql, UnitOfWorkManager uowManager) : base(uowMa
             public override ISelect<Order> Select => base.SelectDiy;
         }
 
+        [Fact]
+        public void Test2()
+        {
+            using (var fsql = g.CreateMemory())
+            {
+                new OrderRepository(fsql, null);
+                var repo = fsql.GetAggregateRootRepository<Order>();
+
+                var order = new Order
+                {
+                    Field2 = "field2",
+                    Extdata = new OrderExt { Field3 = "field3" },
+                    //Details = new List<OrderDetail>
+                    //{
+                    //    new OrderDetail { Field4 = "field4_01", Extdata = new OrderDetailExt { Field5 = "field5_01" } },
+                    //    new OrderDetail { Field4 = "field4_02", Extdata = new OrderDetailExt { Field5 = "field5_02" } },
+                    //    new OrderDetail { Field4 = "field4_03", Extdata = new OrderDetailExt { Field5 = "field5_03" } },
+                    //},
+                };
+                repo.Insert(order); //级联插入
+
+                var findOrder = repo.Select.Where(a => a.Id == order.Id).First();
+                findOrder.Details = new List<OrderDetail>
+                {
+                    new OrderDetail { Field4 = "field4_01", Extdata = new OrderDetailExt { Field5 = "field5_01" } },
+                    new OrderDetail { Field4 = "field4_02", Extdata = new OrderDetailExt { Field5 = "field5_02" } },
+                    new OrderDetail { Field4 = "field4_03", Extdata = new OrderDetailExt { Field5 = "field5_03" } },
+                };
+                repo.InsertOrUpdate(findOrder);
+            }
+        }
+
         [Fact]
         public void Test1()
         {
@@ -79,11 +111,11 @@ void LocalTest()
                         Field2 = "field2",
                         Extdata = new OrderExt { Field3 = "field3" },
                         Details = new List<OrderDetail>
-                    {
-                        new OrderDetail { Field4 = "field4_01", Extdata = new OrderDetailExt { Field5 = "field5_01" } },
-                        new OrderDetail { Field4 = "field4_02", Extdata = new OrderDetailExt { Field5 = "field5_02" } },
-                        new OrderDetail { Field4 = "field4_03", Extdata = new OrderDetailExt { Field5 = "field5_03" } },
-                    },
+                        {
+                            new OrderDetail { Field4 = "field4_01", Extdata = new OrderDetailExt { Field5 = "field5_01" } },
+                            new OrderDetail { Field4 = "field4_02", Extdata = new OrderDetailExt { Field5 = "field5_02" } },
+                            new OrderDetail { Field4 = "field4_03", Extdata = new OrderDetailExt { Field5 = "field5_03" } },
+                        },
                         Tags = fsql.Select<Tag>().Where(a => new[] { 1, 2, 3 }.Contains(a.Id)).ToList()
                     };
                     repo.Insert(order); //级联插入