Merge pull request #149 from binarymash/feature/#147-Fix-optimistic-c…

…oncurrency Make expected version optional cos it's difficult right now to get th…
binarymash · Dec 24, 2018 · af2cba4 · af2cba4
2 parents 28dbdf9 + 04b4a20
commit af2cba4
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 31 deletions.
diff --git a/src/Evelyn.Core/WriteModel/Project/Commands/AddEnvironment/Command.cs b/src/Evelyn.Core/WriteModel/Project/Commands/AddEnvironment/Command.cs
@@ -4,7 +4,7 @@
 
     public class Command : WriteModel.Command
     {
-        public Command(string userId, Guid projectId, string key, string name, int expectedProjectVersion)
+        public Command(string userId, Guid projectId, string key, string name, int? expectedProjectVersion)
             : base(userId)
         {
             Key = key;
@@ -13,7 +13,7 @@ public Command(string userId, Guid projectId, string key, string name, int expec
             ExpectedProjectVersion = expectedProjectVersion;
         }
 
-        public int ExpectedProjectVersion { get; set; }
+        public int? ExpectedProjectVersion { get; set; }
 
         public Guid ProjectId { get; set; }
 

diff --git a/src/Evelyn.Core/WriteModel/Project/Commands/AddToggle/Command.cs b/src/Evelyn.Core/WriteModel/Project/Commands/AddToggle/Command.cs
@@ -4,7 +4,7 @@
 
     public class Command : WriteModel.Command
     {
-        public Command(string userId, Guid projectId, string key, string name, int expectedProjectVersion)
+        public Command(string userId, Guid projectId, string key, string name, int? expectedProjectVersion)
             : base(userId)
         {
             Key = key;
@@ -13,7 +13,7 @@ public Command(string userId, Guid projectId, string key, string name, int expec
             ExpectedProjectVersion = expectedProjectVersion;
         }
 
-        public int ExpectedProjectVersion { get; set; }
+        public int? ExpectedProjectVersion { get; set; }
 
         public Guid ProjectId { get; set; }
 

diff --git a/src/Evelyn.Core/WriteModel/Project/Commands/ChangeToggleState/Command.cs b/src/Evelyn.Core/WriteModel/Project/Commands/ChangeToggleState/Command.cs
@@ -4,7 +4,7 @@
 
     public class Command : WriteModel.Command
     {
-        public Command(string userId, Guid projectId, string environmentKey, string toggleKey, string value, int expectedToggleStateVersion)
+        public Command(string userId, Guid projectId, string environmentKey, string toggleKey, string value, int? expectedToggleStateVersion)
             : base(userId)
         {
             ProjectId = projectId;
@@ -16,7 +16,7 @@ public Command(string userId, Guid projectId, string environmentKey, string togg
 
         public Guid ProjectId { get; set; }
 
-        public int ExpectedToggleStateVersion { get; set; }
+        public int? ExpectedToggleStateVersion { get; set; }
 
         public string EnvironmentKey { get; set; }
 

diff --git a/src/Evelyn.Core/WriteModel/Project/Commands/DeleteEnvironment/Command.cs b/src/Evelyn.Core/WriteModel/Project/Commands/DeleteEnvironment/Command.cs
@@ -4,15 +4,15 @@
 
     public class Command : WriteModel.Command
     {
-        public Command(string userId, Guid projectId, string key, int expectedEnvironmentVersion)
+        public Command(string userId, Guid projectId, string key, int? expectedEnvironmentVersion)
             : base(userId)
         {
             Key = key;
             ProjectId = projectId;
             ExpectedEnvironmentVersion = expectedEnvironmentVersion;
         }
 
-        public int ExpectedEnvironmentVersion { get; set; }
+        public int? ExpectedEnvironmentVersion { get; set; }
 
         public Guid ProjectId { get; set; }
 

diff --git a/src/Evelyn.Core/WriteModel/Project/Commands/DeleteToggle/Command.cs b/src/Evelyn.Core/WriteModel/Project/Commands/DeleteToggle/Command.cs
@@ -4,15 +4,15 @@
 
     public class Command : WriteModel.Command
     {
-        public Command(string userId, Guid projectId, string key, int expectedToggleVersion)
+        public Command(string userId, Guid projectId, string key, int? expectedToggleVersion)
             : base(userId)
         {
             Key = key;
             ProjectId = projectId;
             ExpectedToggleVersion = expectedToggleVersion;
         }
 
-        public int ExpectedToggleVersion { get; set; }
+        public int? ExpectedToggleVersion { get; set; }
 
         public Guid ProjectId { get; set; }
 

diff --git a/src/Evelyn.Core/WriteModel/Project/Domain/Project.cs b/src/Evelyn.Core/WriteModel/Project/Domain/Project.cs
@@ -44,7 +44,7 @@ public Project(string userId, Guid accountId, Guid projectId, string name)
 
         public string Name { get; private set; }
 
-        public void AddEnvironment(string userId, string key, string name, int expectedProjectVersion)
+        public void AddEnvironment(string userId, string key, string name, int? expectedProjectVersion)
         {
             AssertNotDeleted();
             AssertVersion(expectedProjectVersion);
@@ -67,7 +67,7 @@ public void AddEnvironment(string userId, string key, string name, int expectedP
             ApplyChange(new EnvironmentStateAdded(userId, Id, key, now, toggleStates));
         }
 
-        public void AddToggle(string userId, string key, string name, int expectedProjectVersion)
+        public void AddToggle(string userId, string key, string name, int? expectedProjectVersion)
         {
             AssertNotDeleted();
             AssertVersion(expectedProjectVersion);
@@ -92,7 +92,7 @@ public void AddToggle(string userId, string key, string name, int expectedProjec
             }
         }
 
-        public void ChangeToggleState(string userId, string environmentKey, string toggleKey, string value, int expectedToggleStateVersion)
+        public void ChangeToggleState(string userId, string environmentKey, string toggleKey, string value, int? expectedToggleStateVersion)
         {
             AssertNotDeleted();
 
@@ -108,7 +108,7 @@ public void ChangeToggleState(string userId, string environmentKey, string toggl
                 throw new InvalidOperationException($"There is no toggle with the key {toggleKey}");
             }
 
-            toggleState.AssertVersion(expectedToggleStateVersion, Id);
+            toggleState.AssertVersion(Id, expectedToggleStateVersion);
 
             if (!bool.TryParse(value, out var parsedValue))
             {
@@ -118,7 +118,7 @@ public void ChangeToggleState(string userId, string environmentKey, string toggl
             ApplyChange(new ToggleStateChanged(userId, Id, environmentKey, toggleKey, value, DateTimeOffset.UtcNow));
         }
 
-        public void DeleteToggle(string userId, string key, int expectedToggleVersion)
+        public void DeleteToggle(string userId, string key, int? expectedToggleVersion)
         {
             AssertNotDeleted();
 
@@ -128,7 +128,7 @@ public void DeleteToggle(string userId, string key, int expectedToggleVersion)
                 throw new InvalidOperationException($"There is no toggle with the key {key}");
             }
 
-            toggle.AssertVersion(expectedToggleVersion, Id);
+            toggle.AssertVersion(Id, expectedToggleVersion);
 
             ApplyChange(new ToggleDeleted(userId, Id, key, DateTimeOffset.UtcNow));
 
@@ -138,7 +138,7 @@ public void DeleteToggle(string userId, string key, int expectedToggleVersion)
             }
         }
 
-        public void DeleteEnvironment(string userId, string key, int expectedEnvironmentVersion)
+        public void DeleteEnvironment(string userId, string key, int? expectedEnvironmentVersion)
         {
             AssertNotDeleted();
 
@@ -148,7 +148,7 @@ public void DeleteEnvironment(string userId, string key, int expectedEnvironment
                 throw new InvalidOperationException($"There is no environment with the key {key}");
             }
 
-            environment.AssertVersion(expectedEnvironmentVersion, Id);
+            environment.AssertVersion(Id, expectedEnvironmentVersion);
 
             ApplyChange(new EnvironmentDeleted(userId, Id, key, DateTimeOffset.UtcNow));
             ApplyChange(new EnvironmentStateDeleted(userId, Id, key, DateTimeOffset.UtcNow));

diff --git a/src/Evelyn.Core/WriteModel/ScopedEntity.cs b/src/Evelyn.Core/WriteModel/ScopedEntity.cs
@@ -7,11 +7,14 @@ public abstract class ScopedEntity
     {
         public int LastModifiedVersion { get; protected set; }
 
-        public void AssertVersion(int expectedVersion, Guid aggregateId)
+        public void AssertVersion(Guid aggregateId, int? expectedVersion)
         {
-            if (LastModifiedVersion > expectedVersion)
+            if (expectedVersion.HasValue)
             {
-                throw new ConcurrencyException(aggregateId, expectedVersion, LastModifiedVersion);
+                if (LastModifiedVersion > expectedVersion)
+                {
+                    throw new ConcurrencyException(aggregateId, expectedVersion.Value, LastModifiedVersion);
+                }
             }
         }
     }

diff --git a/src/Evelyn.Management.Api.Rest/Write/Environments/Messages/AddEnvironment.cs b/src/Evelyn.Management.Api.Rest/Write/Environments/Messages/AddEnvironment.cs
@@ -4,7 +4,7 @@
 
     public class AddEnvironment
     {
-        public AddEnvironment(string key, string name, int expectedProjectVersion)
+        public AddEnvironment(string key, string name, int? expectedProjectVersion)
         {
             Key = key;
             Name = name;
@@ -15,6 +15,6 @@ public AddEnvironment(string key, string name, int expectedProjectVersion)
 
         public string Name { get; set; }
 
-        public int ExpectedProjectVersion { get; set; }
+        public int? ExpectedProjectVersion { get; set; }
     }
 }
diff --git a/src/Evelyn.Management.Api.Rest/Write/Environments/Messages/DeleteEnvironment.cs b/src/Evelyn.Management.Api.Rest/Write/Environments/Messages/DeleteEnvironment.cs
@@ -2,11 +2,11 @@
 {
     public class DeleteEnvironment
     {
-        public DeleteEnvironment(int expectedEnvironmentVersion)
+        public DeleteEnvironment(int? expectedEnvironmentVersion)
         {
             ExpectedEnvironmentVersion = expectedEnvironmentVersion;
         }
 
-        public int ExpectedEnvironmentVersion { get; set; }
+        public int? ExpectedEnvironmentVersion { get; set; }
     }
 }
diff --git a/src/Evelyn.Management.Api.Rest/Write/ToggleStates/Messages/ChangeToggleState.cs b/src/Evelyn.Management.Api.Rest/Write/ToggleStates/Messages/ChangeToggleState.cs
@@ -2,13 +2,13 @@
 {
     public class ChangeToggleState
     {
-        public ChangeToggleState(int expectedToggleStateVersion, string state)
+        public ChangeToggleState(string state, int? expectedToggleStateVersion)
         {
             ExpectedToggleStateVersion = expectedToggleStateVersion;
             State = state;
         }
 
-        public int ExpectedToggleStateVersion { get; set; }
+        public int? ExpectedToggleStateVersion { get; set; }
 
         public string State { get; set; }
     }

diff --git a/src/Evelyn.Management.Api.Rest/Write/Toggles/Messages/AddToggle.cs b/src/Evelyn.Management.Api.Rest/Write/Toggles/Messages/AddToggle.cs
@@ -2,7 +2,7 @@
 {
     public class AddToggle
     {
-        public AddToggle(string key, string name, int expectedProjectVersion)
+        public AddToggle(string key, string name, int? expectedProjectVersion)
         {
             Key = key;
             Name = name;
@@ -13,6 +13,6 @@ public AddToggle(string key, string name, int expectedProjectVersion)
 
         public string Name { get; set; }
 
-        public int ExpectedProjectVersion { get; set; }
+        public int? ExpectedProjectVersion { get; set; }
     }
 }
diff --git a/src/Evelyn.Management.Api.Rest/Write/Toggles/Messages/DeleteToggle.cs b/src/Evelyn.Management.Api.Rest/Write/Toggles/Messages/DeleteToggle.cs
@@ -2,11 +2,11 @@
 {
     public class DeleteToggle
     {
-        public DeleteToggle(int expectedToggleVersion)
+        public DeleteToggle(int? expectedToggleVersion)
         {
             ExpectedToggleVersion = expectedToggleVersion;
         }
 
-        public int ExpectedToggleVersion { get; set; }
+        public int? ExpectedToggleVersion { get; set; }
     }
 }