Merge pull request #693 from PathfinderHonorManager/develop

Use separate admin connection string for database migrations

Author: brian-cummings

.github/workflows/main_pathfinderhonormanager.yml

@@ -105,6 +105,7 @@ jobs:
           files: '${{env.DOTNET_ROOT}}/myapp/appsettings.json'
         env:
           ConnectionStrings.PathfinderCS: ${{ secrets.PRODCONNECTIONSTRING }}
+          ConnectionStrings.PathfinderMigrationCS: ${{ secrets.PROD_ADMIN_CONNECTIONSTRING }}
           App.ServerRootAddress: ${{ env.SERVER_ROOT_ADDRESS }}
 
       - name: Upload artifact for deployment job

PathfinderHonorManager/Service/MigrationService.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -14,25 +15,39 @@ public class MigrationService : IHostedService
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly ILogger<MigrationService> _logger;
+        private readonly IConfiguration _configuration;
 
-        public MigrationService(IServiceProvider serviceProvider, ILogger<MigrationService> logger)
+        public MigrationService(IServiceProvider serviceProvider, ILogger<MigrationService> logger, IConfiguration configuration)
         {
             _serviceProvider = serviceProvider;
             _logger = logger;
+            _configuration = configuration;
         }
 
         public async Task StartAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("Starting database migration check...");
 
             using var scope = _serviceProvider.CreateScope();
-            var context = scope.ServiceProvider.GetRequiredService<PathfinderContext>();
+            
+            var migrationConnectionString = _configuration.GetConnectionString("PathfinderMigrationCS");
+            var optionsBuilder = new DbContextOptionsBuilder<PathfinderContext>();
+            optionsBuilder.UseNpgsql(migrationConnectionString, 
+                npgsqlOptions => 
+                {
+                    npgsqlOptions.CommandTimeout(60);
+                    npgsqlOptions.EnableRetryOnFailure(
+                        maxRetryCount: 3,
+                        maxRetryDelay: TimeSpan.FromSeconds(10),
+                        errorCodesToAdd: null);
+                });
+            
+            var context = new PathfinderContext(optionsBuilder.Options);
 
             try
             {
-                var connectionString = context.Database.GetConnectionString();
-                var builder = new Npgsql.NpgsqlConnectionStringBuilder(connectionString);
-                _logger.LogDebug("Connecting to database: Host={Host}, Database={Database}, Username={Username}", 
+                var builder = new Npgsql.NpgsqlConnectionStringBuilder(migrationConnectionString);
+                _logger.LogDebug("Connecting to database for migrations: Host={Host}, Database={Database}, Username={Username}", 
                     builder.Host, builder.Database, builder.Username);
 
                 var canConnect = await context.Database.CanConnectAsync(cancellationToken);

PathfinderHonorManager/appsettings.json

@@ -1,7 +1,8 @@
 {
   "https_port": 443,
   "ConnectionStrings": {
-    "PathfinderCS": "defaultConnection"
+    "PathfinderCS": "defaultConnection",
+    "PathfinderMigrationCS": "defaultMigrationConnection"
   },
   "Logging": {
     "LogLevel": {