Merge branch 'develop'

src/BuildingBlocks/EFCore/Extensions.cs

@@ -1,6 +1,5 @@
 using System.Linq.Expressions;
 using BuildingBlocks.Core.Model;
-using BuildingBlocks.PersistMessageProcessor.Data;
 using BuildingBlocks.Web;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -114,9 +113,6 @@ private static async Task MigrateDatabaseAsync<TContext>(IServiceProvider servic
     {
         using var scope = serviceProvider.CreateScope();
 
-        var persistMessageContext = scope.ServiceProvider.GetRequiredService<PersistMessageDbContext>();
-        await persistMessageContext.Database.MigrateAsync();
-
         var context = scope.ServiceProvider.GetRequiredService<TContext>();
         await context.Database.MigrateAsync();
     }

src/BuildingBlocks/PersistMessageProcessor/Data/PersistMessageDbContext.cs

@@ -57,6 +57,29 @@ public override async Task<int> SaveChangesAsync(CancellationToken cancellationT
         }
     }
 
+    public void CreatePersistMessageTable()
+    {
+        if (Database.GetPendingMigrations().Any())
+        {
+            throw new InvalidOperationException("Cannot create table if there are pending migrations.");
+        }
+
+        string createTableSql = @"
+            create table if not exists persist_message (
+            id uuid not null,
+            data_type text,
+            data text,
+            created timestamp with time zone not null,
+            retry_count integer not null,
+            message_status text not null default 'InProgress'::text,
+            delivery_type text not null default 'Outbox'::text,
+            version bigint not null,
+            constraint pk_persist_message primary key (id)
+            )";
+
+        Database.ExecuteSqlRaw(createTableSql);
+    }
+
     private void OnBeforeSaving()
     {
         try

src/BuildingBlocks/PersistMessageProcessor/Extensions.cs

@@ -30,7 +30,15 @@ public static IServiceCollection AddPersistMessageProcessor(this IServiceCollect
                 .UseSnakeCaseNamingConvention();
         });
 
-        services.AddScoped<IPersistMessageDbContext>(provider => provider.GetService<PersistMessageDbContext>());
+        services.AddScoped<IPersistMessageDbContext>(provider =>
+        {
+            var persistMessageDbContext = provider.GetRequiredService<PersistMessageDbContext>();
+
+            persistMessageDbContext.Database.EnsureCreated();
+            persistMessageDbContext.CreatePersistMessageTable();
+
+            return persistMessageDbContext;
+        });
 
         services.AddScoped<IPersistMessageProcessor, PersistMessageProcessor>();
 
@@ -41,19 +49,4 @@ public static IServiceCollection AddPersistMessageProcessor(this IServiceCollect
 
         return services;
     }
-
-    public static IApplicationBuilder UseMigrationPersistMessage<TContext>(this IApplicationBuilder app,
-        IWebHostEnvironment env)
-        where TContext : DbContext, IPersistMessageDbContext
-    {
-        using var scope = app.ApplicationServices.CreateScope();
-
-        var persistMessageContext = scope.ServiceProvider.GetRequiredService<PersistMessageDbContext>();
-        persistMessageContext.Database.Migrate();
-
-        var context = scope.ServiceProvider.GetRequiredService<TContext>();
-        context.Database.Migrate();
-
-        return app;
-    }
 }

src/Services/Booking/src/Booking/Extensions/Infrastructure/InfrastructureExtensions.cs

@@ -24,8 +24,6 @@
 
 namespace Booking.Extensions.Infrastructure;
 
-using BuildingBlocks.PersistMessageProcessor.Data;
-
 public static class InfrastructureExtensions
 {
     public static WebApplicationBuilder AddInfrastructure(this WebApplicationBuilder builder)
@@ -97,7 +95,6 @@ public static WebApplication UseInfrastructure(this WebApplication app)
         });
         app.UseCorrelationId();
         app.UseHttpMetrics();
-        app.UseMigrationPersistMessage<PersistMessageDbContext>(env);
         app.UseCustomHealthCheck();
         app.MapMetrics();
         app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name));

src/Services/Flight/src/Flight/Extensions/Infrastructure/InfrastructureExtensions.cs

@@ -102,7 +102,6 @@ public static WebApplication UseInfrastructure(this WebApplication app)
         });
         app.UseCorrelationId();
         app.UseHttpMetrics();
-        app.UseMigrationPersistMessage<PersistMessageDbContext>(env);
         app.UseMigration<FlightDbContext>(env);
         app.MapMetrics();
         app.UseCustomHealthCheck();

src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs

@@ -99,7 +99,6 @@ public static WebApplication UseInfrastructure(this WebApplication app)
         {
             options.EnrichDiagnosticContext = LogEnrichHelper.EnrichFromRequest;
         });
-        app.UseMigrationPersistMessage<PersistMessageDbContext>(env);
         app.UseMigration<IdentityContext>(env);
         app.UseCorrelationId();
         app.UseHttpMetrics();

src/Services/Passenger/src/Passenger/Extensions/Infrastructure/InfrastructureExtensions.cs

@@ -26,8 +26,6 @@
 
 namespace Passenger.Extensions.Infrastructure;
 
-using BuildingBlocks.PersistMessageProcessor.Data;
-
 public static class InfrastructureExtensions
 {
     public static WebApplicationBuilder AddInfrastructure(this WebApplicationBuilder builder)
@@ -94,7 +92,6 @@ public static WebApplication UseInfrastructure(this WebApplication app)
         {
             options.EnrichDiagnosticContext = LogEnrichHelper.EnrichFromRequest;
         });
-        app.UseMigrationPersistMessage<PersistMessageDbContext>(env);
         app.UseMigration<PassengerDbContext>(env);
         app.UseCorrelationId();
         app.UseHttpMetrics();