fix(templateMatcher): Исправление ошибок в именах шаблонов и рефакторинг синхронизации

- Устранена ошибка, когда при переиспользовании шаблона для шорткодов передавался ЭК "КОМПЛЕКСЫ-[ЗО]" вместо целевого ЭК шаблона.
- Проведен небольшой рефакторинг общих процессов синхронизации различных типов групп работ.

PARR.TemplateMatcher/Services/Implementations/GroupedTemplateProcessor.cs

@@ -19,30 +19,26 @@ internal class GroupedTemplateProcessor : IGroupedTemplateProcessor
     private readonly ILogger<GroupedTemplateProcessor> logger;
     private readonly ITemplateRepository templateRepository;
     private readonly IUnitRepository unitRepository;
-    private readonly ITemplateReuser templateReuser;
     private readonly ITemplateNameNormalizer templateNameNormalizer;
-    private readonly ITemplateUpdaterMqSender templateUpdaterMqSender;
-    private readonly MqSettings mqSettings;
-    private readonly IRabbitService mqService;
+    private readonly ITemplateAllocationService templateAllocationService;
+    private readonly ITemplateMqPublisher templateMqPublisher;
 
     public GroupedTemplateProcessor(
         ILogger<GroupedTemplateProcessor> logger,
         ITemplateRepository templateRepository,
         IUnitRepository unitRepository,
-        ITemplateReuser templateReuser,
         ITemplateNameNormalizer templateNameNormalizer,
-        ITemplateUpdaterMqSender templateUpdaterMqSender,
+        ITemplateAllocationService templateAllocationService,
+        ITemplateMqPublisher templateMqPublisher,
         MqSettings mqSettings,
         IRabbitService mqService)
     {
         this.logger = logger;
         this.templateRepository = templateRepository;
         this.unitRepository = unitRepository;
-        this.templateReuser = templateReuser;
         this.templateNameNormalizer = templateNameNormalizer;
-        this.templateUpdaterMqSender = templateUpdaterMqSender;
-        this.mqSettings = mqSettings;
-        this.mqService = mqService;
+        this.templateAllocationService = templateAllocationService;
+        this.templateMqPublisher = templateMqPublisher;
     }
 
     public async Task<HashSet<(Guid JobId, Guid UnitId, int Index)>> ProcessAsync(
@@ -89,7 +85,7 @@ internal class GroupedTemplateProcessor : IGroupedTemplateProcessor
                 }
                 else
                 {
-                    await HandleNewOrReusableTemplateAsync(potentialUnitId, unitsInTemplateSubGroup, targetJob, globalIndex, initiator);
+                    await HandleNewOrReusableTemplateAsync(potentialUnitId, unitsInTemplateSubGroup, targetJob, globalIndex, initiator, ct);
                 }
             }
         }
@@ -159,7 +155,7 @@ internal class GroupedTemplateProcessor : IGroupedTemplateProcessor
                         UnitFieldValueId = t.UnitFieldValueId
                     }).ToList()
                 };
-                await templateUpdaterMqSender.SendTemplateUpdateMessageAsync(updateRequest);
+                await templateMqPublisher.PublishUpdateAsync(updateRequest);
             }
         }
         else
@@ -174,50 +170,33 @@ internal class GroupedTemplateProcessor : IGroupedTemplateProcessor
         List<(Guid UnitId, Guid UnitFieldValueId)> unitsInTemplateSubGroup,
         Job targetJob,
         int globalIndex,
