feat(db): implement options pattern for database connection strings

Chapter-1-initial-architecture/Src/Fitnet/Contracts/Data/Database/ContractsPersistenceOptions.cs

@@ -0,0 +1,10 @@
+namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database;
+
+using System.ComponentModel.DataAnnotations;
+
+internal sealed class ContractsPersistenceOptions
+{
+    public const string SectionName = "ConnectionStrings";
+
+    [Required] public string Contracts { get; init; } = string.Empty;
+}

Chapter-1-initial-architecture/Src/Fitnet/Contracts/Data/Database/DatabaseModule.cs

@@ -1,15 +1,22 @@
 namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database;
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 internal static class DatabaseModule
 {
-    private const string ConnectionStringName = "Contracts";
-
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(ConnectionStringName);
-        services.AddDbContext<ContractsPersistence>(options => options.UseNpgsql(connectionString));
+        services.Configure<ContractsPersistenceOptions>(
+            configuration.GetSection(ContractsPersistenceOptions.SectionName));
+        services.AddOptionsWithValidateOnStart<ContractsPersistenceOptions>();
+
+        services.AddDbContext<ContractsPersistence>((serviceProvider, options) =>
+        {
+            var persistenceOptions = serviceProvider.GetRequiredService<IOptions<ContractsPersistenceOptions>>();
+            var connectionString = persistenceOptions.Value.Contracts;
+            options.UseNpgsql(connectionString);
+        });
 
         return services;
     }

Chapter-1-initial-architecture/Src/Fitnet/Offers/Data/Database/DatabaseModule.cs

@@ -1,15 +1,21 @@
 namespace EvolutionaryArchitecture.Fitnet.Offers.Data.Database;
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 internal static class DatabaseModule
 {
-    private const string ConnectionStringName = "Offers";
-
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(ConnectionStringName);
-        services.AddDbContext<OffersPersistence>(options => options.UseNpgsql(connectionString));
+        services.Configure<OffersPersistenceOptions>(configuration.GetSection(OffersPersistenceOptions.SectionName));
+        services.AddOptionsWithValidateOnStart<OffersPersistenceOptions>();
+
+        services.AddDbContext<OffersPersistence>((serviceProvider, options) =>
+        {
+            var persistenceOptions = serviceProvider.GetRequiredService<IOptions<OffersPersistenceOptions>>();
+            var connectionString = persistenceOptions.Value.Offers;
+            options.UseNpgsql(connectionString);
+        });
 
         return services;
     }
@@ -20,4 +26,4 @@ internal static IApplicationBuilder UseDatabase(this IApplicationBuilder applica
 
         return applicationBuilder;
     }
-}
+}

Chapter-1-initial-architecture/Src/Fitnet/Offers/Data/Database/OffersPersistenceOptions.cs

@@ -0,0 +1,10 @@
+namespace EvolutionaryArchitecture.Fitnet.Offers.Data.Database;
+
+using System.ComponentModel.DataAnnotations;
+
+internal sealed class OffersPersistenceOptions
+{
+    public const string SectionName = "ConnectionStrings";
+
+    [Required] public string Offers { get; init; } = string.Empty;
+}

Chapter-1-initial-architecture/Src/Fitnet/Passes/Data/Database/DatabaseModule.cs

@@ -1,15 +1,21 @@
 namespace EvolutionaryArchitecture.Fitnet.Passes.Data.Database;
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 internal static class DatabaseModule
 {
-    private const string ConnectionStringName = "Passes";
-
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(ConnectionStringName);
-        services.AddDbContext<PassesPersistence>(options => options.UseNpgsql(connectionString));
+        services.Configure<PassesPersistenceOptions>(configuration.GetSection(PassesPersistenceOptions.SectionName));
+        services.AddOptionsWithValidateOnStart<PassesPersistenceOptions>();
+
+        services.AddDbContext<PassesPersistence>((serviceProvider, options) =>
+        {
+            var persistenceOptions = serviceProvider.GetRequiredService<IOptions<PassesPersistenceOptions>>();
+            var connectionString = persistenceOptions.Value.Passes;
+            options.UseNpgsql(connectionString);
+        });
 
         return services;
     }

