Merge remote-tracking branch 'origin/main'

Author: alexeyzimarev

Bookings.Payments/Program.cs

@@ -10,27 +10,25 @@
 Logging.ConfigureLog();
 
 var builder = WebApplication.CreateBuilder(args);
+builder.Host.UseSerilog();
 
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-
 // OpenTelemetry instrumentation must be added before adding Eventuous services
 builder.Services.AddOpenTelemetry();
-
-builder.Services.AddServices(builder.Configuration);
-builder.Host.UseSerilog();
+builder.Services.AddEventuous(builder.Configuration);
 
 var app = builder.Build();
-app.AddEventuousLogs();
 
-app.UseSwagger();
+app.AddEventuousLogs();
+app.UseSwagger().UseSwaggerUI();
 app.UseOpenTelemetryPrometheusScrapingEndpoint();
 
 // Here we discover commands by their annotations
 // app.MapDiscoveredCommands();
 app.MapDiscoveredCommands<Payment>();
 
-app.UseSwaggerUI();
+
 
 if (app.Configuration.GetValue<bool>("Postgres:InitializeDatabase")) {
     await InitialiseSchema(app);

Bookings.Payments/Registrations.cs

@@ -17,7 +17,7 @@
 namespace Bookings.Payments;
 
 public static class Registrations {
-    public static void AddServices(this IServiceCollection services, IConfiguration configuration) {
+    public static void AddEventuous(this IServiceCollection services, IConfiguration configuration) {
         NpgsqlConnection GetConnection() => new(configuration["Postgres:ConnectionString"]);
 
         var connectionFactory = new ConnectionFactory {
@@ -27,6 +27,7 @@ public static void AddServices(this IServiceCollection services, IConfiguration
 
         services.AddSingleton(connectionFactory);
         services.AddSingleton((GetPostgresConnection)GetConnection);
+        services.AddSingleton(new PostgresStoreOptions());
         services.AddAggregateStore<PostgresStore>();
         services.AddApplicationService<CommandService, Payment>();
         services.AddSingleton(Mongo.ConfigureMongo(configuration));