From 3b3606859a18be220bf4c919a7c0a99e1d2354fa Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Thu, 4 Jul 2024 16:44:25 +1000
Subject: [PATCH] =?UTF-8?q?feat(api,=20generatorTemplates,=20templateDistr?=
 =?UTF-8?q?ibutor):=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=20e?=
 =?UTF-8?q?sppScheduleResponse.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20DistributeTempl?=
 =?UTF-8?q?ate,=20=D1=82=D0=B0=D0=BA=20=D0=B6=D0=B5=20=D0=BE=D0=B1=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=B2=20Generator?=
 =?UTF-8?q?Templates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs | 2 ++
 PARR.GeneratorTemplates/Services/TemplateManager.cs     | 2 +-
 PARR.TemplateDistributor/ITemplateDistributor.cs        | 2 +-
 PARR.TemplateDistributor/TemplateDistributor.cs         | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs b/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs
index 8b373efe..fab55922 100644
--- a/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs
+++ b/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs
@@ -57,6 +57,8 @@
         public Guid Id { get; set; }
 
         public required string Value { get; set; }
+
+        public Guid? DistributionPeriodId { get; set; }
     }
 
     public class EsppScheduleTypeConfigWithDataResponse
diff --git a/PARR.GeneratorTemplates/Services/TemplateManager.cs b/PARR.GeneratorTemplates/Services/TemplateManager.cs
index a7357e38..029c07ec 100644
--- a/PARR.GeneratorTemplates/Services/TemplateManager.cs
+++ b/PARR.GeneratorTemplates/Services/TemplateManager.cs
@@ -109,7 +109,7 @@ namespace PARR.GeneratorTemplates.Services
                 var templates = CreateQueryTemplates(groupingHosts, query);
 
                 //заполняем NextRun
-                templates = await templateDistributor.DistributeTemplateAsync(templates, appInWorkWg.Id);
+                templates = await templateDistributor.DistributeTemplateAsync(templates, appInWorkWg.Id, (Guid)group.Key!);
 
                 // сохраняем
                 foreach (var template in templates)
diff --git a/PARR.TemplateDistributor/ITemplateDistributor.cs b/PARR.TemplateDistributor/ITemplateDistributor.cs
index ceacc2a3..c28dd8ac 100644
--- a/PARR.TemplateDistributor/ITemplateDistributor.cs
+++ b/PARR.TemplateDistributor/ITemplateDistributor.cs
@@ -10,7 +10,7 @@ namespace PARR.TemplateDistributor
         /// <param name="templates"></param>
         /// <param name="applicationInWorkId"></param>
         /// <returns></returns>
-        Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId);
+        Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId, Guid workGroupid);
 
         /// <summary>
         /// Обновляет расписание запуска шаблонов по РР (сохраняет в БД)
diff --git a/PARR.TemplateDistributor/TemplateDistributor.cs b/PARR.TemplateDistributor/TemplateDistributor.cs
index 1042d371..ec8294df 100644
--- a/PARR.TemplateDistributor/TemplateDistributor.cs
+++ b/PARR.TemplateDistributor/TemplateDistributor.cs
@@ -24,7 +24,8 @@ namespace PARR.TemplateDistributor
 
 
 
-        public async Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId)
+        //public async Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId)
+        public async Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId, Guid workGroupid)
         {
             //TODO: ЗАГУЛШКА переделать!