Be explicit about SaveChanges

Test/Altinn.Correspondence.Tests/Dialogporten/DialogportenServiceTests.cs

@@ -10,6 +10,9 @@
 using Altinn.Correspondence.Core.Services;
 using Altinn.Correspondence.Integrations.Dialogporten;
 using Altinn.Correspondence.Integrations.Dialogporten.Models;
+using Altinn.Correspondence.Persistence;
+using Altinn.Correspondence.Tests.Helpers;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -21,6 +24,8 @@ namespace Altinn.Correspondence.Tests.Dialogporten;
 
 public class DialogportenServiceTests
 {
+    private static ApplicationDbContext CreateTestDbContext() => TestDbContextFactory.Create();
+
     private static (DialogportenService service, Func<string> getLastRequestBody) CreateServiceWithMockedDialogPost(CorrespondenceEntity correspondence)
     {
         var capturedRequestBody = string.Empty;
@@ -76,6 +81,7 @@ private static (DialogportenService service, Func<string> getLastRequestBody) Cr
                                               mockLogger.Object,
                                               mockIdem.Object,
                                               mockResourceRegistryService.Object,
+                                              CreateTestDbContext(),
                                               mockPartyUrnHelper.Object);
         return (service, () => capturedRequestBody);
     }
@@ -141,6 +147,7 @@ private static (DialogportenService service, Mock<ICorrespondenceForwardingEvent
                                               mockLogger.Object,
                                               mockIdem.Object,
                                               mockResourceRegistryService.Object,
+                                              CreateTestDbContext(),
                                               mockPartyUrnHelper.Object);
         return (service, mockCorrespondenceForwardingEventRepository, mockAltinnRegisterService, () => capturedRequestBody);
     }
@@ -174,6 +181,7 @@ private static (DialogportenService service, Mock<ICorrespondenceRepository> rep
         var mockAltinnRegisterService = new Mock<IAltinnRegisterService>();
         var mockPartyUrnHelper = new Mock<PartyUrnHelper>(mockAltinnRegisterService.Object, Mock.Of<ILogger<PartyUrnHelper>>());
         var options = Options.Create(new GeneralSettings { CorrespondenceBaseUrl = "https://correspondence.example" });
+        var dbContext = TestDbContextFactory.Create();
 
         var service = new DialogportenService(
             httpClient,
@@ -184,6 +192,7 @@ private static (DialogportenService service, Mock<ICorrespondenceRepository> rep
             Mock.Of<ILogger<DialogportenService>>(),
             Mock.Of<IIdempotencyKeyRepository>(),
             Mock.Of<IResourceRegistryService>(),
+            dbContext,
             mockPartyUrnHelper.Object);
 
         return (service, mockRepo);

Test/Altinn.Correspondence.Tests/Fixtures/UniqueViolationOnDeferredSaveDbContext.cs

@@ -0,0 +1,34 @@
+using Altinn.Correspondence.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Npgsql;
+
+namespace Altinn.Correspondence.Tests.Fixtures;
+
+/// <summary>
+/// Simulates a concurrent idempotency insert losing the race on the batched flush inside
+/// <see cref="Altinn.Correspondence.Application.Helpers.DatabaseTransactionHelper.ExecuteAsync"/>.
+/// </summary>
+public sealed class UniqueViolationOnDeferredSaveDbContext(
+    DbContextOptions<ApplicationDbContext> options,
+    int uniqueViolationOnSaveAttempt = 1)
+    : TestApplicationDbContext(options)
+{
+    private int _saveAttempts;
+
+    public override async Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+    {
+        _saveAttempts++;
+        if (_saveAttempts == uniqueViolationOnSaveAttempt)
+        {
+            throw new DbUpdateException(
+                "duplicate key",
+                new PostgresException(
+                    "duplicate key value violates unique constraint",
+                    "ERROR",
+                    "ERROR",
+                    "23505"));
+        }
+
+        return await base.SaveChangesAsync(cancellationToken);
+    }
+}

Test/Altinn.Correspondence.Tests/Helpers/AttachmentHelper.cs

@@ -113,9 +113,9 @@ public static string CalculateChecksum(byte[] data)
                 return BitConverter.ToString(hash).Replace("-", "").ToLower();
             }
         }
