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

feat(templateGenerator, templateMatcher, dal): INextRunService прикручен к Matcher + Syncer.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-01-22 12:06:57 +10:00
parent 9f035efb35
commit 1845154b26
4 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.TemplateGeneratorWorker/TemplateGenerator.cs
View File

@@ -8,6 +8,7 @@ using PARR.DAL.DomainServices.Shortcodes.Models;
using PARR.DAL.Models;
using PARR.DAL.Models.Job;
using PARR.DAL.Models.Unit;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.DAL.TransformServices;
@@ -23,7 +24,9 @@ namespace PARR.TemplateGeneratorWorker
private readonly IJobService jobService;
private readonly IShortcodesService shortcodesService;
private readonly ITemplateService templateService;
private readonly IEsppScheduleTransformService esppScheduleTransformService;
private readonly INextRunService nextRunService;
//private readonly IEsppScheduleTransformService esppScheduleTransformService;
public TemplateGenerator(
ILogger<TemplateGenerator> logger,
@@ -32,7 +35,8 @@ namespace PARR.TemplateGeneratorWorker
IJobService jobService,
IShortcodesService shortcodesService,
ITemplateService templateService,
IEsppScheduleTransformService esppScheduleTransformService
INextRunService nextRunService
//IEsppScheduleTransformService esppScheduleTransformService
)
{
this.logger = logger;
@@ -41,7 +45,8 @@ namespace PARR.TemplateGeneratorWorker
this.jobService = jobService;
this.shortcodesService = shortcodesService;
this.templateService = templateService;
this.esppScheduleTransformService = esppScheduleTransformService;
this.nextRunService = nextRunService;
//this.esppScheduleTransformService = esppScheduleTransformService;
}
public async Task GenerateTemplateAsync(string msg)
@@ -97,7 +102,8 @@ namespace PARR.TemplateGeneratorWorker
var templateName = await shortcodesService.ApplyShortcodesAsync(job.TemplateNameMask!, tempTemplateForShortcodes);
var nextRun = await esppScheduleTransformService.GetNextDateAsync(job.GroupId, job.Group!.ReferenceDate);
//var nextRun = await esppScheduleTransformService.GetNextDateAsync(job.GroupId, job.Group!.ReferenceDate);
var nextRun = await nextRunService.GetNextRunForNewTemplateAsync(job.GroupId);
var template = new Template
{