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

feat(templateMatcher): init. сделан воркер, контроллер. перенесена логика из TemplateTaskGenerator

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-11-01 15:29:12 +10:00
parent e716d9649d
commit 2950d21a69
24 changed files with 584 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PARR.TemplateMatcher/IMqTemplateTaskGenerator.cs Normal file
View File

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

9
PARR.TemplateMatcher/ITemplateMatcher.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace PARR.TemplateMatcher
{
internal interface ITemplateMatcher
{
Task MatchTemplatesForJob(Guid jobId);
Task MatchTemplatesForJobGroup(Guid jobGroupId);
Task MatchTemplatesForTemplate(Guid templateId);
}
}

87
PARR.TemplateMatcher/MqTemplateMatcher.cs Normal file
View File

@@ -0,0 +1,87 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.TemplateMatcher.Services.Interfaces;
using PARR.TemplateMatcher.Settings;
namespace PARR.TemplateMatcher
{
internal class MqTemplateMatcher : IMqTemplateMatcher
{
private readonly ILogger<IMqTemplateMatcher> logger;
private readonly MqSettings mqSettings;
private readonly IMqService mqService;
private readonly ITransformService transformService;
private readonly IServiceProvider serviceProvider;
public MqTemplateMatcher(
ILogger<IMqTemplateMatcher> 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.TemplateMatcher, HandleMessageAsync);
if (!isConnected)
throw new Exception("Ошибка при подключении к RabbitMq");
}
private async Task HandleMessageAsync(string msg)
{
logger.LogInformation($"Получили запрос: {msg}");
var query = transformService.GetModelFromJson<TemplateMatcherMq>(msg);
if (query == null)
return;
await using (var scope = serviceProvider.CreateAsyncScope())
{
var templateMatcherService = GetServiceInScope<ITemplateMatcher>(scope);
switch (query.EntityType)
{
case Constants.SyncTaskEntityTypeEnum.Job:
var validatorService = GetServiceInScope<IJobValidatorService>(scope);
if (!await validatorService.IsValidAsync(query.Id))
return;
await templateMatcherService.MatchTemplatesForJob(query.Id);
break;
default:
logger.LogWarning("Неизвестный тип сущности: {EntityType}", query.EntityType);
break;
}
}
}
public async Task StopAsync()
{
await mqService.DisposeAsync();
}
private Service GetServiceInScope<Service>(IServiceScope scope)
{
var service = scope.ServiceProvider.GetService<Service>();
if (service == null)
throw new Exception($"Не найден сервис: {nameof(Service)}");
return service;
}
}
}

14
PARR.TemplateMatcher/PARR.TemplateMatcher.csproj Normal file
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>

33
PARR.TemplateMatcher/Services/Implemetaions/JobValidatorService.cs Normal file
View File

@@ -0,0 +1,33 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Services.Interfaces.Job;
using PARR.TemplateMatcher.Services.Interfaces;
namespace PARR.TemplateMatcher.Services.Implemetaions
{
internal class JobValidatorService : IJobValidatorService
{
private readonly ILogger<IJobValidatorService> logger;
private readonly IJobService jobService;
public JobValidatorService(
ILogger<IJobValidatorService> 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;
}
}
}

12
PARR.TemplateMatcher/Services/Interfaces/IJobValidatorService.cs Normal file
View File

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

34
PARR.TemplateMatcher/Settings/MqSettings.cs Normal file
View File

@@ -0,0 +1,34 @@
using PARR.BLL.Contracts.Interfaces;
using PARR.BLL.Domain.Mq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PARR.TemplateMatcher.Settings
{
public class MqSettings
{
public TemplateMatcher TemplateMatcher { get; set; } = new TemplateMatcher();
public TemplateGenerator TemplateGenerator { get; set; } = new TemplateGenerator();
}
internal class TemplateMatcher : 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 TemplateGenerator : 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;
}
}

71
PARR.TemplateMatcher/TemplateMatcher.cs Normal file
View File

@@ -0,0 +1,71 @@
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.TemplateMatcher.Settings;
using System.Text.Json;
namespace PARR.TemplateMatcher
{
public class TemplateMatcher : ITemplateMatcher
{
private readonly Logger<TemplateMatcher> logger;
private readonly IUnitFilterService unitFilterService;
private readonly MqSettings mqSettings;
private readonly IMqService mqService;
public TemplateMatcher(
Logger<TemplateMatcher> logger,
IUnitFilterService unitFilterService,
MqSettings mqSettings,
IMqService mqService
)
{
this.logger = logger;
this.unitFilterService = unitFilterService;
this.mqSettings = mqSettings;
this.mqService = mqService;
}
public async Task MatchTemplatesForJob(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.TemplateGenerator, new[] { msg });
if (result.IsSuccess)
logger.LogInformation($"Отправлен запрос на создание шаблона: {msg}");
else
logger.LogError($"Ошибка при отправке запроса на создание шаблона: {msg}");
}
}
public Task MatchTemplatesForJobGroup(Guid jobGroupId)
{
throw new NotImplementedException();
}
public Task MatchTemplatesForTemplate(Guid templateId)
{
throw new NotImplementedException();
}
}
}

39
PARR.TemplateMatcher/TemplateMatcherInstaller.cs Normal file
View File

@@ -0,0 +1,39 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.BLL;
using PARR.DAL;
using PARR.TemplateMatcher.Services.Implemetaions;
using PARR.TemplateMatcher.Services.Interfaces;
using PARR.TemplateMatcher.Settings;
namespace PARR.TemplateMatcher
{
public static class TemplateMatcherInstaller
{
public static void InstallTemplateMatcherSerivces(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<IMqTemplateMatcher, MqTemplateMatcher>();
services.AddTransient<IJobValidatorService, JobValidatorService>();
services.AddTransient<ITemplateMatcher, TemplateMatcher>();
}
public static IConfigurationBuilder AddTemplateMatcherConfigurations(this IConfigurationBuilder builder, IServiceCollection services)
{
builder.AddDalConfigurations(services);
return builder;
}
public static void AddTemplateMatcherSettings(this IServiceCollection services, IConfiguration configuration)
{
services.AddDallSettings(configuration);
}
}
}