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

feat(templateUpdater): основная логика + cicd

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-04 08:23:57 +10:00
parent 74419c0435
commit df9c29358c
20 changed files with 622 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PARR.TemplateUpdater/ITemplateUpdater.cs Normal file
View File

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

14
PARR.TemplateUpdater/PARR.TemplateUpdater.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>

9
PARR.TemplateUpdater/Services/ITemplateUpdaterService.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.BLL.Domain.Mq;
namespace PARR.TemplateUpdater.Services
{
internal interface ITemplateUpdaterService
{
Task UpdateTemplateAsync(TemplateUpdaterMq query);
}
}

173
PARR.TemplateUpdater/Services/TemplateUpdaterService.cs Normal file
View File

@@ -0,0 +1,173 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq;
using PARR.Constants;
using PARR.DAL.Contracts;
using PARR.DAL.Extensions;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.DAL.Services.Interfaces.Unit;
namespace PARR.TemplateUpdater.Services
{
internal class TemplateUpdaterService : ITemplateUpdaterService
{
private readonly ILogger<TemplateUpdaterService> logger;
private readonly ITemplateService templateService;
private readonly IJobService jobService;
private readonly IUnitService unitService;
private readonly IRobotConfigurationService robotConfigurationService;
public TemplateUpdaterService(
ILogger<TemplateUpdaterService> logger,
ITemplateService templateService,
IJobService jobService,
IUnitService unitService,
IRobotConfigurationService robotConfigurationService
)
{
this.logger = logger;
this.templateService = templateService;
this.jobService = jobService;
this.unitService = unitService;
this.robotConfigurationService = robotConfigurationService;
}
public async Task UpdateTemplateAsync(TemplateUpdaterMq query)
{
var isValid = await IsValidAsync(query);
if (!isValid)
{
logger.LogError($"Не валидны входные данные. Конец обработки сообщения {query.ToJson()}");
return;
}
var template = await templateService.Get()
.Include(t => t.RobotConfigurations)
.FirstOrDefaultAsync(t => t.Id == query.TemplateId);
if (template == null)
{
logger.LogError($"Не найден шаблон с id {query.TemplateId}");
return;
}
var templateIsChanged = false;
var scheduleIsChanged = false;
if (template.Name != query.Name.Trim())
{
template.Name = query.Name.Trim();
templateIsChanged = true;
scheduleIsChanged = true;
}
if (template.JobId != query.JobId)
{
template.JobId = query.JobId;
templateIsChanged = true;
scheduleIsChanged = true;
}
if (template.IsActiveTemplate != query.IsActiveTemplate)
{
template.IsActiveTemplate = query.IsActiveTemplate;
templateIsChanged = true;
}
if (template.IsActiveSchedule != query.IsActiveSchedule)
{
template.IsActiveSchedule = query.IsActiveSchedule;
scheduleIsChanged = true;
}
if (template.NextRun != query.NextRun)
{
template.NextRun = query.NextRun;
scheduleIsChanged = true;
}
if (template.UnitId != query.UnitId)
{
template.UnitId = query.UnitId;
templateIsChanged = true;
scheduleIsChanged = true;
}
//просто обнволяем. не влияет ни на шаблон, ни на расписание
template.LastRun = query.LastRun;
template.Index = query.Index;
template.StatusTypeId = query.StatusTypeId;
if (templateIsChanged)
{
// ставим задачу на обновление шаблона
var config = robotConfigurationService.GetFromTemplateByRobotCode(RobotsEnum.TemplateOrder, template);
robotConfigurationService.ChangeTaskStatus(TaskStatusEnum.Updating, config);
logger.LogDebug($"Для шаблона {nameof(template.Id)}:{template.Id} устанавливаю статус {RobotStatusEnum.Wait.ToString()}");
}
if (scheduleIsChanged)
{
// ставим задачу на обновление расписания
var config = robotConfigurationService.GetFromTemplateByRobotCode(RobotsEnum.ScheduleOrder, template);
robotConfigurationService.ChangeTaskStatus(TaskStatusEnum.Updating, config);
logger.LogDebug($"Для расписания {nameof(template.Id)}:{template.Id} устанавливаю статус {RobotStatusEnum.Wait.ToString()}");
}
if (!await templateService.CommitAsync(query.Initiator))
logger.LogError($"Не удалось сохранить изменения в БД. {nameof(TemplateUpdaterMq)}: {query.ToJson()}.");
logger.LogInformation($"Выполнено изменение шаблона в БД. Отправлен запрос на синхронизацию шаблона: {templateIsChanged}, расписания: {scheduleIsChanged} .Query {query.ToJson()}");
}
/// <summary>
/// Валидация входящего сообщения
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
private async Task<bool> IsValidAsync(TemplateUpdaterMq query)
{
var template = await templateService.Get().AsNoTracking().AnyAsync(t => t.Id == query.TemplateId);
if (!template)
{
logger.LogError($"Сообщение не валидно. Не найден шаблон с id: {query.TemplateId}");
return false;
}
if (string.IsNullOrEmpty(query.Name.Trim()))
{
logger.LogError($"Сообщение не валидно. Имя шаблона не может быть пустым: {query.Name}");
return false;
}
var existTemplateName = await templateService.Get().AsNoTracking().AnyAsync(t => t.Id != query.TemplateId && t.Name.ToUpper() == query.Name.Trim().ToUpper());
if (existTemplateName)
{
logger.LogError($"Сообщение не валидно. Имя шаблона не уникально: {query.Name}");
return false;
}
var job = await jobService.Get().AsNoTracking().AnyAsync(t => t.Id == query.JobId);
if (!job)
{
logger.LogError($"Сообщение не валидно. Не найдена работа с JobId: {query.JobId}");
return false;
}
var unit = await unitService.Get().AsNoTracking().AnyAsync(t => t.Id == query.UnitId);
if (!unit)
{
logger.LogError($"Сообщение не валидно. Не найден unit с UnitId: {query.UnitId}");
return false;
}
return true;
}
}
}

