From 7e4466f93838b66b0bee7ea56e28ac7424f8d2ba Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Wed, 26 Jul 2023 10:09:25 +1000
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D1=81=D0=BF=D0=BE=D0=BD=D1=81=20/jobs/ip/?=
 =?UTF-8?q?=20(=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=20=D0=9F=D1=80=D0=B8=D0=B3=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=94.=D0=92.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Contracts/V1/Responses/JobResponse.cs |  9 ++++++++-
 PARR.API/Controllers/V1/JobController.cs       | 18 ++++++++++--------
 .../MappingProfiles/DomainToResponseProfile.cs |  9 ++++++++-
 PARR.API/MappingProfiles/Resolvers/.gitkeep    |  6 ++++++
 PARR.API/PARR.API.csproj                       |  5 -----
 PARR.API/Validators/.gitkeep                   |  6 ++++++
 6 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 PARR.API/MappingProfiles/Resolvers/.gitkeep
 create mode 100644 PARR.API/Validators/.gitkeep

diff --git a/PARR.API/Contracts/V1/Responses/JobResponse.cs b/PARR.API/Contracts/V1/Responses/JobResponse.cs
index 97927ba3..42179e88 100644
--- a/PARR.API/Contracts/V1/Responses/JobResponse.cs
+++ b/PARR.API/Contracts/V1/Responses/JobResponse.cs
@@ -6,7 +6,7 @@
         public DateTimeOffset StartAt { get; set; }
         public int FrequencyMinute { get; set; }
         public required JobModeResponse JobMode { get; set; }
-        public required string ScriptName { get; set; }
+        public required string Script { get; set; }
     }
 
     public class JobGetAllResponse : JobBaseResponse
@@ -19,4 +19,11 @@
     {
 
     }
+
+    public class JobMinResponse
+    {
+        public DateTimeOffset StartAt { get; set; }
+
+        public required string Script { get; set; }
+    }
 }
diff --git a/PARR.API/Controllers/V1/JobController.cs b/PARR.API/Controllers/V1/JobController.cs
index 8b0c30ee..bf0d16d7 100644
--- a/PARR.API/Controllers/V1/JobController.cs
+++ b/PARR.API/Controllers/V1/JobController.cs
@@ -133,14 +133,16 @@ namespace PARR.API.Controllers.V1
 
 
             // возврат минимального ответа
-            try
-            {
-                return Ok(jobsToResponse.ToDictionary(t => t.ScriptName, d => d.StartAt));
-            }
-            catch (ArgumentException ex)
-            {
-                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не могу создать json объект с одинаковым значением ключа (ScriptName). {ex.Message}" } }));
-            }
+            return Ok(mapper.Map<List<JobMinResponse>>(jobsToResponse));
+
+            //try
+            //{
+            //    return Ok(jobsToResponse.ToDictionary(t => t.ScriptName, d => d.StartAt));
+            //}
+            //catch (ArgumentException ex)
+            //{
+            //    return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не могу создать json объект с одинаковым значением ключа (ScriptName). {ex.Message}" } }));
+            //}
         }
 
 
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index 998cb073..fb49d63c 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -11,9 +11,16 @@ namespace PARR.API.MappingProfiles
             // --- Job ---
             CreateMap<Job, JobBaseResponse>()
                 .Include<Job, JobGetAllResponse>()
-                .ForMember(d => d.FrequencyMinute, o => o.MapFrom(s => s.Frequency));
+                .ForMember(d => d.FrequencyMinute, o => o.MapFrom(s => s.Frequency))
+                .ForMember(d => d.Script, o => o.MapFrom(s => s.ScriptName));
+
             CreateMap<Job, JobGetAllResponse>();
 
+            CreateMap<Job, JobMinResponse>()
+                .ForMember(d => d.Script, o => o.MapFrom(s => s.ScriptName));
+            // === Job ===
+
+
 
             CreateMap<JobMode, JobModeResponse>();
         }
diff --git a/PARR.API/MappingProfiles/Resolvers/.gitkeep b/PARR.API/MappingProfiles/Resolvers/.gitkeep
new file mode 100644
index 00000000..70abcb05
--- /dev/null
+++ b/PARR.API/MappingProfiles/Resolvers/.gitkeep
@@ -0,0 +1,6 @@
+namespace PARR.API.MappingProfiles.Resolvers
+{
+    public class _
+    {
+    }
+}
diff --git a/PARR.API/PARR.API.csproj b/PARR.API/PARR.API.csproj
index 454dd83a..d839331e 100644
--- a/PARR.API/PARR.API.csproj
+++ b/PARR.API/PARR.API.csproj
@@ -33,11 +33,6 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="MappingProfiles\Resolvers\" />
-    <Folder Include="Validators\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PARR.DAL\PARR.DAL.csproj" />
   </ItemGroup>
diff --git a/PARR.API/Validators/.gitkeep b/PARR.API/Validators/.gitkeep
new file mode 100644
index 00000000..9093214c
--- /dev/null
+++ b/PARR.API/Validators/.gitkeep
@@ -0,0 +1,6 @@
+namespace PARR.API.Validators
+{
+    public class _
+    {
+    }
+}