From f4304ea45a8b55f3e09d9ffb90a87d44dcbec34d Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 15 Feb 2024 09:21:01 +1000 Subject: [PATCH] =?UTF-8?q?fix(scheduleSync,=20templateSync):=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=20=D0=B8=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=B1=D0=B5=D0=B7=20=D1=83?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B0=20=D0=97=D0=9E=20=D0=B2=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D1=84=D0=B8=D0=BA=D1=81=D0=B5=20(=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.EsppScheduleSync/ScheduleSyncher.cs | 8 ++++++-- PARR.EsppTemplateSync/TemplateMQSyncer.cs | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/PARR.EsppScheduleSync/ScheduleSyncher.cs b/PARR.EsppScheduleSync/ScheduleSyncher.cs index 8ed44bf5..3d63cf2a 100644 --- a/PARR.EsppScheduleSync/ScheduleSyncher.cs +++ b/PARR.EsppScheduleSync/ScheduleSyncher.cs @@ -8,6 +8,7 @@ using PARR.DAL.Services.Interfaces; using PARR.EsppScheduleSync.Domain; using PARR.EsppScheduleSync.Settings; using PARR.EsppSync; +using System.Linq; namespace PARR.EsppScheduleSync { @@ -257,10 +258,13 @@ namespace PARR.EsppScheduleSync { var currentCulture = Thread.CurrentThread.CurrentCulture; - if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) && name.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)) + //if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) && name.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)) + // return true; + + if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) && name.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase)) return true; - logger.LogWarning($"Имя шаблона или расписания не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixName}). {name} игнорирован"); + logger.LogWarning($"Имя шаблона или расписания не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixWithoutVariable}). {name} игнорирован"); return false; } diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs index 6c633aed..759ddc08 100644 --- a/PARR.EsppTemplateSync/TemplateMQSyncer.cs +++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs @@ -108,9 +108,10 @@ namespace PARR.EsppTemplateSync var templateName = splittedContent[0].Trim(); var currentCulture = Thread.CurrentThread.CurrentCulture; - if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) || !templateName.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)) + //if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) || !templateName.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)) + if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixWithoutVariable) || !templateName.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase)) { - logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixName}). Шаблон {templateName} игнорирован"); + logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixWithoutVariable}). Шаблон {templateName} игнорирован"); return null; }