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

Прикрутил правильно bll

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-09-25 13:45:11 +10:00
parent 251d23e9b4
commit 322ac75111
3 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.API/Validators/GeneratorTemplateRequestValidator.cs
View File

@@ -24,7 +24,7 @@ namespace PARR.API.Validators
.WithMessage("У данного приложения нет связанных работ");
//TODO: возможно сделать проверку, по данному выражению есть ли ЭК
RuleFor(t => t.Ek).NotEmpty().WithMessage("ЭК, принимает регулярное выражение. Например: *, ВРТ-*-ДВС");
RuleFor(t => t.Ek).NotEmpty().WithMessage("Недопустимое значение ЭК. Возможные значения: *, ВРТ-*-ДВС");
RuleFor(t => t.Action)
.Must(t => t.ToLower() == GenerateTemplateActionsEnum.create.ToString() || t.ToLower() == GenerateTemplateActionsEnum.deactivate.ToString())

4
PARR.GeneratorTemplates/GeneratorTemplate.cs
View File

@@ -46,7 +46,7 @@ namespace PARR.GeneratorTemplates
//string msg = "{\"WorkId\":\"91219bec-e5f7-4a1a-b4c9-c135035d2498\",\"ApplicationId\":\"13044a1f-fa0c-476f-b501-2b8d06bac9f8\",\"Action\":\"create\",\"Ek\":\"вРТ-*RZD\"}";
string msg = "{\"WorkId\":\"91219bec-e5f7-4a1a-b4c9-c135035d2498\",\"ApplicationId\":\"13044a1f-fa0c-476f-b501-2b8d06bac9f8\",\"Action\":\"create\",\"Ek\":\"*ДВС\"}";
//string msg = "{\"WorkId\":\"91219bec-e5f7-4a1a-b4c9-c135035d2498\",\"ApplicationId\":\"13044a1f-fa0c-476f-b501-2b8d06bac9f8\",\"Action\":\"deactivate\",\"Ek\":\"вРТ-*RZD\"}";
//string msg = "{\"WorkId\":\"91219bec-e5f7-4a1a-b4c9-c135035d2498\",\"ApplicationId\":\"13044a1f-fa0c-476f-b501-2b8d06bac9f8\",\"Action\":\"deactivate\",\"Ek\":\"*\"}";
await GenerateTemplates(msg);
// // проверить как ту дела с асинком
@@ -72,7 +72,7 @@ namespace PARR.GeneratorTemplates
private async Task GenerateTemplates(string msg)
{
logger.LogDebug($"Получили запрос: {msg}");
logger.LogInformation($"Получили запрос: {msg}");
var query = transformService.GetModelFromJson<GeneratorTemplateMq>(msg);
if (query == null)

78
PARR.GeneratorTemplatesWorker/Program.cs
View File

@@ -3,32 +3,60 @@ using PARR.GeneratorTemplatesWorker;
using Serilog;
IHost host = Host.CreateDefaultBuilder(args)
.ConfigureServices((hostContext, services) =>
{
services.InstallGeneratorTemplateServices(hostContext.Configuration);
//hostContext.Configuration.AddGeneratorTemplateConfigurations(services);
//services.AddGeneratorTemplateSettings(hostContext.Configuration);
var builder = Host.CreateApplicationBuilder();
//services.AddHostedService<Worker>();
})
//.ConfigureAppConfiguration((hostContext, configBuilder) =>
//{
//TODO: !!! !!! !!! не смог прикрутить AddGeneratorTemplateConfigurations, не могу прокинуть туда сервисы
// configBuilder.AddGeneratorTemplateConfigurations(hostContext.Services);
//})
.ConfigureServices((hostContext, services) =>
{
services.AddGeneratorTemplateSettings(hostContext.Configuration);
builder.Services.AddLogging(config =>
{
config.ClearProviders();
var logger = new LoggerConfiguration()
.WriteTo.Console()
.ReadFrom.Configuration(builder.Configuration)
.CreateLogger();
config.AddSerilog(logger);
});
services.AddHostedService<Worker>();
})
.UseSerilog((hostContext, services, config) =>
{
config
.WriteTo.Console()
.ReadFrom.Configuration(hostContext.Configuration);
})
.Build();
builder.Services.InstallGeneratorTemplateServices(builder.Configuration);
builder.Configuration.AddGeneratorTemplateConfigurations(builder.Services);
builder.Services.AddGeneratorTemplateSettings(builder.Configuration);
builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();
//IHost host = Host.CreateDefaultBuilder(args)
// .ConfigureServices((hostContext, services) =>
// {
// services.InstallGeneratorTemplateServices(hostContext.Configuration);
// //hostContext.Configuration.AddGeneratorTemplateConfigurations(services);
// //services.AddGeneratorTemplateSettings(hostContext.Configuration);
// //services.AddHostedService<Worker>();
// })
// .ConfigureAppConfiguration((hostContext, configBuilder) =>
// {
// //TODO: !!!!!!!!!не смог прикрутить AddGeneratorTemplateConfigurations, не могу прокинуть туда сервисы
// configBuilder.AddGeneratorTemplateConfigurations(hostContext.Services);
// })
// .ConfigureServices((hostContext, services) =>
// {
// services.AddGeneratorTemplateSettings(hostContext.Configuration);
// services.AddHostedService<Worker>();
// })
// .UseSerilog((hostContext, services, config) =>
// {
// config
// .WriteTo.Console()
// .ReadFrom.Configuration(hostContext.Configuration);
// })
// .Build();
//host.Run();