Merge pull request #5660 from abpframework/liangshiwei/patch-1-template

hikalkan · web-flow · commit 7c14ff286e7d · 2020-10-01T09:50:11.000+03:00
Move SeedDataAsync into the change tenant code block
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs
@@ -47,9 +47,9 @@ public async Task MigrateAsync()
             var migratedDatabaseSchemas = new HashSet<string>();
             foreach (var tenant in tenants)
             {
-                if (tenant.ConnectionStrings.Any())
+                using (_currentTenant.Change(tenant.Id))
                 {
-                    using (_currentTenant.Change(tenant.Id))
+                    if (tenant.ConnectionStrings.Any())
                     {
                         var tenantConnectionStrings = tenant.ConnectionStrings
                             .Select(x => x.Value)
@@ -62,9 +62,9 @@ public async Task MigrateAsync()
                             migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);
                         }
                     }
-                }
 
-                await SeedDataAsync(tenant);
+                    await SeedDataAsync(tenant);
+                }
 
                 Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations.");
             }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ public async Task MigrateAsync()`
`47`	`47`	`var migratedDatabaseSchemas = new HashSet<string>();`
`48`	`48`	`foreach (var tenant in tenants)`
`49`	`49`	`{`
`50`		`- if (tenant.ConnectionStrings.Any())`
	`50`	`+ using (_currentTenant.Change(tenant.Id))`
`51`	`51`	`{`
`52`		`- using (_currentTenant.Change(tenant.Id))`
	`52`	`+ if (tenant.ConnectionStrings.Any())`
`53`	`53`	`{`
`54`	`54`	`var tenantConnectionStrings = tenant.ConnectionStrings`
`55`	`55`	`.Select(x => x.Value)`
`@@ -62,9 +62,9 @@ public async Task MigrateAsync()`
`62`	`62`	`migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`- }`
`66`	`65`
`67`		`- await SeedDataAsync(tenant);`
	`66`	`+ await SeedDataAsync(tenant);`
	`67`	`+ }`
`68`	`68`
`69`	`69`	`Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations.");`
`70`	`70`	`}`