From bd79cb7db7df7c50c275501d8ba1b7cb0d294329 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Fri, 24 May 2019 11:37:05 +0300
Subject: [PATCH] Don't seed data in the domain layer.

---
 .../MyProjectNameDomainModule.cs              | 20 +------------------
 .../MyProjectNameIdentityServerModule.cs      |  8 ++++++++
 .../MyProjectNameWebModule.cs                 | 10 ++++++----
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
index 48ab68ac6b..a391ad8f38 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
@@ -1,10 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Data;
-using MyCompanyName.MyProjectName.MultiTenancy;
-using Volo.Abp;
+using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp.AuditLogging;
 using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Data;
 using Volo.Abp.FeatureManagement;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer;
@@ -14,7 +10,6 @@ using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.PermissionManagement.IdentityServer;
 using Volo.Abp.SettingManagement;
 using Volo.Abp.TenantManagement;
-using Volo.Abp.Threading;
 
 namespace MyCompanyName.MyProjectName
 {
@@ -39,18 +34,5 @@ namespace MyCompanyName.MyProjectName
                 options.IsEnabled = MultiTenancyConsts.IsMultiTenancyEnabled;
             });
         }
-
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            SeedDatabase(context);
-        }
-
-        private void SeedDatabase(ApplicationInitializationContext context)
-        {
-            /* Seeding in the application startup can be a problem in a clustered environment.
-             * See https://github.com/abpframework/abp/issues/1123
-             */
-            DataSeedHelper.Seed(context);
-        }
     }
 }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
index 6d7935af28..8a99d626d0 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using MyCompanyName.MyProjectName.Data;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -105,14 +106,21 @@ namespace MyCompanyName.MyProjectName
             app.UseCorrelationId();
             app.UseVirtualFiles();
             app.UseAuthentication();
+
             if (MultiTenancyConsts.IsMultiTenancyEnabled)
             {
                 app.UseMultiTenancy();
             }
+
             app.UseIdentityServer();
             app.UseAbpRequestLocalization();
             app.UseAuditing();
             app.UseMvcWithDefaultRouteAndArea();
+
+            /* Seeding in the application startup can be a problem in a clustered environment.
+             * See https://github.com/abpframework/abp/issues/1123
+             */
+            DataSeedHelper.Seed(context);
         }
     }
 }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index d0fc09cdb4..8e997b7127 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -7,6 +7,7 @@ using MyCompanyName.MyProjectName.Menus;
 using Swashbuckle.AspNetCore.Swagger;
 using System.IO;
 using Microsoft.Extensions.Configuration;
+using MyCompanyName.MyProjectName.Data;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp;
@@ -195,18 +196,19 @@ namespace MyCompanyName.MyProjectName
             }
 
             app.UseIdentityServer();
-
             app.UseAbpRequestLocalization();
-
             app.UseSwagger();
             app.UseSwaggerUI(options =>
             {
                 options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API");
             });
-
             app.UseAuditing();
-
             app.UseMvcWithDefaultRouteAndArea();
+
+            /* Seeding in the application startup can be a problem in a clustered environment.
+            * See https://github.com/abpframework/abp/issues/1123
+            */
+            DataSeedHelper.Seed(context);
         }
     }
 }