feat: apply options pattern

Author: kamilbaczek

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/DatabaseModule.cs

@@ -4,16 +4,21 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Repositories;
 
 internal static class DatabaseModule
 {
-    private const string ConnectionStringName = "Contracts";
+    private const string DatabaseConfigurationSection = "Database";
 
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(ConnectionStringName);
-        services.AddDbContext<ContractsPersistence>(options => options.UseNpgsql(connectionString));
+        services.Configure<DatabaseOptions>(options => configuration.GetSection(DatabaseConfigurationSection).Bind(options));
+        services.AddDbContext<ContractsPersistence>((serviceProvider, options) =>
+        {
+            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
+            options.UseNpgsql(databaseOptions.Value.ConnectionString);
+        });
         services.AddRepositories();
 
         return services;

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/DatabaseOptions.cs

@@ -0,0 +1,6 @@
+namespace EvolutionaryArchitecture.Fitnet.Contracts.Infrastructure.Database;
+
+internal sealed class DatabaseOptions
+{
+    public string? ConnectionString { get; init; }
+}

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/ContractsDatabaseConfiguration.cs

@@ -10,6 +10,6 @@ internal sealed class ContractsDatabaseConfiguration : IDatabaseConfiguration
 
     public Dictionary<string, string?> Get() => new()
     {
-        { "ConnectionStrings:Contracts", _connectionString }
+        { "Database:ConnectionString", _connectionString }
     };
 }

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts/appsettings.Development.json

@@ -8,8 +8,8 @@
   "FeatureManagement": {
     "Contracts": true,
   },
-  "ConnectionStrings": {
-    "Contracts": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword"
+  "Database": {
+    "ConnectionString": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword"
   },
   "EventBus": {
     "Uri": "rabbitmq",

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts/appsettings.json

@@ -9,8 +9,8 @@
   "FeatureManagement": {
     "Contracts": true,
   },
-  "ConnectionStrings": {
-    "Contracts": ""
+  "Database": {
+    "ConnectionString": ""
   },
   "ExternalEventBus": {
     "Uri": "localhost",

Chapter-3-microservice-extraction/Fitnet/Src/Fitnet/appsettings.Development.json

@@ -11,10 +11,8 @@
     "Passes": true,
     "Reports": true
   },
-  "ConnectionStrings": {
-    "Passes": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword",
-    "Reports": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword",
-    "Offers": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword"
+  "Database": {
+    "ConnectionString": "Host=postgres:5432;Database=fitnet;Username=postgres;Password=mysecretpassword"
   },
   "EventBus": {
     "Uri": "rabbitmq",

Chapter-3-microservice-extraction/Fitnet/Src/Fitnet/appsettings.json

@@ -17,10 +17,8 @@
       "Enabled": true
     }
   },
-  "ConnectionStrings": {
-    "Passes": "",
-    "Reports": "",
-    "Offers": ""
+  "Database": {
+    "ConnectionString": ""
   },
   "EventBus": {
     "Uri": "localhost",

Chapter-3-microservice-extraction/Fitnet/Src/Offers/Fitnet.Offers.DataAccess/Database/DatabaseModule.cs

@@ -4,15 +4,20 @@ namespace EvolutionaryArchitecture.Fitnet.Offers.DataAccess.Database;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 
 internal static class DatabaseModule
 {
-    private const string ConnectionStringName = "Offers";
+    private const string DatabaseConfigurationSection = "Database";
 
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(ConnectionStringName);
-        services.AddDbContext<OffersPersistence>(options => options.UseNpgsql(connectionString));
+        services.Configure<DatabaseOptions>(_ => configuration.GetSection(DatabaseConfigurationSection));
+        services.AddDbContext<OffersPersistence>((serviceProvider, options) =>
+        {
+            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
+            options.UseNpgsql(databaseOptions.Value.ConnectionString);
+        });
 
         return services;
     }
@@ -23,4 +28,4 @@ internal static IApplicationBuilder UseDatabase(this IApplicationBuilder applica
 
         return applicationBuilder;
     }
-}
+}

Chapter-3-microservice-extraction/Fitnet/Src/Offers/Fitnet.Offers.DataAccess/Database/DatabaseOptions.cs

@@ -0,0 +1,6 @@
+namespace EvolutionaryArchitecture.Fitnet.Offers.DataAccess.Database;
+
+internal sealed class DatabaseOptions
+{
+    public string? ConnectionString { get; init; }
+}

Chapter-3-microservice-extraction/Fitnet/Src/Offers/Tests/Fitnet.Offers.IntegrationTests/OffersDatabaseConfiguration.cs

@@ -10,6 +10,6 @@ internal sealed class OffersDatabaseConfiguration : IDatabaseConfiguration
 
     public Dictionary<string, string?> Get() => new()
     {
-        { "ConnectionStrings:Offers", _connectionString }
+        { "Database:ConnectionString", _connectionString }
     };
 }