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

feat(templateGeneratorWorker): ci/cd, основной метод вынесен в отдельный класс.

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-08-19 11:13:56 +10:00
parent 2c005f038e
commit 963da184f1
9 changed files with 202 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
PARR.TemplateGeneratorWorker/Worker.cs
View File

@@ -1,11 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.BLL.Contracts.Interfaces;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.DomainServices.Interfaces;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.TemplateGeneratorWorker.Services;
@@ -18,24 +13,23 @@ namespace PARR.TemplateGeneratorWorker
private readonly ILogger<Worker> logger;
private readonly IMqSettings mqSettings;
private readonly IMqService mqService;
private readonly IServiceProvider serviceProvider;
private readonly ITransformService transformService;
private readonly IValidatorService validatorService;
private readonly IServiceProvider serviceProvider;
private readonly IJobService jobService;
private readonly IShortcodesService shortcodesService;
private readonly ITemplateService templateService;
public Worker(
ILogger<Worker> logger,
MqSettings mqSettings,
IMqService mqService,
ITransformService transformService,
IValidatorService validatorService,
IServiceProvider serviceProvider
)
{
this.logger = logger;
this.mqSettings = mqSettings;
this.mqService = mqService;
this.transformService = transformService;
this.validatorService = validatorService;
this.serviceProvider = serviceProvider;
}
@@ -61,61 +55,14 @@ namespace PARR.TemplateGeneratorWorker
private async Task GenerateTemplateAsync(string msg)
{
logger.LogInformation($"{this.GetType().Name}. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: {msg}");
var query = transformService.GetModelFromJson<TemplateGeneratorWorkerMq>(msg);
if (query == null)
return;
if (!await validatorService.IsValidAsync(query.JobId, query.UnitId))
{
logger.LogError($"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {nameof(query.JobId)}: {query.JobId}");
return;
}
using (var scope = serviceProvider.CreateScope())
{
var jobService = GetServiceInScope<IJobService>(scope);
var job = await jobService
.Get().AsNoTracking()
.FirstOrDefaultAsync(t => t.Id == query.JobId);
var shortcodesService = GetServiceInScope<IShortcodesService>(scope);
var templateName = await shortcodesService.ApplyShortcodesAsync(job!.TemplateNameMask!, query.UnitId, query.JobId);
var template = new Template
{
Id = Guid.NewGuid(),
Name = templateName,
UnitId = query.UnitId,
JobId = query.JobId,
IsActiveTemplate = query.IsActiveTemplate ?? false,
IsActiveSchedule = query.IsActiveSchedule ?? false,
InitiatorComment = query.HistoryInitiator?.InitiatorComment,
InitiatorParrComponentId = query.HistoryInitiator?.InitiatorParrComponentId
};
var templateService = GetServiceInScope<ITemplateService>(scope);
if (!await templateService.CreateAsync(template) || !await templateService.CommitAsync(new HistoryInitiator { InitiatorComment = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", InitiatorParrComponentId = ParrComponentsEnum.TemplateGenerator }))
{
logger.LogError($"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Name: {template.Name}, {nameof(template.Job)}: {template.JobId}, {nameof(template.Unit)}: {template.UnitId}");
}
else
{
logger.LogInformation($"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: Name: {template.Name}, {nameof(template.Job)}: {template.JobId}, {nameof(template.Unit)}: {template.UnitId}");
}
var templateGenerator = scope.ServiceProvider.GetService<ITemplateGenerator>();
if (templateGenerator == null)
throw new Exception($"<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: {nameof(ITemplateGenerator)}");
await templateGenerator.GenerateTemplateAsync(msg);
}
}
private Service GetServiceInScope<Service>(IServiceScope scope)
{
var service = scope.ServiceProvider.GetService<Service>();
if (service == null)
throw new Exception($"<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: {nameof(Service)}");
return service;
}
}
}