18
PARR.TemplateUpdater/Settings/MqSettings.cs Normal file
View File

@@ -0,0 +1,18 @@
using PARR.BLL.Contracts.Interfaces;
namespace PARR.TemplateUpdater.Settings
{
internal class MqSettings
{
public TemplatesUpdaterMq TemplatesUpdater { get; set; } = new TemplatesUpdaterMq();
}
internal class TemplatesUpdaterMq : 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;
}
}

67
PARR.TemplateUpdater/TemplateUpdater.cs Normal file
View File

@@ -0,0 +1,67 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using PARR.TemplateUpdater.Services;
using PARR.TemplateUpdater.Settings;
namespace PARR.TemplateUpdater
{
internal class TemplateUpdater : ITemplateUpdater
{
private readonly MqSettings mqSettings;
private readonly IMqService mqService;
private readonly ILogger<TemplateUpdater> logger;
private readonly IServiceProvider serviceProvider;
private readonly ITransformService transformService;
public TemplateUpdater(
MqSettings mqSettings,
IMqService mqService,
ILogger<TemplateUpdater> logger,
IServiceProvider serviceProvider,
ITransformService transformService
)
{
this.mqSettings = mqSettings;
this.mqService = mqService;
this.logger = logger;
this.serviceProvider = serviceProvider;
this.transformService = transformService;
}
public async Task StartAsync()
{
var isConnected = await mqService.InitConsumerAsync(mqSettings.TemplatesUpdater, UpdateTemplateAsync);
if (!isConnected)
throw new Exception("Ошибка при подключении к RabbitMq");
}
public async Task StopAsync()
{
await mqService.DisposeAsync();
}
private async Task UpdateTemplateAsync(string msg)
{
logger.LogInformation($"Получили запрос: {msg}");
var query = transformService.GetModelFromJson<TemplateUpdaterMq>(msg);
if (query == null)
return;
using (var scope = serviceProvider.CreateScope())
{
var service = scope.ServiceProvider.GetService<ITemplateUpdaterService>();
if (service == null)
throw new Exception($"Не найден сервис: {nameof(service.GetType)}");
await service.UpdateTemplateAsync(query);
}
}
}
}

37
PARR.TemplateUpdater/TemplateUpdaterInstaller.cs Normal file
View File

@@ -0,0 +1,37 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.BLL;
using PARR.DAL;
using PARR.TemplateUpdater.Services;
using PARR.TemplateUpdater.Settings;
namespace PARR.TemplateUpdater
{
public static class TemplateUpdaterInstaller
{
public static void InstallTemplateUpdaterServices(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<ITemplateUpdater, TemplateUpdater>();
services.AddTransient<ITemplateUpdaterService, TemplateUpdaterService>();
}
public static IConfigurationBuilder AddTemplateUpdaterConfigurations(this IConfigurationBuilder builder, IServiceCollection services)
{
builder.AddDalConfigurations(services);
return builder;
}
public static void AddTemplateUpdaterSettings(this IServiceCollection services, IConfiguration configuration)
{
services.AddDallSettings(configuration);
}
}
}