From fc197a6a5b23f951f140c174d586189ebd987663 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 16 Jul 2024 12:06:46 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BD=D1=8F=20=D0=B5=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D1=81=D1=8F=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=A0=D0=A0=20=D0=B7=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=80=D0=BE=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=20=D0=B2=20Mapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Controllers/V1/RobotTaskController.cs       |  5 -----
 .../Resolvers/RobotTaskScheduleSchResolver.cs        | 12 ++++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs
index b8a39de8..147acdf9 100644
--- a/PARR.API/Controllers/V1/RobotTaskController.cs
+++ b/PARR.API/Controllers/V1/RobotTaskController.cs
@@ -132,11 +132,6 @@ namespace PARR.API.Controllers.V1
                     //RobotTaskScheduleResponse
                     var response = mapper.Map<RobotTaskScheduleResponse>(task);
 
-                    //Если задача относится к распределенной модели исполнения за период месяц устанавливаем день равный NextRun
-                    if (task.Template!.ApplicationsInWork!.IsAutoDistributionEnabled &&
-                        task.Template!.ApplicationsInWork!.EsppSchValues!.First()!.EsppSchTypeConfig!.TypeScheduleId == 3)
-                        response!.Schedule!.First().Value = task.Template.NextRun.Day.ToString();
-
                     return Ok(new Response<RobotTaskScheduleResponse>(response, true));
                 default:
                     break;
diff --git a/PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs b/PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs
index 78990a85..4b9efe81 100644
--- a/PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs
+++ b/PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs
@@ -1,7 +1,9 @@
 using AutoMapper;
 using PARR.API.Contracts.V1.Responses;
+using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
+using System.Threading.Tasks;
 
 namespace PARR.API.MappingProfiles.Resolvers
 {
@@ -37,9 +39,15 @@ namespace PARR.API.MappingProfiles.Resolvers
                 Type = t.Type.Name,
                 TypeCode = t.Type.Id,
                 Value = t.Value.Value
-            });
+            }).OrderBy(t => t.Order).ToList();
 
-            return response.OrderBy(t => t.Order).ToList();
+            //Если задача относится к распределенной модели исполнения за период месяц устанавливаем день равный NextRun
+            if (source.Template!.ApplicationsInWork!.IsAutoDistributionEnabled &&
+                schedule.TypeSchedule.Id == (int)EsppSchTypeScheduleEnum.Monthly)
+                    response.First().Value = source.Template.NextRun.Day.ToString();
+
+
+            return response;
         }
     }
 }