Merge pull request #104 from Nfactor26/optional-migration-and-no-auto…

…-db-creation Optional migration and no auto db creation
Nfactor26 · Jan 21, 2024 · e0e0ea4 · e0e0ea4
2 parents 2cf21b0 + 6841e5b
commit e0e0ea4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/.config/identity-postgres-with-console-email.env b/.config/identity-postgres-with-console-email.env
@@ -3,6 +3,7 @@
 #Admin account to create on initialize
 InitAdminUser=[email protected]
 InitAdminUserPass=Admi9@pixel
+AutoMigrate=true
 
 #Plugin configuration
 Plugins__Collection__0__Type=EmailSender

diff --git a/src/Pixel.Identity.Store.PostgreSQL/SqlConfigurator.cs b/src/Pixel.Identity.Store.PostgreSQL/SqlConfigurator.cs
@@ -37,7 +37,8 @@ public IdentityBuilder ConfigureIdentity(IConfiguration configuration, IServiceC
 
         return services.AddDbContext<ApplicationDbContext>(options =>
         {
-            options.UseNpgsql(configuration.GetConnectionString("PostgreServerConnection"));
+            options.UseNpgsql(configuration.GetConnectionString("PostgreServerConnection"), 
+                x => x.MigrationsAssembly("Pixel.Identity.Store.PostgreSQL"));
 
             // Register the entity sets needed by OpenIddict.
             // Note: use the generic overload if you need

diff --git a/src/Pixel.Identity.Store.Sql.Shared/Worker.cs b/src/Pixel.Identity.Store.Sql.Shared/Worker.cs
@@ -35,7 +35,13 @@ public async Task StartAsync(CancellationToken cancellationToken)
         using var scope = this.serviceProvider.CreateScope();
 
         var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        await context.Database.EnsureCreatedAsync();
+        //Apply migrations if autoMigrate configuration is enabled. In production, migrations should be applied
+        //using sql scripts provided with release. This can be handy to quickly spin a container or in dev / ci-cd environments
+        if (bool.TryParse(configuration["AutoMigrate"] ?? "false", out bool autoMigrate) && autoMigrate)
+        {
+            await context.Database.MigrateAsync();
+            logger.LogInformation("Entity framework migration was applied based on 'AutoMigrate' configuraation flag");
+        }      
 
         var applicationManager = scope.ServiceProvider.GetRequiredService<IOpenIddictApplicationManager>();
 

diff --git a/src/Pixel.Identity.Store.SqlServer/SqlConfigurator.cs b/src/Pixel.Identity.Store.SqlServer/SqlConfigurator.cs
@@ -37,7 +37,8 @@ public IdentityBuilder ConfigureIdentity(IConfiguration configuration, IServiceC
 
         return services.AddDbContext<ApplicationDbContext>(options =>
         {
-            options.UseSqlServer(configuration.GetConnectionString("SqlServerConnection"));
+            options.UseSqlServer(configuration.GetConnectionString("SqlServerConnection"),
+                x => x.MigrationsAssembly("Pixel.Identity.Store.SqlServer"));
 
             // Register the entity sets needed by OpenIddict.
             // Note: use the generic overload if you need

diff --git a/src/Pixel.Identity.UI.Tests/PageModels/RegisterPage.cs b/src/Pixel.Identity.UI.Tests/PageModels/RegisterPage.cs
@@ -1,4 +1,5 @@
 using Microsoft.Playwright;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Pixel.Identity.UI.Tests.PageModels
@@ -23,6 +24,11 @@ public RegisterPage(IPage page)
         public async Task GoToAsync()
         {           
             await page.ClickAsync("#registerPageLink");
+            await page.WaitForURLAsync(new System.Text.RegularExpressions.Regex(".*/Account/Register/*"), new PageWaitForURLOptions()
+            {
+                WaitUntil = WaitUntilState.NetworkIdle,
+                Timeout = 60000
+            });
         }
 
         /// <summary>