- use test container for default database mssql

- use test container for default broker rabbitmq
- change structure persist-message-db

deployments/docker-compose/docker-compose.yaml

@@ -19,10 +19,8 @@ services:
       - db
       - rabbitmq
       - jaeger
-      - eventstore.db
       - elasticsearch
       - kibana
-      # - mongo
     volumes:
       - '${USERPROFILE}\.aspnet\https:/https/'
     environment:
@@ -52,10 +50,9 @@ services:
       - db
       - rabbitmq
       - jaeger
-      - eventstore.db
       - elasticsearch
       - kibana
-      # - mongo
+      - mongo
     volumes:
       - '${USERPROFILE}\.aspnet\https:/https/'
     environment:
@@ -85,10 +82,8 @@ services:
       - db
       - rabbitmq
       - jaeger
-      - eventstore.db
       - elasticsearch
       - kibana
-      # - mongo
     volumes:
       - '${USERPROFILE}\.aspnet\https:/https/'
     environment:
@@ -118,10 +113,9 @@ services:
       - db
       - rabbitmq
       - jaeger
-      - eventstore.db
       - elasticsearch
       - kibana
-      # - mongo
+      - mongo
     volumes:
       - '${USERPROFILE}\.aspnet\https:/https/'
     environment:
@@ -154,7 +148,7 @@ services:
       - eventstore.db
       - elasticsearch
       - kibana
-      # - mongo
+      - mongo
     volumes:
       - '${USERPROFILE}\.aspnet\https:/https/'
     environment:
@@ -166,6 +160,37 @@ services:
       - booking
 
 
+    #######################################################
+    #  SqlServer
+    #######################################################
+  db:
+    container_name: sqldb
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    restart: unless-stopped
+    ports:
+      - "1433:1433"
+    environment:
+      SA_PASSWORD: "@Aa123456"
+      ACCEPT_EULA: "Y"
+    networks:
+      - booking
+
+
+#    ######################################################
+#    #  Postgres
+#    ######################################################
+#  postgres:
+#    image: postgres:latest
+#    container_name: postgres
+#    restart: on-failure
+#    ports:
+#      - '5432:5432'
+#    environment:
+#      - POSTGRES_USER=postgres
+#      - POSTGRES_PASSWORD=postgres
+#    networks:
+#      - booking
+
 
     #######################################################
     #  Rabbitmq
@@ -181,22 +206,6 @@ services:
       - booking
 
 
-    #######################################################
-    #  SqlServer
-    #######################################################
-  db:
-    container_name: sqldb
-    image: mcr.microsoft.com/mssql/server:2017-latest
-    restart: unless-stopped
-    ports:
-      - "1433:1433"
-    environment:
-      SA_PASSWORD: "@Aa123456"
-      ACCEPT_EULA: "Y"
-    networks:
-      - booking
-
-
     #######################################################
     #  Jaeger
     #######################################################

deployments/docker-compose/infrastracture.yaml

@@ -20,7 +20,7 @@ services:
     #######################################################
   db:
     container_name: sqldb
-    image: mcr.microsoft.com/mssql/server:2017-latest
+    image: mcr.microsoft.com/mssql/server:2022-latest
     restart: unless-stopped
     ports:
       - "1433:1433"
@@ -31,6 +31,21 @@ services:
       - booking
 
 
+#    #######################################################
+#    #  Postgres
+#    ######################################################
+#  postgres:
+#    image: postgres:latest
+#    container_name: postgres
+#    restart: on-failure
+#    ports:
+#      - '5432:5432'
+#    environment:
+#      - POSTGRES_USER=postgres
+#      - POSTGRES_PASSWORD=postgres
+#    networks:
+#      - booking
+
     #######################################################
     #  Jaeger
     #######################################################
@@ -125,6 +140,18 @@ services:
    networks:
     - booking
 
+    #######################################################
+    #  Redis
+    #######################################################
+  redis:
+    image: redis
+    container_name: redis
+    restart: unless-stopped
+    networks:
+      - booking
+    ports:
+      - 6379:6379
+
 
 
 networks:
@@ -141,3 +168,4 @@ volumes:
 
 
 
+

src/BuildingBlocks/BuildingBlocks.csproj

@@ -27,6 +27,10 @@
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
     <PackageReference Include="Grpc.Core.Testing" Version="2.46.5" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
     <PackageReference Include="Mongo2Go" Version="3.1.3" />
@@ -123,7 +127,7 @@
     <PackageReference Include="Bogus" Version="34.0.2" />
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
     <PackageReference Include="MediatR" Version="9.0.0" />
-    <PackageReference Include="Respawn" Version="4.0.0" />
+    <PackageReference Include="Respawn" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
     <PackageReference Include="Moq" Version="4.18.2" />

src/BuildingBlocks/EFCore/AppDbContextBase.cs

@@ -2,8 +2,8 @@ using System.Collections.Immutable;
 using System.Data;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Core.Model;
+using BuildingBlocks.PersistMessageProcessor;
 using BuildingBlocks.Utils;
