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

36
PARR.Core/Infrastructure/Mapping/TaskMappingProfile.cs Normal file
View File

@@ -0,0 +1,36 @@
using AutoMapper;
using PARR.Domain.DTOs.TaskDTO;
namespace PARR.Core.Infrastructure.Mapping
{
/// <summary>
/// Маппинг все что касается Task
/// </summary>
internal class TaskMappingProfile : Profile
{
public TaskMappingProfile()
{
#region TaskItem
CreateMap<Domain.Entities.TaskEntities.TaskItem, TaskItemBase>()
.Include<Domain.Entities.TaskEntities.TaskItem, Domain.DTOs.TaskDTO.TaskItem>()
.Include<Domain.Entities.TaskEntities.TaskItem, Domain.DTOs.TaskDTO.ActiveTask>();
CreateMap<Domain.Entities.TaskEntities.TaskItem, Domain.DTOs.TaskDTO.TaskItem>();
#endregion
#region ActiveTask
CreateMap<Domain.Entities.TaskEntities.TaskItem, ActiveTask>()
.ForMember(d => d.Type, o => o.MapFrom(s => s.TaskType))
.ForMember(d => d.Status, o => o.MapFrom(s => s.TaskStatus));
#endregion
#region TaskType
CreateMap<Domain.Entities.TaskEntities.TaskType, Domain.DTOs.TaskDTO.TaskType>();
#endregion
#region TaskStatus
CreateMap<Domain.Entities.TaskEntities.TaskStatus, Domain.DTOs.TaskDTO.TaskStatus>();
#endregion
}
}
}

4
PARR.Core/PARR.Core.csproj
View File

@@ -6,10 +6,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Folder Include="Infrastructure\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.2" />

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 && (

11
PARR.Core/Services/TaskServices/Interfaces/ITaskManagementService.cs
View File

@@ -1,4 +1,5 @@
using PARR.Domain.Entities.Base.History;
using PARR.Domain.DTOs.TaskDTO;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
using PARR.Domain.Settings;
@@ -19,5 +20,13 @@ namespace PARR.Core.Services.TaskServices.Interfaces
/// <param name="mqSettings">Настройки очереди</param>
/// <returns></returns>
Task<Guid> CreateTaskAsync<T>(TaskTypeEnum typeCode, T payload, IHistoryInitiator initiator, IMqSettings mqSettings);
/// <summary>
/// Получить список активных задач
/// </summary>
/// <param name="typeCode"></param>
/// <returns></returns>
Task<List<ActiveTask>> GetActiveTasksAsync(TaskTypeEnum? typeCode = null);
}
}