-        HistoryInitiator initiator)
+        HistoryInitiator initiator,
+        CancellationToken ct)
     {
-        var reusableTemplate = await templateReuser.TryReuseOneUnusedTemplateAsync(targetJob.Id, potentialUnitId, initiator);
+        // Вычисляем флаги активности
+        var isActiveTemplate = targetJob.AutoControl?.InitUsedTemplateState ?? false;
+        var isActiveSchedule = targetJob.AutoControl?.InitUsedScheduleState ?? false;
 
-        if (reusableTemplate != null)
-        {
-            logger.LogInformation("Переиспользован шаблон {TemplateId}.", reusableTemplate.Id);
-
-            var tempTemplateForName = new Template
+        // Маппим кортежи в сообщения
+        var unitsInTemplateMsg = unitsInTemplateSubGroup
+            .Select(e => new UnitInTemplateMessage
             {
-                Id = reusableTemplate.Id,
-                Name = reusableTemplate.Name,
-                JobId = targetJob.Id,
-                UnitId = potentialUnitId,
-                Index = globalIndex,
-                Job = targetJob,
-                Unit = reusableTemplate.Unit,
-                UnitsInTemplate = unitsInTemplateSubGroup.Select(e => new UnitsInTemplate { UnitId = e.UnitId, UnitFieldValueId = e.UnitFieldValueId }).ToList()
-            };
+                UnitId = e.UnitId,
+                UnitFieldValueId = e.UnitFieldValueId
+            })
+            .ToList();
 
-            var expectedName = await templateNameNormalizer.GetNormalizedTemplateNameAsync(tempTemplateForName);
+        var request = new TemplateAllocationRequest(
+            TargetJob: targetJob,
+            TargetUnitId: potentialUnitId,
+            TargetUnit: null,
+            Index: globalIndex,
+            UnitsInTemplate: unitsInTemplateMsg,
+            IsActiveTemplate: isActiveTemplate,
+            IsActiveSchedule: isActiveSchedule,
+            Initiator: initiator);
 
-            var updateRequest = new TemplateUpdaterMessage
-            {
-                TemplateId = reusableTemplate.Id,
-                JobId = targetJob.Id,
-                UnitId = potentialUnitId,
-                Name = expectedName,
-                IsActiveTemplate = targetJob.AutoControl?.InitUsedTemplateState ?? false,
-                IsActiveSchedule = targetJob.AutoControl?.InitUsedScheduleState ?? false,
-                StatusTypeId = TemplateStatusTypeEnum.Used,
-                Initiator = initiator,
-                IsNew = true,
-                Index = globalIndex,
-                UnitsInTemplate = unitsInTemplateSubGroup.Select(e => new UnitInTemplateMessage { UnitId = e.UnitId, UnitFieldValueId = e.UnitFieldValueId }).ToList()
-            };
-
-            await templateUpdaterMqSender.SendTemplateUpdateMessageAsync(updateRequest);
-        }
-        else
-        {
-            logger.LogDebug("Создание нового шаблона.");
-            await CreateGroupedTemplateAsync(targetJob.Id, potentialUnitId, unitsInTemplateSubGroup, globalIndex, initiator);
-        }
+        await templateAllocationService.AllocateAsync(request, ct);
     }
 
     private async Task UpdateTemplateUnitsAsync(
@@ -270,32 +249,9 @@ internal class GroupedTemplateProcessor : IGroupedTemplateProcessor
             UnitsInTemplate = newUnitEntries.Select(e => new UnitInTemplateMessage { UnitId = e.UnitId, UnitFieldValueId = e.UnitFieldValueId }).ToList()
         };
 
-        await templateUpdaterMqSender.SendTemplateUpdateMessageAsync(updateRequest);
+        await templateMqPublisher.PublishUpdateAsync(updateRequest);
     }
 
-    private async Task CreateGroupedTemplateAsync(
-        Guid jobId,
-        Guid relationshipUnitId,
-        List<(Guid UnitId, Guid UnitFieldValueId)> unitsInTemplate,
-        int index,
-        HistoryInitiator initiator)
-    {
-        logger.LogInformation("Создание нового группового шаблона.");
-
-        var mqRequest = new TemplateGeneratorMessage
-        {
-            JobId = jobId,
-            UnitId = relationshipUnitId,
-            UnitsInTemplate = unitsInTemplate.Select(e => new UnitInTemplateMessage { UnitId = e.UnitId, UnitFieldValueId = e.UnitFieldValueId }).ToList(),
-            Index = index,
-            HistoryInitiator = initiator
-        };
-
-        var result = await mqService.SendAsync(mqSettings.TemplateGenerator, new List<object> { mqRequest });
-
-        if (!result.IsSuccess)
-            logger.LogError("Ошибка отправки команды создания шаблона.");
-    }
 
     private static Job SelectTargetJob(List<Job> jobsInGroup, int subGroupSize, Job maxJob)
     {