feat(templateMatcher,dal): небольшой рефакторинг, добавлен Dockerfile

PARR.AIHITSyncerWorker/Worker.cs

@@ -1,4 +1,4 @@
-using PARR.AIHITMainSyncer;
+using PARR.AIHITMainSyncer;
 
 namespace PARR.AIHITSyncerWorker
 {
@@ -15,48 +15,15 @@ namespace PARR.AIHITSyncerWorker
 
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        {
-            //await aihitSyncer.StartAsync();
-            //await Task.Delay(Timeout.Infinite, stoppingToken);
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                try
         {
             await aihitSyncer.StartAsync();
             await Task.Delay(Timeout.Infinite, stoppingToken);
-                    // <20><><EFBFBD><EFBFBD> StartAsync <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>),
-                    // <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Task.Delay <20><><EFBFBD> break.
-                    // <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> StartAsync <20> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
-                    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> **<2A><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>** <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
-                    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
-                    _logger.LogWarning("AihitMainSyncer <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 10 <20><><EFBFBD>...");
-                }
-                catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
-                {
-                    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> Worker. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 10 <20><><EFBFBD>...");
-                }
-
-                try
-                {
-                    await Task.Delay(TimeSpan.FromSeconds(10), stoppingToken);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-            }
         }
 
 
         public override Task StopAsync(CancellationToken cancellationToken)
         {
             aihitSyncer.StopAsync();
-
             return base.StopAsync(cancellationToken);
         }
     }

PARR.API/Controllers/V1/JobUnitPreviewController.cs

@@ -11,6 +11,7 @@ using PARR.API.Controllers.V1.Base;
 using PARR.Constants;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.Models.Job;
+using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Unit;
 using static PARR.API.Contracts.V1.ApiRoutes;
 using Job = PARR.DAL.Models.Job.Job;
@@ -27,6 +28,7 @@ namespace PARR.API.Controllers.V1
         private readonly IUnitFilterService unitFilterService;
         private readonly IValidator<JobRequest> jobValidator;
         private readonly IUnitService unitService;
+        private readonly IJobGroupService jobGroupService;
         private readonly IMapper mapper;
 
         public JobUnitPreviewController(
@@ -34,6 +36,7 @@ namespace PARR.API.Controllers.V1
             IUnitFilterService unitFilterService,
             IValidator<JobRequest> jobValidator,
             IUnitService unitService,
+            IJobGroupService jobGroupService,
             IMapper mapper
             )
         {
@@ -41,6 +44,7 @@ namespace PARR.API.Controllers.V1
             this.unitFilterService = unitFilterService;
             this.jobValidator = jobValidator;
             this.unitService = unitService;
+            this.jobGroupService = jobGroupService;
             this.mapper = mapper;
         }
 
@@ -61,6 +65,11 @@ namespace PARR.API.Controllers.V1
 
             var job = mapper.Map<Job>(request);
 
+            var jobGroup = await jobGroupService.Get().AsNoTracking()
+                                    .Include(t=>t.GroupType)
+                                    .FirstAsync(t=>t.Id == job.GroupId);
+            job.Group = jobGroup;
+
             var unitIds = await unitFilterService.GetUnitsIdByJobFilterAsync(job, 100);
 
             if (unitIds == null || !unitIds.Any())

PARR.DAL/DomainServices/Implementations/UnitFilterService.cs

@@ -1,11 +1,13 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using PARR.DAL.Contracts;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Unit;
 using System.Net.NetworkInformation;
+using System.Text.RegularExpressions;
 
 
 namespace PARR.DAL.DomainServices.Implementations
