From 27f963371e605db8e2a02fa6f0ce968394c2c547 Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Wed, 19 Jun 2024 11:54:31 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20HostResponse,=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5?=
 =?UTF-8?q?=20EkResponseArea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Contracts/V1/Responses/HostBaseResponse.cs | 2 ++
 PARR.API/Controllers/V1/HostController.cs           | 4 ++--
 PARR.API/MappingProfiles/DomainToResponseProfile.cs | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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<PaginationFilter>(paginationQuery);
 
             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.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<IActionResult> 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<DAL.Models.Host, HostWithApplicationsResponse>()
                 .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<DAL.Models.Host, HostTemplateResponse>();