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

feat(api): HostResponse, добавлено поле EkResponseArea

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-06-19 11:54:31 +10:00
parent 97f9b3bd14
commit 27f963371e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.API/Contracts/V1/Responses/HostBaseResponse.cs
View File

@@ -16,6 +16,8 @@
public string? ResponseArea { get; set; } public string? ResponseArea { get; set; }
public ResponseAreaResponse? EkResponseArea { get; set; }
public DateTimeOffset? LastLogon { get; set; } public DateTimeOffset? LastLogon { get; set; }
} }

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

@@ -39,7 +39,7 @@ namespace PARR.API.Controllers.V1
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery); var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
IQueryable<DAL.Models.Host> query = hostService.Get() IQueryable<DAL.Models.Host> query = hostService.Get()
.Include(t=>t.WorkGroup) .Include(t=>t.WorkGroup).ThenInclude(t=>t!.ResponseArea)
.Include(s => s.EkStatus) .Include(s => s.EkStatus)
.Include(s => s.ResponseArea) .Include(s => s.ResponseArea)
.Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType) .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType)
@@ -69,7 +69,7 @@ namespace PARR.API.Controllers.V1
public async Task<IActionResult> GetById([FromRoute] Guid id) public async Task<IActionResult> GetById([FromRoute] Guid id)
{ {
var host = await hostService.Get() var host = await hostService.Get()
.Include(t => t.WorkGroup) .Include(t => t.WorkGroup).ThenInclude(t => t!.ResponseArea)
.Include(s => s.EkStatus) .Include(s => s.EkStatus)
.Include(s => s.ResponseArea) .Include(s => s.ResponseArea)
.Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType) .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType)

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

@@ -88,8 +88,9 @@ 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.WorkGroup.Name)) .ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroup!.Name))
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)); .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup))
.ForMember(d => d.EkResponseArea, o => o.MapFrom(s => s.ResponseArea));
CreateMap<DAL.Models.Host, HostTemplateResponse>(); CreateMap<DAL.Models.Host, HostTemplateResponse>();