From 65ff13af088c13f9de27a1e8ba4654ae8b20b8f3 Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Thu, 15 Feb 2024 13:47:34 +1000
Subject: [PATCH] =?UTF-8?q?fix(scheduleSync,=20templateSync):=20=D0=B8?=
 =?UTF-8?q?=D0=B3=D0=BD=D0=BE=D1=80=20=D0=BA=D1=83=D0=BB=D1=8C=D1=82=D1=83?=
 =?UTF-8?q?=D1=80=D1=8B,=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2=20=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=B7=20=D1=83=D1=87=D0=B5=D1=82=D0=B0=20=D0=97=D0=9E=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81=D0=B5=20(?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.EsppScheduleSync/ScheduleSyncher.cs  |  2 +-
 PARR.EsppTemplateSync/TemplateMQSyncer.cs |  2 +-
 PARR.Test/Worker.cs                       | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/PARR.EsppScheduleSync/ScheduleSyncher.cs b/PARR.EsppScheduleSync/ScheduleSyncher.cs
index 3d63cf2a..11debea7 100644
--- a/PARR.EsppScheduleSync/ScheduleSyncher.cs
+++ b/PARR.EsppScheduleSync/ScheduleSyncher.cs
@@ -261,7 +261,7 @@ namespace PARR.EsppScheduleSync
             //if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) && name.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture))
             //    return true;
 
-            if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) && name.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase))
+            if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) && name.Contains(settingsFromDb.TemplatePrefixWithoutVariable)) // , StringComparison.CurrentCultureIgnoreCase
                 return true;
 
             logger.LogWarning($"Имя шаблона или расписания не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixWithoutVariable}). {name} игнорирован");
diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs
index 759ddc08..0d0022e7 100644
--- a/PARR.EsppTemplateSync/TemplateMQSyncer.cs
+++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs
@@ -109,7 +109,7 @@ namespace PARR.EsppTemplateSync
 
             var currentCulture = Thread.CurrentThread.CurrentCulture;
             //if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) || !templateName.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture))
-            if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) || !templateName.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase))
+            if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) || !templateName.Contains(settingsFromDb.TemplatePrefixWithoutVariable)) // , StringComparison.CurrentCultureIgnoreCase
             {
                 logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixWithoutVariable}). Шаблон {templateName} игнорирован");
                 return null;
diff --git a/PARR.Test/Worker.cs b/PARR.Test/Worker.cs
index 441fe981..5853a2c3 100644
--- a/PARR.Test/Worker.cs
+++ b/PARR.Test/Worker.cs
@@ -20,6 +20,16 @@ namespace PARR.Test
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
+            #region test
+            //var tName = "ДВС-ЭИТИ-ПТК-ПАРР__ВРТ-VCD-02-ДВС__ПРОЧЕЕ(РАБОТЫ)";
+            //var prefix = "ЭИТИ-ПТК-ПАРР";
+            ////templateName.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase)
+            //var res = tName.Contains(prefix);
+
+            #endregion
+
+
+
             ////test interval
             //await intervalService.IntervalInitAsync(async () =>
             //{