test: or-2582 projections tests without starting program

src/AssociationRegistry.Admin.Api/Infrastructure/Extensions/ElasticSearchExtensions.cs

@@ -32,7 +32,7 @@ private static IServiceCollection AddMappingsForVerenigingZoek(this IServiceColl
     private static GetMappingResponse GetMappingFor<T>(this IServiceProvider serviceProvider) where T : class
         => serviceProvider.GetRequiredService<ElasticClient>().Indices.GetMapping<T>();
 
-    private static ElasticClient CreateElasticClient(ElasticSearchOptionsSection elasticSearchOptions, ILogger logger)
+    public static ElasticClient CreateElasticClient(ElasticSearchOptionsSection elasticSearchOptions, ILogger logger)
     {
         var settings = new ConnectionSettings(new Uri(elasticSearchOptions.Uri!))
                       .BasicAuthentication(

src/AssociationRegistry.Admin.ProjectionHost/Infrastructure/Program/WebApplicationBuilder/ConfigureMartenExtensions.cs

@@ -48,6 +48,27 @@ public static IServiceCollection ConfigureProjectionsWithMarten(
     private static MartenServiceCollectionExtensions.MartenConfigurationExpression AddMarten(
         IServiceCollection services,
         ConfigurationManager configurationManager)
+    {
+        var martenConfigurationExpression = services.AddMarten(
+            serviceProvider =>
+            {
+                var opts = new StoreOptions();
+
+                return ConfigureStoreOptions(opts, serviceProvider.GetRequiredService<ILogger<LocatieLookupProjection>>(), serviceProvider.GetRequiredService<ILogger<LocatieZonderAdresMatchProjection>>(), serviceProvider.GetRequiredService<IElasticRepository>(), serviceProvider.GetRequiredService<IHostEnvironment>().IsDevelopment(), serviceProvider.GetRequiredService<ILogger<BeheerZoekenEventsConsumer>>(), configurationManager.GetSection(PostgreSqlOptionsSection.SectionName)
+                                            .Get<PostgreSqlOptionsSection>());
+            });
+
+        return martenConfigurationExpression;
+    }
+
+    public static StoreOptions ConfigureStoreOptions(
+        StoreOptions opts,
+        ILogger<LocatieLookupProjection> locatieLookupLogger,
+        ILogger<LocatieZonderAdresMatchProjection> locatieZonderAdresMatchProjectionLogger,
+        IElasticRepository elasticRepository,
+        bool isDevelopment,
+        ILogger<BeheerZoekenEventsConsumer> beheerZoekenEventsConsumerLogger,
+        PostgreSqlOptionsSection? postgreSqlOptionsSection)
     {
         static string GetPostgresConnectionString(PostgreSqlOptionsSection postgreSqlOptions)
             => $"host={postgreSqlOptions.Host};" +
@@ -70,97 +91,89 @@ static JsonNetSerializer CreateCustomMartenSerializer()
             return jsonNetSerializer;
         }
 
-        var martenConfigurationExpression = services.AddMarten(
-            serviceProvider =>
-            {
-                var postgreSqlOptions = configurationManager.GetSection(PostgreSqlOptionsSection.SectionName)
-                                                            .Get<PostgreSqlOptionsSection>() ??
-                                        throw new ConfigurationErrorsException("Missing a valid postgres configuration");
+        var postgreSqlOptions = postgreSqlOptionsSection ??
+                                throw new ConfigurationErrorsException("Missing a valid postgres configuration");
 
-                var connectionString = GetPostgresConnectionString(postgreSqlOptions);
+        var connectionString = GetPostgresConnectionString(postgreSqlOptions);
 
-                var opts = new StoreOptions();
 
-                if (!string.IsNullOrEmpty(postgreSqlOptions.Schema))
-                {
-                    opts.Events.DatabaseSchemaName = postgreSqlOptions.Schema;
-                    opts.DatabaseSchemaName = postgreSqlOptions.Schema;
-                }
+        if (!string.IsNullOrEmpty(postgreSqlOptions.Schema))
+        {
+            opts.Events.DatabaseSchemaName = postgreSqlOptions.Schema;
+            opts.DatabaseSchemaName = postgreSqlOptions.Schema;
+        }
 
-                opts.Connection(connectionString);
+        opts.Connection(connectionString);
 
                 opts.OpenTelemetry.TrackConnections = TrackLevel.Normal;
                 opts.OpenTelemetry.TrackEventCounters();
 
                 opts.Events.StreamIdentity = StreamIdentity.AsString;
 
-                opts.Events.MetadataConfig.EnableAll();
+        opts.Events.MetadataConfig.EnableAll();
 
-                opts.Projections.StaleSequenceThreshold = TimeSpan.FromSeconds(30);
+        opts.Projections.StaleSequenceThreshold = TimeSpan.FromSeconds(30);
 
-                opts.Projections.DaemonLockId = 1;
+        opts.Projections.DaemonLockId = 1;
 
-                opts.Projections.Add(new BeheerVerenigingHistoriekProjection(), ProjectionLifecycle.Async);
-                opts.Projections.Add(new BeheerVerenigingDetailProjection(), ProjectionLifecycle.Async);
-                opts.Projections.Add(new PowerBiExportProjection(), ProjectionLifecycle.Async);
-                opts.Projections.Add(new BeheerKboSyncHistoriekProjection(), ProjectionLifecycle.Async);
-                opts.Projections.Add( new LocatieLookupProjection(serviceProvider.GetRequiredService<ILogger<LocatieLookupProjection>>()), ProjectionLifecycle.Async);
-                opts.Projections.Add( new LocatieZonderAdresMatchProjection(serviceProvider.GetRequiredService<ILogger<LocatieZonderAdresMatchProjection>>()), ProjectionLifecycle.Async);
+        opts.Projections.Add(new BeheerVerenigingHistoriekProjection(), ProjectionLifecycle.Async);
+        opts.Projections.Add(new BeheerVerenigingDetailProjection(), ProjectionLifecycle.Async);
+        opts.Projections.Add(new PowerBiExportProjection(), ProjectionLifecycle.Async);
+        opts.Projections.Add(new BeheerKboSyncHistoriekProjection(), ProjectionLifecycle.Async);
+        opts.Projections.Add( new LocatieLookupProjection(locatieLookupLogger), ProjectionLifecycle.Async);
+        opts.Projections.Add( new LocatieZonderAdresMatchProjection(locatieZonderAdresMatchProjectionLogger), ProjectionLifecycle.Async);
 
-                opts.Projections.Add(
-                    new MartenSubscription(
-                        new BeheerZoekenEventsConsumer(
-                            new BeheerZoekProjectionHandler(
-                                serviceProvider.GetRequiredService<IElasticRepository>()
-                            ),
-                            serviceProvider.GetRequiredService<ILogger<BeheerZoekenEventsConsumer>>())
+        opts.Projections.Add(
+            new MartenSubscription(
+                new BeheerZoekenEventsConsumer(
+                    new BeheerZoekProjectionHandler(
+                        elasticRepository
                     ),
-                    ProjectionLifecycle.Async,
-                    ProjectionNames.BeheerZoek);
-
-                opts.Projections.Add(
-                    new MartenSubscription(
-                        new DuplicateDetectionEventsConsumer(
-                            new DuplicateDetectionProjectionHandler(
-                                serviceProvider.GetRequiredService<IElasticRepository>())
-                        )
-                    ),
-                    ProjectionLifecycle.Async,
-                    ProjectionNames.DuplicateDetection);
-
-                opts.Serializer(CreateCustomMartenSerializer());
-
-                opts.RegisterDocumentType<BeheerVerenigingDetailDocument>();
-                opts.RegisterDocumentType<PowerBiExportDocument>();
-                opts.RegisterDocumentType<BeheerVerenigingHistoriekDocument>();
-                opts.RegisterDocumentType<BeheerKboSyncHistoriekGebeurtenisDocument>();
-                opts.RegisterDocumentType<LocatieLookupDocument>();
-                opts.RegisterDocumentType<LocatieZonderAdresMatchDocument>();
-
-                opts.Schema.For<LocatieLookupDocument>()
-                    .UseNumericRevisions(true)
-                    .UseOptimisticConcurrency(false);
-                opts.Schema.For<LocatieZonderAdresMatchDocument>()
-                    .UseNumericRevisions(true)
-                    .UseOptimisticConcurrency(false);
-
-                opts.Schema.For<PowerBiExportDocument>()
-                    .UseNumericRevisions(true)
-                    .UseOptimisticConcurrency(false);
-
-                if (serviceProvider.GetRequiredService<IHostEnvironment>().IsDevelopment())
-                {
-                    opts.GeneratedCodeMode = TypeLoadMode.Dynamic;
-                }
-                else
-                {
-                    opts.GeneratedCodeMode = TypeLoadMode.Static;
-                    opts.SourceCodeWritingEnabled = false;
-                }
-
-                return opts;
-            });
+                    beheerZoekenEventsConsumerLogger)
+            ),
+            ProjectionLifecycle.Async,
+            ProjectionNames.BeheerZoek);
+
+        opts.Projections.Add(
+            new MartenSubscription(
+                new DuplicateDetectionEventsConsumer(
+                    new DuplicateDetectionProjectionHandler(
+                        elasticRepository)
+                )
+            ),
+            ProjectionLifecycle.Async,
+            ProjectionNames.DuplicateDetection);
+
+        opts.Serializer(CreateCustomMartenSerializer());
+
+        opts.RegisterDocumentType<BeheerVerenigingDetailDocument>();
+        opts.RegisterDocumentType<PowerBiExportDocument>();
+        opts.RegisterDocumentType<BeheerVerenigingHistoriekDocument>();
+        opts.RegisterDocumentType<BeheerKboSyncHistoriekGebeurtenisDocument>();
+        opts.RegisterDocumentType<LocatieLookupDocument>();
+        opts.RegisterDocumentType<LocatieZonderAdresMatchDocument>();
+
+        opts.Schema.For<LocatieLookupDocument>()
+            .UseNumericRevisions(true)
+            .UseOptimisticConcurrency(false);
+        opts.Schema.For<LocatieZonderAdresMatchDocument>()
+            .UseNumericRevisions(true)
+            .UseOptimisticConcurrency(false);
+
+        opts.Schema.For<PowerBiExportDocument>()
+            .UseNumericRevisions(true)
+            .UseOptimisticConcurrency(false);
+
+        if (isDevelopment)
+        {
+            opts.GeneratedCodeMode = TypeLoadMode.Dynamic;
+        }
+        else
+        {
+            opts.GeneratedCodeMode = TypeLoadMode.Static;
+            opts.SourceCodeWritingEnabled = false;
+        }
 
-        return martenConfigurationExpression;
+        return opts;
     }
 }

src/AssociationRegistry.Public.Api/Infrastructure/Extensions/ConfigurationExtensions.cs

@@ -1,7 +1,7 @@
 namespace AssociationRegistry.Public.Api.Infrastructure.Extensions;
 
-using ConfigurationBindings;
 using Framework;
+using Hosts.Configuration.ConfigurationBindings;
 using Microsoft.Extensions.Configuration;
 using System;
 
@@ -10,8 +10,8 @@ public static class ConfigurationExtensions
     public static AssociationRegistry.Hosts.Configuration.ConfigurationBindings.PostgreSqlOptionsSection GetPostgreSqlOptionsSection(this IConfiguration configuration)
     {
         var postgreSqlOptionsSection = configuration
-                                      .GetSection(PostgreSqlOptionsSection.Name)
-                                      .Get<AssociationRegistry.Hosts.Configuration.ConfigurationBindings.PostgreSqlOptionsSection>();
+                                      .GetSection(PostgreSqlOptionsSection.SectionName)
+                                      .Get<PostgreSqlOptionsSection>();
 
         postgreSqlOptionsSection.ThrowIfInvalid();
 

src/AssociationRegistry.Public.Api/Infrastructure/Extensions/ElasticSearchExtensions.cs

@@ -1,13 +1,9 @@
 namespace AssociationRegistry.Public.Api.Infrastructure.Extensions;
 
-using ConfigurationBindings;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Identity.Client;
+using Hosts.Configuration.ConfigurationBindings;
 using Nest;
 using Schema;
 using Schema.Search;
-using System;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
@@ -18,8 +14,13 @@ public static IServiceCollection AddElasticSearch(
         this IServiceCollection services,
         ElasticSearchOptionsSection elasticSearchOptions)
     {
-        services.AddSingleton<ElasticClient>(serviceProvider => CreateElasticClient(elasticSearchOptions, serviceProvider.GetRequiredService<ILogger<ElasticClient>>()));
-        services.AddSingleton<IElasticClient>(serviceProvider => CreateElasticClient(elasticSearchOptions, serviceProvider.GetRequiredService<ILogger<ElasticClient>>()));
+        services.AddSingleton<ElasticClient>(serviceProvider
+                                                 => CreateElasticClient(elasticSearchOptions,
+                                                                        serviceProvider.GetRequiredService<ILogger<ElasticClient>>()));
+
+        services.AddSingleton<IElasticClient>(serviceProvider
+                                                  => CreateElasticClient(elasticSearchOptions,
+                                                                         serviceProvider.GetRequiredService<ILogger<ElasticClient>>()));
 
         services.AddSingleton(serviceProvider =>
         {
@@ -32,28 +33,28 @@ public static IServiceCollection AddElasticSearch(
         return services;
     }
 
-    private static ElasticClient CreateElasticClient(ElasticSearchOptionsSection elasticSearchOptions, ILogger logger)
+    public static ElasticClient CreateElasticClient(ElasticSearchOptionsSection elasticSearchOptions, ILogger logger)
     {
         var settings = new ConnectionSettings(
                            new Uri(elasticSearchOptions.Uri!))
                       .BasicAuthentication(
                            elasticSearchOptions.Username,
                            elasticSearchOptions.Password)
-                     .ServerCertificateValidationCallback((o, certificate, arg3, arg4) =>
-                      {
-                          logger.LogWarning("Policy errors: [{Cert}|{Chain}] {Error}", certificate.Subject, arg3, arg4.ToString());
-                          logger.LogWarning("Policy object: {@Error}", o);
+                      .ServerCertificateValidationCallback((o, certificate, arg3, arg4) =>
+                       {
+                           logger.LogWarning("Policy errors: [{Cert}|{Chain}] {Error}", certificate.Subject, arg3, arg4.ToString());
+                           logger.LogWarning("Policy object: {@Error}", o);
 
-                          if (arg4 != SslPolicyErrors.None)
-                          {
-                              logger.LogWarning(Convert.ToBase64String(certificate.Export(X509ContentType.Cert),
-                                                                       Base64FormattingOptions.InsertLineBreaks));
+                           if (arg4 != SslPolicyErrors.None)
+                           {
+                               logger.LogWarning(Convert.ToBase64String(certificate.Export(X509ContentType.Cert),
+                                                                        Base64FormattingOptions.InsertLineBreaks));
 
-                              LogCertificateDetails(certificate, arg3);
-                          }
+                               LogCertificateDetails(certificate, arg3);
+                           }
 
-                          return true;
-                      })
+                           return true;
+                       })
                       .IncludeServerStackTraceOnError()
                       .MapVerenigingDocument(elasticSearchOptions.Indices!.Verenigingen!);