mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(all): удалена колонка WorkGroup из таблицы Hosts

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-06-04 12:30:44 +10:00
parent 2cc40a26fc
commit d75b787801
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PARR.AIHITSyncer/Services/SyncerService.cs
View File

@@ -92,7 +92,7 @@ namespace PARR.AIHITSyncer.Services
IP = objFromQuery.IP, IP = objFromQuery.IP,
EkStatusCode = ResolveCode(objFromQuery.Status), EkStatusCode = ResolveCode(objFromQuery.Status),
//WorkGroup = objFromQuery.WorkGroup, //WorkGroup = objFromQuery.WorkGroup,
WorkGroupItem = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup), WorkGroup = await CreateWorkGroupIfNotExistAsync(objFromQuery.WorkGroup),
ResponseAreaCode = ((ResolveCode(objFromQuery.ResponseArea) == 0) ? 99 : ResolveCode(objFromQuery.ResponseArea)) ResponseAreaCode = ((ResolveCode(objFromQuery.ResponseArea) == 0) ? 99 : ResolveCode(objFromQuery.ResponseArea))
}; };
@@ -149,9 +149,9 @@ namespace PARR.AIHITSyncer.Services
// isChanged = true; // 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; isChanged = true;
} }

4
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -63,7 +63,7 @@ namespace PARR.API.Controllers.V1
// шаблоны // шаблоны
query = query.Include(t => t.Template) query = query.Include(t => t.Template)
.ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea) .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) .Include(t => t.Template)
.ThenInclude(a => a!.ApplicationsInWork) .ThenInclude(a => a!.ApplicationsInWork)
.ThenInclude(w => w!.Work) .ThenInclude(w => w!.Work)
@@ -77,7 +77,7 @@ namespace PARR.API.Controllers.V1
// тут не делаем AsSplitQuery, не может подтянуть все таблицы // тут не делаем AsSplitQuery, не может подтянуть все таблицы
query = query.Include(t => t.Template) query = query.Include(t => t.Template)
.ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea) .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) .Include(t => t.Template)
.ThenInclude(t => t!.ApplicationsInWork) .ThenInclude(t => t!.ApplicationsInWork)
.ThenInclude(t => t!.EsppSchValues) .ThenInclude(t => t!.EsppSchValues)

8
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -88,8 +88,8 @@ namespace PARR.API.MappingProfiles
.Include<DAL.Models.Host, HostWithApplicationsResponse>() .Include<DAL.Models.Host, HostWithApplicationsResponse>()
.ForMember(d => d.Status, o => o.MapFrom(s => s.EkStatus!.Name)) .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.ResponseArea, o => o.MapFrom(s => s.ResponseArea!.Name))
.ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroupItem.Name)) .ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroup.Name))
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroupItem)); .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup));
CreateMap<DAL.Models.Host, HostTemplateResponse>(); CreateMap<DAL.Models.Host, HostTemplateResponse>();
@@ -139,7 +139,7 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.TemplateDuration, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.TemplateDuration)) .ForMember(d => d.TemplateDuration, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.TemplateDuration))
.ForMember(d => d.Initiator, o => o.MapFrom<RobotTaskTemplateInitiatorResolver>()) .ForMember(d => d.Initiator, o => o.MapFrom<RobotTaskTemplateInitiatorResolver>())
.ForMember(d => d.Category, o => o.MapFrom<RobotTaskTemplateCategoryResolver>()) .ForMember(d => d.Category, o => o.MapFrom<RobotTaskTemplateCategoryResolver>())
.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.Ek, o => o.MapFrom(s => s.Template!.Host!.Ek))
.ForMember(d => d.Name, o => o.MapFrom(s => s.Template!.Name)) .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)) .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.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
.ForMember(d => d.TemplateName, o => o.MapFrom(s => s.Template!.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.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<RobotTaskScheduleExcludeResolver>()) .ForMember(d => d.Exclude, o => o.MapFrom<RobotTaskScheduleExcludeResolver>())
.ForMember(d => d.Timezone, o => o.MapFrom<RobotTaskScheduleTimezoneResolver>()) .ForMember(d => d.Timezone, o => o.MapFrom<RobotTaskScheduleTimezoneResolver>())
.ForMember(d => d.RepeatRange, o => o.MapFrom<RobotTaskScheduleRepeatRangeResolver>()) .ForMember(d => d.RepeatRange, o => o.MapFrom<RobotTaskScheduleRepeatRangeResolver>())

4
PARR.DAL/Models/Host.cs
View File

@@ -28,7 +28,7 @@ namespace PARR.DAL.Models
//TODO: удалить поле Status, вместо него использовать EkStatusCode //TODO: удалить поле Status, вместо него использовать EkStatusCode
//public string? StatusStr { get; set; } //public string? StatusStr { get; set; }
public string? WorkGroup { get; set; } //public string? WorkGroup { get; set; }
public Guid? WorkGroupId { get; set; } public Guid? WorkGroupId { get; set; }
@@ -52,6 +52,6 @@ namespace PARR.DAL.Models
public ResponseArea? ResponseArea { get; set; } public ResponseArea? ResponseArea { get; set; }
[ForeignKey(nameof(WorkGroupId))] [ForeignKey(nameof(WorkGroupId))]
public WorkGroup? WorkGroupItem { get; set; } public WorkGroup? WorkGroup { get; set; }
} }
} }

