diff --git a/PARR.AIHITSyncer/Services/SyncerService.cs b/PARR.AIHITSyncer/Services/SyncerService.cs index 502c0d4d..51437f20 100644 --- a/PARR.AIHITSyncer/Services/SyncerService.cs +++ b/PARR.AIHITSyncer/Services/SyncerService.cs @@ -92,7 +92,7 @@ namespace PARR.AIHITSyncer.Services IP = objFromQuery.IP, EkStatusCode = ResolveCode(objFromQuery.Status), //WorkGroup = objFromQuery.WorkGroup, - WorkGroupItem = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup), + WorkGroup = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup), ResponseAreaCode = ((ResolveCode(objFromQuery.ResponseArea) == 0) ? 99 : ResolveCode(objFromQuery.ResponseArea)) }; @@ -149,9 +149,9 @@ namespace PARR.AIHITSyncer.Services // isChanged = true; //} - if (objFromQuery.WorkGroup != null && (host.WorkGroupItem == null || !host.WorkGroupItem!.Name.Equals(objFromQuery.WorkGroup))) + if (objFromQuery.WorkGroup != null && (host.WorkGroup == null || !host.WorkGroup!.Name.Equals(objFromQuery.WorkGroup))) { - host.WorkGroupItem = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup); + host.WorkGroup = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup); isChanged = true; } diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs index f471df85..cffff695 100644 --- a/PARR.API/Controllers/V1/RobotTaskController.cs +++ b/PARR.API/Controllers/V1/RobotTaskController.cs @@ -63,7 +63,7 @@ namespace PARR.API.Controllers.V1 // шаблоны query = query.Include(t => t.Template) .ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea) - .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroupItem) + .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroup) .Include(t => t.Template) .ThenInclude(a => a!.ApplicationsInWork) .ThenInclude(w => w!.Work) @@ -77,7 +77,7 @@ namespace PARR.API.Controllers.V1 // тут не делаем AsSplitQuery, не может подтянуть все таблицы query = query.Include(t => t.Template) .ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea) - .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroupItem) + .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroup) .Include(t => t.Template) .ThenInclude(t => t!.ApplicationsInWork) .ThenInclude(t => t!.EsppSchValues) diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 58ca8bc9..ff20b6c7 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -88,8 +88,8 @@ namespace PARR.API.MappingProfiles .Include() .ForMember(d => d.Status, o => o.MapFrom(s => s.EkStatus!.Name)) .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.ResponseArea!.Name)) - .ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroupItem.Name)) - .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroupItem)); + .ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroup.Name)) + .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)); CreateMap(); @@ -139,7 +139,7 @@ namespace PARR.API.MappingProfiles .ForMember(d => d.TemplateDuration, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.TemplateDuration)) .ForMember(d => d.Initiator, o => o.MapFrom()) .ForMember(d => d.Category, o => o.MapFrom()) - .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Host!.WorkGroupItem!.Name)) + .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Host!.WorkGroup!.Name)) .ForMember(d => d.Ek, o => o.MapFrom(s => s.Template!.Host!.Ek)) .ForMember(d => d.Name, o => o.MapFrom(s => s.Template!.Name)) .ForMember(d => d.ProcessName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process!.Name)) @@ -160,7 +160,7 @@ namespace PARR.API.MappingProfiles .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name)) .ForMember(d => d.TemplateName, o => o.MapFrom(s => s.Template!.Name)) .ForMember(d => d.TemplateId, o => o.MapFrom(s => s.Template!.Id)) - .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Host!.WorkGroupItem!.Name)) + .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Host!.WorkGroup!.Name)) .ForMember(d => d.Exclude, o => o.MapFrom()) .ForMember(d => d.Timezone, o => o.MapFrom()) .ForMember(d => d.RepeatRange, o => o.MapFrom()) diff --git a/PARR.DAL/Models/Host.cs b/PARR.DAL/Models/Host.cs index cc6a6b6b..8a61d7f7 100644 --- a/PARR.DAL/Models/Host.cs +++ b/PARR.DAL/Models/Host.cs @@ -28,7 +28,7 @@ namespace PARR.DAL.Models //TODO: удалить поле Status, вместо него использовать EkStatusCode //public string? StatusStr { get; set; } - public string? WorkGroup { get; set; } + //public string? WorkGroup { get; set; } public Guid? WorkGroupId { get; set; } @@ -52,6 +52,6 @@ namespace PARR.DAL.Models public ResponseArea? ResponseArea { get; set; } [ForeignKey(nameof(WorkGroupId))] - public WorkGroup? WorkGroupItem { get; set; } + public WorkGroup? WorkGroup { get; set; } } } diff --git a/PARR.DAL/Services/Implementations/TemplateService.cs b/PARR.DAL/Services/Implementations/TemplateService.cs index f99d21c4..be619545 100644 --- a/PARR.DAL/Services/Implementations/TemplateService.cs +++ b/PARR.DAL/Services/Implementations/TemplateService.cs @@ -37,7 +37,7 @@ namespace PARR.DAL.Services.Implementations .Include(h => h.Host) .ThenInclude(t => t!.ResponseArea) .Include(h => h.Host) - .ThenInclude(t => t!.WorkGroupItem) + .ThenInclude(t => t!.WorkGroup) .Include(h => h.Host) .ThenInclude(t => t!.EkStatus) .Include(a => a.ApplicationsInWork) diff --git a/PARR.EsppScheduleSync/ScheduleSyncher.cs b/PARR.EsppScheduleSync/ScheduleSyncher.cs index 78f79912..9c7390a1 100644 --- a/PARR.EsppScheduleSync/ScheduleSyncher.cs +++ b/PARR.EsppScheduleSync/ScheduleSyncher.cs @@ -85,7 +85,7 @@ namespace PARR.EsppScheduleSync IsActive = template.IsActiveSchedule, ResponseArea = template.Host!.ResponseArea!.Name, //WorkGroup = template.Host!.WorkGroup!, - WorkGroup = template.Host!.WorkGroupItem!.Name, + WorkGroup = template.Host!.WorkGroup!.Name, //Мы решили, что для всех расписаний "Нет исключений", если что-то поменяется, тут нужно переделать TypeV60calendar = settingsFromDb.ScheduleExclude == "Нет исключений" ? "NONE" : "", Scheduled = EsppScheduleHelpers.GetNextRun(template.ApplicationsInWork!.NextRun), diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs index 46c9c37e..14f6be08 100644 --- a/PARR.EsppTemplateSync/TemplateMQSyncer.cs +++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs @@ -74,7 +74,7 @@ namespace PARR.EsppTemplateSync TemplateName = template.Name, IsActive = template.IsActiveTemplate, //WorkGroup = template.Host!.WorkGroup!, - WorkGroup = template.Host!.WorkGroupItem!.Name, + WorkGroup = template.Host!.WorkGroup!.Name, ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription), ResponseArea = template.Host!.ResponseArea!.Name, Duration = template.ApplicationsInWork.TemplateDuration,