From 8549e80a54561c1cf2ef373d881915ec74f9bfb6 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 24 Sep 2024 12:16:55 +1000
Subject: [PATCH] =?UTF-8?q?refactor(templateActivator):=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.TemplateActivator/TemplateActivator.cs | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/PARR.TemplateActivator/TemplateActivator.cs b/PARR.TemplateActivator/TemplateActivator.cs
index 4525d793..617b0ede 100644
--- a/PARR.TemplateActivator/TemplateActivator.cs
+++ b/PARR.TemplateActivator/TemplateActivator.cs
@@ -91,13 +91,13 @@ internal class TemplateActivator : ITemplateActivator
                     );
                 changes = await UpdateScheduleStateAsync(query, false);
                 break;
-            case TemplateActivatorActionsEnum.ActivateAllForAutoControl:
-                logger.LogInformation($"Получен запрос на активацию шаблонов и расписаний, для ЭК удовлетворяющим условиям автоконтроля");
-                changes = await CoordinateJobsWithAutoControl(applicationInWorkId, query, true);
-                break;
             case TemplateActivatorActionsEnum.DeactivateAllForAutoControl:
                 logger.LogInformation($"Получен запрос на деактивацию шаблонов и расписаний, для ЭК неудовлетворяющим условиям автоконтроля");
-                changes = await CoordinateJobsWithAutoControl(applicationInWorkId, query, false);
+                changes = await CoordinateJobsWithAutoControlAsync(applicationInWorkId, query, false);
+                break;
+            case TemplateActivatorActionsEnum.ActivateAllForAutoControl:
+                logger.LogInformation($"Получен запрос на активацию шаблонов и расписаний, для ЭК удовлетворяющим условиям автоконтроля");
+                changes = await CoordinateJobsWithAutoControlAsync(applicationInWorkId, query, true);
                 break;
             default:
                 break;
@@ -109,12 +109,15 @@ internal class TemplateActivator : ITemplateActivator
         logger.LogDebug($"{GetType().Name} изменил состояние шаблонов/расписаний({changes}) регламентной работы Id {applicationInWorkId}");
     }
 
-    private async Task<int> CoordinateJobsWithAutoControl(Guid applicationInWorkId, IQueryable<Template> query, bool isActivate)
+    private async Task<int> CoordinateJobsWithAutoControlAsync(Guid applicationInWorkId, IQueryable<Template> query, bool isActivate)
     {
         var changes = 0;
 
+        //Добавляем информацию о рабочих группах для возможности их фильтрации
+        query = query.Include(t => t.Host).ThenInclude(h => h!.WorkGroup);
+
         //Получаем настройки авто-контроля
-        var jobAutoControlSettings = await GetJobAutoControlSettings(applicationInWorkId);
+        var jobAutoControlSettings = await GetJobAutoControlSettingsAsync(applicationInWorkId);
         if (jobAutoControlSettings == null)
             return 0;
 
@@ -129,9 +132,6 @@ internal class TemplateActivator : ITemplateActivator
 
         //Фильтруем обратное состояние - активированные для деактивации
         query = FilterTemplatesQueryByWrongState(query, jobAutoControlSettings, isActivate);
-        
-        //Добавляем информацию о рабочих группах для возможности их фильтрации
-        query = query.Include(t => t.Host).ThenInclude(h => h!.WorkGroup);
 
         //Фильтруем по маскам ЭК
         var templates = FilterTemplatesByNameNotMatchToMasks(query, trueMasks);
@@ -159,7 +159,7 @@ internal class TemplateActivator : ITemplateActivator
     {
         var appInWorkInWorkGroups = applicationsInWorkService.Get()
                                  .Include(aiw => aiw.WorkGroups)
-                                 .Where(x => x.Id == applicationInWorkId).Select(aiw => aiw.WorkGroups).FirstOrDefault();
+                                 .FirstOrDefault(t => t.Id == applicationInWorkId)?.WorkGroups;
 
         if (appInWorkInWorkGroups != null)
             return appInWorkInWorkGroups.ToList();
@@ -190,12 +190,12 @@ internal class TemplateActivator : ITemplateActivator
     private IQueryable<Template> FilterTemplatesQueryByWrongState(IQueryable<Template> query, JobAutoControl jobAutoControlSettings, bool isActivate)
     {
         if (isActivate)
-            return query.Include(t => t.Host).Where(t => t.IsActiveTemplate != jobAutoControlSettings.OnTemplateIsActive || t.IsActiveSchedule != jobAutoControlSettings.OnScheduleIsActive);
+            return query.Where(t => t.IsActiveTemplate != jobAutoControlSettings.OnTemplateIsActive || t.IsActiveSchedule != jobAutoControlSettings.OnScheduleIsActive);
 
-        return query.Include(t => t.Host).Where(t => t.IsActiveTemplate != jobAutoControlSettings.OffTemplateIsActive || t.IsActiveSchedule != jobAutoControlSettings.OffScheduleIsActive);
+        return query.Where(t => t.IsActiveTemplate != jobAutoControlSettings.OffTemplateIsActive || t.IsActiveSchedule != jobAutoControlSettings.OffScheduleIsActive);
     }
 
-    private async Task<JobAutoControl> GetJobAutoControlSettings(Guid applicationInWorkId)
+    private async Task<JobAutoControl> GetJobAutoControlSettingsAsync(Guid applicationInWorkId)
     {
         return await jobAutoControlService.Get()
                             .Include(jac => jac.JobAutoControlInEkStatuses)