Merge pull request #227 from DFE-Digital/FHB-732

[FHB-732] Disable EF Core runtime migrations
DFE-Digital · Nov 12, 2024 · cfa0773 · cfa0773
2 parents 274bb14 + 85c29af
commit cfa0773
Show file tree

Hide file tree

Showing 28 changed files with 4,683 additions and 340 deletions.
diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Api/Program.cs b/src/service/idam-api/src/FamilyHubs.Idam.Api/Program.cs
@@ -23,11 +23,11 @@ public static async Task Main(string[] args)
 
             builder.Services.RegisterApplicationComponents(builder.Configuration);
 
-            builder.Services.ConfigureServices(builder.Configuration, builder.Environment.IsProduction());
+            builder.Services.ConfigureServices(builder.Configuration);
 
             var webApplication = builder.Build();
 
-            await webApplication.ConfigureWebApplication();
+            webApplication.ConfigureWebApplication();
 
             await webApplication.RunAsync();
         }

diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Api/StartupExtensions.cs b/src/service/idam-api/src/FamilyHubs.Idam.Api/StartupExtensions.cs
@@ -110,7 +110,7 @@ private static void RegisterMediator(this IServiceCollection services)
         services.AddTransient<ExceptionHandlingMiddleware>();
     }
 
-    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration, bool isProduction)
+    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddSingleton<ITelemetryInitializer, IdamsTelemetryPiiRedactor>();
         services.AddApplicationInsightsTelemetry();
@@ -132,7 +132,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
         services.AddFamilyHubsHealthChecks(configuration);
     }
 
-    public static async Task ConfigureWebApplication(this WebApplication webApplication)
+    public static void ConfigureWebApplication(this WebApplication webApplication)
     {
         webApplication.UseSerilogRequestLogging();
 
@@ -148,28 +148,5 @@ public static async Task ConfigureWebApplication(this WebApplication webApplicat
         webApplication.MapControllers();
 
         webApplication.MapFamilyHubsHealthChecks(typeof(StartupExtensions).Assembly);
-
-        await webApplication.InitialiseDatabase();
-    }
-
-    private static async Task InitialiseDatabase(this WebApplication webApplication)
-    {
-        using var scope = webApplication.Services.CreateScope();
-
-        // Seed Database
-        var dbContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var shouldRestDatabaseOnRestart = webApplication.Configuration.GetValue<bool>("ShouldRestDatabaseOnRestart");
-
-        if (!webApplication.Environment.IsProduction())
-        {
-
-            if (shouldRestDatabaseOnRestart) 
-                await dbContext.Database.EnsureDeletedAsync();
-
-            if(dbContext.Database.IsSqlServer())
-                await dbContext.Database.MigrateAsync();
-            else
-                await dbContext.Database.EnsureCreatedAsync();
-        }
     }
 }
diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Api/appsettings.json b/src/service/idam-api/src/FamilyHubs.Idam.Api/appsettings.json
@@ -30,7 +30,6 @@
   "aeg-sas-key": "",
   "ServiceDirectoryApiBaseUrl": "https://localhost:7022/",
   "UseSqlite": false,
-  "ShouldRestDatabaseOnRestart": false,
   "LogLevel": "Verbose",
   "AllowedHosts": "*",
   "APPINSIGHTS_INSTRUMENTATIONKEY": "",

diff --git a/...service/idam-api/tests/FamilyHubs.Idam.Api.FunctionalTests/CustomWebApplicationFactory.cs b/...service/idam-api/tests/FamilyHubs.Idam.Api.FunctionalTests/CustomWebApplicationFactory.cs
@@ -45,6 +45,7 @@ public void SetupTestData(bool many = false)
         {
             var context = scopedServices.GetRequiredService<ApplicationDbContext>();
 
+            context.Database.EnsureCreated();
             context.Accounts.Add(TestDataProvider.GetTestAccount(many));
 
             context.SaveChanges();

diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Api/Program.cs b/src/service/notification-api/src/FamilyHubs.Notification.Api/Program.cs
@@ -24,11 +24,11 @@ public static async Task Main(string[] args)
 
             builder.Services.RegisterApplicationComponents(builder.Configuration);
 
-            builder.Services.ConfigureServices(builder.Configuration, builder.Environment.IsProduction());
+            builder.Services.ConfigureServices(builder.Configuration);
 
             var webApplication = builder.Build();
 
-            await webApplication.ConfigureWebApplication();
+            webApplication.ConfigureWebApplication();
 
             await webApplication.RunAsync();
         }

diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Api/StartupExtensions.cs b/src/service/notification-api/src/FamilyHubs.Notification.Api/StartupExtensions.cs
@@ -101,7 +101,6 @@ private static void RegisterAutoMapper(this IServiceCollection services)
     private static void RegisterAppDbContext(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddTransient<AuditableEntitySaveChangesInterceptor>();
-        services.AddTransient<ApplicationDbContextInitialiser>();
 
         var connectionString = configuration.GetConnectionString("NotificationConnection");
         ArgumentException.ThrowIfNullOrEmpty(connectionString);
@@ -151,7 +150,7 @@ public static void RegisterMediator(this IServiceCollection services)
         services.AddTransient<ExceptionHandlingMiddleware>();
     }
 
-    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration, bool isProduction)
+    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddApplicationInsightsTelemetry();
 
@@ -167,7 +166,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
         });
     }
 
-    public static async Task ConfigureWebApplication(this WebApplication webApplication)
+    public static void ConfigureWebApplication(this WebApplication webApplication)
     {
         webApplication.UseSerilogRequestLogging();
 
@@ -184,29 +183,14 @@ public static async Task ConfigureWebApplication(this WebApplication webApplicat
 
         webApplication.MapFamilyHubsHealthChecks(typeof(StartupExtensions).Assembly);
 
-        await RegisterEndPoints(webApplication);
+        RegisterEndPoints(webApplication);
     }
 
-    private static async Task RegisterEndPoints(this WebApplication app)
+    private static void RegisterEndPoints(this WebApplication app)
     {
         using var scope = app.Services.CreateScope();
 
         var notifyApi = scope.ServiceProvider.GetService<MinimalNotifyEndPoints>();
         notifyApi?.RegisterMinimalNotifyEndPoints(app);
-
-        try
-        {
-            if (!app.Environment.IsProduction())
-            {
-                // Seed Database
-                var initialiser = scope.ServiceProvider.GetRequiredService<ApplicationDbContextInitialiser>();
-                var shouldRestDatabaseOnRestart = app.Configuration.GetValue<bool>("ShouldRestDatabaseOnRestart");
-                await initialiser.InitialiseAsync(app.Environment.IsProduction(), shouldRestDatabaseOnRestart);
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "An error occurred seeding the DB. {exceptionMessage}", ex.Message);
-        }
     }
 }
diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Api/appsettings.json b/src/service/notification-api/src/FamilyHubs.Notification.Api/appsettings.json
@@ -4,7 +4,6 @@
     "NotificationConnection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=FamilyHubs.Notify.Database;Integrated Security=True;MultipleActiveResultSets=True;Pooling=False;Connect Timeout=30;"
   },
   "UseSqlite": false,
