mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dal): в методе получения Id неиспользуемого шаблона добавлена проверка на Ok статус, чтобы не давать роботу ошибочные задания.

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2026-02-20 15:57:51 +10:00
parent cf98658d21
commit 114f7ec083
7 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PARR.TemplateMatcher/Services/Implemetaions/SimpleTemplateSynchronizer.cs
View File

@@ -1,5 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.Common.Domain;
@@ -29,9 +30,6 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
private const bool DefaultUsedTemplateState = false;
private const bool DefaultUsedScheduleState = false;
// Маска для неиспользуемых шаблонов — хардкод, недоступна из GUI
private const string UnusedTemplateNameMask = "%П-1%_НЕАКТУАЛЬНЫЕ_%ЭК%_%ТИКТАК%";
private readonly ILogger<SimpleTemplateSynchronizer> logger;
private readonly IUnitFilterService unitFilterService;
private readonly MqSettings mqSettings;
@@ -45,6 +43,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
private readonly IMatchingStatusService matchingStatusService;
private readonly SettingsFromDb settingsFromDb;
private readonly INextRunService nextRunService;
private readonly IOptions<TemplateSettings> templateSettings;
public SimpleTemplateSynchronizer(
ILogger<SimpleTemplateSynchronizer> logger,
@@ -65,7 +64,8 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
ITemplateUpdaterMqSender templateUpdaterMqSender,
IMatchingStatusService matchingStatusService,
SettingsFromDb settingsFromDb,
INextRunService nextRunService
INextRunService nextRunService,
IOptions<TemplateSettings> templateSettings
)
{
this.logger = logger;
@@ -81,6 +81,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
this.matchingStatusService = matchingStatusService;
this.settingsFromDb = settingsFromDb;
this.nextRunService = nextRunService;
this.templateSettings = templateSettings;
}
public async Task SyncTemplatesForJobAsync(Guid jobId, HistoryInitiator initiator)
@@ -552,7 +553,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
MinValueRelationships = unusedJob.MinValueRelationships,
MaxValueRelationships = unusedJob.MaxValueRelationships,
IsParentRelationships = unusedJob.IsParentRelationships,
TemplateNameMask = UnusedTemplateNameMask,
TemplateNameMask = templateSettings.Value.UnusedTemplateNameMask,
WorkGroupMask = unusedJob.WorkGroupMask,
ResponseAreaMask = unusedJob.ResponseAreaMask,
TnkId = unusedJob.TnkId,