-using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 
@@ -11,6 +11,8 @@ namespace BuildingBlocks.EFCore;
 
 public abstract class AppDbContextBase : DbContext, IDbContext
 {
+    public const string DefaultSchema = "dbo";
+
     private readonly ICurrentUserProvider _currentUserProvider;
 
     private IDbContextTransaction _currentTransaction;

src/BuildingBlocks/EFCore/DatabaseOptions.cs

@@ -1,6 +1,6 @@
 namespace BuildingBlocks.EFCore;
 
-public class ConnectionStrings
+public class DatabaseOptions
 {
     public string DefaultConnection { get; set; }
 }

src/BuildingBlocks/EFCore/Extensions.cs

@@ -1,6 +1,7 @@
 using System.Linq.Expressions;
 using BuildingBlocks.Core.Model;
-using BuildingBlocks.PersistMessageProcessor.Data;
+using BuildingBlocks.PersistMessageProcessor;
+using BuildingBlocks.Web;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
@@ -18,14 +19,17 @@ public static class Extensions
         IConfiguration configuration)
         where TContext : DbContext, IDbContext
     {
-        services.AddOptions<ConnectionStrings>()
+        services.AddOptions<DatabaseOptions>()
-            .Bind(configuration.GetSection(nameof(ConnectionStrings)))
+            .Bind(configuration.GetSection(nameof(DatabaseOptions)))
             .ValidateDataAnnotations();
 
-        services.AddDbContext<TContext>(options =>
+        services.AddDbContext<TContext>((sp, options) =>
-            options.UseSqlServer(
+        {
-                configuration.GetConnectionString("DefaultConnection"),
+            var databaseOptions = services.GetOptions<DatabaseOptions>(nameof(DatabaseOptions));
-                x => x.MigrationsAssembly(typeof(TContext).Assembly.GetName().Name)));
+
+            options.UseSqlServer(databaseOptions?.DefaultConnection,
+                dbOptions => dbOptions.MigrationsAssembly(typeof(TContext).Assembly.GetName().Name));
+        });
 
         services.AddScoped<IDbContext>(provider => provider.GetService<TContext>());
 
@@ -67,10 +71,8 @@ public static class Extensions
     {
         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/EFCore/IDbContext.cs

@@ -1,12 +1,13 @@
 using BuildingBlocks.Core.Event;
+using BuildingBlocks.PersistMessageProcessor;
 using Microsoft.EntityFrameworkCore;
 
 namespace BuildingBlocks.EFCore;
 
 public interface IDbContext
 {
-    DbSet<TEntity> Set<TEntity>()
+    DbSet<TEntity> Set<TEntity>() where TEntity : class;
-        where TEntity : class;
+    DbSet<PersistMessage> PersistMessages => Set<PersistMessage>();
 
     IReadOnlyList<IDomainEvent> GetDomainEvents();
     Task BeginTransactionAsync(CancellationToken cancellationToken = default);

src/BuildingBlocks/HealthCheck/Extensions.cs

@@ -3,7 +3,6 @@ using BuildingBlocks.Logging;
 using BuildingBlocks.MassTransit;
 using BuildingBlocks.Mongo;
 using BuildingBlocks.Web;
-using DotNetCore.CAP.MongoDB;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
@@ -17,11 +16,11 @@ public static class Extensions
 {
     public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services)
     {
-        var appOptions = services.GetOptions<AppOptions>("AppOptions");
+        var appOptions = services.GetOptions<AppOptions>(nameof(AppOptions));
-        var sqlOptions = services.GetOptions<ConnectionStrings>("ConnectionStrings");
+        var sqlOptions = services.GetOptions<DatabaseOptions>(nameof(DatabaseOptions));
-        var rabbitMqOptions = services.GetOptions<RabbitMqOptions>("RabbitMq");
+        var rabbitMqOptions = services.GetOptions<RabbitMqOptions>(nameof(RabbitMqOptions));
-        var mongoOptions = services.GetOptions<MongoOptions>("MongoOptions");
+        var mongoOptions = services.GetOptions<MongoOptions>(nameof(MongoOptions));
-        var logOptions = services.GetOptions<LogOptions>("LogOptions");
+        var logOptions = services.GetOptions<LogOptions>(nameof(LogOptions));
 
         var healthChecksBuilder = services.AddHealthChecks()
             .AddRabbitMQ(rabbitConnectionString: $"amqp://{rabbitMqOptions.UserName}:{rabbitMqOptions.Password}@{rabbitMqOptions.HostName}")

src/BuildingBlocks/MassTransit/Extensions.cs

@@ -46,7 +46,7 @@ public static class Extensions
 
         configure.UsingRabbitMq((context, configurator) =>
         {
-            var rabbitMqOptions = services.GetOptions<RabbitMqOptions>("RabbitMq");
+            var rabbitMqOptions = services.GetOptions<RabbitMqOptions>(nameof(RabbitMqOptions));
             var host = IsRunningInContainer ? "rabbitmq" : rabbitMqOptions.HostName;
 
             configurator.Host(host, rabbitMqOptions?.Port ?? 5672, "/", h =>

src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs

@@ -1,16 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-
-namespace BuildingBlocks.PersistMessageProcessor.Data;
-
-public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<PersistMessageDbContext>
-{
-    public PersistMessageDbContext CreateDbContext(string[] args)
-    {
-        var builder = new DbContextOptionsBuilder<PersistMessageDbContext>();
-
-        builder.UseSqlServer(
-            "Data Source=.\\sqlexpress;Initial Catalog=PersistMessageDB;Persist Security Info=False;Integrated Security=SSPI");
-        return new PersistMessageDbContext(builder.Options);
-    }
-}

src/BuildingBlocks/PersistMessageProcessor/Data/Migrations/20220728155556_initial.Designer.cs

@@ -1,69 +0,0 @@
-// <auto-generated />
-using System;
-using Booking.Data;
-using BuildingBlocks.PersistMessageProcessor.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Booking.Data.Migrations
-{
-    [DbContext(typeof(PersistMessageDbContext))]
-    [Migration("20220728155556_initial")]
-    partial class initial
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
-
-            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ApplicationName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("Created")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Data")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DataType")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeliveryType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .IsUnicode(false)
-                        .HasColumnType("varchar(50)");
-
-                    b.Property<string>("MessageStatus")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .IsUnicode(false)
-                        .HasColumnType("varchar(50)");
-
-                    b.Property<int>("RetryCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PersistMessage", "dbo");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/BuildingBlocks/PersistMessageProcessor/Data/Migrations/20220728155556_initial.cs

@@ -1,41 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Booking.Data.Migrations
-{
-    public partial class initial : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.EnsureSchema(
-                name: "dbo");
-
-            migrationBuilder.CreateTable(
-                name: "PersistMessage",
-                schema: "dbo",
-                columns: table => new
-                {
-                    Id = table.Column<long>(type: "bigint", nullable: false),
-                    DataType = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Data = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Created = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    RetryCount = table.Column<int>(type: "int", nullable: false),
-                    MessageStatus = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false),
-                    DeliveryType = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_PersistMessage", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "PersistMessage",
-                schema: "dbo");
-        }
-    }
-}

src/BuildingBlocks/PersistMessageProcessor/Data/Migrations/PersistMessageDbContextModelSnapshot.cs

@@ -1,63 +0,0 @@
-// <auto-generated />
-using System;
-using Booking.Data;
-using BuildingBlocks.PersistMessageProcessor.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Booking.Data.Migrations
-{
-    [DbContext(typeof(PersistMessageDbContext))]
-    partial class PersistMessageDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
-
-            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    b.Property<DateTime>("Created")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Data")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DataType")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("DeliveryType")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .IsUnicode(false)
-                        .HasColumnType("varchar(50)");
-
-                    b.Property<string>("MessageStatus")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .IsUnicode(false)
-                        .HasColumnType("varchar(50)");
-
-                    b.Property<int>("RetryCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PersistMessage", "dbo");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

src/BuildingBlocks/PersistMessageProcessor/Data/PersistMessageDbContext.cs

@@ -1,23 +0,0 @@
-using BuildingBlocks.EFCore;
-using BuildingBlocks.PersistMessageProcessor.Data.Configurations;
-using BuildingBlocks.Utils;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
-
-namespace BuildingBlocks.PersistMessageProcessor.Data;
-
-public class PersistMessageDbContext : AppDbContextBase, IPersistMessageDbContext
-{
-    public const string DefaultSchema = "dbo";
-
-    public PersistMessageDbContext(DbContextOptions<PersistMessageDbContext> options)
-        : base(options)
-    {
-    }
-
-    protected override void OnModelCreating(ModelBuilder builder)
-    {
-        builder.ApplyConfiguration(new PersistMessageConfiguration());
-        base.OnModelCreating(builder);
-    }
-}

src/BuildingBlocks/PersistMessageProcessor/Data/readme.md

@@ -1,2 +0,0 @@
-dotnet ef migrations add initial --context PersistMessageDbContext -o "Data\Migrations"
-dotnet ef database update --context PersistMessageDbContext

src/BuildingBlocks/PersistMessageProcessor/Extensions.cs

@@ -1,28 +1,11 @@
-using BuildingBlocks.Core;
+using Microsoft.Extensions.DependencyInjection;
-using BuildingBlocks.PersistMessageProcessor.Data;
-using BuildingBlocks.Web;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace BuildingBlocks.PersistMessageProcessor;
 
 public static class Extensions
 {
-    public static IServiceCollection AddPersistMessage(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddPersistMessageProcessor(this IServiceCollection services)
     {
-        services.AddOptions<PersistMessageOptions>()
-            .Bind(configuration.GetSection(nameof(PersistMessageOptions)))
-            .ValidateDataAnnotations();
-
-        var persistMessageOptions = services.GetOptions<PersistMessageOptions>("PersistMessageOptions");
-
-        services.AddDbContext<PersistMessageDbContext>(options =>
-            options.UseSqlServer(persistMessageOptions.ConnectionString,
-                x => x.MigrationsAssembly(typeof(PersistMessageDbContext).Assembly.GetName().Name)));
-
-        services.AddScoped<IPersistMessageDbContext>(provider => provider.GetService<PersistMessageDbContext>());
-
         services.AddScoped<IPersistMessageProcessor, PersistMessageProcessor>();
         services.AddHostedService<PersistMessageBackgroundService>();
 

src/BuildingBlocks/PersistMessageProcessor/IPersistMessageDbContext.cs

@@ -1,9 +0,0 @@
-using BuildingBlocks.EFCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace BuildingBlocks.PersistMessageProcessor;
-
-public interface IPersistMessageDbContext : IDbContext
-{
-    DbSet<PersistMessage> PersistMessages => Set<PersistMessage>();
-}

src/BuildingBlocks/PersistMessageProcessor/PersistMessageProcessor.cs

@@ -2,6 +2,7 @@
 using System.Text.Json;
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core.Event;
+using BuildingBlocks.EFCore;
 using BuildingBlocks.IdsGenerator;
 using BuildingBlocks.Utils;
 using MassTransit;
@@ -15,18 +16,18 @@ public class PersistMessageProcessor : IPersistMessageProcessor
 {
     private readonly ILogger<PersistMessageProcessor> _logger;
     private readonly IMediator _mediator;
-    private readonly IPersistMessageDbContext _persistMessageDbContext;
+    private readonly IDbContext _dbContext;
     private readonly IPublishEndpoint _publishEndpoint;
 
     public PersistMessageProcessor(
         ILogger<PersistMessageProcessor> logger,
         IMediator mediator,
-        IPersistMessageDbContext persistMessageDbContext,
+        IDbContext dbContext,
         IPublishEndpoint publishEndpoint)
     {
         _logger = logger;
         _mediator = mediator;
-        _persistMessageDbContext = persistMessageDbContext;
+        _dbContext = dbContext;
         _publishEndpoint = publishEndpoint;
     }
 
@@ -54,13 +55,13 @@ public class PersistMessageProcessor : IPersistMessageProcessor
     public async Task<IReadOnlyList<PersistMessage>> GetByFilterAsync(Expression<Func<PersistMessage, bool>> predicate,
         CancellationToken cancellationToken = default)
     {
-        return (await _persistMessageDbContext.PersistMessages.Where(predicate).ToListAsync(cancellationToken))
+        return (await _dbContext.PersistMessages.Where(predicate).ToListAsync(cancellationToken))
             .AsReadOnly();
     }
 
     public Task<PersistMessage> ExistMessageAsync(long messageId, CancellationToken cancellationToken = default)
     {
-        return _persistMessageDbContext.PersistMessages.FirstOrDefaultAsync(x =>
+        return _dbContext.PersistMessages.FirstOrDefaultAsync(x =>
                 x.Id == messageId &&
                 x.DeliveryType == MessageDeliveryType.Inbox &&
                 x.MessageStatus == MessageStatus.Processed,
@@ -73,7 +74,7 @@ public class PersistMessageProcessor : IPersistMessageProcessor
         CancellationToken cancellationToken = default)
     {
         var message =
-            await _persistMessageDbContext.PersistMessages.FirstOrDefaultAsync(
+            await _dbContext.PersistMessages.FirstOrDefaultAsync(
                 x => x.Id == messageId && x.DeliveryType == deliveryType, cancellationToken);
 
         if (message is null)
@@ -110,7 +111,7 @@ public class PersistMessageProcessor : IPersistMessageProcessor
 
     public async Task ProcessAllAsync(CancellationToken cancellationToken = default)
     {
-        var messages = await _persistMessageDbContext.PersistMessages
+        var messages = await _dbContext.PersistMessages
             .Where(x => x.MessageStatus != MessageStatus.Processed)
             .ToListAsync(cancellationToken);
 
@@ -119,7 +120,7 @@ public class PersistMessageProcessor : IPersistMessageProcessor
 
     public async Task ProcessInboxAsync(long messageId, CancellationToken cancellationToken = default)
     {
-        var message = await _persistMessageDbContext.PersistMessages.FirstOrDefaultAsync(
+        var message = await _dbContext.PersistMessages.FirstOrDefaultAsync(
             x => x.Id == messageId &&
                  x.DeliveryType == MessageDeliveryType.Inbox &&
                  x.MessageStatus == MessageStatus.InProgress,
@@ -190,7 +191,7 @@ public class PersistMessageProcessor : IPersistMessageProcessor
         else
             id = SnowFlakIdGenerator.NewId();
 
-        await _persistMessageDbContext.PersistMessages.AddAsync(
+        await _dbContext.PersistMessages.AddAsync(
             new PersistMessage(
                 id,
                 messageEnvelope.Message.GetType().ToString(),
@@ -198,7 +199,7 @@ public class PersistMessageProcessor : IPersistMessageProcessor
                 deliveryType),
             cancellationToken);
 
-        await _persistMessageDbContext.SaveChangesAsync(cancellationToken);
+        await _dbContext.SaveChangesAsync(cancellationToken);
 
         _logger.LogInformation(
             "Message with id: {MessageID} and delivery type: {DeliveryType} saved in persistence message store.",
@@ -212,8 +213,8 @@ public class PersistMessageProcessor : IPersistMessageProcessor
     {
         message.ChangeState(MessageStatus.Processed);
 
-        _persistMessageDbContext.PersistMessages.Update(message);
+        _dbContext.PersistMessages.Update(message);
 
-        await _persistMessageDbContext.SaveChangesAsync(cancellationToken);
+        await _dbContext.SaveChangesAsync(cancellationToken);
     }
 }

src/BuildingBlocks/TestBase/IntegrationTestBase.cs

@@ -2,7 +2,6 @@
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Core.Model;
 using BuildingBlocks.EFCore;
-using BuildingBlocks.MassTransit;
 using BuildingBlocks.Mongo;
 using BuildingBlocks.PersistMessageProcessor;
 using BuildingBlocks.Web;
@@ -14,6 +13,7 @@ using MediatR;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -21,33 +21,31 @@ using Microsoft.Extensions.Options;
 using Mongo2Go;
 using NSubstitute;
 using Respawn;
+using Respawn.Graph;
 using Serilog;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace BuildingBlocks.TestBase;
 
-public class IntegrationTestFixture<TEntryPoint> : IDisposable
+public class IntegrationTestFixture<TEntryPoint> : IAsyncLifetime
     where TEntryPoint : class
 {
     private readonly WebApplicationFactory<TEntryPoint> _factory;
-
-
     private int Timeout => 60; // Second
-    private ITestHarness TestHarness => ServiceProvider.GetTestHarness();
+
-    public HttpClient HttpClient => _factory.CreateClient();
+    public MsSqlTestcontainer MsSqlTestContainer;
+    public RabbitMqTestcontainer RabbitMqTestContainer;
+
+    private ITestHarness TestHarness => ServiceProvider?.GetTestHarness();
+    public HttpClient HttpClient => _factory?.CreateClient();
 
     public GrpcChannel Channel =>
         GrpcChannel.ForAddress(HttpClient.BaseAddress!, new GrpcChannelOptions { HttpClient = HttpClient });
 
     public Action<IServiceCollection> TestRegistrationServices { get; set; }
-    public IServiceProvider ServiceProvider => _factory.Services;
+    public IServiceProvider ServiceProvider => _factory?.Services;
-    public IConfiguration Configuration => _factory.Services.GetRequiredService<IConfiguration>();
+    public IConfiguration Configuration => _factory?.Services.GetRequiredService<IConfiguration>();
-
-    public MsSqlTestcontainer SqlTestContainer;
-    public MsSqlTestcontainer SqlPersistTestContainer;
-    public MongoDbTestcontainer MongoTestContainer;
-    public RabbitMqTestcontainer RabbitMqTestContainer;
 
     public IntegrationTestFixture()
     {
@@ -60,12 +58,21 @@ public class IntegrationTestFixture<TEntryPoint> : IDisposable
                     TestRegistrationServices?.Invoke(services);
                     services.ReplaceSingleton(AddHttpContextAccessorMock);
                 });
+
+                builder.ConfigureAppConfiguration(AddCustomAppSettings);
             });
     }
 
-    public void Dispose()
+
+    public async Task InitializeAsync()
     {
-        _factory.Dispose();
+        await StartTestContainerAsync();
+    }
+
+    public async Task DisposeAsync()
+    {
+        await StopTestContainerAsync();
+        _factory?.DisposeAsync();
     }
 
     public virtual void RegisterServices(Action<IServiceCollection> services)
@@ -190,6 +197,34 @@ public class IntegrationTestFixture<TEntryPoint> : IDisposable
         });
     }
 
+
+    private async Task StartTestContainerAsync()
+    {
+        MsSqlTestContainer = TestContainers.MsSqlTestContainer;
+        RabbitMqTestContainer = TestContainers.RabbitMqTestContainer;
+
+        await MsSqlTestContainer.StartAsync();
+        await RabbitMqTestContainer.StartAsync();
+    }
+
+    private async Task StopTestContainerAsync()
+    {
+        await MsSqlTestContainer.StopAsync();
+        await RabbitMqTestContainer.StopAsync();
+    }
+
+    private void AddCustomAppSettings(IConfigurationBuilder configuration)
+    {
+        configuration.AddInMemoryCollection(new KeyValuePair<string, string>[]
+        {
+            new("DatabaseOptions:DefaultConnection", MsSqlTestContainer.ConnectionString + "TrustServerCertificate=True"),
+            new("RabbitMqOptions:HostName", RabbitMqTestContainer.Hostname),
+            new("RabbitMqOptions:UserName", RabbitMqTestContainer.Username),
+            new("RabbitMqOptions:Password", RabbitMqTestContainer.Password),
+            new("RabbitMqOptions:Port", RabbitMqTestContainer.Port.ToString())
+        });
+    }
+
     private IHttpContextAccessor AddHttpContextAccessorMock(IServiceProvider serviceProvider)
     {
         var httpContextAccessorMock = Substitute.For<IHttpContextAccessor>();
@@ -329,32 +364,9 @@ public class IntegrationTestFixture<TEntryPoint, TWContext, TRContext> : Integra
 public class IntegrationTestFixtureCore<TEntryPoint> : IAsyncLifetime
     where TEntryPoint : class
 {
-    private Checkpoint _checkpointDefaultDB;
+    private Respawner _reSpawnerDefaultDb;
-    private Checkpoint _checkpointPersistMessageDB;
     private MongoDbRunner _mongoRunner;
 
-    private string DefaultConnectionString
-    {
-        get => Fixture.ServiceProvider.GetRequiredService<IOptions<ConnectionStrings>>()?.Value.DefaultConnection;
-        set => Fixture.ServiceProvider.GetRequiredService<IOptions<ConnectionStrings>>().Value.DefaultConnection =
-            value;
-    }
-
-    private string PersistConnectionString
-    {
-        get => Fixture.ServiceProvider.GetRequiredService<IOptions<PersistMessageOptions>>()?.Value.ConnectionString;
-        set => Fixture.ServiceProvider.GetRequiredService<IOptions<PersistMessageOptions>>().Value.ConnectionString =
-            value;
-    }
-
-    private string MongoConnectionString
-    {
-        get => Fixture.ServiceProvider.GetRequiredService<IOptions<MongoOptions>>()?.Value?.ConnectionString;
-        set => Fixture.ServiceProvider.GetRequiredService<IOptions<MongoOptions>>().Value.ConnectionString = value;
-    }
-
-    private RabbitMqOptions RabbitMqOptions =>
-        Fixture.ServiceProvider.GetRequiredService<IOptions<RabbitMqOptions>>()?.Value;
 
     public IntegrationTestFixtureCore(IntegrationTestFixture<TEntryPoint> integrationTestFixture)
     {
@@ -364,71 +376,43 @@ public class IntegrationTestFixtureCore<TEntryPoint> : IAsyncLifetime
 
     public IntegrationTestFixture<TEntryPoint> Fixture { get; }
 
+
     public async Task InitializeAsync()
     {
-        _checkpointDefaultDB = new Checkpoint {TablesToIgnore = new[] {"__EFMigrationsHistory"}};
+        var databaseOptions = Fixture.ServiceProvider.GetRequiredService<IOptions<DatabaseOptions>>()?.Value;
-        _checkpointPersistMessageDB = new Checkpoint {TablesToIgnore = new[] {"__EFMigrationsHistory"}};
+        var mongoOptions = Fixture.ServiceProvider.GetRequiredService<IOptions<MongoOptions>>()?.Value;
 
-        if (!string.IsNullOrEmpty(DefaultConnectionString))
+        if (!string.IsNullOrEmpty(databaseOptions?.DefaultConnection))
-            await _checkpointDefaultDB.Reset(DefaultConnectionString);
+        {
+            var dbConnection = new SqlConnection(databaseOptions.DefaultConnection);
+            await dbConnection.OpenAsync();
 
-        if (!string.IsNullOrEmpty(PersistConnectionString))
+            _reSpawnerDefaultDb = await Respawner.CreateAsync(dbConnection,
-            await _checkpointPersistMessageDB.Reset(PersistConnectionString);
+                new RespawnerOptions
+                {
+                    TablesToIgnore = new Table[] { "__EFMigrationsHistory" },
+                });
+
+            await _reSpawnerDefaultDb.ResetAsync(dbConnection);
+        }
 
         _mongoRunner = MongoDbRunner.Start();
 
-        if (MongoConnectionString != null)
+        if (!string.IsNullOrEmpty(mongoOptions?.ConnectionString))
-            MongoConnectionString = _mongoRunner.ConnectionString;
+            mongoOptions.ConnectionString = _mongoRunner.ConnectionString;
-
-        //await StartTestContainerAsync();
 
         await SeedDataAsync();
     }
 
     public async Task DisposeAsync()
     {
-        if (!string.IsNullOrEmpty(PersistConnectionString))
         _mongoRunner.Dispose();
-
-        //await StopTestContainerAsync();
     }
 
     protected virtual void RegisterTestsServices(IServiceCollection services)
     {
     }
 
-    private async Task StartTestContainerAsync()
-    {
-        // <<For using test-container base>>
-        Fixture.SqlTestContainer = TestContainers.SqlTestContainer;
-        Fixture.SqlPersistTestContainer = TestContainers.SqlPersistTestContainer;
-        Fixture.MongoTestContainer = TestContainers.MongoTestContainer;
-        Fixture.RabbitMqTestContainer = TestContainers.RabbitMqTestContainer;
-
-        await Fixture.SqlTestContainer.StartAsync();
-        await Fixture.SqlPersistTestContainer.StartAsync();
-        await Fixture.MongoTestContainer.StartAsync();
-        await Fixture.RabbitMqTestContainer.StartAsync();
-
-        DefaultConnectionString = Fixture.SqlTestContainer?.ConnectionString;
-        PersistConnectionString = Fixture.SqlPersistTestContainer?.ConnectionString;
-        MongoConnectionString = Fixture.MongoTestContainer?.ConnectionString;
-
-        RabbitMqOptions.Password = Fixture.RabbitMqTestContainer.Password;
-        RabbitMqOptions.UserName = Fixture.RabbitMqTestContainer.Username;
-        RabbitMqOptions.HostName = Fixture.RabbitMqTestContainer.Hostname;
-        RabbitMqOptions.Port = (ushort)Fixture.RabbitMqTestContainer.Port;
-    }
-
-    private async Task StopTestContainerAsync()
-    {
-        // <<For using test-container base>>
-        await Fixture.SqlTestContainer.StopAsync();
-        await Fixture.SqlPersistTestContainer.StopAsync();
-        await Fixture.MongoTestContainer.StopAsync();
-        await Fixture.RabbitMqTestContainer.StopAsync();
-    }
-
     private async Task SeedDataAsync()
     {
         using var scope = Fixture.ServiceProvider.CreateScope();

src/BuildingBlocks/TestBase/TestContainers.cs

@@ -6,24 +6,30 @@ namespace BuildingBlocks.TestBase;
 
 public static class TestContainers
 {
-    public static MsSqlTestcontainer SqlTestContainer => new TestcontainersBuilder<MsSqlTestcontainer>()
+    public static PostgreSqlTestcontainer PostgresTestContainer => new TestcontainersBuilder<PostgreSqlTestcontainer>()
         .WithDatabase(
-            new MsSqlTestcontainerConfiguration
+            new PostgreSqlTestcontainerConfiguration
             {
                 Database = Guid.NewGuid().ToString("D"),
-                Password = Guid.NewGuid().ToString("D")
+                Password = Guid.NewGuid().ToString("D"),
+                Username = Guid.NewGuid().ToString("D")
             })
-        .WithImage("mcr.microsoft.com/mssql/server:2017-latest")
+        .WithImage("postgres:latest")
         .Build();
 
-    public static MsSqlTestcontainer SqlPersistTestContainer => new TestcontainersBuilder<MsSqlTestcontainer>()
+
-        .WithDatabase(new MsSqlTestcontainerConfiguration
+    // issue ref: https://github.com/testcontainers/testcontainers-dotnet/discussions/533
+    public static MsSqlTestcontainer MsSqlTestContainer = new TestcontainersBuilder<MsSqlTestcontainer>()
+        .WithDatabase(new MsSqlTestcontainerConfiguration()
         {
-            Database = Guid.NewGuid().ToString("D"), Password = Guid.NewGuid().ToString("D")
+            Password = Guid.NewGuid().ToString("D")
         })
-        .WithImage("mcr.microsoft.com/mssql/server:2017-latest")
+        .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
+        .WithExposedPort(1433)
+        .WithPortBinding(1433, true) // Add this line for issue in hangup MsSqlTestContainer in docker desktop
         .Build();
 
+
     public static MongoDbTestcontainer MongoTestContainer => new TestcontainersBuilder<MongoDbTestcontainer>()
         .WithDatabase(new MongoDbTestcontainerConfiguration()
         {
@@ -34,12 +40,9 @@ public static class TestContainers
         .WithImage("mongo")
         .Build();
 
+
     public static RabbitMqTestcontainer RabbitMqTestContainer => new TestcontainersBuilder<RabbitMqTestcontainer>()
-        .WithMessageBroker(new RabbitMqTestcontainerConfiguration()
+        .WithMessageBroker(new RabbitMqTestcontainerConfiguration() { Password = "guest", Username = "guest" })
-        {
-            Password = "guest",
-            Username = "guest"
-        })
         .WithImage("rabbitmq:3-management")
         .Build();
 }

src/Services/Booking/src/Booking.Api/appsettings.docker.json

@@ -6,7 +6,7 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "rabbitmq",
     "ExchangeName": "booking",
     "UserName": "guest",

src/Services/Booking/src/Booking.Api/appsettings.json

@@ -19,7 +19,7 @@
     "Authority": "https://localhost:5005",
     "Audience": "booking-api"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "booking",
     "UserName": "guest",
@@ -40,7 +40,7 @@
   "PersistMessageOptions": {
     "Interval": 30,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Port=5432;Database=persist_message_db;User Id=postgres;Password=postgres;Include Error Detail=true"
   },
   "AllowedHosts": "*"
 }

src/Services/Booking/src/Booking.Api/appsettings.test.json

@@ -1,5 +1,5 @@
 {
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "booking",
     "UserName": "guest",
@@ -17,7 +17,7 @@
   "PersistMessageOptions": {
     "Interval": 1,
     "Enabled": true,
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "ConnectionString": "Server=localhost;Port=5432;Database=persist_message_db_test;User Id=postgres;Password=postgres;Include Error Detail=true"
   },
   "MongoOptions": {
     "ConnectionString": "mongodb://localhost:27017",

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

@@ -43,7 +43,7 @@ public static class InfrastructureExtensions
             options.SuppressModelStateInvalidFilter = true;
         });
 
-        var appOptions = builder.Services.GetOptions<AppOptions>("AppOptions");
+        var appOptions = builder.Services.GetOptions<AppOptions>(nameof(AppOptions));
 
         Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name));
 
@@ -58,7 +58,7 @@ public static class InfrastructureExtensions
                     }));
         });
 
-        builder.Services.AddPersistMessage(configuration);
+        builder.Services.AddPersistMessageProcessor();
         builder.Services.AddMongoDbContext<BookingReadDbContext>(configuration);
 
         builder.AddCustomSerilog(env);
@@ -90,7 +90,7 @@ public static class InfrastructureExtensions
     public static WebApplication UseInfrastructure(this WebApplication app)
     {
         var env = app.Environment;
-        var appOptions = app.GetOptions<AppOptions>("AppOptions");
+        var appOptions = app.GetOptions<AppOptions>(nameof(AppOptions));
 
         app.UseProblemDetails();
         app.UseSerilogRequestLogging();

src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs

@@ -1,18 +1,15 @@
-using System.Collections.Generic;
+using System.Linq;
-using System.Linq;
 using System.Threading.Tasks;
 using Booking.Api;
 using Booking.Data;
 using BuildingBlocks.Contracts.EventBus.Messages;
-using BuildingBlocks.PersistMessageProcessor.Data;
+using BuildingBlocks.EFCore;
 using BuildingBlocks.TestBase;
 using Flight;
 using FluentAssertions;
 using Grpc.Core;
 using Grpc.Core.Testing;
 using Integration.Test.Fakes;
-using MassTransit;
-using MassTransit.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using NSubstitute;
@@ -22,10 +19,10 @@ using GetByIdRequest = Flight.GetByIdRequest;
 
 namespace Integration.Test.Booking.Features;
 
-public class CreateBookingTests : IntegrationTestBase<Program, PersistMessageDbContext, BookingReadDbContext>
+public class CreateBookingTests : IntegrationTestBase<Program, AppDbContextBase, BookingReadDbContext>
 {
     public CreateBookingTests(
-        IntegrationTestFixture<Program, PersistMessageDbContext, BookingReadDbContext> integrationTestFixture) : base(
+        IntegrationTestFixture<Program, AppDbContextBase, BookingReadDbContext> integrationTestFixture) : base(
         integrationTestFixture)
     {
     }

src/Services/Flight/src/Flight.Api/appsettings.json

@@ -15,7 +15,7 @@
       "interval": "day"
     }
   },
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "MongoOptions": {
@@ -26,7 +26,7 @@
     "Authority": "https://localhost:5005",
     "Audience": "flight-api"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "flight",
     "UserName": "guest",
@@ -35,8 +35,7 @@
   },
   "PersistMessageOptions": {
     "Interval": 30,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }

src/Services/Flight/src/Flight.Api/appsettings.test.json

@@ -1,8 +1,8 @@
 {
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "flight",
     "UserName": "guest",
@@ -19,7 +19,6 @@
   },
   "PersistMessageOptions": {
     "Interval": 1,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   }
 }

src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs

@@ -1,3 +1,4 @@
+using BuildingBlocks.EFCore;
 using Flight.Aircrafts.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -8,7 +9,7 @@ public class AircraftConfiguration : IEntityTypeConfiguration<Aircraft>
 {
     public void Configure(EntityTypeBuilder<Aircraft> builder)
     {
-        builder.ToTable("Aircraft", FlightDbContext.DefaultSchema);
+        builder.ToTable("Aircraft", AppDbContextBase.DefaultSchema);
         builder.HasKey(r => r.Id);
         builder.Property(r => r.Id).ValueGeneratedNever();
     }

src/Services/Flight/src/Flight/Data/Configurations/AirportConfiguration.cs

@@ -1,3 +1,4 @@
+using BuildingBlocks.EFCore;
 using Flight.Airports.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -8,7 +9,7 @@ public class AirportConfiguration: IEntityTypeConfiguration<Airport>
 {
     public void Configure(EntityTypeBuilder<Airport> builder)
     {
-        builder.ToTable("Airport", FlightDbContext.DefaultSchema);
+        builder.ToTable("Airport", AppDbContextBase.DefaultSchema);
 
         builder.HasKey(r => r.Id);
         builder.Property(r => r.Id).ValueGeneratedNever();

src/Services/Flight/src/Flight/Data/Configurations/FlightConfiguration.cs

@@ -1,3 +1,4 @@
+using BuildingBlocks.EFCore;
 using Flight.Aircrafts.Models;
 using Flight.Airports.Models;
 using Microsoft.EntityFrameworkCore;
@@ -9,7 +10,7 @@ public class FlightConfiguration : IEntityTypeConfiguration<Flights.Models.Fligh
 {
     public void Configure(EntityTypeBuilder<Flights.Models.Flight> builder)
     {
-        builder.ToTable("Flight", FlightDbContext.DefaultSchema);
+        builder.ToTable("Flight", AppDbContextBase.DefaultSchema);
 
         builder.HasKey(r => r.Id);
         builder.Property(r => r.Id).ValueGeneratedNever();

src/Services/Flight/src/Flight/Data/Configurations/PersistMessageConfiguration.cs

@@ -0,0 +1,45 @@
+using System;
+using BuildingBlocks.EFCore;
+using BuildingBlocks.PersistMessageProcessor;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Flight.Data.Configurations;
+
+public class PersistMessageConfiguration : IEntityTypeConfiguration<PersistMessage>
+{
+    public void Configure(EntityTypeBuilder<PersistMessage> builder)
+    {
+        builder.ToTable("PersistMessage", AppDbContextBase.DefaultSchema);
+
+        builder.HasKey(x => x.Id);
+        builder.Property(r => r.Id).ValueGeneratedNever();
+
+        builder.Property(x => x.Id)
+            .IsRequired();
+
+        builder.Property(x => x.DeliveryType)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageDeliveryType)Enum.Parse(typeof(MessageDeliveryType), v))
+            .IsRequired()
+            .IsUnicode(false);
+
+        builder.Property(x => x.DeliveryType)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageDeliveryType)Enum.Parse(typeof(MessageDeliveryType), v))
+            .IsRequired()
+            .IsUnicode(false);
+
+        builder.Property(x => x.MessageStatus)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageStatus)Enum.Parse(typeof(MessageStatus), v))
+            .IsRequired()
+            .IsUnicode(false);
+    }
+}

src/Services/Flight/src/Flight/Data/Configurations/SeatConfiguration.cs

@@ -1,3 +1,4 @@
+using BuildingBlocks.EFCore;
 using Flight.Seats.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -8,7 +9,7 @@ public class SeatConfiguration : IEntityTypeConfiguration<Seat>
 {
     public void Configure(EntityTypeBuilder<Seat> builder)
     {
-        builder.ToTable("Seat", FlightDbContext.DefaultSchema);
+        builder.ToTable("Seat", AppDbContextBase.DefaultSchema);
 
         builder.HasKey(r => r.Id);
         builder.Property(r => r.Id).ValueGeneratedNever();

src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs

@@ -9,8 +9,7 @@ namespace Flight.Data
         {
             var builder = new DbContextOptionsBuilder<FlightDbContext>();
 
-            builder.UseSqlServer(
+            builder.UseSqlServer("Data Source=.\\sqlexpress;Initial Catalog=FlightDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
-                "Data Source=.\\sqlexpress;Initial Catalog=FlightDB;Persist Security Info=False;Integrated Security=SSPI");
             return new FlightDbContext(builder.Options, null);
         }
     }

src/Services/Flight/src/Flight/Data/FlightDbContext.cs

@@ -1,22 +1,18 @@
-using System.Reflection;
 using BuildingBlocks.EFCore;
 using BuildingBlocks.Utils;
 using Flight.Aircrafts.Models;
 using Flight.Airports.Models;
 using Flight.Seats.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
 namespace Flight.Data;
 
 public sealed class FlightDbContext : AppDbContextBase
 {
-    public const string DefaultSchema = "dbo";
     public FlightDbContext(DbContextOptions<FlightDbContext> options, ICurrentUserProvider currentUserProvider) : base(
         options, currentUserProvider)
     {
     }
-
     public DbSet<Flights.Models.Flight> Flights => Set<Flights.Models.Flight>();
     public DbSet<Airport> Airports => Set<Airport>();
     public DbSet<Aircraft> Aircraft => Set<Aircraft>();
@@ -24,8 +20,8 @@ public sealed class FlightDbContext : AppDbContextBase
 
     protected override void OnModelCreating(ModelBuilder builder)
     {
+        base.OnModelCreating(builder);
         builder.FilterSoftDeletedProperties();
         builder.ApplyConfigurationsFromAssembly(typeof(FlightRoot).Assembly);
-        base.OnModelCreating(builder);
     }
 }

src/Services/Flight/src/Flight/Data/Migrations/20221203201848_Initial.Designer.cs

@@ -12,17 +12,52 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Flight.Data.Migrations
 {
     [DbContext(typeof(FlightDbContext))]
-    [Migration("20220728175834_Init")]
+    [Migration("20221203201848_Initial")]
-    partial class Init
+    partial class Initial
     {
+        /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Flight.Aircrafts.Models.Aircraft", b =>
                 {

src/Services/Flight/src/Flight/Data/Migrations/20221203201848_Initial.cs

@@ -5,8 +5,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Flight.Data.Migrations
 {
-    public partial class Init : Migration
+    /// <inheritdoc />
+    public partial class Initial : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.EnsureSchema(
@@ -54,6 +56,24 @@ namespace Flight.Data.Migrations
                     table.PrimaryKey("PK_Airport", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "PersistMessage",
+                schema: "dbo",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false),
+                    DataType = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Data = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Created = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RetryCount = table.Column<int>(type: "int", nullable: false),
+                    MessageStatus = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false),
+                    DeliveryType = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PersistMessage", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Flight",
                 schema: "dbo",
@@ -144,8 +164,13 @@ namespace Flight.Data.Migrations
                 column: "FlightId");
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "PersistMessage",
+                schema: "dbo");
+
             migrationBuilder.DropTable(
                 name: "Seat",
                 schema: "dbo");

src/Services/Flight/src/Flight/Data/Migrations/FlightDbContextModelSnapshot.cs

@@ -17,10 +17,44 @@ namespace Flight.Data.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Flight.Aircrafts.Models.Aircraft", b =>
                 {

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

@@ -52,7 +52,7 @@ public static class InfrastructureExtensions
         builder.Services.AddCustomMediatR();
         builder.Services.AddCustomProblemDetails();
 
-        var appOptions = builder.Services.GetOptions<AppOptions>("AppOptions");
+        var appOptions = builder.Services.GetOptions<AppOptions>(nameof(AppOptions));
         Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name));
 
         builder.Services.AddRateLimiter(options =>
@@ -66,11 +66,11 @@ public static class InfrastructureExtensions
                     }));
         });
 
+        builder.Services.AddPersistMessageProcessor();
         builder.Services.AddCustomDbContext<FlightDbContext>(configuration);
         builder.Services.AddScoped<IDataSeeder, FlightDataSeeder>();
-
         builder.Services.AddMongoDbContext<FlightReadDbContext>(configuration);
-        builder.Services.AddPersistMessage(configuration);
+
 
         builder.AddCustomSerilog(env);
         builder.Services.AddJwt();
@@ -99,7 +99,7 @@ public static class InfrastructureExtensions
     public static WebApplication UseInfrastructure(this WebApplication app)
     {
         var env = app.Environment;
-        var appOptions = app.GetOptions<AppOptions>("AppOptions");
+        var appOptions = app.GetOptions<AppOptions>(nameof(AppOptions));
 
         app.UseProblemDetails();
         app.UseSerilogRequestLogging();

src/Services/Identity/src/Identity.Api/appsettings.docker.json

@@ -1,9 +1,9 @@
 {
   "App": "Identity-Service",
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=db;Database=IdentityDB;User ID=sa;Password=@Aa123456"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "rabbitmq",
     "ExchangeName": "identity",
     "UserName": "guest",

src/Services/Identity/src/Identity.Api/appsettings.json

@@ -2,10 +2,10 @@
   "AppOptions": {
     "Name": "Identity-Service"
   },
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "identity",
     "UserName": "guest",
@@ -31,8 +31,7 @@
   },
   "PersistMessageOptions": {
     "Interval": 30,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }

src/Services/Identity/src/Identity.Api/appsettings.test.json

@@ -1,8 +1,8 @@
 {
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "identity",
     "UserName": "guest",
@@ -19,7 +19,6 @@
   },
   "PersistMessageOptions": {
     "Interval": 1,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   }
 }

src/Services/Identity/src/Identity/Data/Configurations/PersistMessageConfiguration.cs

@@ -0,0 +1,44 @@
+using System;
+using BuildingBlocks.EFCore;
+using BuildingBlocks.PersistMessageProcessor;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Identity.Data.Configurations;
+
+public class PersistMessageConfiguration : IEntityTypeConfiguration<PersistMessage>
+{
+    public void Configure(EntityTypeBuilder<PersistMessage> builder)
+    {
+        builder.ToTable("PersistMessage", AppDbContextBase.DefaultSchema);
+
+        builder.HasKey(x => x.Id);
+
+        builder.Property(x => x.Id)
+            .IsRequired();
+
+        builder.Property(x => x.DeliveryType)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageDeliveryType)Enum.Parse(typeof(MessageDeliveryType), v))
+            .IsRequired()
+            .IsUnicode(false);
+
+        builder.Property(x => x.DeliveryType)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageDeliveryType)Enum.Parse(typeof(MessageDeliveryType), v))
+            .IsRequired()
+            .IsUnicode(false);
+
+        builder.Property(x => x.MessageStatus)
+            .HasMaxLength(50)
+            .HasConversion(
+                v => v.ToString(),
+                v => (MessageStatus)Enum.Parse(typeof(MessageStatus), v))
+            .IsRequired()
+            .IsUnicode(false);
+    }
+}

src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs

@@ -9,7 +9,7 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<IdentityCo
     {
         var builder = new DbContextOptionsBuilder<IdentityContext>();
 
-        builder.UseSqlServer("Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true");
+        builder.UseSqlServer("Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True");
         return new IdentityContext(builder.Options, null);
     }
 }

src/Services/Identity/src/Identity/Data/IdentityContext.cs

@@ -8,11 +8,13 @@ using System.Threading.Tasks;
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Core.Model;
 using BuildingBlocks.EFCore;
+using Humanizer;
 using Identity.Identity.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 
 namespace Identity.Data;
@@ -21,8 +23,6 @@ public sealed class IdentityContext : IdentityDbContext<ApplicationUser, Identit
     IdentityUserClaim<long>,
     IdentityUserRole<long>, IdentityUserLogin<long>, IdentityRoleClaim<long>, IdentityUserToken<long>>, IDbContext
 {
-    public const string DefaultSchema = "dbo";
-
     private IDbContextTransaction _currentTransaction;
 
     public IdentityContext(DbContextOptions<IdentityContext> options, IHttpContextAccessor httpContextAccessor) :
@@ -35,6 +35,13 @@ public sealed class IdentityContext : IdentityDbContext<ApplicationUser, Identit
         builder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
         base.OnModelCreating(builder);
 
+        // https://andrewlock.net/customising-asp-net-core-identity-ef-core-naming-conventions-for-postgresql/
+        foreach (var entity in builder.Model.GetEntityTypes())
+        {
+            // Replace schema
+            entity.SetSchema(AppDbContextBase.DefaultSchema);
+        }
+
         builder.FilterSoftDeletedProperties();
     }
 

src/Services/Identity/src/Identity/Data/Migrations/20221203211306_initial.Designer.cs

@@ -12,17 +12,55 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Identity.Data.Migrations
 {
     [DbContext(typeof(IdentityContext))]
-    [Migration("20220728175937_initial")]
+    [Migration("20221203211306_initial")]
     partial class initial
     {
+        /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Identity.Identity.Models.ApplicationUser", b =>
                 {
@@ -30,7 +68,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bigint");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
 
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("int");
@@ -98,7 +136,7 @@ namespace Identity.Data.Migrations
                         .HasDatabaseName("UserNameIndex")
                         .HasFilter("[NormalizedUserName] IS NOT NULL");
 
-                    b.ToTable("AspNetUsers", (string)null);
+                    b.ToTable("AspNetUsers", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole<long>", b =>
@@ -107,7 +145,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bigint");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
@@ -128,7 +166,7 @@ namespace Identity.Data.Migrations
                         .HasDatabaseName("RoleNameIndex")
                         .HasFilter("[NormalizedName] IS NOT NULL");
 
-                    b.ToTable("AspNetRoles", (string)null);
+                    b.ToTable("AspNetRoles", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<long>", b =>
@@ -137,7 +175,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("ClaimType")
                         .HasColumnType("nvarchar(max)");
@@ -152,7 +190,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AspNetRoleClaims", (string)null);
+                    b.ToTable("AspNetRoleClaims", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<long>", b =>
@@ -161,7 +199,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("ClaimType")
                         .HasColumnType("nvarchar(max)");
@@ -176,7 +214,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AspNetUserClaims", (string)null);
+                    b.ToTable("AspNetUserClaims", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<long>", b =>
@@ -197,7 +235,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AspNetUserLogins", (string)null);
+                    b.ToTable("AspNetUserLogins", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<long>", b =>
@@ -212,7 +250,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AspNetUserRoles", (string)null);
+                    b.ToTable("AspNetUserRoles", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<long>", b =>
@@ -231,7 +269,7 @@ namespace Identity.Data.Migrations
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
-                    b.ToTable("AspNetUserTokens", (string)null);
+                    b.ToTable("AspNetUserTokens", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<long>", b =>

src/Services/Identity/src/Identity/Data/Migrations/20221203211306_initial.cs

@@ -5,12 +5,18 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Identity.Data.Migrations
 {
+    /// <inheritdoc />
     public partial class initial : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.EnsureSchema(
+                name: "dbo");
+
             migrationBuilder.CreateTable(
                 name: "AspNetRoles",
+                schema: "dbo",
                 columns: table => new
                 {
                     Id = table.Column<long>(type: "bigint", nullable: false)
@@ -26,6 +32,7 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateTable(
                 name: "AspNetUsers",
+                schema: "dbo",
                 columns: table => new
                 {
                     Id = table.Column<long>(type: "bigint", nullable: false)
@@ -53,8 +60,28 @@ namespace Identity.Data.Migrations
                     table.PrimaryKey("PK_AspNetUsers", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "PersistMessage",
+                schema: "dbo",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DataType = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Data = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Created = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RetryCount = table.Column<int>(type: "int", nullable: false),
+                    MessageStatus = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false),
+                    DeliveryType = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PersistMessage", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AspNetRoleClaims",
+                schema: "dbo",
                 columns: table => new
                 {
                     Id = table.Column<int>(type: "int", nullable: false)
@@ -69,6 +96,7 @@ namespace Identity.Data.Migrations
                     table.ForeignKey(
                         name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
                         column: x => x.RoleId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetRoles",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
@@ -76,6 +104,7 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateTable(
                 name: "AspNetUserClaims",
+                schema: "dbo",
                 columns: table => new
                 {
                     Id = table.Column<int>(type: "int", nullable: false)
@@ -90,6 +119,7 @@ namespace Identity.Data.Migrations
                     table.ForeignKey(
                         name: "FK_AspNetUserClaims_AspNetUsers_UserId",
                         column: x => x.UserId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetUsers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
@@ -97,6 +127,7 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateTable(
                 name: "AspNetUserLogins",
+                schema: "dbo",
                 columns: table => new
                 {
                     LoginProvider = table.Column<string>(type: "nvarchar(450)", nullable: false),
@@ -110,6 +141,7 @@ namespace Identity.Data.Migrations
                     table.ForeignKey(
                         name: "FK_AspNetUserLogins_AspNetUsers_UserId",
                         column: x => x.UserId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetUsers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
@@ -117,6 +149,7 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateTable(
                 name: "AspNetUserRoles",
+                schema: "dbo",
                 columns: table => new
                 {
                     UserId = table.Column<long>(type: "bigint", nullable: false),
@@ -128,12 +161,14 @@ namespace Identity.Data.Migrations
                     table.ForeignKey(
                         name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
                         column: x => x.RoleId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetRoles",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_AspNetUserRoles_AspNetUsers_UserId",
                         column: x => x.UserId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetUsers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
@@ -141,6 +176,7 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateTable(
                 name: "AspNetUserTokens",
+                schema: "dbo",
                 columns: table => new
                 {
                     UserId = table.Column<long>(type: "bigint", nullable: false),
@@ -154,6 +190,7 @@ namespace Identity.Data.Migrations
                     table.ForeignKey(
                         name: "FK_AspNetUserTokens_AspNetUsers_UserId",
                         column: x => x.UserId,
+                        principalSchema: "dbo",
                         principalTable: "AspNetUsers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
@@ -161,11 +198,13 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetRoleClaims_RoleId",
+                schema: "dbo",
                 table: "AspNetRoleClaims",
                 column: "RoleId");
 
             migrationBuilder.CreateIndex(
                 name: "RoleNameIndex",
+                schema: "dbo",
                 table: "AspNetRoles",
                 column: "NormalizedName",
                 unique: true,
@@ -173,54 +212,71 @@ namespace Identity.Data.Migrations
 
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserClaims_UserId",
+                schema: "dbo",
                 table: "AspNetUserClaims",
                 column: "UserId");
 
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserLogins_UserId",
+                schema: "dbo",
                 table: "AspNetUserLogins",
                 column: "UserId");
 
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserRoles_RoleId",
+                schema: "dbo",
                 table: "AspNetUserRoles",
                 column: "RoleId");
 
             migrationBuilder.CreateIndex(
                 name: "EmailIndex",
+                schema: "dbo",
                 table: "AspNetUsers",
                 column: "NormalizedEmail");
 
             migrationBuilder.CreateIndex(
                 name: "UserNameIndex",
+                schema: "dbo",
                 table: "AspNetUsers",
                 column: "NormalizedUserName",
                 unique: true,
                 filter: "[NormalizedUserName] IS NOT NULL");
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "AspNetRoleClaims");
+                name: "AspNetRoleClaims",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetUserClaims");
+                name: "AspNetUserClaims",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetUserLogins");
+                name: "AspNetUserLogins",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetUserRoles");
+                name: "AspNetUserRoles",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetUserTokens");
+                name: "AspNetUserTokens",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetRoles");
+                name: "PersistMessage",
+                schema: "dbo");
 
             migrationBuilder.DropTable(
-                name: "AspNetUsers");
+                name: "AspNetRoles",
+                schema: "dbo");
+
+            migrationBuilder.DropTable(
+                name: "AspNetUsers",
+                schema: "dbo");
         }
     }
 }

src/Services/Identity/src/Identity/Data/Migrations/IdentityContextModelSnapshot.cs

@@ -17,10 +17,47 @@ namespace Identity.Data.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Identity.Identity.Models.ApplicationUser", b =>
                 {
@@ -28,7 +65,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bigint");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
 
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("int");
@@ -96,7 +133,7 @@ namespace Identity.Data.Migrations
                         .HasDatabaseName("UserNameIndex")
                         .HasFilter("[NormalizedUserName] IS NOT NULL");
 
-                    b.ToTable("AspNetUsers", (string)null);
+                    b.ToTable("AspNetUsers", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole<long>", b =>
@@ -105,7 +142,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bigint");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
@@ -126,7 +163,7 @@ namespace Identity.Data.Migrations
                         .HasDatabaseName("RoleNameIndex")
                         .HasFilter("[NormalizedName] IS NOT NULL");
 
-                    b.ToTable("AspNetRoles", (string)null);
+                    b.ToTable("AspNetRoles", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<long>", b =>
@@ -135,7 +172,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("ClaimType")
                         .HasColumnType("nvarchar(max)");
@@ -150,7 +187,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AspNetRoleClaims", (string)null);
+                    b.ToTable("AspNetRoleClaims", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<long>", b =>
@@ -159,7 +196,7 @@ namespace Identity.Data.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("ClaimType")
                         .HasColumnType("nvarchar(max)");
@@ -174,7 +211,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AspNetUserClaims", (string)null);
+                    b.ToTable("AspNetUserClaims", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<long>", b =>
@@ -195,7 +232,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AspNetUserLogins", (string)null);
+                    b.ToTable("AspNetUserLogins", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<long>", b =>
@@ -210,7 +247,7 @@ namespace Identity.Data.Migrations
 
                     b.HasIndex("RoleId");
 
-                    b.ToTable("AspNetUserRoles", (string)null);
+                    b.ToTable("AspNetUserRoles", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<long>", b =>
@@ -229,7 +266,7 @@ namespace Identity.Data.Migrations
 
                     b.HasKey("UserId", "LoginProvider", "Name");
 
-                    b.ToTable("AspNetUserTokens", (string)null);
+                    b.ToTable("AspNetUserTokens", "dbo");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<long>", b =>

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

@@ -41,7 +41,7 @@ public static class InfrastructureExtensions
             options.SuppressModelStateInvalidFilter = true;
         });
 
-        var appOptions = builder.Services.GetOptions<AppOptions>("AppOptions");
+        var appOptions = builder.Services.GetOptions<AppOptions>(nameof(AppOptions));
         Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name));
 
         builder.Services.AddRateLimiter(options =>
@@ -56,7 +56,7 @@ public static class InfrastructureExtensions
         });
 
         builder.Services.AddControllers();
-        builder.Services.AddPersistMessage(configuration);
+        builder.Services.AddPersistMessageProcessor();
         builder.Services.AddCustomDbContext<IdentityContext>(configuration);
         builder.Services.AddScoped<IDataSeeder, IdentityDataSeeder>();
         builder.AddCustomSerilog(env);
@@ -82,7 +82,7 @@ public static class InfrastructureExtensions
     public static WebApplication UseInfrastructure(this WebApplication app)
     {
         var env = app.Environment;
-        var appOptions = app.GetOptions<AppOptions>("AppOptions");
+        var appOptions = app.GetOptions<AppOptions>(nameof(AppOptions));
 
         app.UseProblemDetails();
         app.UseSerilogRequestLogging();

src/Services/Passenger/src/Passenger.Api/appsettings.docker.json

@@ -1,13 +1,13 @@
 {
   "App": "Passenger-Service",
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=db;Database=PassengerDB;User ID=sa;Password=@Aa123456"
   },
   "Jwt": {
     "Authority": "https://localhost:5005",
     "Audience": "passenger-api"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "rabbitmq",
     "ExchangeName": "passenger",
     "UserName": "guest",

src/Services/Passenger/src/Passenger.Api/appsettings.json

@@ -2,7 +2,7 @@
   "AppOptions": {
     "Name": "Passenger-Service"
   },
-  "ConnectionStrings": {
+  "DatabaseOptions": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "MongoOptions": {
@@ -13,7 +13,7 @@
     "Authority": "https://localhost:5005",
     "Audience": "passenger-api"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "passenger",
     "UserName": "guest",
@@ -35,8 +35,7 @@
   },
   "PersistMessageOptions": {
     "Interval": 30,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
   "AllowedHosts": "*"
 }

src/Services/Passenger/src/Passenger.Api/appsettings.test.json

@@ -1,8 +1,8 @@
 {
-  "ConnectionStrings": {
+  "DatabaseOptions": {
-    "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
+    "DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
-  "RabbitMq": {
+  "RabbitMqOptions": {
     "HostName": "localhost",
     "ExchangeName": "passenger",
     "UserName": "guest",
@@ -19,7 +19,6 @@
   },
   "PersistMessageOptions": {
     "Interval": 1,
-    "Enabled": true,
+    "Enabled": true
-    "ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageTestDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   }
 }

src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs

@@ -1,3 +1,4 @@
+using BuildingBlocks.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
@@ -7,7 +8,7 @@ public class PassengerConfiguration: IEntityTypeConfiguration<Passengers.Models.
 {
     public void Configure(EntityTypeBuilder<Passengers.Models.Passenger> builder)
     {
-        builder.ToTable("Passenger", "dbo");
+        builder.ToTable("Passenger", AppDbContextBase.DefaultSchema);
 
         builder.HasKey(r => r.Id);
         builder.Property(r => r.Id).ValueGeneratedNever();

src/Services/Passenger/src/Passenger/Data/Configurations/PersistMessageConfiguration.cs

@@ -1,13 +1,15 @@
-using Microsoft.EntityFrameworkCore;
+using BuildingBlocks.EFCore;
+using BuildingBlocks.PersistMessageProcessor;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace BuildingBlocks.PersistMessageProcessor.Data.Configurations;
+namespace Passenger.Data.Configurations;
 
 public class PersistMessageConfiguration : IEntityTypeConfiguration<PersistMessage>
 {
     public void Configure(EntityTypeBuilder<PersistMessage> builder)
     {
-        builder.ToTable("PersistMessage", PersistMessageDbContext.DefaultSchema);
+        builder.ToTable("PersistMessage", AppDbContextBase.DefaultSchema);
 
         builder.HasKey(x => x.Id);
 

src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs

@@ -10,7 +10,7 @@ public class DesignTimeDbContextFactory: IDesignTimeDbContextFactory<PassengerDb
         var builder = new DbContextOptionsBuilder<PassengerDbContext>();
 
         builder.UseSqlServer(
-            "Data Source=.\\sqlexpress;Initial Catalog=PassengerDB;Persist Security Info=False;Integrated Security=SSPI");
+            "Data Source=.\\sqlexpress;Initial Catalog=PassengerDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
         return new PassengerDbContext(builder.Options, null);
     }
 }

src/Services/Passenger/src/Passenger/Data/Migrations/20221203211633_initial.Designer.cs

@@ -12,17 +12,55 @@ using Passenger.Data;
 namespace Passenger.Data.Migrations
 {
     [DbContext(typeof(PassengerDbContext))]
-    [Migration("20220728180020_initial")]
+    [Migration("20221203211633_initial")]
     partial class initial
     {
+        /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Passenger.Passengers.Models.Passenger", b =>
                 {

src/Services/Passenger/src/Passenger/Data/Migrations/20221203211633_initial.cs

@@ -5,8 +5,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Passenger.Data.Migrations
 {
+    /// <inheritdoc />
     public partial class initial : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.EnsureSchema(
@@ -33,13 +35,37 @@ namespace Passenger.Data.Migrations
                 {
                     table.PrimaryKey("PK_Passenger", x => x.Id);
                 });
+
+            migrationBuilder.CreateTable(
+                name: "PersistMessage",
+                schema: "dbo",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DataType = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Data = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Created = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RetryCount = table.Column<int>(type: "int", nullable: false),
+                    MessageStatus = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false),
+                    DeliveryType = table.Column<string>(type: "varchar(50)", unicode: false, maxLength: 50, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PersistMessage", x => x.Id);
+                });
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
                 name: "Passenger",
                 schema: "dbo");
+
+            migrationBuilder.DropTable(
+                name: "PersistMessage",
+                schema: "dbo");
         }
     }
 }

src/Services/Passenger/src/Passenger/Data/Migrations/PassengerDbContextModelSnapshot.cs

@@ -17,10 +17,47 @@ namespace Passenger.Data.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.1")
+                .HasAnnotation("ProductVersion", "7.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BuildingBlocks.PersistMessageProcessor.PersistMessage", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DataType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<string>("MessageStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .IsUnicode(false)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PersistMessage", "dbo");
+                });
 
             modelBuilder.Entity("Passenger.Passengers.Models.Passenger", b =>
                 {

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

@@ -45,7 +45,7 @@ public static class InfrastructureExtensions
             options.SuppressModelStateInvalidFilter = true;
         });
 
-        var appOptions = builder.Services.GetOptions<AppOptions>("AppOptions");
+        var appOptions = builder.Services.GetOptions<AppOptions>(nameof(AppOptions));
         Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name));
 
         builder.Services.AddRateLimiter(options =>
@@ -59,9 +59,9 @@ public static class InfrastructureExtensions
                     }));
         });
 
+        builder.Services.AddPersistMessageProcessor();
         builder.Services.AddCustomDbContext<PassengerDbContext>(configuration);
         builder.Services.AddMongoDbContext<PassengerReadDbContext>(configuration);
-        builder.Services.AddPersistMessage(configuration);
 
         builder.AddCustomSerilog(env);
         builder.Services.AddJwt();
@@ -89,7 +89,7 @@ public static class InfrastructureExtensions
     public static WebApplication UseInfrastructure(this WebApplication app)
     {
         var env = app.Environment;
-        var appOptions = app.GetOptions<AppOptions>("AppOptions");
+        var appOptions = app.GetOptions<AppOptions>(nameof(AppOptions));
 
         app.UseProblemDetails();
         app.UseSerilogRequestLogging();