Merge pull request #62 from Informatievlaanderen/feat/or-1244_small_r…

…efactor feat: or-1244 rename repo.save -> repo.index + async
Informatievlaanderen · Oct 19, 2022 · 32578d0 · 32578d0
2 parents 4ec880c + bda4c98
commit 32578d0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/src/AssociationRegistry.Public.Api/Projections/ElasticEventHandler.cs b/src/AssociationRegistry.Public.Api/Projections/ElasticEventHandler.cs
@@ -1,6 +1,7 @@
 namespace AssociationRegistry.Public.Api.Projections;
 
 using System.Linq;
+using System.Threading.Tasks;
 using Events;
 using SearchVerenigingen;
 
@@ -15,8 +16,8 @@ public ElasticEventHandler(IElasticRepository elasticRepository, IVerenigingBrol
         _brolFeeder = brolFeeder;
     }
 
-    public void HandleEvent(VerenigingWerdGeregistreerd message)
-        => _elasticRepository.Save(
+    public async Task HandleEvent(VerenigingWerdGeregistreerd message)
+        => await _elasticRepository.IndexAsync(
             new VerenigingDocument(
                 message.VCode,
                 message.Naam,

diff --git a/src/AssociationRegistry.Public.Api/Projections/ElasticRepository.cs b/src/AssociationRegistry.Public.Api/Projections/ElasticRepository.cs
@@ -1,5 +1,6 @@
 namespace AssociationRegistry.Public.Api.Projections;
 
+using System.Threading.Tasks;
 using Nest;
 
 public class ElasticRepository : IElasticRepository
@@ -11,7 +12,7 @@ public ElasticRepository(IElasticClient elasticClient)
         _elasticClient = elasticClient;
     }
 
-    public void Save<TDocument>(TDocument document)
+    public void Index<TDocument>(TDocument document)
         where TDocument : class
     {
         var response = _elasticClient.IndexDocument(document);
@@ -22,4 +23,16 @@ public void Save<TDocument>(TDocument document)
             throw new IndexDocumentFailed(response.DebugInformation);
         }
     }
+
+    public async Task IndexAsync<TDocument>(TDocument document)
+        where TDocument : class
+    {
+        var response = await _elasticClient.IndexDocumentAsync(document);
+
+        if (!response.IsValid)
+        {
+            // todo: log ? (should never happen in test/staging/production)
+            throw new IndexDocumentFailed(response.DebugInformation);
+        }
+    }
 }
diff --git a/src/AssociationRegistry.Public.Api/Projections/IElasticRepository.cs b/src/AssociationRegistry.Public.Api/Projections/IElasticRepository.cs
@@ -1,7 +1,12 @@
 namespace AssociationRegistry.Public.Api.Projections;
 
+using System.Threading.Tasks;
+
 public interface IElasticRepository
 {
-    void Save<TDocument>(TDocument document)
+    void Index<TDocument>(TDocument document)
+        where TDocument : class;
+
+    Task IndexAsync<TDocument>(TDocument document)
         where TDocument : class;
 }
diff --git a/src/AssociationRegistry.Public.Api/Projections/MartenEventsConsumer.cs b/src/AssociationRegistry.Public.Api/Projections/MartenEventsConsumer.cs
@@ -15,12 +15,10 @@ public MartenEventsConsumer(ElasticEventHandler eventHandler)
         _eventHandler = eventHandler;
     }
 
-    public Task ConsumeAsync(IReadOnlyList<StreamAction> streamActions)
+    public async Task ConsumeAsync(IReadOnlyList<StreamAction> streamActions)
     {
         foreach (var @event in streamActions.SelectMany(streamAction => streamAction.Events))
             if (@event.EventType == typeof(VerenigingWerdGeregistreerd))
-                _eventHandler.HandleEvent((VerenigingWerdGeregistreerd)@event.Data);
-
-        return Task.CompletedTask;
+                await _eventHandler.HandleEvent((VerenigingWerdGeregistreerd)@event.Data);
     }
 }
diff --git a/...t/Projections.Tests/When_Saving_A_Document_To_Elastic/Given_A_Valid_VerenigingDocument.cs b/...t/Projections.Tests/When_Saving_A_Document_To_Elastic/Given_A_Valid_VerenigingDocument.cs
@@ -26,7 +26,7 @@ public void Then_it_does_not_throw_an_exception()
         var fixture = new Fixture();
 
         _classFixture.ElasticRepository
-            .Save(
+            .Index(
                 new VerenigingDocument(
                     fixture.Create<string>(),
                     fixture.Create<string>(),