fix: make sure the right migration gets marked as completed or failed

Author: jorgeparavicini

src/Rapidata.MongoDB.Migrations/Repositories/MigrationRepository.cs

@@ -84,14 +84,15 @@ public async Task<bool> StartMigration(IMigration migration, CancellationToken c
             .UpdateOneAsync(filter, update, options, cancellationToken)
             .ConfigureAwait(false);
 
-        return result.UpsertedId != null;
+        return result.UpsertedId is not null;
     }
 
     public async Task CompleteMigration(IMigration migration, CancellationToken cancellationToken)
     {
         var collection = GetCollection();
 
-        var filter = Builders<Migration>.Filter.Eq(x => x.Version, migration.Version) &
+        var filter = Builders<Migration>.Filter.Eq(x => x.Date, migration.Date) &
+                     Builders<Migration>.Filter.Eq(x => x.Version, migration.Version) &
                      Builders<Migration>.Filter.Eq(x => x.DeveloperId, migration.DeveloperId);
 
         var update = Builders<Migration>.Update
@@ -106,7 +107,8 @@ public async Task FailMigration(IMigration migration, CancellationToken cancella
     {
         var collection = GetCollection();
 
-        var filter = Builders<Migration>.Filter.Eq(x => x.Version, migration.Version) &
+        var filter = Builders<Migration>.Filter.Eq(x => x.Date, migration.Date) &
+                     Builders<Migration>.Filter.Eq(x => x.Version, migration.Version) &
                      Builders<Migration>.Filter.Eq(x => x.DeveloperId, migration.DeveloperId);
 
         var update = Builders<Migration>.Update

tests/Rapidata.MongoDB.Migrations.Tests.Integration/Core/MigrationEngineTests.cs

@@ -299,4 +299,44 @@ public async Task Migrate_WhenTwoMigrationsAndOneAlreadyApplied_AppliesOnlyOne()
         var count = await DefaultCollection.CountDocumentsAsync(FilterDefinition<Migration>.Empty);
         count.Should().Be(2);
     }
+
+    [Test]
+    public async Task Migrate_WhenTwoMigrationsWithSameVersionButDifferentDate_AppliesBoth()
+    {
+        // Arrange
+        var migration1 = new MigrationMockBuilder().WithVersion(1).WithDate(DateOnly.FromDateTime(DateTime.Today))
+            .Build();
+        var migration2 = new MigrationMockBuilder().WithVersion(1)
+            .WithDate(DateOnly.FromDateTime(DateTime.Today.AddDays(1))).Build();
+        Setup(configure: null, migration1.Object, migration2.Object);
+
+        // Act
+        await Subject.Migrate(CancellationToken.None);
+
+        // Assert
+        var count = await DefaultCollection.CountDocumentsAsync(FilterDefinition<Migration>.Empty);
+        count.Should().Be(2);
+    }
+
+    [Test]
+    public async Task Migrate_WhenMigrationWithSameVersionButDifferentDateAlreadyApplied_StillsAppliesMigration()
+    {
+        // Arrange
+        var migration1 = new MigrationMockBuilder().WithVersion(1).WithDate(DateOnly.FromDateTime(DateTime.Today))
+            .Build();
+        Setup(configure: null, migration1.Object);
+        await Subject.Migrate(CancellationToken.None);
+
+        var migration2 = new MigrationMockBuilder().WithVersion(1)
+            .WithDate(DateOnly.FromDateTime(DateTime.Today.AddDays(1))).Build();
+        MigrationResolver.Setup(x => x.GetMigrations(It.IsAny<IEnumerable<Assembly>>()))
+            .Returns([migration2.Object]);
+
+        // Act
+        await Subject.Migrate(CancellationToken.None);
+
+        // Assert
+        var count = await DefaultCollection.CountDocumentsAsync(FilterDefinition<Migration>.Empty);
+        count.Should().Be(2);
+    }
 }