From fdf5d5da0a014751027cc5b2471316925e9cec6c Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sun, 17 Dec 2017 11:45:48 +0100
Subject: [PATCH] Migrator fixed.

---
 .../Migrations/MongoMigrationStatus.cs                        | 4 ++--
 src/Squidex.Infrastructure/Migrations/IMigrationStatus.cs     | 2 +-
 src/Squidex.Infrastructure/Migrations/Migrator.cs             | 2 +-
 .../Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs b/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs
index 751a96f7f..eb0ab586a 100644
--- a/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs
+++ b/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs
@@ -34,13 +34,13 @@ namespace Squidex.Infrastructure.Migrations
             return entity.Version;
         }
 
-        public async Task<bool> TryLockAsync(int currentVersion)
+        public async Task<bool> TryLockAsync()
         {
             var entity =
                 await Collection.FindOneAndUpdateAsync<MongoMigrationEntity>(x => x.Id == DefaultId,
                     Update
                         .Set(x => x.IsLocked, true)
-                        .Set(x => x.Version, currentVersion),
+                        .Set(x => x.Version, 0),
                     UpsertFind);
 
             return entity == null || entity.IsLocked == false;
diff --git a/src/Squidex.Infrastructure/Migrations/IMigrationStatus.cs b/src/Squidex.Infrastructure/Migrations/IMigrationStatus.cs
index 3de9b5536..96f7e2043 100644
--- a/src/Squidex.Infrastructure/Migrations/IMigrationStatus.cs
+++ b/src/Squidex.Infrastructure/Migrations/IMigrationStatus.cs
@@ -14,7 +14,7 @@ namespace Squidex.Infrastructure.Migrations
     {
         Task<int> GetVersionAsync();
 
-        Task<bool> TryLockAsync(int currentVersion);
+        Task<bool> TryLockAsync();
 
         Task UnlockAsync(int newVersion);
     }
diff --git a/src/Squidex.Infrastructure/Migrations/Migrator.cs b/src/Squidex.Infrastructure/Migrations/Migrator.cs
index d5d015489..f8a85aa40 100644
--- a/src/Squidex.Infrastructure/Migrations/Migrator.cs
+++ b/src/Squidex.Infrastructure/Migrations/Migrator.cs
@@ -42,7 +42,7 @@ namespace Squidex.Infrastructure.Migrations
             {
                 var lastMigrator = migrations.FirstOrDefault();
 
-                while (!await migrationStatus.TryLockAsync(lastMigrator.ToVersion))
+                while (!await migrationStatus.TryLockAsync())
                 {
                     log.LogInformation(w => w
                         .WriteProperty("action", "Migrate")
diff --git a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs
index 2c479f9d7..c70e10290 100644
--- a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs
@@ -32,7 +32,7 @@ namespace Squidex.Infrastructure.Migrations
                 return Task.FromResult(version);
             }
 
-            public Task<bool> TryLockAsync(int currentVersion)
+            public Task<bool> TryLockAsync()
             {
                 var lockAcquired = false;
 
@@ -65,7 +65,7 @@ namespace Squidex.Infrastructure.Migrations
         public MigratorTests()
         {
             A.CallTo(() => status.GetVersionAsync()).Returns(0);
-            A.CallTo(() => status.TryLockAsync(A<int>.Ignored)).Returns(true);
+            A.CallTo(() => status.TryLockAsync()).Returns(true);
         }
 
         [Fact]