2
PARR.DAL/Services/Implementations/TemplateService.cs
View File

@@ -37,7 +37,7 @@ namespace PARR.DAL.Services.Implementations
.Include(h => h.Host) .Include(h => h.Host)
.ThenInclude(t => t!.ResponseArea) .ThenInclude(t => t!.ResponseArea)
.Include(h => h.Host) .Include(h => h.Host)
.ThenInclude(t => t!.WorkGroupItem) .ThenInclude(t => t!.WorkGroup)
.Include(h => h.Host) .Include(h => h.Host)
.ThenInclude(t => t!.EkStatus) .ThenInclude(t => t!.EkStatus)
.Include(a => a.ApplicationsInWork) .Include(a => a.ApplicationsInWork)

2
PARR.EsppScheduleSync/ScheduleSyncher.cs
View File

@@ -85,7 +85,7 @@ namespace PARR.EsppScheduleSync
IsActive = template.IsActiveSchedule, IsActive = template.IsActiveSchedule,
ResponseArea = template.Host!.ResponseArea!.Name, ResponseArea = template.Host!.ResponseArea!.Name,
//WorkGroup = template.Host!.WorkGroup!, //WorkGroup = template.Host!.WorkGroup!,
WorkGroup = template.Host!.WorkGroupItem!.Name, WorkGroup = template.Host!.WorkGroup!.Name,
//Мы решили, что для всех расписаний "Нет исключений", если что-то поменяется, тут нужно переделать //Мы решили, что для всех расписаний "Нет исключений", если что-то поменяется, тут нужно переделать
TypeV60calendar = settingsFromDb.ScheduleExclude == "Нет исключений" ? "NONE" : "", TypeV60calendar = settingsFromDb.ScheduleExclude == "Нет исключений" ? "NONE" : "",
Scheduled = EsppScheduleHelpers.GetNextRun(template.ApplicationsInWork!.NextRun), Scheduled = EsppScheduleHelpers.GetNextRun(template.ApplicationsInWork!.NextRun),

2
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -74,7 +74,7 @@ namespace PARR.EsppTemplateSync
TemplateName = template.Name, TemplateName = template.Name,
IsActive = template.IsActiveTemplate, IsActive = template.IsActiveTemplate,
//WorkGroup = template.Host!.WorkGroup!, //WorkGroup = template.Host!.WorkGroup!,
WorkGroup = template.Host!.WorkGroupItem!.Name, WorkGroup = template.Host!.WorkGroup!.Name,
ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription), ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription),
ResponseArea = template.Host!.ResponseArea!.Name, ResponseArea = template.Host!.ResponseArea!.Name,
Duration = template.ApplicationsInWork.TemplateDuration, Duration = template.ApplicationsInWork.TemplateDuration,