fix bug cannot do migration

thangchung · thangchung · commit 0293d03d7c9b · 2019-04-06T17:32:34.000+07:00
diff --git a/samples/ExchangeService/NetCoreKit.Samples.ExchangeService.csproj b/samples/ExchangeService/NetCoreKit.Samples.ExchangeService.csproj
@@ -21,9 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="1.17.1" />
-    <PackageReference Include="Grpc.HealthCheck" Version="1.17.1" />
-    <PackageReference Include="Grpc.Tools" Version="1.17.1">
+    <PackageReference Include="Grpc" Version="1.19.0" />
+    <PackageReference Include="Grpc.HealthCheck" Version="1.19.0" />
+    <PackageReference Include="Grpc.Tools" Version="1.19.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/samples/TodoApi/Infrastructure/Db/TodoListDbContext.cs b/samples/TodoApi/Infrastructure/Db/TodoListDbContext.cs
@@ -1,11 +1,14 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using NetCoreKit.Domain;
 using NetCoreKit.Infrastructure.EfCore.Db;
 
 namespace NetCoreKit.Samples.TodoAPI.Infrastructure.Db
 {
     public class TodoListDbContext : AppDbContext
     {
-        public TodoListDbContext(DbContextOptions options) : base(options)
+        public TodoListDbContext(DbContextOptions<TodoListDbContext> options, IConfiguration config, IDomainEventDispatcher eventBus)
+            : base(options, config, eventBus)
         {
         }
     }
diff --git a/samples/TodoApi/Migrations/20190406102459_InitTodoDb.Designer.cs b/samples/TodoApi/Migrations/20190406102459_InitTodoDb.Designer.cs
diff --git a/samples/TodoApi/Migrations/20190406102459_InitTodoDb.cs b/samples/TodoApi/Migrations/20190406102459_InitTodoDb.cs
@@ -8,20 +8,23 @@ public partial class InitTodoDb : Migration
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
-                "Projects",
-                table => new
+                name: "Projects",
+                columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
                     Created = table.Column<DateTime>(nullable: false),
                     Updated = table.Column<DateTime>(nullable: false),
                     Version = table.Column<int>(nullable: false),
                     Name = table.Column<string>(nullable: true)
                 },
-                constraints: table => { table.PrimaryKey("PK_Projects", x => x.Id); });
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Projects", x => x.Id);
+                });
 
             migrationBuilder.CreateTable(
-                "Tasks",
-                table => new
+                name: "Tasks",
+                columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
                     Created = table.Column<DateTime>(nullable: false),
@@ -37,26 +40,26 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     table.PrimaryKey("PK_Tasks", x => x.Id);
                     table.ForeignKey(
-                        "FK_Tasks_Projects_ProjectId",
-                        x => x.ProjectId,
-                        "Projects",
-                        "Id",
+                        name: "FK_Tasks_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateIndex(
-                "IX_Tasks_ProjectId",
-                "Tasks",
-                "ProjectId");
+                name: "IX_Tasks_ProjectId",
+                table: "Tasks",
+                column: "ProjectId");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                "Tasks");
+                name: "Tasks");
 
             migrationBuilder.DropTable(
-                "Projects");
+                name: "Projects");
         }
     }
 }
diff --git a/samples/TodoApi/Migrations/TodoListDbContextModelSnapshot.cs b/samples/TodoApi/Migrations/TodoListDbContextModelSnapshot.cs
@@ -1,76 +1,76 @@
 ﻿// <auto-generated />
-
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using NetCoreKit.Samples.TodoAPI.Infrastructure.Db;
 
 namespace NetCoreKit.Samples.TodoApi.Migrations
 {
     [DbContext(typeof(TodoListDbContext))]
-    internal class TodoListDbContextModelSnapshot : ModelSnapshot
+    partial class TodoListDbContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024")
+                .HasAnnotation("ProductVersion", "2.2.2-servicing-10034")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("NetCoreKit.Samples.TodoAPI.Domain.Project", b =>
-            {
-                b.Property<Guid>("Id")
-                    .ValueGeneratedOnAdd();
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
 
-                b.Property<DateTime>("Created");
+                    b.Property<DateTime>("Created");
 
-                b.Property<string>("Name");
+                    b.Property<string>("Name");
 
-                b.Property<DateTime>("Updated");
+                    b.Property<DateTime>("Updated");
 
-                b.Property<int>("Version");
+                    b.Property<int>("Version");
 
-                b.HasKey("Id");
+                    b.HasKey("Id");
 
-                b.ToTable("Projects");
-            });
+                    b.ToTable("Projects");
+                });
 
             modelBuilder.Entity("NetCoreKit.Samples.TodoAPI.Domain.Task", b =>
-            {
-                b.Property<Guid>("Id")
-                    .ValueGeneratedOnAdd();
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
 
-                b.Property<Guid>("AuthorId");
+                    b.Property<Guid>("AuthorId");
 
-                b.Property<string>("AuthorName");
+                    b.Property<string>("AuthorName");
 
-                b.Property<bool?>("Completed");
+                    b.Property<bool?>("Completed");
 
-                b.Property<DateTime>("Created");
+                    b.Property<DateTime>("Created");
 
-                b.Property<int?>("Order");
+                    b.Property<int?>("Order");
 
-                b.Property<Guid>("ProjectId");
+                    b.Property<Guid>("ProjectId");
 
-                b.Property<string>("Title")
-                    .IsRequired();
+                    b.Property<string>("Title")
+                        .IsRequired();
 
-                b.Property<DateTime>("Updated");
+                    b.Property<DateTime>("Updated");
 
-                b.HasKey("Id");
+                    b.HasKey("Id");
 
-                b.HasIndex("ProjectId");
+                    b.HasIndex("ProjectId");
 
-                b.ToTable("Tasks");
-            });
+                    b.ToTable("Tasks");
+                });
 
             modelBuilder.Entity("NetCoreKit.Samples.TodoAPI.Domain.Task", b =>
-            {
-                b.HasOne("NetCoreKit.Samples.TodoAPI.Domain.Project", "Project")
-                    .WithMany("Tasks")
-                    .HasForeignKey("ProjectId")
-                    .OnDelete(DeleteBehavior.Cascade);
-            });
+                {
+                    b.HasOne("NetCoreKit.Samples.TodoAPI.Domain.Project", "Project")
+                        .WithMany("Tasks")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
 #pragma warning restore 612, 618
         }
     }
