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

fix(api): Task - получение статусов задач, доработка отчетов workload

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-05-15 16:09:49 +10:00
parent 87db7c5fd6
commit 911e6febcd
22 changed files with 334 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
PARR.Core/Services/TaskServices/Implementations/TaskManagementService.cs
View File

@@ -1,11 +1,12 @@
using Microsoft.EntityFrameworkCore;
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Repositories.Interfaces.TaskRepositories;
using PARR.Core.Services.TaskServices.Interfaces;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.DTOs.TaskDTO;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.TaskEntities;
using PARR.Domain.Enums;
using PARR.Domain.Settings;
using System.Text.Encodings.Web;
@@ -19,24 +20,29 @@ namespace PARR.Core.Services.TaskServices.Implementations
private readonly ITaskTypeRepository taskTypeRepository;
private readonly ITaskRepository taskRepository;
private readonly IRabbitService rabbitService;
private readonly IMapper mapper;
public TaskManagementService(
ILogger<TaskManagementService> logger,
ITaskTypeRepository taskTypeRepository,
ITaskRepository taskRepository,
IRabbitService rabbitService
IRabbitService rabbitService,
IMapper mapper
)
{
this.logger = logger;
this.taskTypeRepository = taskTypeRepository;
this.taskRepository = taskRepository;
this.rabbitService = rabbitService;
this.mapper = mapper;
}
public async Task<Guid> CreateTaskAsync<T>(TaskTypeEnum typeCode, T payload, IHistoryInitiator initiator, IMqSettings mqSettings)
{
var taskType = await taskTypeRepository.Get().AsNoTracking().FirstOrDefaultAsync(t => t.Code == typeCode);
var taskType = await taskTypeRepository.Get()
.AsNoTracking()
.FirstOrDefaultAsync(t => t.Code == typeCode);
if (taskType == null)
{
@@ -59,7 +65,7 @@ namespace PARR.Core.Services.TaskServices.Implementations
var payloadStr = PayloadToString(payload);
// Создаем новую запись задачи
var task = new TaskItem
var task = new Domain.Entities.TaskEntities.TaskItem
{
Id = Guid.NewGuid(),
TypeCode = typeCode,
@@ -99,12 +105,29 @@ namespace PARR.Core.Services.TaskServices.Implementations
}
public async Task<List<ActiveTask>> GetActiveTasksAsync(TaskTypeEnum? typeCode = null)
{
var query = taskRepository.Get()
.AsNoTracking()
.Include(t => t.TaskStatus)
.Include(t => t.TaskType)
.Where(t => t.StatusCode == TaskItemStatusEnum.Pending || t.StatusCode == TaskItemStatusEnum.Processing);
if (typeCode.HasValue)
query = query.Where(t => t.TypeCode == typeCode.Value);
var tasks = await query.OrderByDescending(t => t.DateCreated).ToListAsync();
return mapper.Map<List<ActiveTask>>(tasks);
}
/// <summary>
/// Получить активную singleton задачу указанного типа
/// </summary>
/// <param name="typeCode"></param>
/// <returns></returns>
private async Task<TaskItem?> GetActiveSingletonTaskAsync(TaskTypeEnum typeCode)
private async Task<Domain.Entities.TaskEntities.TaskItem?> GetActiveSingletonTaskAsync(TaskTypeEnum typeCode)
{
return await taskRepository.Get().AsNoTracking()
.FirstOrDefaultAsync(t => t.TypeCode == typeCode && (