fix(templateTaskGenerator): изменена папка проекта

This commit is contained in:
Mikhail Kuznetsov
2025-08-26 13:40:02 +10:00
parent ba01ebb206
commit 12478e1951
18 changed files with 4 additions and 4 deletions

View File

@@ -0,0 +1,8 @@
namespace PARR.TemplateTaskGenerator
{
public interface IMqTemplateTaskGenerator
{
Task StartAsync();
Task StopAsync();
}
}

View File

@@ -0,0 +1,7 @@
namespace PARR.TemplateTaskGenerator
{
internal interface ITemplateTaskGenerator
{
Task GenerateTemplateTaskAsync(Guid jobId);
}
}

View File

@@ -0,0 +1,79 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.TemplateTaskGenerator.Services;
using PARR.TemplateTaskGenerator.Settings;
namespace PARR.TemplateTaskGenerator
{
internal class MqTemplateTaskGenerator : IMqTemplateTaskGenerator
{
private readonly ILogger<MqTemplateTaskGenerator> logger;
private readonly MqSettings mqSettings;
private readonly IMqService mqService;
private readonly ITransformService transformService;
private readonly IServiceProvider serviceProvider;
public MqTemplateTaskGenerator(
ILogger<MqTemplateTaskGenerator> logger,
MqSettings mqSettings,
IMqService mqService,
ITransformService transformService,
IServiceProvider serviceProvider
)
{
this.logger = logger;
this.mqSettings = mqSettings;
this.mqService = mqService;
this.transformService = transformService;
this.serviceProvider = serviceProvider;
}
public async Task StartAsync()
{
var isConnected = await mqService.InitConsumerAsync(mqSettings.TemplateTaskGenerator, GenerateTemplateTaskAsync);
if (!isConnected)
throw new Exception("Ошибка при подключении к RabbitMq");
}
public async Task StopAsync()
{
await mqService.DisposeAsync();
}
private async Task GenerateTemplateTaskAsync(string msg)
{
logger.LogInformation($"Получили запрос: {msg}");
var query = transformService.GetModelFromJson<TemplateTaskGeneratorMq>(msg);
if (query == null)
return;
await using (var scope = serviceProvider.CreateAsyncScope())
{
var validatorService = GetServiceInScope<IValidatorService>(scope);
if (!await validatorService.IsValidAsync(query.JobId))
return;
var templateTaskGenerator = GetServiceInScope<ITemplateTaskGenerator>(scope);
await templateTaskGenerator.GenerateTemplateTaskAsync(query.JobId);
}
}
private Service GetServiceInScope<Service>(IServiceScope scope)
{
var service = scope.ServiceProvider.GetService<Service>();
if (service == null)
throw new Exception($"Не найден сервис: {nameof(Service)}");
return service;
}
}
}

View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
<ProjectReference Include="..\PARR.DAL\PARR.DAL.csproj" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,12 @@
namespace PARR.TemplateTaskGenerator.Services
{
internal interface IValidatorService
{
/// <summary>
/// Проверяет существование регламентной работы
/// </summary>
/// <param name="jobId"></param>
/// <returns></returns>
Task<bool> IsValidAsync(Guid jobId);
}
}

View File

@@ -0,0 +1,36 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Services.Interfaces.Job;
namespace PARR.TemplateTaskGenerator.Services
{
internal class ValidatorService : IValidatorService
{
private readonly ILogger<ValidatorService> logger;
private readonly IJobService jobService;
public ValidatorService(
ILogger<ValidatorService> logger,
IJobService jobService
)
{
this.logger = logger;
this.jobService = jobService;
}
public async Task<bool> IsValidAsync(Guid jobId)
{
var isExist = await jobService.GetAsync(jobId);
if (isExist == null)
{
logger.LogError($"Не найдена регалментная работа {nameof(jobId)}: {jobId}");
return false;
}
return true;
}
}
}

View File