diff --git a/samples/TodoApi/appsettings.Development.json b/samples/TodoApi/appsettings.Development.json
@@ -7,7 +7,7 @@
   "Features": {
     "EfCore": {
       "MySqlDb": {
-        "FQDN": "127.0.0.1:32605",
+        "FQDN": "127.0.0.1:3306",
         "Password": "P@ssw0rd"
       }
     },
diff --git a/src/NetCoreKit.Infrastructure.EfCore/Db/AppDbContext.cs b/src/NetCoreKit.Infrastructure.EfCore/Db/AppDbContext.cs
@@ -6,25 +6,28 @@
 using System.Threading.Tasks;
 using Humanizer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using NetCoreKit.Domain;
 
 namespace NetCoreKit.Infrastructure.EfCore.Db
 {
     public abstract class AppDbContext : DbContext
     {
-        protected AppDbContext(DbContextOptions options) : base(options)
+        private readonly IConfiguration _config;
+        private readonly IDomainEventDispatcher _eventBus = null;
+
+        protected AppDbContext(DbContextOptions options, IConfiguration config, IDomainEventDispatcher eventBus = null)
+            : base(options)
         {
+            _config = config;
+            _eventBus = eventBus ?? new MemoryDomainEventDispatcher();
         }
 
         protected override void OnModelCreating(ModelBuilder builder)
         {
-            var config = this.GetService<IConfiguration>();
-
             var typeToRegisters = new List<Type>();
 
-            var ourModules = config.LoadFullAssemblies();
+            var ourModules = _config.LoadFullAssemblies();
 
             typeToRegisters.AddRange(ourModules.SelectMany(m => m.DefinedTypes));
 
@@ -39,25 +42,15 @@ protected override void OnModelCreating(ModelBuilder builder)
 
         public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
         {
-            var eventBus = this.GetService<IDomainEventDispatcher>();
-
             var result = base.SaveChangesAsync(cancellationToken);
-
-            if (eventBus != null)
-                SaveChangesWithEvents(eventBus);
-
+            SaveChangesWithEvents(_eventBus);
             return result;
         }
 
         public override int SaveChanges()
         {
-            var eventBus = this.GetService<IDomainEventDispatcher>();
-
             var result = base.SaveChanges();
-
-            if (eventBus != null)
-                SaveChangesWithEvents(eventBus);
-
+            SaveChangesWithEvents(_eventBus);
             return result;
         }
 
diff --git a/src/NetCoreKit.Infrastructure.GrpcHost/HostBuilderExtensions.cs b/src/NetCoreKit.Infrastructure.GrpcHost/HostBuilderExtensions.cs
@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using System.Linq;
+using AutoMapper;
+using MediatR;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using NetCoreKit.Domain;
+using NetCoreKit.Infrastructure.Features;
+
+namespace NetCoreKit.Infrastructure.GrpcHost
+{
+    public static class HostBuilderExtensions
+    {
+        public static IHost ConfigureDefaultSettings(this HostBuilder hostBuilder,
+            string[] args,
+            Action<IServiceCollection> preDbWorkHook = null,
+            Action<IServiceCollection> moreRegisterAction = null)
+        {
+            return hostBuilder
+                .ConfigureHostConfiguration(configHost =>
+                {
+                    configHost.SetBasePath(Directory.GetCurrentDirectory());
+                    configHost.AddJsonFile("hostsettings.json", optional: true);
+                    configHost.AddEnvironmentVariables();
+                    configHost.AddCommandLine(args);
+                })
+                .ConfigureAppConfiguration((hostContext, configApp) =>
+                {
+                    configApp.AddJsonFile("appsettings.json", optional: true);
+                    configApp.AddJsonFile(
+                        $"appsettings.{hostContext.HostingEnvironment.EnvironmentName}.json",
+                        optional: true);
+                    configApp.AddEnvironmentVariables();
+                    configApp.AddCommandLine(args);
+                })
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddLogging();
+                    services.AddFeatureToggle();
+
+                    using (var scope = services.BuildServiceProvider().GetService<IServiceScopeFactory>().CreateScope())
+                    {
+                        var svcProvider = scope.ServiceProvider;
+                        var config = svcProvider.GetRequiredService<IConfiguration>();
+                        var feature = svcProvider.GetRequiredService<IFeature>();
+
+                        services.AddSingleton<IDomainEventDispatcher, MemoryDomainEventDispatcher>();
+
+                        preDbWorkHook?.Invoke(services);
+
+                        Mapper.Initialize(cfg => cfg.AddProfiles(config.LoadFullAssemblies()));
+                        services.AddMediatR(config.LoadFullAssemblies().ToArray());
+
+                        moreRegisterAction?.Invoke(services);
+                    }
+                })
+                .ConfigureLogging((hostContext, configLogging) =>
+                {
+                    configLogging.AddConsole();
+                    configLogging.AddDebug();
+                })
+                .UseConsoleLifetime()
+                .Build();
+        }
+    }
+}
diff --git a/src/NetCoreKit.Infrastructure.GrpcHost/NetCoreKit.Infrastructure.GrpcHost.csproj b/src/NetCoreKit.Infrastructure.GrpcHost/NetCoreKit.Infrastructure.GrpcHost.csproj
@@ -17,12 +17,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="1.17.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
+    <PackageReference Include="Grpc" Version="1.19.0" />
     <PackageReference Include="Grpc.Reflection" Version="1.17.1" />
     <PackageReference Include="Grpc.Tools" Version="1.17.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MediatR" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
@@ -39,6 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NetCoreKit.Infrastructure\NetCoreKit.Infrastructure.csproj" />
     <ProjectReference Include="..\NetCoreKit.Utils\NetCoreKit.Utils.csproj" />
   </ItemGroup>
 
diff --git a/templates/NetCoreKit.RestTemplate.EfCore/ServiceCollectionExtensions.cs b/templates/NetCoreKit.RestTemplate.EfCore/ServiceCollectionExtensions.cs
@@ -42,7 +42,7 @@ public static IServiceCollection AddEfCoreTemplate<TDbContext>(this IServiceColl
                 {
                     if (feature.IsEnabled("Mongo")) throw new Exception("Should turn MongoDb feature off.");
 
-                    services.AddDbContextPool<TDbContext>((sp, o) =>
+                    services.AddDbContext<TDbContext>((sp, o) =>
                     {
                         var extendOptionsBuilder = sp.GetRequiredService<IExtendDbContextOptionsBuilder>();
                         var connStringFactory = sp.GetRequiredService<IDatabaseConnectionStringFactory>();

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,14 @@`
`1`	`1`	`using Microsoft.EntityFrameworkCore;`
	`2`	`+using Microsoft.Extensions.Configuration;`
	`3`	`+using NetCoreKit.Domain;`
`2`	`4`	`using NetCoreKit.Infrastructure.EfCore.Db;`
`3`	`5`
`4`	`6`	`namespace NetCoreKit.Samples.TodoAPI.Infrastructure.Db`
`5`	`7`	`{`
`6`	`8`	`public class TodoListDbContext : AppDbContext`
`7`	`9`	`{`
`8`		`- public TodoListDbContext(DbContextOptions options) : base(options)`
	`10`	`+ public TodoListDbContext(DbContextOptions<TodoListDbContext> options, IConfiguration config, IDomainEventDispatcher eventBus)`
	`11`	`+ : base(options, config, eventBus)`
`9`	`12`	`{`
`10`	`13`	`}`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"Features": {`
`8`	`8`	`"EfCore": {`
`9`	`9`	`"MySqlDb": {`
`10`		`- "FQDN": "127.0.0.1:32605",`
	`10`	`+ "FQDN": "127.0.0.1:3306",`
`11`	`11`	`"Password": "P@ssw0rd"`
`12`	`12`	`}`
`13`	`13`	`},`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static IServiceCollection AddEfCoreTemplate<TDbContext>(this IServiceColl`
`42`	`42`	`{`
`43`	`43`	`if (feature.IsEnabled("Mongo")) throw new Exception("Should turn MongoDb feature off.");`
`44`	`44`
`45`		`- services.AddDbContextPool<TDbContext>((sp, o) =>`
	`45`	`+ services.AddDbContext<TDbContext>((sp, o) =>`
`46`	`46`	`{`
`47`	`47`	`var extendOptionsBuilder = sp.GetRequiredService<IExtendDbContextOptionsBuilder>();`
`48`	`48`	`var connStringFactory = sp.GetRequiredService<IDatabaseConnectionStringFactory>();`