From 475311810aaf603bbcaf0f836a8eb595c70d2dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Mon, 16 Mar 2020 09:56:09 +0300 Subject: [PATCH] requested changes resolved. --- .../Volo/Abp/Data/DataSeederExtensions.cs | 9 --------- .../TenantManagement/DataSeederExtensions.cs | 18 ++++++++++++++++++ .../Abp/TenantManagement/TenantAppService.cs | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/DataSeederExtensions.cs diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs index 0d0ac7a1fd..8208d02d2c 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeederExtensions.cs @@ -9,14 +9,5 @@ namespace Volo.Abp.Data { return seeder.SeedAsync(new DataSeedContext(tenantId)); } - - public static Task SeedAsync(this IDataSeeder seeder, Guid? tenantId, string adminEmailAddress, string adminPassword) - { - var context = new DataSeedContext(tenantId) - .WithProperty("AdminEmail", adminEmailAddress) - .WithProperty("AdminPassword", adminPassword); - - return seeder.SeedAsync(context); - } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/DataSeederExtensions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/DataSeederExtensions.cs new file mode 100644 index 0000000000..04bc1cf12a --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/DataSeederExtensions.cs @@ -0,0 +1,18 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.Data; + +namespace Volo.Abp.TenantManagement +{ + public static class DataSeederExtensions + { + public static Task SeedAsync(this IDataSeeder seeder, Guid? tenantId, TenantCreateDto input) + { + var context = new DataSeedContext(tenantId) + .WithProperty("AdminEmail", input.AdminEmailAddress) + .WithProperty("AdminPassword", input.AdminPassword); + + return seeder.SeedAsync(context); + } + } +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs index 4ddba47d3c..966fb854e6 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs @@ -51,7 +51,7 @@ namespace Volo.Abp.TenantManagement { //TODO: Handle database creation? - await DataSeeder.SeedAsync(tenant.Id, input.AdminEmailAddress, input.AdminPassword); + await DataSeeder.SeedAsync(tenant.Id, input); } return ObjectMapper.Map(tenant);