@@ -0,0 +1,30 @@
using PARR.BLL.Contracts.Interfaces;
namespace PARR.TemplateTaskGenerator.Settings
{
internal class MqSettings
{
public TemplateTaskGenerator TemplateTaskGenerator { get; set; } = new TemplateTaskGenerator();
public TemplateGeneratorWorker TemplateGeneratorWorker { get; set; } = new TemplateGeneratorWorker();
}
internal class TemplateTaskGenerator : IMqSettings
{
public string HostName { get; set; } = string.Empty;
public string QueueName { get; set; } = string.Empty;
public string User { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public ushort? PrefetchCount { get; set; } = 0;
}
internal class TemplateGeneratorWorker : IMqSettings
{
public string HostName { get; set; } = string.Empty;
public string QueueName { get; set; } = string.Empty;
public string User { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public ushort? PrefetchCount { get; set; } = 0;
}
}

View File

@@ -0,0 +1,60 @@
using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.DomainServices.Interfaces;
using PARR.TemplateTaskGenerator.Settings;
using System.Text.Json;
namespace PARR.TemplateTaskGenerator
{
internal class TemplateTaskGenerator : ITemplateTaskGenerator
{
private readonly ILogger<TemplateTaskGenerator> logger;
private readonly IUnitFilterService unitFilterService;
private readonly MqSettings mqSettings;
private readonly IMqService mqService;
public TemplateTaskGenerator(
ILogger<TemplateTaskGenerator> logger,
IUnitFilterService unitFilterService,
MqSettings mqSettings,
IMqService mqService
)
{
this.logger = logger;
this.unitFilterService = unitFilterService;
this.mqSettings = mqSettings;
this.mqService = mqService;
}
public async Task GenerateTemplateTaskAsync(Guid jobId)
{
var unitIdsToCreateTemplate = await unitFilterService.GetUnitsIdForNotExistTemplatesByJobFilterAsync(jobId);
if (unitIdsToCreateTemplate == null || !unitIdsToCreateTemplate.Any())
return;
foreach (var unitId in unitIdsToCreateTemplate)
{
var mqRequest = new TemplateGeneratorWorkerMq
{
JobId = jobId,
UnitId = unitId,
HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на создание шаблона", InitiatorParrComponentId = ParrComponentsEnum.TemplateTaskGenerator }
};
var msg = JsonSerializer.Serialize(mqRequest);
var result = await mqService.SendAsync(mqSettings.TemplateGeneratorWorker, new[] { msg });
if (result.IsSuccess)
logger.LogInformation($"Отправлен запрос на создание шаблона: {msg}");
else
logger.LogError($"Ошибка при отправке запроса на создание шаблона: {msg}");
}
}
}
}

View File

@@ -0,0 +1,38 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.BLL;
using PARR.DAL;
using PARR.TemplateTaskGenerator.Services;
using PARR.TemplateTaskGenerator.Settings;
namespace PARR.TemplateTaskGenerator
{
public static class TemplateTaskGeneratorInstaller
{
public static void InstallTemplateTaskGeneratorSerivces(this IServiceCollection services, IConfiguration configuration)
{
services.InstallBllServices(configuration);
services.InstallDalServices(configuration);
var mqSettings = new MqSettings();
configuration.GetSection(nameof(MqSettings)).Bind(mqSettings);
services.AddSingleton(mqSettings);
services.AddTransient<IMqTemplateTaskGenerator, MqTemplateTaskGenerator>();
services.AddTransient<IValidatorService, ValidatorService>();
services.AddTransient<ITemplateTaskGenerator, TemplateTaskGenerator>();
}
public static IConfigurationBuilder AddTemplateTaskGeneratorConfigurations(this IConfigurationBuilder builder, IServiceCollection services)
{
builder.AddDalConfigurations(services);
return builder;
}
public static void AddTemplateTaskGeneratorSettings(this IServiceCollection services, IConfiguration configuration)
{
services.AddDallSettings(configuration);
}
}
}