diff --git a/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs b/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs index 7a8332ad..d2de9b6c 100644 --- a/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs +++ b/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs @@ -16,6 +16,8 @@ public string? ResponseArea { get; set; } + public ResponseAreaResponse? EkResponseArea { get; set; } + public DateTimeOffset? LastLogon { get; set; } } diff --git a/PARR.API/Controllers/V1/HostController.cs b/PARR.API/Controllers/V1/HostController.cs index fe5ce5d3..736f2d40 100644 --- a/PARR.API/Controllers/V1/HostController.cs +++ b/PARR.API/Controllers/V1/HostController.cs @@ -39,7 +39,7 @@ namespace PARR.API.Controllers.V1 var paginationFilter = mapper.Map(paginationQuery); IQueryable query = hostService.Get() - .Include(t=>t.WorkGroup) + .Include(t=>t.WorkGroup).ThenInclude(t=>t!.ResponseArea) .Include(s => s.EkStatus) .Include(s => s.ResponseArea) .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType) @@ -69,7 +69,7 @@ namespace PARR.API.Controllers.V1 public async Task GetById([FromRoute] Guid id) { var host = await hostService.Get() - .Include(t => t.WorkGroup) + .Include(t => t.WorkGroup).ThenInclude(t => t!.ResponseArea) .Include(s => s.EkStatus) .Include(s => s.ResponseArea) .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType) diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 1961167b..667ca96a 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -88,8 +88,9 @@ 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.WorkGroup.Name)) - .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)); + .ForMember(d => d.WorkGroupName, o => o.MapFrom(s => s.WorkGroup!.Name)) + .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)) + .ForMember(d => d.EkResponseArea, o => o.MapFrom(s => s.ResponseArea)); CreateMap();