Changed context

jinwenming · Jan 3, 2020 · d090866 · d090866
1 parent 263fde0
commit d090866
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ Client configuration
         IdentityTokenLifetime = 3600,
         LogoUri = "https://jpproject.azurewebsites.net/sso/images/brand/logo.png",
         AuthorizationCodeLifetime = 3600,
-        PostLogoutRedirectUris = {$"{configuration["ApplicationSettings:IS4AdminUi"]}",},
+        PostLogoutRedirectUris = {"http://localhost:4300",},
         AllowedScopes =
         {
             IdentityServerConstants.StandardScopes.OpenId,

diff --git a/src/Backend/JPProject.Admin.Api/Configuration/AdminUiConfiguration.cs b/src/Backend/JPProject.Admin.Api/Configuration/AdminUiConfiguration.cs
@@ -2,6 +2,7 @@
 using AutoMapper.Configuration;
 using JPProject.Admin.Application.AutoMapper;
 using JPProject.Admin.Database;
+using JPProject.Admin.Infra.Data.Context;
 using JPProject.AspNet.Core;
 using JPProject.Domain.Core.ViewModels;
 using MediatR;
@@ -19,6 +20,7 @@ public static IServiceCollection ConfigureAdminUi(this IServiceCollection servic
             var database = configuration.GetValue<DatabaseType>("ApplicationSettings:DatabaseType");
             var connString = configuration.GetConnectionString("SSOConnection");
 
+            services.Configure<JpDatabaseOptions>(o => o.MustThrowExceptionIfDatabaseDontExist = false);
             services.ConfigureJpAdmin<AspNetUser>().AddDatabase(database, connString);
 
             return services;

diff --git a/src/Backend/JPProject.Admin.Api/Configuration/AdminUiMigrationHelpers.cs b/src/Backend/JPProject.Admin.Api/Configuration/AdminUiMigrationHelpers.cs
@@ -0,0 +1,32 @@
+using JPProject.Admin.Infra.Data.Context;
+using JPProject.EntityFrameworkCore.Context;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading.Tasks;
+
+namespace JPProject.Admin.Api.Configuration
+{
+    public static class AdminUiMigrationHelpers
+    {
+        /// <summary>
+        /// Generate migrations before running this method, you can use command bellow:
+        /// Nuget package manager: Add-Migration DbInit -context ApplicationIdentityContext -output Data/Migrations
+        /// Dotnet CLI: dotnet ef migrations add DbInit -c ApplicationIdentityContext -o Data/Migrations
+        /// </summary>
+        public static async Task EnsureSeedData(IServiceScope serviceScope)
+        {
+            var services = serviceScope.ServiceProvider;
+            await EnsureSeedData(services);
+        }
+        public static async Task EnsureSeedData(IServiceProvider serviceProvider)
+        {
+            await Infra.Data.Configuration.DbMigrationHelpers.CheckDatabases(serviceProvider, new JpDatabaseOptions() { MustThrowExceptionIfDatabaseDontExist = true });
+
+            using (var scope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            {
+                var eventStoreDb = scope.ServiceProvider.GetRequiredService<EventStoreContext>();
+                await Infra.Data.Configuration.DbMigrationHelpers.ConfigureEventStoreContext(eventStoreDb);
+            }
+        }
+    }
+}
diff --git a/src/Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj b/src/Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj
@@ -10,10 +10,10 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Hellang.Middleware.ProblemDetails" Version="3.1.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="JPProject.Admin.Application" Version="3.1.3" />
-    <PackageReference Include="JPProject.Admin.Database" Version="3.1.3" />
-    <PackageReference Include="JPProject.AspNet.Core" Version="3.1.3" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="JPProject.Admin.Application" Version="3.1.5" />
+    <PackageReference Include="JPProject.Admin.Database" Version="3.1.5" />
+    <PackageReference Include="JPProject.AspNet.Core" Version="3.1.5" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">

diff --git a/src/Backend/JPProject.Admin.Api/Program.cs b/src/Backend/JPProject.Admin.Api/Program.cs
@@ -1,18 +1,19 @@
-using System;
+using JPProject.Admin.Api.Configuration;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Events;
+using System;
 
 namespace JPProject.Admin.Api
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            Console.Title = "JP Project - User Management";
+            Console.Title = "JP Project - Admin Light API";
 
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
@@ -25,7 +26,11 @@ public static void Main(string[] args)
                 .WriteTo.Console()
                 .CreateLogger();
 
-            CreateHostBuilder(args).Build().Run();
+            var host = CreateHostBuilder(args).Build();
+
+            AdminUiMigrationHelpers.EnsureSeedData(host.Services).Wait();
+
+            host.Run();
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>

diff --git a/src/Backend/JPProject.Admin.Api/appsettings.json b/src/Backend/JPProject.Admin.Api/appsettings.json
@@ -3,7 +3,7 @@
     // Postgre Connection
     //"SSOConnection": "Server=localhost;Port=5432;Database=jpproject;User Id=postgres;Password=@Password1;"
     // Sql Server connection
-    "SSOConnection": "Server=.;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
+    "SSOConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;database=IdentityServer4.Quickstart.EntityFramework-3.0.0;trusted_connection=yes;"
     // MySql connection
     // "SSOConnection": "server=localhost,port=3306;database=jpproject;user=bruno;password=10203040"
     // SQLite Connection
@@ -32,7 +32,7 @@
     "SendEmail": "false"
   },
   "ApplicationSettings": {
-    "DatabaseType": "SqlServer",
+    "DatabaseType": "SQLServer",
     "Authority": "https://localhost:5000",
     "ApiName": "jp_api",
     "ApiSecret": "Q&tGrEQMypEk.XxPU:%bWDZMdpZeJiyMwpLv4F7d**w9x:7KuJ#fy,E8KPHpKz++"