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

feat(bll, dal, templateGenertartor, templateMatcher, templateUpdater): интеграция с INextRunServiceV2

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-26 14:42:53 +10:00
parent 62059683ba
commit c718a4b406
12 changed files with 4273 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
private readonly ITemplateUpdaterMqSender templateUpdaterMqSender;
private readonly IMatchingStatusService matchingStatusService;
private readonly SettingsFromDb settingsFromDb;
private readonly INextRunService nextRunService;
//private readonly INextRunService nextRunService;
private readonly IOptions<TemplateSettings> templateSettings;
public SimpleTemplateSynchronizer(
@@ -64,7 +64,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
ITemplateUpdaterMqSender templateUpdaterMqSender,
IMatchingStatusService matchingStatusService,
SettingsFromDb settingsFromDb,
INextRunService nextRunService,
//INextRunService nextRunService,
IOptions<TemplateSettings> templateSettings
)
{
@@ -80,7 +80,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
this.templateUpdaterMqSender = templateUpdaterMqSender;
this.matchingStatusService = matchingStatusService;
this.settingsFromDb = settingsFromDb;
this.nextRunService = nextRunService;
//this.nextRunService = nextRunService;
this.templateSettings = templateSettings;
}
@@ -224,7 +224,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
};
var expectedName = await templateNameNormalizer.GetNormalizedTemplateNameAsync(tempTemplateForName);
var nextRun = await nextRunService.GetNextRunForTemplateAsync(reusableTemplate.Id, true);
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(reusableTemplate.Id, true);
var updateRequest = new TemplateUpdaterMq
{
@@ -236,7 +236,8 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
IsActiveSchedule = job.AutoControl?.InitUsedScheduleState ?? DefaultUsedScheduleState,
StatusTypeId = TemplateStatusTypeEnum.Used,
Initiator = initiator,
NextRun = nextRun,
//NextRun = nextRun,
IsNew = true,
UnitsInTemplate = new List<Guid>() // для простого шаблона
};
@@ -259,7 +260,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
{
logger.LogDebug("Шаблон {TemplateId} требует обновления имени: старое = '{OldName}', новое = '{NewName}'", template.Id, template.Name, expectedName);
var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
var updateRequest = new TemplateUpdaterMq
{
@@ -269,8 +270,9 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
Name = expectedName,
IsActiveTemplate = template.IsActiveTemplate,
IsActiveSchedule = template.IsActiveSchedule,
LastRun = template.LastRun,
NextRun = nextRun,
//LastRun = template.LastRun,
//NextRun = nextRun,
IsNew = false,
Index = template.Index,
StatusTypeId = TemplateStatusTypeEnum.Used,
Initiator = initiator,
@@ -397,7 +399,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
{
logger.LogDebug("Шаблон {TemplateId} требует обновления имени: старое = '{OldName}', новое = '{NewName}'", template.Id, template.Name, expectedName);
var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
var updateRequest = new TemplateUpdaterMq
{
@@ -407,8 +409,9 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
Name = expectedName,
IsActiveTemplate = template.IsActiveTemplate,
IsActiveSchedule = template.IsActiveSchedule,
LastRun = template.LastRun,
NextRun = nextRun,
//LastRun = template.LastRun,
//NextRun = nextRun,
IsNew = false,
Index = template.Index,
StatusTypeId = TemplateStatusTypeEnum.Used,
Initiator = initiator,
@@ -507,7 +510,7 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
continue;
}
var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
var updateRequest = new TemplateUpdaterMq
{
@@ -517,8 +520,9 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
Name = expectedName,
IsActiveTemplate = false,
IsActiveSchedule = false,
LastRun = template.LastRun,
NextRun = nextRun,
//LastRun = template.LastRun,
//NextRun = nextRun,
IsNew = false,
Index = null,
StatusTypeId = template.StatusTypeId,
Initiator = initiator,