Merge pull request #26 from sbmako/5.2.4-patch

added saga data change detection and removed subscription dependency on IHaveDocumentVersion

Author: sbmako

packaging/nuget/NServiceBus.MongoDB.nuspec

@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>NServiceBus.MongoDB</id>
     <title>NServiceBus MongoDB</title>
-    <version>5.2.4</version>
+    <version>5.2.5</version>
     <authors>Carlos Sandoval</authors>
     <owners>SharkByte Software</owners>
     <licenseUrl>https://github.com/sbmako/NServiceBus.MongoDB/blob/master/LICENSE</licenseUrl>

src/.nuget/NuGet.exe

@@ -83,6 +83,8 @@ public class TestSagaData : IContainSagaData, IHaveDocumentVersion
                 public virtual Guid SomeId { get; set; }
 
                 public int DocumentVersion { get; set; }
+
+                public int ETag { get; set; }
             }
         }
 

src/NServiceBus.MongoDB.Acceptance.Tests/App_Packages/NSB.AcceptanceTests.5.2.5/Sagas/When_a_existing_saga_instance_exists.cs

@@ -148,6 +148,7 @@ public class TestSagaData : IContainSagaData, IHaveDocumentVersion
                 public virtual Guid SomeId { get; set; }
 
                 public int DocumentVersion { get; set; }
+                public int ETag { get; set; }
             }
         }
 

src/NServiceBus.MongoDB.Acceptance.Tests/App_Packages/NSB.AcceptanceTests.5.2.5/Sagas/When_receiving_that_completes_the_saga.cs

@@ -81,6 +81,7 @@ public class TestSagaData : IContainSagaData, IHaveDocumentVersion
                 public virtual Guid SomeId { get; set; }
 
                 public int DocumentVersion { get; set; }
+                public int ETag { get; set; }
             }
         }
 

src/NServiceBus.MongoDB.Acceptance.Tests/App_Packages/NSB.AcceptanceTests.5.2.5/Sagas/When_saga_has_a_non_empty_constructor.cs

@@ -70,6 +70,7 @@ public class TestSagaData : IContainSagaData, IHaveDocumentVersion
                 public virtual string KeyValue { get; set; }
 
                 public int DocumentVersion { get; set; }
+                public int ETag { get; set; }
             }
         }
 

src/NServiceBus.MongoDB.Acceptance.Tests/App_Packages/NSB.AcceptanceTests.5.2.5/Sagas/When_saga_is_mapped_to_complex_expression.cs

@@ -71,6 +71,7 @@ public class TestSagaData : IContainSagaData, IHaveDocumentVersion
                 public virtual Guid SomeId { get; set; }
 
                 public int DocumentVersion { get; set; }
+                public int ETag { get; set; }
             }
         }
 

src/NServiceBus.MongoDB.Acceptance.Tests/App_Packages/NSB.AcceptanceTests.5.2.5/Sagas/When_using_a_received_message_for_timeout.cs

@@ -75,5 +75,6 @@ public sealed class DeviceCommandSagaState : IContainSagaData, IHaveDocumentVers
 
         //IHaveDocumentVersion properties
         public int DocumentVersion { get; set; }
+        public int ETag { get; set; }
     }
 }

src/NServiceBus.MongoDB.Tests/Issues/Issue_16.cs

@@ -238,6 +238,40 @@ public void UpdatingSagaWithoutDocumentVersion(
             sut.Invoking(s => s.Update(sagaData)).ShouldThrow<InvalidOperationException>();
         }
 
+        [Theory, IntegrationTest]
+        [AutoDatabase]
+        public void UpdatingSagaWithNoChangesShouldNotUpdateVersion(
+            MongoSagaPersister sut,
+            MongoDatabaseFactory factory,
+            SagaWithoutUniqueProperties sagaData)
+        {
+            sut.Save(sagaData);
+            var saga1 = factory.RetrieveSagaData(sagaData);
+
+            sut.Update(saga1);
+
+            var saga2 = factory.RetrieveSagaData(sagaData);
+            saga2.DocumentVersion.Should().Be(saga1.DocumentVersion);
+        }
+
+        [Theory, IntegrationTest]
+        [AutoDatabase]
+        public void UpdatingSagaWithChangesShouldUpdateVersion(
+                MongoSagaPersister sut,
+                MongoDatabaseFactory factory,
+                SagaWithoutUniqueProperties sagaData)
+        {
+            sut.Save(sagaData);
+            var saga1 = factory.RetrieveSagaData(sagaData);
+
+            saga1.UniqueProperty = "NewValue";
+            sut.Update(saga1);
+
+            var saga2 = factory.RetrieveSagaData(sagaData);
+            saga2.DocumentVersion.Should().Be(saga1.DocumentVersion + 1);
+            saga2.UniqueProperty.Should().Be(saga1.UniqueProperty);
+        }
+
         [Theory, IntegrationTest]
         [AutoDatabase]
         public void CompletingSagaShouldRemoveDocument(

src/NServiceBus.MongoDB.Tests/SagaPersister/MongoSagaPersisterTests.cs

@@ -39,5 +39,10 @@ public abstract class ContainMongoSagaData : ContainSagaData, IHaveDocumentVersi
         /// Gets or sets the document version.
         /// </summary>
         public int DocumentVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the e tag.
+        /// </summary>
+        public int ETag { get; set; }
     }
 }