-  "ShouldRestDatabaseOnRestart": false,
   "Crypto": {
     "DbEncryptionKey": "",
     "DbEncryptionIVKey": ""

diff --git a/...cation-api/src/FamilyHubs.Notification.Data/Repository/ApplicationDbContextInitialiser.cs b/...cation-api/src/FamilyHubs.Notification.Data/Repository/ApplicationDbContextInitialiser.cs
diff --git a/...fication-api/tests/FamilyHubs.Notification.FunctionalTests/CustomWebApplicationFactory.cs b/...fication-api/tests/FamilyHubs.Notification.FunctionalTests/CustomWebApplicationFactory.cs
@@ -73,12 +73,8 @@ public void SetupTestDatabaseAndSeedData()
 
         try
         {
-#pragma warning disable S1481
             var context = scopedServices.GetRequiredService<ApplicationDbContext>();
-#pragma warning restore S1481
-
-
-
+            context.Database.EnsureCreated();
         }
         catch (Exception ex)
         {

diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Api/Program.cs b/src/service/referral-api/src/FamilyHubs.Referral.Api/Program.cs
@@ -23,11 +23,11 @@ public static async Task Main(string[] args)
 
             builder.Services.RegisterApplicationComponents(builder.Configuration);
 
-            builder.Services.ConfigureServices(builder.Configuration, builder.Environment.IsProduction());
+            builder.Services.ConfigureServices(builder.Configuration);
 
             var webApplication = builder.Build();
 
-            await webApplication.ConfigureWebApplication();
+            webApplication.ConfigureWebApplication();
 
             await webApplication.RunAsync();
         }

diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Api/StartupExtensions.cs b/src/service/referral-api/src/FamilyHubs.Referral.Api/StartupExtensions.cs
@@ -120,7 +120,6 @@ private static void RegisterAutoMapper(this IServiceCollection services)
     private static void RegisterAppDbContext(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddTransient<AuditableEntitySaveChangesInterceptor>();
-        services.AddTransient<ApplicationDbContextInitialiser>();
 
         var connectionString = configuration.GetConnectionString("ReferralConnection");
         ArgumentException.ThrowIfNullOrEmpty(connectionString);
@@ -170,7 +169,7 @@ public static void RegisterMediator(this IServiceCollection services)
         services.AddTransient<ExceptionHandlingMiddleware>();
     }
 
-    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration, bool isProduction)
+    public static void ConfigureServices(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddSingleton<ITelemetryInitializer, ConnectTelemetryPiiRedactor>();
         services.AddApplicationInsightsTelemetry();
@@ -187,7 +186,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
         });
     }
 
-    public static async Task ConfigureWebApplication(this WebApplication webApplication)
+    public static void ConfigureWebApplication(this WebApplication webApplication)
     {
         webApplication.UseSerilogRequestLogging();
 
@@ -204,10 +203,10 @@ public static async Task ConfigureWebApplication(this WebApplication webApplicat
 
         webApplication.MapFamilyHubsHealthChecks(typeof(StartupExtensions).Assembly);
 
-        await RegisterEndPoints(webApplication);
+        RegisterEndPoints(webApplication);
     }
 
-    private static async Task RegisterEndPoints(this WebApplication app)
+    private static void RegisterEndPoints(this WebApplication app)
     {
         using var scope = app.Services.CreateScope();
 
@@ -224,21 +223,5 @@ private static async Task RegisterEndPoints(this WebApplication app)
             throw new InvalidOperationException("MinimalUserAccountEndPoints is not registered");
         }
         userAccountsApi.RegisterUserAccountEndPoints(app);
-
-        try
-        {
-            if (!app.Environment.IsProduction())
-            {
-                // Seed Database
-                // Seed Database
-                var initialiser = scope.ServiceProvider.GetRequiredService<ApplicationDbContextInitialiser>();
-                var shouldRestDatabaseOnRestart = app.Configuration.GetValue<bool>("ShouldRestDatabaseOnRestart");
-                await initialiser.InitialiseAsync(app.Environment.IsProduction(), shouldRestDatabaseOnRestart);
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "An error occurred seeding the DB. {ExceptionMessage}", ex.Message);
-        }
     }
 }
diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Api/appsettings.json b/src/service/referral-api/src/FamilyHubs.Referral.Api/appsettings.json
@@ -4,7 +4,6 @@
     "ReferralConnection": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=FamilyHubs.Referral.Database;Integrated Security=True;MultipleActiveResultSets=True;Pooling=False;Connect Timeout=30;"
   },
   "UseSqlite": false,
-  "ShouldRestDatabaseOnRestart": false,
   "GovUkOidcConfiguration": {
     "BearerTokenSigningKey": ""
   },