hotfix for bulk updates not working with .ModifyWith(entity)

dj-nitehawk · Feb 10, 2022 · b03f64e · b03f64e
1 parent e2dbb08
commit b03f64e
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 6 deletions.
diff --git a/MongoDB.Entities/Builders/Update.cs b/MongoDB.Entities/Builders/Update.cs
@@ -385,7 +385,7 @@ public Update<T> AddToQueue()
             var mergedFilter = Logic.MergeWithGlobalFilter(ignoreGlobalFilters, globalFilters, filter);
             if (mergedFilter == Builders<T>.Filter.Empty) throw new ArgumentException("Please use Match() method first!");
             if (defs.Count == 0) throw new ArgumentException("Please use Modify() method first!");
-            if (Cache<T>.HasModifiedOn) Modify(b => b.CurrentDate(Cache<T>.ModifiedOnPropName));
+            if (ShouldSetModDate()) Modify(b => b.CurrentDate(Cache<T>.ModifiedOnPropName));
             onUpdateAction?.Invoke(this);
             models.Add(new UpdateManyModel<T>(mergedFilter, Builders<T>.Update.Combine(defs))
             {

diff --git a/MongoDB.Entities/MongoDB.Entities.csproj b/MongoDB.Entities/MongoDB.Entities.csproj
@@ -2,12 +2,10 @@
 
     <PropertyGroup>
 
-        <Version>20.26.1</Version>
+        <Version>20.26.2</Version>
 
         <PackageReleaseNotes>
-            - hotfix for issue #146 (all children not removed when supplying multiple child IDs)
-            - change project lang version to 10.0
-            - upgrade test/benchmark project SDK to .net 6.0
+            - hotfix for bulk updates not working with .ModifyWith(entity)
             - upgrade dependencies to latest
         </PackageReleaseNotes>
 

diff --git a/Tests/TestUpdating.cs b/Tests/TestUpdating.cs
@@ -405,6 +405,49 @@ await DB.Update<Flower>()
             Assert.AreEqual("daisy", res.Name);
         }
 
+        [TestMethod]
+        public async Task bulk_update_with_modifywith()
+        {
+            var books = new[] {
+                new Book{ Title ="one"},
+                new Book{ Title ="two"},
+            };
+
+            await books.SaveAsync();
+
+            foreach (var book in books)
+            {
+                await DB
+                    .Update<Book>()
+                    .MatchID(book.ID)
+                    .Modify(b => b.ModifiedOn, DateTime.UtcNow.AddDays(-100))
+                    .ExecuteAsync();
+            }
+
+            var bulkUpdate = DB.Update<Book>();
+
+            foreach (var book in books)
+            {
+                book.Title = "updated!";
+                bulkUpdate
+                    .MatchID(book.ID)
+                    .ModifyWith(book)
+                    .AddToQueue();
+            }
+
+            await bulkUpdate.ExecuteAsync();
+
+            var bIDs = books.Select(b => b.ID).ToArray();
+
+            var res = await DB.Find<Book>()
+                .Match(b => bIDs.Contains(b.ID))
+                .ExecuteAsync();
+
+            Assert.AreEqual("updated!", res[0].Title);
+            Assert.AreEqual("updated!", res[1].Title);
+            Assert.IsTrue(res.All(b => b.ModifiedOn.Date == DateTime.UtcNow.Date));
+        }
+
         [TestMethod]
         public async Task update_with_modifyexcept_works()
         {

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -12,7 +12,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-        <PackageReference Include="coverlet.collector" Version="3.1.0">
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>