@@ -33,7 +35,6 @@ namespace PARR.DAL.DomainServices.Implementations
 
         public async Task<IEnumerable<Guid>?> GetUnitsIdByJobFilterAsync(Guid jobId, int? takeCount = null)
         {
-
             var job = await jobService
                             .Get().AsNoTracking()
                                 .Include(t => t.UnitFilters)
@@ -41,6 +42,7 @@ namespace PARR.DAL.DomainServices.Implementations
                                 .Include(t => t.UnitFilters)
                                     .ThenInclude(t => t.RelationshipFilters)
                                 .Include(t => t.Group)
+                                    .ThenInclude(t => t.GroupType)
                             .FirstOrDefaultAsync(t => t.Id == jobId);
 
             if (job == null)
@@ -52,171 +54,258 @@ namespace PARR.DAL.DomainServices.Implementations
 
         public async Task<IEnumerable<Guid>?> GetUnitsIdByJobFilterAsync(Job job, int? takeCount = null)
         {
+            #region проверка инклудов
+            if (job.Group == null)
+            {
+                logger.LogWarning("JobId={JobId} не содержит Group - пропускаем фильтрацию", job.Id);
+                throw new ArgumentNullException(nameof(Group));
+            }
+
+            if (job.Group.GroupType == null)
+            {
+                logger.LogWarning("JobId={JobId} не содержит GroupType - пропускаем фильтрацию", job.Id);
+                throw new ArgumentNullException(nameof(JobGroupType));
+            }
+
             if (job.UnitFilters == null || !job.UnitFilters.Any())
             {
                 logger.LogWarning("JobId={JobId} не содержит UnitFilters - пропускаем фильтрацию", job.Id);
-                return Array.Empty<Guid>();
+                throw new ArgumentNullException(nameof(JobUnitFilter));
             }
+            #endregion
 
-            var baseQuery = unitService
+            var maxCount = takeCount ?? int.MaxValue;
-                            .Get().AsNoTracking()
+            var collectedIds = new HashSet<Guid>(); // ← гарантирует уникальность
-                            .Include(t => t.UnitValues)
+            var filterNumber = 0;
-                                .ThenInclude(t => t.Field)
-                            .Include(t => t.UnitValues)
-                                .ThenInclude(t => t.Value)
-                            .Include(t => t.ParentUnits)
-                                    .ThenInclude(t => t.ParentUnit)
-                                        .ThenInclude(t => t.UnitValues)
-                                            .ThenInclude(t => t.Field)
-                            .Include(t => t.ParentUnits)
-                                .ThenInclude(t => t.ParentUnit)
-                                    .ThenInclude(t => t.UnitValues)
-                                        .ThenInclude(t => t.Value)
-                            .Include(t => t.ChildUnits)
-                                    .ThenInclude(t => t.ChildUnit)
-                                        .ThenInclude(t => t.UnitValues)
-                                            .ThenInclude(t => t.Field)
-                            .Include(t => t.ChildUnits)
-                                .ThenInclude(t => t.ChildUnit)
-                                    .ThenInclude(t => t.UnitValues)
-                                        .ThenInclude(t => t.Value);
 
-            var result = new List<Guid>();
+            foreach (var filter in job.UnitFilters)
-            var filterIndex = 0;
-
-            foreach (var unitFilter in job.UnitFilters)
             {
-                filterIndex++;
+                filterNumber++;
 
-                if (takeCount.HasValue && result.Count >= takeCount.Value)
+                // Прекращаем, если набрали достаточно
+                if (collectedIds.Count >= maxCount)
                 {
-                    logger.LogDebug("Достигнуто ограничение takeCount={TakeCount} после {FilterIndex} фильтров", takeCount.Value, filterIndex - 1);
+                    logger.LogDebug("Достигнут лимит takeCount={TakeCount} после {FilterCount} фильтров", maxCount, filterNumber - 1);
                     break;
                 }
 
-                var remainig = takeCount.HasValue ? takeCount.Value - result.Count : int.MaxValue;
+                var remaining = maxCount - collectedIds.Count;
-                if (remainig <= 0) break;
+                if (remaining <= 0) break;
 
                 try
                 {
-                    //фильтруем по имени
+                    // Стартуем с базового условия — имя Unit'а
-                    var query = baseQuery.Where(t => EF.Functions.ILike(t.Name, unitFilter.UnitFilter));
+                    var query = unitService.Get().AsNoTracking()
+                        .Where(unit => EF.Functions.ILike(unit.Name, filter.UnitFilter));
 
-                    //фильтруем по полям
+                    // 1. Фильтры по полям (UnitValues)
-                    foreach (var fieldFilter in unitFilter.FieldFilters)
+                    foreach (var fieldFilter in filter.FieldFilters)
                     {
                         var fieldId = fieldFilter.FieldId;
-                        var fieldValueMask = fieldFilter.ValueMask;
+                        var valueMask = fieldFilter.ValueMask;
-                        query = query.Where(t => 
+
-                            t.UnitValues.Any(x => 
+                        query = query.Where(unit =>
-                                x.FieldId == fieldId &&
+                            unit.UnitValues.Any(value =>
-                                x.Value != null &&
+                                value.FieldId == fieldId
-                                x.Value.Value != null &&
+                                && value.Value != null
-                                EF.Functions.ILike(x.Value.Value, fieldValueMask)));
+                                && value.Value.Value != null
+                                && EF.Functions.ILike(value.Value.Value, valueMask)));
                     }
 
-                    //фильтруем по значениям в связях
+                    // 2. Фильтры по связям (родителям и детям)
-                    if (unitFilter.RelationshipFilters.Any())
+                    foreach (var relFilter in filter.RelationshipFilters)
                     {
-                        var parentFilters = unitFilter.RelationshipFilters.Where(t => t.IsParent == true).ToList();
+                        var fieldId = relFilter.FieldId;
-                        foreach (var parentFilter in parentFilters)
+                        var valueMask = relFilter.ValueMask;
+
+                        if (relFilter.IsParent)
                         {
-                            if (parentFilter.IsInverse == false)
+                            // Работаем с ParentUnits → pu.ParentUnit
+                            if (relFilter.IsInverse)
                             {
-                                if (parentFilter.IsFullMatch)
+                                // "Обратный фильтр": ищем Unit'ы, у которых связанные Unit'ы НЕ имеют указанного значения
-                                    query = query.Where(t => !t.ParentUnits.Any() ||
+                                if (relFilter.IsFullMatch)
-                                        t.ParentUnits.All(p => p.ParentUnit!.UnitValues.Any(pf => 
+                                {
-                                            pf.FieldId == parentFilter.FieldId &&
+                                    // Все родители НЕ должны иметь такое значение
-                                            pf.Value !=null &&
+                                    query = query.Where(unit =>
-                                            pf.Value.Value != null &&
+                                        !unit.ParentUnits.Any() || // если связей нет — подходит
-                                            EF.Functions.ILike(pf.Value.Value, parentFilter.ValueMask))));
+                                        unit.ParentUnits.All(parentLink =>
-                                else
+                                            !parentLink.ParentUnit!.UnitValues.Any(parentValue =>
-                                    query = query.Where(t => !t.ParentUnits.Any() ||
+                                                parentValue.FieldId == fieldId
-                                        t.ParentUnits.Any(p => p.ParentUnit!.UnitValues.Any(pf => 
+                                                && parentValue.Value != null
-                                            pf.FieldId == parentFilter.FieldId &&
+                                                && parentValue.Value.Value != null
-                                            pf.Value !=null &&
+                                                && EF.Functions.ILike(parentValue.Value.Value, valueMask))));
-                                            pf.Value!.Value != null &&
-                                            EF.Functions.ILike(pf.Value.Value, parentFilter.ValueMask))));
                                 }
                                 else
                                 {
-                                if (parentFilter.IsFullMatch)
+                                    // Хотя бы один родитель НЕ имеет такого значения
-                                    query = query.Where(t => !t.ParentUnits.Any() ||
+                                    query = query.Where(unit =>
-                                        !t.ParentUnits.All(p => p.ParentUnit!.UnitValues.Any(pf => 
+                                        !unit.ParentUnits.Any() ||
-                                            pf.FieldId == parentFilter.FieldId &&
+                                        unit.ParentUnits.Any(parentLink =>
-                                            pf.Value !=null &&
+                                            !parentLink.ParentUnit!.UnitValues.Any(parentValue =>
-                                            pf.Value!.Value != null &&
+                                                parentValue.FieldId == fieldId
-                                            EF.Functions.ILike(pf.Value.Value, parentFilter.ValueMask))));
+                                                && parentValue.Value != null
+                                                && parentValue.Value.Value != null
+                                                && EF.Functions.ILike(parentValue.Value.Value, valueMask))));
+                                }
+                            }
                             else
-                                    query = query.Where(t => !t.ParentUnits.Any() ||
+                            {
-                                        !t.ParentUnits.Any(p => p.ParentUnit!.UnitValues.Any(pf =>
+                                // Прямой фильтр: связанные Unit'ы ДОЛЖНЫ иметь значение
-                                            pf.FieldId == parentFilter.FieldId &&
+                                if (relFilter.IsFullMatch)
-                                            pf.Value != null &&
+                                {
-                                            pf.Value!.Value != null && EF.Functions.ILike(pf.Value.Value, parentFilter.ValueMask))));
+                                    // Все родители должны иметь такое значение
+                                    query = query.Where(unit =>
+                                        !unit.ParentUnits.Any() ||
+                                        unit.ParentUnits.All(parentLink =>
+                                            parentLink.ParentUnit!.UnitValues.Any(parentValue =>
+                                                parentValue.FieldId == fieldId
+                                                && parentValue.Value != null
+                                                && parentValue.Value.Value != null
+                                                && EF.Functions.ILike(parentValue.Value.Value, valueMask))));
+                                }
+                                else
+                                {
+                                    // Хотя бы один родитель должен иметь такое значение
+                                    query = query.Where(unit =>
+                                        unit.ParentUnits.Any(parentLink =>
+                                            parentLink.ParentUnit!.UnitValues.Any(parentValue =>
+                                                parentValue.FieldId == fieldId
+                                                && parentValue.Value != null
+                                                && parentValue.Value.Value != null
+                                                && EF.Functions.ILike(parentValue.Value.Value, valueMask))));
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // relFilter.IsParent == false → работаем с детьми (ChildUnits)
+                            if (relFilter.IsInverse)
+                            {
+                                if (relFilter.IsFullMatch)
+                                {
+                                    query = query.Where(unit =>
+                                        !unit.ChildUnits.Any() ||
+                                        unit.ChildUnits.All(childLink =>
+                                            !childLink.ChildUnit!.UnitValues.Any(childValue =>
+                                                childValue.FieldId == fieldId
+                                                && childValue.Value != null
+                                                && childValue.Value.Value != null
+                                                && EF.Functions.ILike(childValue.Value.Value, valueMask))));
+                                }
+                                else
+                                {
+                                    query = query.Where(unit =>
+                                        !unit.ChildUnits.Any() ||
+                                        unit.ChildUnits.Any(childLink =>
+                                            !childLink.ChildUnit!.UnitValues.Any(childValue =>
+                                                childValue.FieldId == fieldId
+                                                && childValue.Value != null
+                                                && childValue.Value.Value != null
+                                                && EF.Functions.ILike(childValue.Value.Value, valueMask))));
+                                }
+                            }
+                            else
+                            {
+                                if (relFilter.IsFullMatch)
+                                {
+                                    query = query.Where(unit =>
+                                        !unit.ChildUnits.Any() ||
+                                        unit.ChildUnits.All(childLink =>
+                                            childLink.ChildUnit!.UnitValues.Any(childValue =>
+                                                childValue.FieldId == fieldId
+                                                && childValue.Value != null
+                                                && childValue.Value.Value != null
+                                                && EF.Functions.ILike(childValue.Value.Value, valueMask))));
+                                }
+                                else
+                                {
+                                    query = query.Where(unit =>
+                                        unit.ChildUnits.Any(childLink =>
+                                            childLink.ChildUnit!.UnitValues.Any(childValue =>
+                                                childValue.FieldId == fieldId
+                                                && childValue.Value != null
+                                                && childValue.Value.Value != null
+                                                && EF.Functions.ILike(childValue.Value.Value, valueMask))));
+                                }
                             }
                         }
                     }
 
-                    //фильтруем по количеству связей
+                    // 3. Ограничение по количеству связей (только для umbrella-групп)
-                    if (job.Group?.IsUmbrella == true)
+                    if (job.Group.GroupType.Code == JobGroupTypesEnum.Umbrella)
                     {
+                        int min = job.MinValueRelationships.GetValueOrDefault(0);
+                        int max = job.MaxValueRelationships.GetValueOrDefault(int.MaxValue);
+
                         if (job.IsParentRelationships == true)
-                            query = query.Where(t => t.ParentUnits.Count >= job.MinValueRelationships && t.ParentUnits.Count <= job.MaxValueRelationships);
+                        {
+                            query = query.Where(unit =>
+                                unit.ParentUnits.Count >= min && unit.ParentUnits.Count <= max);
+                        }
                         else
-                            query = query.Where(t => t.ChildUnits.Count >= job.MinValueRelationships && t.ChildUnits.Count <= job.MaxValueRelationships);
+                        {
+                            query = query.Where(unit =>
+                                unit.ChildUnits.Count >= min && unit.ChildUnits.Count <= max);
+                        }
                     }
 
-                    var newUnits = await query
+                    // Запрашиваем в БД с учётом оставшегося лимита
-                        .Select(t => t.Id)
+                    var newIds = await query
-                        .Take(remainig)
+                        .Select(unit => unit.Id)
+                        .Take(remaining)
                         .ToListAsync();
 
-                    result.AddRange(newUnits);
+                    collectedIds.UnionWith(newIds);
+
+                    logger.LogDebug(
+                        "Фильтр #{Index} (Id={FilterId}): найдено {Count} Unit'ов. Всего: {Total}",
+                        filterNumber, filter.Id, newIds.Count, collectedIds.Count);
 
-                    logger.LogDebug("Фильтр {FilterIndex}: найдено {Count} Unit'ов (осталось набрать: {Remaining})",
-                        filterIndex, newUnits.Count,Math.Max(0,takeCount.GetValueOrDefault(int.MaxValue)-result.Count));
                 }
                 catch (Exception ex)
                 {
-                    logger.LogError(ex, "Ошибка применения UnitFilter {FilterIndex} для JobId={JobId}", filterIndex, job.Id);
+                    logger.LogError(ex, "Ошибка при обработке фильтра {FilterId} (#{Index}) для Job {JobId}",
-                    continue;
+                        filter.Id, filterNumber, job.Id);
+                    // Продолжаем — другие фильтры могут сработать
                 }
             }
 
-            if (takeCount.HasValue && result.Count > takeCount.Value)
+            var result = collectedIds.Take(maxCount).ToList();
-                result = result.Take(takeCount.Value).ToList();
+            logger.LogInformation("Job {JobId}: из {FilterCount} фильтров получено {UnitCount} уникальных Unit'ов",
-
+                job.Id, job.UnitFilters.Count, result.Count);
-            logger.LogInformation("JobId={JobId}: обработано {FilterCount} фильтров, найдено {UnitCount} Unit'ов", job.Id, job.UnitFilters.Count, result.Count);
 
             return result;
         }
 
 
-
+        public async Task<IEnumerable<Guid>> GetUnitsIdByJobFilterWithTemplateStatusAsync(
-        public async Task<IEnumerable<Guid>?> GetUnitsIdForExistTemplatesByJobFilterAsync(Guid jobId, int? takeCount = null)
+                Guid jobId,
+                bool mustHaveTemplate,
+                int? takeCount = null
+            )
         {
-            var unitIdsMustBeCreated = await GetUnitsIdByJobFilterAsync(jobId, takeCount);
+            var unitIds = await GetUnitsIdByJobFilterAsync(jobId, takeCount);
+            if (unitIds == null || !unitIds.Any())
+                return Array.Empty<Guid>();
 
-            if (unitIdsMustBeCreated == null || !unitIdsMustBeCreated.Any())
+            var unitIdSet = unitIds.ToHashSet();
-                return null;
 
-            var unitWithTemplates = await templateService.Get().AsNoTracking().Where(t => t.JobId == jobId && unitIdsMustBeCreated.Any(x => x == t.UnitId)).Select(t => t.UnitId).ToListAsync();
+            // Получаем UnitId, для которых уже есть шаблоны по этому jobId
+            var existingUnitIds = await templateService
+                .Get()
+                .AsNoTracking()
+                .Where(template =>
+                    template.JobId == jobId &&
+                    unitIdSet.Contains(template.UnitId))
+                .Select(template => template.UnitId)
+                .ToListAsync();
 
-            return unitWithTemplates;
+            var existingSet = existingUnitIds.ToHashSet();
-        }
 
-        public async Task<IEnumerable<Guid>?> GetUnitsIdForNotExistTemplatesByJobFilterAsync(Guid jobId, int? takeCount = null)
+            return mustHaveTemplate
-        {
+                ? existingSet
-            var unitIdsMustBeCreated = await GetUnitsIdByJobFilterAsync(jobId, takeCount);
+                : unitIdSet.Except(existingSet);
-
-            if (unitIdsMustBeCreated == null || !unitIdsMustBeCreated.Any())
-                return null;
-
-            var unitIdsWithTemplate = await templateService.Get().AsNoTracking().Where(t => t.JobId == jobId).Select(t => t.UnitId).ToListAsync();
-
-            var unitsIdToCreateTemplate = unitIdsMustBeCreated.Where(t => !unitIdsWithTemplate.Any(x => x == t));
-
-            return unitsIdToCreateTemplate;
         }
     }
 }

PARR.DAL/DomainServices/Interfaces/IUnitFilterService.cs

@@ -5,28 +5,31 @@ namespace PARR.DAL.DomainServices.Interfaces
     public interface IUnitFilterService
     {
         /// <summary>
-        /// Получить все Unit.Id, для которых должны быть созданы Template
+        /// Получить все Unit.Id соответствующие настройкам фильтрации Job
         /// </summary>
         /// <param name="jobId">Id работы</param>
         /// <returns></returns>
         Task<IEnumerable<Guid>?> GetUnitsIdByJobFilterAsync(Guid jobId, int? takeCount = null);
 
+
+        /// <summary>
+        /// Получить все Unit.Id соответствующие настройкам фильтрации Job
+        /// </summary>
+        /// <param name="job">Job обязательно должен содержать UnitFilter, Group и GroupType</param>
+        /// <returns></returns>
         Task<IEnumerable<Guid>?> GetUnitsIdByJobFilterAsync(Job job, int? takeCount = null);
 
-        /// <summary>
-        /// Получить все Unit.Id, для которых не были созданы Template
-        /// </summary>
-        /// <param name="jobId">Id работы</param>
-        /// <returns></returns>
-        Task<IEnumerable<Guid>?> GetUnitsIdForNotExistTemplatesByJobFilterAsync(Guid jobId, int? takeCount = null);
 
         /// <summary>
-        /// Получить все Unit.Id, для которых были созданы Template
+        /// Получить список Id ЭК в зависимости от параметра mustHaveTemplate
         /// </summary>
-        /// <param name="jobId">Id работы</param>
+        /// <param name="jobId"></param>
-        /// <returns></returns>
+        /// <param name="mustHaveTemplate">
-        Task<IEnumerable<Guid>?> GetUnitsIdForExistTemplatesByJobFilterAsync(Guid jobId, int? takeCount = null);
+        /// true - ЭК, которые имеют связанные шаблоны
-
+        /// false - ЭК, для которых шаблоны не созданы
-
+        /// </param>
+        /// <param name="takeCount"></param>
+        /// <returns>Лист Id ЭК</returns>
+        Task<IEnumerable<Guid>> GetUnitsIdByJobFilterWithTemplateStatusAsync(Guid jobId, bool mustHaveTemplate, int? takeCount = null);
     }
 }