Chapter-1-initial-architecture/Src/Fitnet/Passes/Data/Database/PassesPersistenceOptions.cs

@@ -0,0 +1,10 @@
+namespace EvolutionaryArchitecture.Fitnet.Passes.Data.Database;
+
+using System.ComponentModel.DataAnnotations;
+
+internal sealed class PassesPersistenceOptions
+{
+    public const string SectionName = "ConnectionStrings";
+
+    [Required] public string Passes { get; init; } = string.Empty;
+}

Chapter-1-initial-architecture/Src/Fitnet/Program.cs

@@ -18,10 +18,11 @@
 builder.Services.AddRequestsValidations();
 builder.Services.AddClock();
 
+// Add modules - each module registers its own options with validation
 builder.Services.AddPasses(builder.Configuration);
 builder.Services.AddContracts(builder.Configuration);
 builder.Services.AddOffers(builder.Configuration);
-builder.Services.AddReports();
+builder.Services.AddReports(builder.Configuration);
 
 var app = builder.Build();
 

Chapter-1-initial-architecture/Src/Fitnet/Reports/DataAccess/DataAccessModule.cs

@@ -0,0 +1,14 @@
+namespace EvolutionaryArchitecture.Fitnet.Reports.DataAccess;
+
+internal static class DataAccessModule
+{
+    internal static IServiceCollection AddDataAccess(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.Configure<ReportsPersistenceOptions>(configuration.GetSection(ReportsPersistenceOptions.SectionName));
+        services.AddOptionsWithValidateOnStart<ReportsPersistenceOptions>();
+
+        services.AddScoped<IDatabaseConnectionFactory, DatabaseConnectionFactory>();
+
+        return services;
+    }
+}

Chapter-1-initial-architecture/Src/Fitnet/Reports/DataAccess/DatabaseConnectionFactory.cs

@@ -1,9 +1,11 @@
 namespace EvolutionaryArchitecture.Fitnet.Reports.DataAccess;
 
 using System.Data;
+using Microsoft.Extensions.Options;
 using Npgsql;
 
-internal sealed class DatabaseConnectionFactory(IConfiguration configuration) : IDatabaseConnectionFactory
+internal sealed class DatabaseConnectionFactory(IOptions<ReportsPersistenceOptions> persistenceOptions)
+    : IDatabaseConnectionFactory
 {
     private NpgsqlConnection? _connection;
 
@@ -14,8 +16,7 @@ public IDbConnection Create()
             return _connection;
         }
 
-        _connection =
-            new NpgsqlConnection(configuration.GetConnectionString("Reports"));
+        _connection = new NpgsqlConnection(persistenceOptions.Value.Reports);
         _connection.Open();
 
         return _connection;

Chapter-1-initial-architecture/Src/Fitnet/Reports/DataAccess/ReportsPersistenceOptions.cs

@@ -0,0 +1,10 @@
+namespace EvolutionaryArchitecture.Fitnet.Reports.DataAccess;
+
+using System.ComponentModel.DataAnnotations;
+
+internal sealed class ReportsPersistenceOptions
+{
+    public const string SectionName = "ConnectionStrings";
+
+    [Required] public string Reports { get; init; } = string.Empty;
+}

Chapter-1-initial-architecture/Src/Fitnet/Reports/ReportsModule.cs

@@ -5,9 +5,9 @@ namespace EvolutionaryArchitecture.Fitnet.Reports;
 
 internal static class ReportsModule
 {
-    internal static IServiceCollection AddReports(this IServiceCollection services)
+    internal static IServiceCollection AddReports(this IServiceCollection services, IConfiguration configuration)
     {
-        services.AddDataAccess();
+        services.AddDataAccess(configuration);
         services.AddNewPassesRegistrationsPerMonthReport();
 
         return services;