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

---
 PARR.API/Contracts/V1/Responses/EkStatusResponse.cs | 6 ++----
 PARR.API/Contracts/V1/Responses/HostBaseResponse.cs | 4 ++++
 PARR.API/MappingProfiles/DomainToResponseProfile.cs | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/PARR.API/Contracts/V1/Responses/EkStatusResponse.cs b/PARR.API/Contracts/V1/Responses/EkStatusResponse.cs
index 280736e5..70bb144d 100644
--- a/PARR.API/Contracts/V1/Responses/EkStatusResponse.cs
+++ b/PARR.API/Contracts/V1/Responses/EkStatusResponse.cs
@@ -1,10 +1,8 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace PARR.API.Contracts.V1.Responses
+namespace PARR.API.Contracts.V1.Responses
 {
     public class EkStatusResponse
     {
         public int Code { get; set; }
-        public string Name { get; set; } = string.Empty;
+        public required string Name { get; set; }
     }
 }
diff --git a/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs b/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs
index d2de9b6c..8bdc1744 100644
--- a/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs
+++ b/PARR.API/Contracts/V1/Responses/HostBaseResponse.cs
@@ -8,12 +8,16 @@
 
         public required string IP { get; set; }
 
+        //TODO: Удалить поле Status, использовать EkStatus
         public string? Status { get; set; }
 
+        public EkStatusResponse? EkStatus { get; set; }
+
         public string? WorkGroupName { get; set; }
 
         public WorkGroupResponse? WorkGroup { get; set; }
 
+        //TODO: Удалить поле ResponseArea, использовать EkResponseArea
         public string? ResponseArea { get; set; }
 
         public ResponseAreaResponse? EkResponseArea { get; set; }
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index 667ca96a..29c5d108 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -87,6 +87,7 @@ namespace PARR.API.MappingProfiles
                 .Include<DAL.Models.Host, HostTemplateResponse>()
                 .Include<DAL.Models.Host, HostWithApplicationsResponse>()
                 .ForMember(d => d.Status, o => o.MapFrom(s => s.EkStatus!.Name))
+                .ForMember(d => d.EkStatus, o => o.MapFrom(s => s.EkStatus))
                 .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))