diff --git a/AsbCloudDb/Model/DefaultData/DefaultData.cs b/AsbCloudDb/Model/DefaultData/DefaultData.cs index 0bfe29a7..770cfbb3 100644 --- a/AsbCloudDb/Model/DefaultData/DefaultData.cs +++ b/AsbCloudDb/Model/DefaultData/DefaultData.cs @@ -1,10 +1,11 @@ using Microsoft.EntityFrameworkCore; +using System.Collections.Generic; namespace AsbCloudDb.Model.DefaultData { internal static class DefaultContextData { - public static void Fill(ModelBuilder modelBuilder) + public static IEnumerable GetFillers() { var fillers = new IEntityFiller[] { @@ -24,6 +25,12 @@ namespace AsbCloudDb.Model.DefaultData new EntityFillerCompanyType(), new EntityFillerSubsystem(), }; + return fillers; + } + + public static void Fill(ModelBuilder modelBuilder) + { + var fillers = GetFillers(); foreach (var filler in fillers) filler.FillData(modelBuilder); diff --git a/AsbCloudDb/Model/DefaultData/EntityFiller.cs b/AsbCloudDb/Model/DefaultData/EntityFiller.cs index 3087f15c..3b401963 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFiller.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFiller.cs @@ -1,11 +1,12 @@ using Microsoft.EntityFrameworkCore; +using System.Collections.Generic; namespace AsbCloudDb.Model.DefaultData { internal abstract class EntityFiller : IEntityFiller where TEntity : class { - protected abstract TEntity[] GetData(); + public abstract TEntity[] GetData(); public void FillData(ModelBuilder modelBuilder) { diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerCompany.cs b/AsbCloudDb/Model/DefaultData/EntityFillerCompany.cs index c6c4584d..d7416fd6 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerCompany.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerCompany.cs @@ -2,7 +2,7 @@ { internal class EntityFillerCompany : EntityFiller { - protected override Company[] GetData() => new Company[] + public override Company[] GetData() => new Company[] { new (){ Id = 1, Caption = "ООО \"АСБ\"", IdCompanyType = 3}, }; diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerCompanyType.cs b/AsbCloudDb/Model/DefaultData/EntityFillerCompanyType.cs index 42c15726..2e3b77b3 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerCompanyType.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerCompanyType.cs @@ -2,7 +2,7 @@ { internal class EntityFillerCompanyType : EntityFiller { - protected override CompanyType[] GetData() => new CompanyType[] { + public override CompanyType[] GetData() => new CompanyType[] { new (){ Id = 1, Caption = "Недрапользователь", }, new (){ Id = 2, Caption = "Буровой подрядчик", }, new (){ Id = 3, Caption = "Сервис автоматизации бурения", }, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerFileCategory.cs b/AsbCloudDb/Model/DefaultData/EntityFillerFileCategory.cs index 914f27bb..1969bc4e 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerFileCategory.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerFileCategory.cs @@ -2,7 +2,7 @@ { internal class EntityFillerFileCategory: EntityFiller { - protected override FileCategory[] GetData() => new FileCategory[]{ + public override FileCategory[] GetData() => new FileCategory[]{ new () {Id = 1, Name = "Растворный сервис", ShortName = "fluidService"}, new () {Id = 2, Name = "Цементирование", ShortName = "cement"}, new () {Id = 3, Name = "ННБ", ShortName = "nnb"}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerMeasureCategory.cs b/AsbCloudDb/Model/DefaultData/EntityFillerMeasureCategory.cs index 1dbb7dfc..94713108 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerMeasureCategory.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerMeasureCategory.cs @@ -2,7 +2,7 @@ { internal class EntityFillerMeasureCategory : EntityFiller { - protected override MeasureCategory[] GetData() => new MeasureCategory[] { + public override MeasureCategory[] GetData() => new MeasureCategory[] { new (){ Id = 1, Name = "Показатели бурового раствора", ShortName = "Раствор"}, new (){ Id = 2, Name = "Шламограмма", ShortName = "Шламограмма"}, new (){ Id = 3, Name = "ННБ", ShortName = "ННБ"}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs index b6535f5c..da21fbe8 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs @@ -2,7 +2,7 @@ { internal class EntityFillerPermission : EntityFiller { - protected override Permission[] GetData() => new Permission[]{ + public override Permission[] GetData() => new Permission[]{ new (){ Id = 100, Name="AdminCluster.delete", Description="Разрешение удалять админ. Кусты"}, new (){ Id = 101, Name="AdminCluster.edit", Description="Разрешение редактировать админ. Кусты"}, new (){ Id = 102, Name="AdminCluster.get", Description="Разрешение просматривать админ. Кусты"}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRolePermission.cs b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRolePermission.cs index 53f6db3b..0064383b 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRolePermission.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRolePermission.cs @@ -2,7 +2,7 @@ { internal class EntityFillerRelationUserRolePermission: EntityFiller { - protected override RelationUserRolePermission[] GetData() => new RelationUserRolePermission[]{ + public override RelationUserRolePermission[] GetData() => new RelationUserRolePermission[]{ new (){ IdUserRole = 1100, IdPermission = 102}, new (){ IdUserRole = 1100, IdPermission = 111}, new (){ IdUserRole = 1101, IdPermission = 101}, new (){ IdUserRole = 1101, IdPermission = 100}, new (){ IdUserRole = 1102, IdPermission = 105}, new (){ IdUserRole = 1102, IdPermission = 108}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRoleUserRole.cs b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRoleUserRole.cs index 1a84fb1a..87a99eae 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRoleUserRole.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserRoleUserRole.cs @@ -2,7 +2,7 @@ { internal class EntityFillerRelationUserRoleUserRole: EntityFiller< RelationUserRoleUserRole> { - protected override RelationUserRoleUserRole[] GetData() => new RelationUserRoleUserRole[]{ + public override RelationUserRoleUserRole[] GetData() => new RelationUserRoleUserRole[]{ new (){ Id = 1101, IdInclude = 1100 }, new (){ Id = 1103, IdInclude = 1102 }, new (){ Id = 1105, IdInclude = 1104 }, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserUserRole.cs b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserUserRole.cs index 2216f22e..9d2b3d70 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserUserRole.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerRelationUserUserRole.cs @@ -2,7 +2,7 @@ { internal class EntityFillerRelationUserUserRole : EntityFiller { - protected override RelationUserUserRole[] GetData() => new RelationUserUserRole[] + public override RelationUserUserRole[] GetData() => new RelationUserUserRole[] { new () { IdUser = 1, IdUserRole = 1, }, }; diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerSubsystem.cs b/AsbCloudDb/Model/DefaultData/EntityFillerSubsystem.cs index 80fdfc66..bbea56e4 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerSubsystem.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerSubsystem.cs @@ -3,7 +3,7 @@ namespace AsbCloudDb.Model.DefaultData { internal class EntityFillerSubsystem : EntityFiller { - protected override Subsystem[] GetData() => new Subsystem[]{ + public override Subsystem[] GetData() => new Subsystem[]{ // САУБ - ид подсистем с 1 до 65_535 new () {Id = 1, Name = "АКБ", Description = "Совместная работа режимов \"Бурение в роторе\" и \"Бурение в слайде\""}, new () {Id = 2, Name = "MSE", Description = "Алгоритм поиска оптимальных параметров бурения САУБ"}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerUser.cs b/AsbCloudDb/Model/DefaultData/EntityFillerUser.cs index 8d1a5f34..ed7a9fdc 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerUser.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerUser.cs @@ -2,7 +2,7 @@ { internal class EntityFillerUser : EntityFiller { - protected override User[] GetData() => new User[]{ + public override User[] GetData() => new User[]{ new (){ Id = 1, IdCompany = 1, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerUserRole.cs b/AsbCloudDb/Model/DefaultData/EntityFillerUserRole.cs index 78a8e0be..07d7b9dc 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerUserRole.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerUserRole.cs @@ -2,7 +2,7 @@ { internal class EntityFillerUserRole : EntityFiller { - protected override UserRole[] GetData() => new UserRole[]{ + public override UserRole[] GetData() => new UserRole[]{ new (){ Id = 1, Caption = "root", IdType = 1}, new (){ Id = 1100, Caption = "admin_cluster.view", IdType = 1}, new (){ Id = 1101, Caption = "admin_cluster.edit", IdType = 1}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs b/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs index 63eab3ed..e4eaa404 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerWellOperationCategory.cs @@ -2,7 +2,7 @@ { internal class EntityFillerWellOperationCategory : EntityFiller { - protected override WellOperationCategory[] GetData() => new WellOperationCategory[]{ + public override WellOperationCategory[] GetData() => new WellOperationCategory[]{ // Автоматически определяемые операции new () {Id = 1, Name = "Невозможно определить операцию", Code = 0, KeyValueName = "dT", KeyValueUnits = "мин"}, new () {Id = 2, Name = "Роторное бурение", Code = 0, KeyValueName = "МСП", KeyValueUnits = "м/ч" }, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerWellSectionType.cs b/AsbCloudDb/Model/DefaultData/EntityFillerWellSectionType.cs index 76439e7c..57ece797 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerWellSectionType.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerWellSectionType.cs @@ -2,7 +2,7 @@ { internal class EntityFillerWellSectionType : EntityFiller { - protected override WellSectionType[] GetData() => new WellSectionType[] + public override WellSectionType[] GetData() => new WellSectionType[] { new (){ Id = 1, Caption = "Пилотный ствол"}, new (){ Id = 2, Caption = "Направление"}, diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerWellType.cs b/AsbCloudDb/Model/DefaultData/EntityFillerWellType.cs index 74a2f367..895f8f1e 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerWellType.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerWellType.cs @@ -2,7 +2,7 @@ { internal class EntityFillerWellType : EntityFiller { - protected override WellType[] GetData() => new WellType[] + public override WellType[] GetData() => new WellType[] { new (){ Id = 1, Caption = "Наклонно-направленная"}, new (){ Id = 2, Caption = "Горизонтальная"},