Unlock init

Altinn · Oct 16, 2024 · 085ecae · 085ecae
1 parent 461f060
commit 085ecae
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/src/Digdir.Domain.Dialogporten.Domain/DomainExtensions.cs b/src/Digdir.Domain.Dialogporten.Domain/DomainExtensions.cs
@@ -0,0 +1,12 @@
+using Digdir.Domain.Dialogporten.Domain.Common.EventPublisher;
+
+namespace Digdir.Domain.Dialogporten.Domain;
+
+public static class DomainExtensions
+{
+    public static IEnumerable<Type> GetDomainEventTypes()
+        => DomainAssemblyMarker.Assembly
+            .GetTypes()
+            .Where(x => !x.IsAbstract && !x.IsInterface && !x.IsGenericType)
+            .Where(x => x.IsAssignableTo(typeof(IDomainEvent)));
+}
diff --git a/src/Digdir.Domain.Dialogporten.Domain/MediaTypes.cs b/src/Digdir.Domain.Dialogporten.Domain/MediaTypes.cs
@@ -1,5 +1,3 @@
-using Digdir.Domain.Dialogporten.Domain.Common.EventPublisher;
-
 namespace Digdir.Domain.Dialogporten.Domain;
 
 public static class MediaTypes
@@ -12,12 +10,3 @@ public static class MediaTypes
     public const string Markdown = "text/markdown";
     public const string PlainText = "text/plain";
 }
-
-public static class DomainExtensions
-{
-    public static IEnumerable<Type> GetDomainEventTypes()
-        => DomainAssemblyMarker.Assembly
-            .GetTypes()
-            .Where(x => !x.IsAbstract && !x.IsInterface && !x.IsGenericType)
-            .Where(x => x.IsAssignableTo(typeof(IDomainEvent)));
-}
diff --git a/...rten.Infrastructure/Persistence/IdempotentNotifications/INotificationProcessingContext.cs b/...rten.Infrastructure/Persistence/IdempotentNotifications/INotificationProcessingContext.cs
@@ -94,18 +94,26 @@ public async ValueTask DisposeAsync()
     internal async Task Initialize(bool isFirstAttempt = false, CancellationToken cancellationToken = default)
     {
         await _initializeLock.WaitAsync(cancellationToken);
-        if (_serviceScope is not null)
+
+        try
         {
-            return;
+            if (_serviceScope is not null)
+            {
+                throw new InvalidOperationException("Transaction already started.");
+            }
+
+            _serviceScope = _serviceScopeFactory.CreateScope();
+            _db = _serviceScope.ServiceProvider.GetRequiredService<DialogDbContext>();
+            if (!isFirstAttempt)
+            {
+                await _db.NotificationAcknowledgements
+                    .Where(x => x.EventId == _eventId)
+                    .LoadAsync(cancellationToken);
+            }
         }
-
-        _serviceScope = _serviceScopeFactory.CreateScope();
-        _db = _serviceScope.ServiceProvider.GetRequiredService<DialogDbContext>();
-        if (!isFirstAttempt)
+        finally
         {
-            await _db.NotificationAcknowledgements
-                .Where(x => x.EventId == _eventId)
-                .LoadAsync(cancellationToken);
+            _initializeLock.Release();
         }
     }