Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/Infrastructure/Data/ApplicationDbContextInitialiser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using CleanArchitecture.Infrastructure.Identity;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;

Expand Down Expand Up @@ -40,9 +41,14 @@ public async Task InitialiseAsync()
{
try
{
// See https://jasontaylor.dev/ef-core-database-initialisation-strategies
await _context.Database.EnsureDeletedAsync();
await _context.Database.EnsureCreatedAsync();
var hasPendingChanges = _context.Database.HasPendingModelChanges(); // First generate migration for new changes before migrating
var hasPendingMigrations = (await _context.Database.GetPendingMigrationsAsync()).Any(); // If there are pending migrations, run them (update-database)

if (hasPendingChanges || !hasPendingMigrations)
{
return;
}
await _context.Database.MigrateAsync();
}
catch (Exception ex)
{
Expand Down Expand Up @@ -82,7 +88,7 @@ public async Task TrySeedAsync()
await _userManager.CreateAsync(administrator, "Administrator1!");
if (!string.IsNullOrWhiteSpace(administratorRole.Name))
{
await _userManager.AddToRolesAsync(administrator, new [] { administratorRole.Name });
await _userManager.AddToRolesAsync(administrator, new[] { administratorRole.Name });
}
}

Expand Down