From 5b9a325b59c43d08489960bb84a5ce2165415625 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Fri, 9 Aug 2024 12:14:04 +1000 Subject: [PATCH] =?UTF-8?q?feat(templateActivator):=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B4=D0=B5=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=D1=85=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9,=20=D1=83=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D1=85=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D1=81=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.TemplateActivator/TemplateActivator.cs | 9 +++++++++ PARR.TemplateActivator/TemplateActivatorInstaller.cs | 12 ++++++++++++ PARR.TemplateActivatorWorker/Program.cs | 2 ++ 3 files changed, 23 insertions(+) diff --git a/PARR.TemplateActivator/TemplateActivator.cs b/PARR.TemplateActivator/TemplateActivator.cs index 9b6136de..9fa117b4 100644 --- a/PARR.TemplateActivator/TemplateActivator.cs +++ b/PARR.TemplateActivator/TemplateActivator.cs @@ -73,6 +73,15 @@ internal class TemplateActivator : ITemplateActivator query = query.Where(t => !t.IsActiveTemplate && t.IsActiveSchedule); changes = await UpdateScheduleStateAsync(query, false); break; + case TemplateActivatorActionsEnum.DeactivateSchedulesWithTemplateSyncErrors: + logger.LogInformation($"Получен запрос на деактивацию всех расписаний, у которых шаблоны синхронизированы с ошибкой"); + 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); + break; default: break; } diff --git a/PARR.TemplateActivator/TemplateActivatorInstaller.cs b/PARR.TemplateActivator/TemplateActivatorInstaller.cs index af3b0426..2186222f 100644 --- a/PARR.TemplateActivator/TemplateActivatorInstaller.cs +++ b/PARR.TemplateActivator/TemplateActivatorInstaller.cs @@ -21,4 +21,16 @@ public static class TemplateActivatorInstaller services.AddTransient(); services.AddTransient(); } + + public static IConfigurationBuilder AddTemplateActivatorConfigurations(this IConfigurationBuilder builder, IServiceCollection services) + { + builder.AddDalConfigurations(services); + + return builder; + } + + public static void AddTemplateActivatorSettings(this IServiceCollection services, IConfiguration configuration) + { + services.AddDallSettings(configuration); + } } diff --git a/PARR.TemplateActivatorWorker/Program.cs b/PARR.TemplateActivatorWorker/Program.cs index bd6bf903..f2702cd2 100644 --- a/PARR.TemplateActivatorWorker/Program.cs +++ b/PARR.TemplateActivatorWorker/Program.cs @@ -22,6 +22,8 @@ builder.Services.AddLogging(config => }); builder.Services.InstallTemplateActivatorSerivces(builder.Configuration); +builder.Configuration.AddTemplateActivatorConfigurations(builder.Services); +builder.Services.AddTemplateActivatorSettings(builder.Configuration); builder.Services.AddHostedService();