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

feat(api, Core, Domain, Dal): Для entity моделей, для DateModified создан атрибут ManualControl - отключает автоматическое управление датой. TaskReconciliationService - сервис по управлению задачами в статусах ошибки, зависла. ITaskMqSettingsProvider - провайдер для управления настройками MQ в зависимости от TaskType

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-04-22 16:13:23 +10:00
parent 001c09edaa
commit 7da2265d1c
16 changed files with 465 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PARR.API/Controllers/V1/Statistics/StatWorkloadController.cs
View File

@@ -6,6 +6,7 @@ using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces;
using PARR.API.Settings;
using PARR.Core.Services.Task.Interfaces;
using PARR.Core.Services.Task.Providers;
using PARR.Domain.Common.Roles;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
@@ -20,20 +21,23 @@ namespace PARR.API.Controllers.V1.Statistics
{
private readonly ITaskManagementService taskManagementService;
private readonly IClientService clientService;
private readonly MqSettings mqSettings;
//private readonly MqSettings mqSettings;
private readonly ILogger<StatWorkloadController> logger;
private readonly ITaskMqSettingsProvider taskMqSettingsProvider;
public StatWorkloadController(
ITaskManagementService taskManagementService,
IClientService clientService,
MqSettings mqSettings,
ILogger<StatWorkloadController> logger
//MqSettings mqSettings,
ILogger<StatWorkloadController> logger,
ITaskMqSettingsProvider taskMqSettingsProvider
)
{
this.taskManagementService = taskManagementService;
this.clientService = clientService;
this.mqSettings = mqSettings;
//this.mqSettings = mqSettings;
this.logger = logger;
this.taskMqSettingsProvider = taskMqSettingsProvider;
}
@@ -55,13 +59,14 @@ namespace PARR.API.Controllers.V1.Statistics
try
{
mqSettings.Tasks.TryGetValue(TaskTypeEnum.Workload, out var queueSettings);
//mqSettings.Tasks.TryGetValue(TaskTypeEnum.Workload, out var queueSettings);
if (queueSettings == null)
{
logger.LogError("Не удалось получить настройки очереди для TaskType: {TaskType}", TaskTypeEnum.Workload);
throw new InvalidOperationException($"Не удалось получить настройки очереди для TaskTypeEnum.Workload");
}
//if (queueSettings == null)
//{
// logger.LogError("Не удалось получить настройки очереди для TaskType: {TaskType}", TaskTypeEnum.Workload);
// throw new InvalidOperationException($"Не удалось получить настройки очереди для TaskTypeEnum.Workload");
//}
var queueSettings = taskMqSettingsProvider.GetSettings(TaskTypeEnum.Workload);
var taskId = await taskManagementService.CreateTaskAsync<object?>(TaskTypeEnum.Workload, default, initiator, queueSettings);

21
PARR.API/Program.cs
View File

@@ -3,8 +3,11 @@ using FluentValidation;
using Microsoft.AspNetCore.HttpOverrides;
using PARR.API.Authentication;
using PARR.API.Installers;
using PARR.API.Settings;
using PARR.Core;
using PARR.DAL;
using PARR.Domain.Enums;
using PARR.Domain.Settings;
using PARR.Infrastructure;
using Serilog;
using System.Reflection;
@@ -21,14 +24,30 @@ builder.Host.UseSerilog((context, config) =>
config.ReadFrom.Configuration(builder.Configuration);
});
builder.Services.InstallSettings(builder.Configuration);
// Add services to the container.
builder.Services.InstallDalServices(builder.Configuration);
//---- new ----
builder.Services.AddCoreServices(builder.Configuration);
builder.Services.AddTaskManagement(mqSettingsFactory: (provider, taskType) =>
{
var taskSettingsMq = provider.GetRequiredService<MqSettings>();
// swith для примера
//return taskType switch
//{
// TaskTypeEnum.Workload => MqSettingsBase{ },
// _ => throw new ArgumentException($"Неизвестный тип задания {taskType}. Не смог для него получить настройки")
//};
if (taskSettingsMq.Tasks.TryGetValue(taskType, out var settings))
return settings;
throw new ArgumentException($"Настройки для типа задания {taskType} не найдены в конфигурации.");
});
builder.Services.AddInfrastructureServices(builder.Configuration);
//---- --- ----
builder.Services.InstallApiServices(builder.Configuration);
builder.Services.InstallSettings(builder.Configuration);
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
// Dal configuration