feat(bll, dal, templateGenertartor, templateMatcher, templateUpdater): интеграция с INextRunServiceV2
This commit is contained in:
Mikhail Trubnikov
@@ -42,7 +42,7 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
private readonly ITemplateNameNormalizer templateNameNormalizer;
|
||||
private readonly ITemplateUpdaterMqSender templateUpdaterMqSender;
|
||||
private readonly IMatchingStatusService matchingStatusService;
|
||||
private readonly INextRunService nextRunService;
|
||||
//private readonly INextRunService nextRunService;
|
||||
|
||||
public GroupedTemplateSynchronizer(
|
||||
ILogger<GroupedTemplateSynchronizer> logger,
|
||||
@@ -60,8 +60,8 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
ITemplateDeactivator templateDeactivator,
|
||||
ITemplateNameNormalizer templateNameNormalizer,
|
||||
ITemplateUpdaterMqSender templateUpdaterMqSender,
|
||||
IMatchingStatusService matchingStatusService,
|
||||
INextRunService nextRunService
|
||||
IMatchingStatusService matchingStatusService
|
||||
//INextRunService nextRunService
|
||||
)
|
||||
{
|
||||
this.logger = logger;
|
||||
@@ -80,7 +80,7 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
this.templateNameNormalizer = templateNameNormalizer;
|
||||
this.templateUpdaterMqSender = templateUpdaterMqSender;
|
||||
this.matchingStatusService = matchingStatusService;
|
||||
this.nextRunService = nextRunService;
|
||||
//this.nextRunService = nextRunService;
|
||||
}
|
||||
|
||||
public async Task SyncTemplatesForJobAsync(Guid jobId, HistoryInitiator initiator)
|
||||
@@ -486,7 +486,7 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
if (!string.Equals(existingTemplateForSubGroup.Name, expectedName, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
logger.LogDebug("Шаблон {TemplateId} требует обновления имени.", existingTemplateForSubGroup.Id);
|
||||
var nextRun = await nextRunService.GetNextRunForTemplateAsync(existingTemplateForSubGroup.Id, false);
|
||||
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(existingTemplateForSubGroup.Id, false);
|
||||
var updateRequest = new TemplateUpdaterMq
|
||||
{
|
||||
TemplateId = existingTemplateForSubGroup.Id,
|
||||
@@ -495,8 +495,9 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
Name = expectedName,
|
||||
IsActiveTemplate = existingTemplateForSubGroup.IsActiveTemplate,
|
||||
IsActiveSchedule = existingTemplateForSubGroup.IsActiveSchedule,
|
||||
LastRun = existingTemplateForSubGroup.LastRun,
|
||||
NextRun = nextRun,
|
||||
//LastRun = existingTemplateForSubGroup.LastRun,
|
||||
//NextRun = nextRun,
|
||||
IsNew = false,
|
||||
Index = i,
|
||||
StatusTypeId = TemplateStatusTypeEnum.Used,
|
||||
Initiator = initiator,
|
||||
@@ -540,7 +541,7 @@ internal class GroupedTemplateSynchronizer : 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
|
||||
{
|
||||
@@ -552,7 +553,8 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
IsActiveSchedule = targetJob.AutoControl?.InitUsedScheduleState ?? DefaultUsedScheduleState,
|
||||
StatusTypeId = TemplateStatusTypeEnum.Used,
|
||||
Initiator = initiator,
|
||||
NextRun = nextRun,
|
||||
//NextRun = nextRun,
|
||||
IsNew = true,
|
||||
Index = i,
|
||||
UnitsInTemplate = subGroup
|
||||
};
|
||||
@@ -688,7 +690,7 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
};
|
||||
|
||||
var expectedName = await templateNameNormalizer.GetNormalizedTemplateNameAsync(tempTemplateForName);
|
||||
var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
|
||||
//var nextRun = await nextRunService.GetNextRunForTemplateAsync(template.Id, false);
|
||||
var updateRequest = new TemplateUpdaterMq
|
||||
{
|
||||
TemplateId = template.Id,
|
||||
@@ -697,8 +699,9 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
|
||||
Name = expectedName,
|
||||
IsActiveTemplate = template.IsActiveTemplate,
|
||||
IsActiveSchedule = template.IsActiveSchedule,
|
||||
LastRun = template.LastRun,
|
||||
NextRun = nextRun,
|
||||
//LastRun = template.LastRun,
|
||||
//NextRun = nextRun,
|
||||
IsNew = false,
|
||||
Index = newIndex,
|
||||
StatusTypeId = TemplateStatusTypeEnum.Used,
|
||||
Initiator = initiator,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -107,8 +107,9 @@ internal class TemplateDeactivator : ITemplateDeactivator
|
||||
Name = expectedName,
|
||||
IsActiveTemplate = DefaultUnusedTemplateState,
|
||||
IsActiveSchedule = DefaultUnusedScheduleState,
|
||||
LastRun = template.LastRun,
|
||||
NextRun = template.NextRun,
|
||||
//LastRun = template.LastRun,
|
||||
//NextRun = template.NextRun,
|
||||
IsNew = false,
|
||||
Index = template.Index,
|
||||
StatusTypeId = TemplateStatusTypeEnum.Unused,
|
||||
Initiator = initiator,
|
||||
|
||||
Reference in New Issue
Block a user