PARR.TemplateMatcher/TemplateMatcher.cs

@@ -30,7 +30,7 @@ namespace PARR.TemplateMatcher
         }
         public async Task MatchTemplatesForJob(Guid jobId)
         {
-            var unitIdsToCreateTemplate = await unitFilterService.GetUnitsIdForNotExistTemplatesByJobFilterAsync(jobId);
+            var unitIdsToCreateTemplate = await unitFilterService.GetUnitsIdByJobFilterWithTemplateStatusAsync(jobId,false);
 
             if (unitIdsToCreateTemplate == null || !unitIdsToCreateTemplate.Any())
                 return;

PARR.TemplateMatcherWorker/Dockerfile

@@ -0,0 +1,34 @@
+# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+# This stage is used when running from VS in fast mode (Default for Debug configuration)
+FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
+WORKDIR /app
+
+
+# This stage is used to build the service project
+FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["NuGet.config", "."]
+COPY ["PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj", "PARR.TemplateMatcherWorker/"]
+COPY ["PARR.TemplateMatcher/PARR.TemplateMatcher.csproj", "PARR.TemplateMatcher/"]
+COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+RUN dotnet restore "./PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj"
+COPY . .
+WORKDIR "/src/PARR.TemplateMatcherWorker"
+RUN dotnet build "./PARR.TemplateMatcherWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# This stage is used to publish the service project to be copied to the final stage
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+ARG app_version=0.0.0-default
+RUN dotnet publish "./PARR.TemplateMatcherWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
+
+# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "PARR.TemplateMatcherWorker.dll"]

PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj

@@ -5,11 +5,13 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>dotnet-PARR.TemplateMatcherWorker-5320c017-a02a-449c-9b4a-13adca2c3558</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />

PARR.TemplateMatcherWorker/Properties/launchSettings.json

@@ -1,11 +1,14 @@
-{
+{
   "profiles": {
     "PARR.TemplateMatcherWorker": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "environmentVariables": {
         "DOTNET_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker"
     }
   }
 }

PARR.TemplateTaskGenerator/TemplateTaskGenerator.cs

@@ -32,7 +32,7 @@ namespace PARR.TemplateTaskGenerator
 
         public async Task GenerateTemplateTaskAsync(Guid jobId)
         {
-            var unitIdsToCreateTemplate = await unitFilterService.GetUnitsIdForNotExistTemplatesByJobFilterAsync(jobId);
+            var unitIdsToCreateTemplate = await unitFilterService.GetUnitsIdByJobFilterWithTemplateStatusAsync(jobId,false);
 
             if (unitIdsToCreateTemplate == null || !unitIdsToCreateTemplate.Any())
                 return;