From 6bd22fa2e0c52468a25ac4c4151ade39369fc436 Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Tue, 16 Dec 2025 17:05:26 +1000
Subject: [PATCH] =?UTF-8?q?fix(templateMatcher):=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B8=20StatusType,=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=BD=D0=B4=D0=B0=20=D0=B4=D0=B5=D0=B9=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=D0=BE=D1=81=D1=8C=20=D1=81?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B5.=20=D0=91?=
 =?UTF-8?q?=D1=8B=D0=BB=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20Unsed=20=D0=BF=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=BE=20=D1=81=D1=82=D0=B0=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=81=D1=8F=20Unsed=20=D0=B8=20=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=8F=D1=82=D1=8C=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8B=D0=B2=D0=B0=D0=BB=D1=81=D1=8F=20UnixTi?=
 =?UTF-8?q?meSeconds.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implementations/ShortcodesService.cs      |  2 +-
 PARR.TemplateMatcher/TemplateMatcher.cs       | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs b/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
index 99b33c1c..068e4545 100644
--- a/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
+++ b/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
@@ -101,7 +101,7 @@ namespace PARR.DAL.DomainServices.Implementations
                 // Защита от "бесполезных" итераций (строка не изменилась)
                 if (resultName == oldResult)
                 {
-                    logger.LogWarning("Замена стандартных шорткодов не изменила строку на итерации {Iteration}. Останов.", iteration);
+                    logger.LogDebug("Замена стандартных шорткодов не изменила строку на итерации {Iteration}. Останов.", iteration);
                     break;
                 }
             }
diff --git a/PARR.TemplateMatcher/TemplateMatcher.cs b/PARR.TemplateMatcher/TemplateMatcher.cs
index 74ba13fb..d32a1d21 100644
--- a/PARR.TemplateMatcher/TemplateMatcher.cs
+++ b/PARR.TemplateMatcher/TemplateMatcher.cs
@@ -213,14 +213,18 @@ namespace PARR.TemplateMatcher
                     logger.LogInformation("Шаблон {TemplateId} (UnitId {UnitId}) → деактивация.", template.Id, template.UnitId);
                 }
 
-                bool needsUpdate =
-                    template.StatusTypeId != TemplateStatusTypeEnum.Updating &&
-                    (
-                        template.StatusTypeId != targetStatus ||
-                        template.Name != expectedName ||
-                        template.IsActiveTemplate != targetIsActiveTemplate ||
-                        template.IsActiveSchedule != targetIsActiveSchedule
-                    );
+                bool needsUpdate = template.StatusTypeId != TemplateStatusTypeEnum.Updating &&
+                                   (
+                                       // 1. Статус изменился (например, Used → Unused или Unused → Used)
+                                       template.StatusTypeId != targetStatus ||
+
+                                       // 2. Для Used — имя должно соответствовать шаблону
+                                       (targetStatus == TemplateStatusTypeEnum.Used && template.Name != expectedName) ||
+
+                                       // 3. Флаги изменились (редко, но возможно через AutoControl изменение)
+                                       template.IsActiveTemplate != targetIsActiveTemplate ||
+                                       template.IsActiveSchedule != targetIsActiveSchedule
+                                   );
 
                 if (!needsUpdate) continue;