-        public static async Task<AttachmentOverviewExt> WaitForAttachmentStatusUpdate(HttpClient client, JsonSerializerOptions responseSerializerOptions, Guid attachmentId, AttachmentStatusExt expectedStatus, int maxRetries = 5, int delayMs = 900)
+        public static async Task<AttachmentOverviewExt> WaitForAttachmentStatusUpdate(HttpClient client, JsonSerializerOptions responseSerializerOptions, Guid attachmentId, AttachmentStatusExt expectedStatus, int maxRetries = 10, int delayMs = 1000)
         {
-            await Task.Delay(500);
+            await Task.Delay(1000);
             for (int i = 0; i < maxRetries; i++)
             {
                 var attachment = await client.GetFromJsonAsync<AttachmentOverviewExt>($"correspondence/api/v1/attachment/{attachmentId}", responseSerializerOptions);

Test/Altinn.Correspondence.Tests/Helpers/CorrespondenceHelper.cs

@@ -70,7 +70,7 @@ public static MultipartFormDataContent CorrespondenceToFormData(BaseCorresponden
         return formData;
     }
 
-    public static async Task<CorrespondenceOverviewExt> WaitForCorrespondenceStatusUpdate(HttpClient client, JsonSerializerOptions responseSerializerOptions, Guid correspondenceId, CorrespondenceStatusExt expectedStatus, int maxRetries = 5, int delayMs = 900)
+    public static async Task<CorrespondenceOverviewExt> WaitForCorrespondenceStatusUpdate(HttpClient client, JsonSerializerOptions responseSerializerOptions, Guid correspondenceId, CorrespondenceStatusExt expectedStatus, int maxRetries = 10, int delayMs = 1000)
     {
         await Task.Delay(200);
         for (int i = 0; i < maxRetries; i++)

Test/Altinn.Correspondence.Tests/Helpers/CustomWebApplicationFactory.cs

@@ -47,7 +47,8 @@ protected override void ConfigureWebHost(
             .AddJsonFile("appsettings.Development.json")
             .AddInMemoryCollection(new Dictionary<string, string?>
             {
-                ["GeneralSettings:MalwareScanBypassWhiteList"] = TestConstants.ResourceWhitelistedForMalwareScanBypass
+                ["GeneralSettings:MalwareScanBypassWhiteList"] = TestConstants.ResourceWhitelistedForMalwareScanBypass,
+                ["DatabaseOptions:ConnectionString"] = "Host=localhost:5432;Username=postgres;Password=postgres;Database=correspondence;Maximum Pool Size=50;Timeout=30"
             })
             .Build());
 
@@ -79,7 +80,6 @@ protected override void ConfigureWebHost(
             services.AddHangfireServer(options => 
             {
                 options.SchedulePollingInterval = TimeSpan.FromSeconds(1);
-                options.WorkerCount = 5;
                 options.Queues = new[] { HangfireQueues.Default, HangfireQueues.LiveMigration, HangfireQueues.Migration };
                 options.ServerTimeout = TimeSpan.FromSeconds(30);
                 options.ShutdownTimeout = TimeSpan.FromSeconds(5);

Test/Altinn.Correspondence.Tests/Helpers/TestDbContextFactory.cs

@@ -1,6 +1,7 @@
 using Altinn.Correspondence.Persistence;
 using Altinn.Correspondence.Persistence.Helpers;
 using Altinn.Correspondence.Tests.Fixtures;
+using Altinn.Correspondence.Tests.Fixtures;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
@@ -17,6 +18,9 @@ public static class TestDbContextFactory
 
     public static TestApplicationDbContext Create() => new(Options.Value);
 
+    public static UniqueViolationOnDeferredSaveDbContext CreateUniqueViolationOnDeferredSave(int onAttempt = 1)
+        => new(Options.Value, onAttempt);
+
     public static TestApplicationDbContext Create(int maxRetryCount)
     {
         var options = new DbContextOptionsBuilder<ApplicationDbContext>()

Test/Altinn.Correspondence.Tests/TestingController/Correspondence/CorrespondenceInitializationTests.cs

@@ -1328,6 +1328,32 @@ public async Task InitializeCorrespondence_WithDuplicateIdempotentKey_ReturnsCon
             Assert.Contains(CorrespondenceErrors.DuplicateInitCorrespondenceRequest.Message, errorContent);
         }
 
+        [Fact]
+        public async Task InitializeCorrespondence_WithDuplicateIdempotentKey_SkipsValidation()
+        {
+            var idempotentKey = Guid.NewGuid();
+            var validCorrespondence = new CorrespondenceBuilder()
+                .CreateCorrespondence()
+                .WithIdempotentKey(idempotentKey)
+                .Build();
+
+            var firstResponse = await _senderClient.PostAsJsonAsync("correspondence/api/v1/correspondence", validCorrespondence);
+            Assert.Equal(HttpStatusCode.OK, firstResponse.StatusCode);
+
+            var invalidIfValidated = new CorrespondenceBuilder()
+                .CreateCorrespondence()
+                .WithIdempotentKey(idempotentKey)
+                .WithExternalReferencesDialogId("not-a-guid")
+                .Build();
+
+            var duplicateResponse = await _senderClient.PostAsJsonAsync("correspondence/api/v1/correspondence", invalidIfValidated);
+
+            Assert.Equal(HttpStatusCode.Conflict, duplicateResponse.StatusCode);
+            var errorContent = await duplicateResponse.Content.ReadAsStringAsync();
+            Assert.Contains(CorrespondenceErrors.DuplicateInitCorrespondenceRequest.Message, errorContent);
+            Assert.DoesNotContain(CorrespondenceErrors.InvalidCorrespondenceDialogId.Message, errorContent);
+        }
+
         [Fact]
         public async Task InitializeCorrespondence_WithDifferentContentAndSameIdempotentKey_ShouldReturnConflict()
         {
@@ -2570,10 +2596,20 @@ public async Task WhenDialogCreationFails_PublishCorrespondenceHandlerIsStillSch
                     Statuses = new List<CorrespondenceStatusEntity>()
                 });
 
+            var idempotencyKeyRepositoryMock = new Mock<IIdempotencyKeyRepository>();
+            idempotencyKeyRepositoryMock
+                .Setup(x => x.GetByIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((IdempotencyKeyEntity?)null);
+            idempotencyKeyRepositoryMock
+                .Setup(x => x.CreateAsync(It.IsAny<IdempotencyKeyEntity>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((IdempotencyKeyEntity entity, CancellationToken _) => entity);
+
             var helper = new HangfireScheduleHelper(
                 scheduleClientMock.Object,
                 hybridCacheWrapperMock.Object,
                 scheduleRepositoryMock.Object,
+                idempotencyKeyRepositoryMock.Object,
+                TestDbContextFactory.Create(),
                 new Mock<ILogger<HangfireScheduleHelper>>().Object);
 
             await helper.SchedulePublishAfterDialogCreated(correspondenceId, CancellationToken.None);
@@ -2601,12 +2637,15 @@ s is AwaitingState &&
             var correspondenceRepositoryMock = new Mock<ICorrespondenceRepository>();
             var correspondenceStatusRepositoryMock = new Mock<ICorrespondenceStatusRepository>();
             var altinnRegisterServiceMock = new Mock<IAltinnRegisterService>();
-            var idempotencyKeyRepositoryMock = new Mock<IIdempotencyKeyRepository>();
+            var publishIdempotencyKeyRepositoryMock = new Mock<IIdempotencyKeyRepository>();
 
             publishClientMock
                 .Setup(x => x.Create(It.IsAny<Job>(), It.IsAny<IState>()))
                 .Returns(() => Guid.NewGuid().ToString());
-            idempotencyKeyRepositoryMock
+            publishIdempotencyKeyRepositoryMock
+                .Setup(x => x.GetByIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((IdempotencyKeyEntity?)null);
+            publishIdempotencyKeyRepositoryMock
                 .Setup(x => x.CreateAsync(It.IsAny<IdempotencyKeyEntity>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync((IdempotencyKeyEntity key, CancellationToken _) => key);
 
@@ -2660,7 +2699,7 @@ s is AwaitingState &&
                 correspondenceStatusRepositoryMock.Object,
                 new Mock<IContactReservationRegistryService>().Object,
                 publishClientMock.Object,
-                idempotencyKeyRepositoryMock.Object,
+                publishIdempotencyKeyRepositoryMock.Object,
                 TestDbContextFactory.Create());
 
             await publishHandler.Process(correspondenceId, null, CancellationToken.None);