diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/BackgroundWorkerSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/BackgroundWorkerSeeder.cs index 059585b5..ce88712d 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/BackgroundWorkerSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/BackgroundWorkerSeeder.cs @@ -27,7 +27,7 @@ public class BackgroundWorkerSeeder : IDataSeedContributor, ITransientDependency Cron = "5 * * * *", WorkerType = Enums.WorkerTypeEnum.NotificationWorker, IsActive = true, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, }, ]); diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/FormSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/FormSeeder.cs index b612fe98..98a7653d 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/FormSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/FormSeeder.cs @@ -70,7 +70,7 @@ public class FormSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Forms.FormLanguage, Name = AppCodes.Languages.Language, Title = AppCodes.Languages.Language, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Languages.Language, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs index e6c19452..9872586d 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs @@ -73,7 +73,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Tenants, Name = TenantManagementPermissions.Tenants.Default, Title = TenantManagementPermissions.Tenants.Default, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = TenantManagementPermissions.Tenants.Default, @@ -278,7 +278,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Permission, Name = AbpIdentity.Permissions.Default, Title = AbpIdentity.Permissions.Default, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AbpIdentity.Permissions.Default, @@ -610,7 +610,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = IdentityPermissions.Roles.Default, IsTenant = true, IsOrganizationUnit = false, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, Description = IdentityPermissions.Roles.Default, SelectCommandType = SelectCommandTypeEnum.Table, SelectCommand = "AbpRoles", @@ -810,7 +810,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = IdentityPermissions.Users.Default, Title = IdentityPermissions.Users.Default, IsTenant = true, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, Description = IdentityPermissions.Users.Default, SelectCommandType = SelectCommandTypeEnum.Table, SelectCommand = "AbpUsers", @@ -1132,7 +1132,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Language, Name = AppCodes.Languages.Language, Title = AppCodes.Languages.Language, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Languages.Language, @@ -1473,7 +1473,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.LanguageText, Name = AppCodes.Languages.LanguageText, Title = AppCodes.Languages.LanguageText, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Languages.LanguageText, @@ -1777,7 +1777,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Menu, Name = AppCodes.Menus, Title = AppCodes.Menus, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Menus, @@ -2273,7 +2273,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Listform, Name = AppCodes.Listforms.Listform, Title = AppCodes.Listforms.Listform, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Listforms.Listform, @@ -3130,7 +3130,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.SettingDefinition, Name = AppCodes.Settings.SettingDefinitions, Title = AppCodes.Settings.SettingDefinitions, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Settings.SettingDefinitions, @@ -3783,7 +3783,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Chart, Name = AppCodes.Listforms.Chart, Title = AppCodes.Listforms.Chart, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Listforms.Chart, @@ -4093,7 +4093,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.DataSource, Name = AppCodes.Listforms.DataSource, Title = AppCodes.Listforms.DataSource, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Listforms.DataSource, @@ -4342,7 +4342,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.BackgroundWorker, Name = AppCodes.BackgroundWorkers, Title = AppCodes.BackgroundWorkers, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.BackgroundWorkers, @@ -4733,7 +4733,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.NotificationRule, Name = AppCodes.Notifications.NotificationRules, Title = AppCodes.Notifications.NotificationRules, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Notifications.NotificationRules, @@ -5140,7 +5140,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.Notification, Name = AppCodes.Notifications.Notification, Title = AppCodes.Notifications.Notification, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.Notifications.Notification, @@ -5471,7 +5471,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.IpRestriction, Name = AppCodes.IpRestrictions, Title = AppCodes.IpRestrictions, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, IsOrganizationUnit = false, Description = AppCodes.IpRestrictions, @@ -5721,7 +5721,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.PublicApi, Name = AppCodes.PublicApis, Title = AppCodes.PublicApis, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AppCodes.PublicApis, @@ -6112,7 +6112,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.PermissionGroup, Name = AbpIdentity.PermissionGroups.Default, Title = AbpIdentity.PermissionGroups.Default, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = false, IsOrganizationUnit = false, Description = AbpIdentity.PermissionGroups.Default, @@ -6319,7 +6319,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = ListFormCodes.GlobalSearch, Name = AppCodes.Settings.GlobalSearch, Title = AppCodes.Settings.GlobalSearch, - DataSourceCode = "Default", + DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, IsOrganizationUnit = false, Description = AppCodes.Settings.GlobalSearch, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs index b8a6629e..e66259e9 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Kurs.Languages.Entities; using Kurs.Platform.Charts.Dto; using Kurs.Platform.Entities; +using Kurs.Platform.Enums; using Kurs.Platform.ListForms; using Kurs.Platform.Seeds; using Kurs.Settings.Entities; @@ -14,6 +15,7 @@ using Microsoft.Extensions.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; +using static Kurs.Settings.SettingsConsts; namespace Kurs.Platform.Data.Seeds; @@ -42,6 +44,16 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency _charts = charts; } + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json") + .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? ""}.json", true); + + return builder.Build(); + } + public async Task SeedAsync(DataSeedContext context) { var settings = await _settings.GetListAsync(); @@ -130,17 +142,15 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency } } - foreach (var item in items.DataSources) + if (!dataSources.Any(a => a.Code == SeedConsts.DataSources.DefaultCode)) { - if (!dataSources.Any(a => a.Code == item.Code)) + var config = BuildConfiguration(); + await _dataSources.InsertAsync(new() { - await _dataSources.InsertAsync(new() - { - Code = item.Code, - DataSourceType = item.DataSourceType, - ConnectionString = item.ConnectionString - }); - } + Code = SeedConsts.DataSources.DefaultCode, + DataSourceType = DefaultDatabaseProvider == DatabaseProvider.SqlServer ? DataSourceTypeEnum.Mssql : DataSourceTypeEnum.Postgresql, + ConnectionString = config.GetConnectionString(DefaultDatabaseProvider) + }); } foreach (var item in items.Languages) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs index 76cb0017..cf2dc29d 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs @@ -9,7 +9,6 @@ using Volo.Abp.Guids; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; -using static Kurs.Platform.Data.Seeds.SeedConsts; using IdentityRole = Volo.Abp.Identity.IdentityRole; using IdentityUser = Volo.Abp.Identity.IdentityUser; diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Dev.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Dev.json index ded128a2..0f530c14 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Dev.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Dev.json @@ -1,9 +1,2 @@ { - "DataSources": [ - { - "code": "Default", - "dataSourceType": 2, - "connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;" - } - ] } diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Production.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Production.json index ded128a2..0f530c14 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Production.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Production.json @@ -1,9 +1,2 @@ { - "DataSources": [ - { - "code": "Default", - "dataSourceType": 2, - "connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;" - } - ] } diff --git a/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs b/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs index 08c6ef6c..f80fed17 100644 --- a/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs @@ -147,7 +147,7 @@ public static class SeedConsts public static class AbpAccount { public const string GroupName = $"{Prefix.Abp}.Account"; - + public const string General = GroupName + ".General"; public const string IsSelfRegistrationEnabled = GroupName + ".IsSelfRegistrationEnabled"; public const string EnableLocalLogin = GroupName + ".EnableLocalLogin"; @@ -351,5 +351,10 @@ public static class SeedConsts public const string IpRestrictions = Prefix.App + ".IpRestrictions"; public const string PublicApis = Prefix.App + ".PublicApis"; } + + public static class DataSources + { + public const string DefaultCode = "Default"; + } }