From a333589c77c019cbbcb1b2d6a8223b0aef2488e8 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Fri, 9 Aug 2024 16:36:37 +1000
Subject: [PATCH] =?UTF-8?q?feat(templateActivator,templateDistributor):=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B6?=
 =?UTF-8?q?=D1=83=D1=80=D0=BD=D0=B0=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.TemplateActivator/TemplateActivator.cs          | 11 ++++++-----
 PARR.TemplateDistributor/TemplateDistributor.cs      |  5 ++++-
 .../TemplateDistributorInstaller.cs                  | 12 ++++++++++++
 PARR.TemplateDistributorWorker/Program.cs            |  2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/PARR.TemplateActivator/TemplateActivator.cs b/PARR.TemplateActivator/TemplateActivator.cs
index 9fa117b4..1310bc34 100644
--- a/PARR.TemplateActivator/TemplateActivator.cs
+++ b/PARR.TemplateActivator/TemplateActivator.cs
@@ -75,9 +75,9 @@ internal class TemplateActivator : ITemplateActivator
                 break;
             case TemplateActivatorActionsEnum.DeactivateSchedulesWithTemplateSyncErrors:
                 logger.LogInformation($"Получен запрос на деактивацию всех расписаний, у которых шаблоны синхронизированы с ошибкой");
-                query = query.Where(t => !t.IsActiveTemplate && 
-                    t.RobotConfigurations.Any(t => 
-                        t.RobotCode == (int) RobotsEnum.TemplateOrder && 
+                query = query.Where(t => !t.IsActiveTemplate &&
+                    t.RobotConfigurations.Any(t =>
+                        t.RobotCode == (int)RobotsEnum.TemplateOrder &&
                         t.RobotStatusCode == (int)RobotStatusEnum.Error)
                     );
                 changes = await UpdateScheduleStateAsync(query, false);
@@ -86,8 +86,9 @@ internal class TemplateActivator : ITemplateActivator
                 break;
         }
 
-        if (changes > 0 && !await templateService.CommitAsync())
-            logger.LogError($"{this.GetType} не удалось записать измения в БД о новых состояниях шаблонов и расписаний регламентной работы Id {applicationInWorkId}");
+        if (changes > 0)
+            if (!await templateService.CommitAsync()) logger.LogError($"{this.GetType} не удалось записать измения в БД о новых состояниях шаблонов и расписаний регламентной работы Id {applicationInWorkId}");
+            else logger.LogDebug($"{GetType} изменил состояние шаблонов/расписаний({changes}) регламентной работы Id {applicationInWorkId}");
 
     }
 
diff --git a/PARR.TemplateDistributor/TemplateDistributor.cs b/PARR.TemplateDistributor/TemplateDistributor.cs
index f4a35bf8..8f6298cf 100644
--- a/PARR.TemplateDistributor/TemplateDistributor.cs
+++ b/PARR.TemplateDistributor/TemplateDistributor.cs
@@ -114,7 +114,10 @@ namespace PARR.TemplateDistributor
                 var templateToDistrib = new List<Template>();
 
                 if (existingTemplates.Count > 0)
+                {
                     templateToDistrib = GetTemplatesToDistribute(ref distrPlan, existingTemplates);
+                    logger.LogInformation($"{GetType().Name}(AppInWId:{applicationInWorkId}, WorkGroup:{existingTemplates.Select(t =>t.Host!.WorkGroup!.Name).First()}) запланировал изменение даты следующего срабатывания у {templateToDistrib.Count()} существующих шаблона(ов), {existingTemplates.Count() - templateToDistrib.Count()} остались без изменений");
+                }
 
                 templateToDistrib.AddRange(templates);
 
@@ -286,7 +289,7 @@ namespace PARR.TemplateDistributor
             //Определим шаблоны за границами рабочих дней. Их тоже необходимо перераспределить
             var workDays = distributionPlan.Keys.ToList();
             var templateWithNextRunOut = templates.Where(t => workDays.All(w => w != DateOnly.FromDateTime(t.NextRun.DateTime))).ToList();
-            
+
             if (templateWithNextRunOut.Any())
                 result.AddRange(templateWithNextRunOut);
 
diff --git a/PARR.TemplateDistributor/TemplateDistributorInstaller.cs b/PARR.TemplateDistributor/TemplateDistributorInstaller.cs
index 6ef8a0ca..1e506db1 100644
--- a/PARR.TemplateDistributor/TemplateDistributorInstaller.cs
+++ b/PARR.TemplateDistributor/TemplateDistributorInstaller.cs
@@ -22,5 +22,17 @@ namespace PARR.TemplateDistributor
             services.AddTransient<IMqTemplateDistributor, MqTemplateDistributor>();
             services.AddTransient<IValidatorService,ValidatorService>();
         }
+
+        public static IConfigurationBuilder AddTemplateDistributorConfigurations(this IConfigurationBuilder builder, IServiceCollection services)
+        {
+            builder.AddDalConfigurations(services);
+
+            return builder;
+        }
+
+        public static void AddTemplateDistributorSettings(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddDallSettings(configuration);
+        }
     }
 }
diff --git a/PARR.TemplateDistributorWorker/Program.cs b/PARR.TemplateDistributorWorker/Program.cs
index 937eb77a..ffe81836 100644
--- a/PARR.TemplateDistributorWorker/Program.cs
+++ b/PARR.TemplateDistributorWorker/Program.cs
@@ -22,6 +22,8 @@ builder.Services.AddLogging(config =>
 });
 
 builder.Services.InstallTemplateDistributorSerivces(builder.Configuration);
+builder.Configuration.AddTemplateDistributorConfigurations(builder.Services);
+builder.Services.AddTemplateDistributorSettings(builder.Configuration);
 
 builder.Services.AddHostedService<Worker>();