feat(templateGeneratorWorker): ci/cd, основной метод вынесен в отдельный класс.
This commit is contained in:
@@ -6,57 +6,46 @@ namespace PARR.TemplateGeneratorWorker.Services
|
||||
{
|
||||
internal class ValidatorService : IValidatorService
|
||||
{
|
||||
private readonly IServiceProvider serviceProvider;
|
||||
private readonly ILogger<ValidatorService> logger;
|
||||
private readonly IJobService jobService;
|
||||
private readonly IUnitService unitService;
|
||||
|
||||
public ValidatorService(
|
||||
IServiceProvider serviceProvider,
|
||||
ILogger<ValidatorService> logger
|
||||
ILogger<ValidatorService> logger,
|
||||
IJobService jobService,
|
||||
IUnitService unitService
|
||||
)
|
||||
{
|
||||
this.serviceProvider = serviceProvider;
|
||||
this.logger = logger;
|
||||
this.jobService = jobService;
|
||||
this.unitService = unitService;
|
||||
}
|
||||
|
||||
|
||||
public async Task<bool> IsValidAsync(Guid jobId, Guid unitId)
|
||||
{
|
||||
using (var scope = serviceProvider.CreateScope())
|
||||
|
||||
var job = await jobService
|
||||
.Get().AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == jobId);
|
||||
|
||||
if (job == null)
|
||||
{
|
||||
var jobService = GetServiceInScope<IJobService>(scope);
|
||||
var job = await jobService
|
||||
.Get().AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == jobId);
|
||||
|
||||
if (job == null)
|
||||
{
|
||||
logger.LogError($"Не найдена регалментная работа {nameof(jobId)}: {jobId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
var unitService = GetServiceInScope<IUnitService>(scope);
|
||||
var unit = await unitService
|
||||
.Get().AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == unitId);
|
||||
|
||||
if (unit == null)
|
||||
{
|
||||
logger.LogError($"Не найден элемент конфигурации {nameof(unitId)}: {unitId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
logger.LogError($"Не найдена регалментная работа {nameof(jobId)}: {jobId}");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
var unit = await unitService
|
||||
.Get().AsNoTracking()
|
||||
.FirstOrDefaultAsync(t => t.Id == unitId);
|
||||
|
||||
private Service GetServiceInScope<Service>(IServiceScope scope)
|
||||
{
|
||||
var service = scope.ServiceProvider.GetService<Service>();
|
||||
if (service == null)
|
||||
throw new Exception($"Не найден сервис: {nameof(Service)}");
|
||||
if (unit == null)
|
||||
{
|
||||
logger.LogError($"Не найден элемент конфигурации {nameof(unitId)}: {unitId}");
|
||||
return false;
|
||||
}
|
||||
|
||||
return service;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user