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

9
PARR.API/Contracts/V1/ApiRoutes.cs
View File

@@ -564,6 +564,15 @@
#endregion #endregion
#region Tasks
public static class Tasks
{
public const string GetActiveTasks = Base + "/tasks/active";
}
#endregion
} }
} }

9
PARR.API/Contracts/V1/Responses/ActiveTaskResponse.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace PARR.API.Contracts.V1.Responses
{
public record ActiveTaskResponse : TaskItemBaseResponse
{
public required TaskItemTypeResponse Type { get; init; }
public required TaskItemStatusResponse Status { get; init; }
}
}

21
PARR.API/Contracts/V1/Responses/TaskItemResponse.cs Normal file
View File

@@ -0,0 +1,21 @@
namespace PARR.API.Contracts.V1.Responses
{
public record TaskItemBaseResponse
{
public Guid Id { get; init; }
public DateTimeOffset DateCreated { get; init; }
public DateTimeOffset? DateModified { get; init; }
public int RetryCount { get; init; }
public DateTimeOffset? ProcessedAt { get; init; }
}
public record TaskItemResponse : TaskItemBaseResponse
{
}
}

13
PARR.API/Contracts/V1/Responses/TaskItemStatusResponse.cs Normal file
View File

@@ -0,0 +1,13 @@
using PARR.Domain.Enums;
namespace PARR.API.Contracts.V1.Responses
{
public record TaskItemStatusResponse
{
public TaskItemStatusEnum Code { get; init; }
public required string Name { get; init; }
public required string Description { get; init; }
}
}

33
PARR.API/Contracts/V1/Responses/TaskItemTypeResponse.cs Normal file
View File

@@ -0,0 +1,33 @@
using PARR.Domain.Enums;
namespace PARR.API.Contracts.V1.Responses
{
public record TaskItemTypeResponse
{
public TaskTypeEnum Code { get; init; }
public required string Name { get; init; }
public required string Description { get; init; }
/// <summary>
/// Максимальное кол-во попыток
/// </summary>
public int MaxRetries { get; init; }
/// <summary>
/// Максимальное время выполнения
/// </summary>
public int MaxExecutionTimeMinutes { get; init; }
/// <summary>
/// Одновременно может быть только одна задача или несколько
/// </summary>
public bool IsSingleton { get; init; }
/// <summary>
/// Сколько дней хранить в БД
/// </summary>
public int RetentionDays { get; init; }
}
}

95
PARR.API/Controllers/V1/GeneratorTemplateController.cs
View File

@@ -1,95 +0,0 @@
namespace PARR.API.Controllers.V1
{
//[Authorize(Roles = ParrRoles.Administrator.Role)]
//public class GeneratorTemplateController : BaseApiController
//{
// private readonly IValidator<GeneratorTemplateRequest> validator;
// private readonly IRabbitService mqService;
// private readonly IUriService uriService;
// private readonly MqSettings mqSettings;
// private readonly IClientService clientService;
// public GeneratorTemplateController(
// IValidator<GeneratorTemplateRequest> validator,
// IRabbitService mqService,
// IUriService uriService,
// MqSettings mqSettings,
// IClientService clientService
// )
// {
// this.validator = validator;
// this.mqService = mqService;
// this.uriService = uriService;
// this.mqSettings = mqSettings;
// this.clientService = clientService;
// }
// /// !!!!!!!!!! Это старый контроллер, удалить !!!!!!!!!!
// /// <summary>
// /// Запрос на генерацию шаблонов
// /// </summary>
// /// <returns></returns>
// [HttpPost(ApiRoutes.GeneratorTemplate.Create)]
// public async Task<IActionResult> Create([FromBody] GeneratorTemplateRequest request)
// {
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var result = true;
// request.Ek.ForEach(ek =>
// {
// //todo: проверить в ForEach(async status - отрабатывает ли нормально async, возможно надо переделать в обычный foreach
// request.Status.ForEach(async status =>
// {
// var obj = new GeneratorTemplateMq
// {
// Action = request.Action,
// ApplicationId = request.ApplicationId,
// Ek = ek,
// WorkId = request.WorkId,
// StatusEk = status,
// IsActiveTemplate = request.IsActiveTemplate,
// IsActiveSchedule = request.IsActiveSchedule,
// HistoryInitiator = new HistoryInitiator { InitiatorIp = clientService.GetClientIp()?.ToString(), InitiatorParrComponentId = ParrComponentsEnum.Api }
// };
// //var msg = JsonSerializer.Serialize(obj);
// //var _result = await mqService.SendAsync(mqSettings.GenerateTemplates, new[] { msg });
// var _result = await mqService.SendAsync(mqSettings.GenerateTemplates, new List<object> { obj });
// if (_result.IsSuccess == false)
// result = false;
// });
// });
// //var obj = new GeneratorTemplateMq
// //{
// // Action = request.Action,
// // ApplicationId = request.ApplicationId,
// // Ek = request.Ek,
// // WorkId = request.WorkId,
// // StatusEk = request.Status,
// // IsActiveTemplate = request.IsActiveTemplate,
// // IsActiveSchedule = request.IsActiveSchedule
// //};
// //var msg = JsonSerializer.Serialize(obj);
// //var result = mqService.Send(mqSettings.GenerateTemplates, new[] { msg });
// //if (!result.IsSuccess)
// if (!result)
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при отправке данных." } }));
// var createdUri = uriService.GetAllUri(ApiRoutes.Template.GetAll);
// return Created(createdUri, new Response<string?>(null, true, new List<ErrorModel>(), "Отправлен запрос на генерацию шаблонов."));
// }
//}
}

212
PARR.API/Controllers/V1/JobAutoControlController.cs
View File

@@ -1,212 +0,0 @@
using Microsoft.AspNetCore.Authorization;
using PARR.API.Controllers.V1.Base;
using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Управление автоматическим созданием/деактивацией/активацией РР
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class JobAutoControlController : BaseApiController
{
//private readonly IJobAutoControlService jobAutoControlService;
//private readonly IApplicationsInWorkService applicationsInWorkService;
//private readonly IMapper mapper;
//private readonly IValidator<JobAutoControlRequest> validator;
//private readonly IUriService uriService;
//public JobAutoControlController(
// IJobAutoControlService jobAutoControlService,
// IApplicationsInWorkService applicationsInWorkService,
// IMapper mapper,
// IValidator<JobAutoControlRequest> validator,
// IUriService uriService
// )
//{
// this.jobAutoControlService = jobAutoControlService;
// this.applicationsInWorkService = applicationsInWorkService;
// this.mapper = mapper;
// this.validator = validator;
// this.uriService = uriService;
//}
///// <summary>
///// Получить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <returns></returns>
//[HttpGet(ApiRoutes.JobAutoControl.Get)]
//public async Task<IActionResult> Get([FromRoute] Guid applicationInWorkId)
//{
// var obj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (obj == null)
// {
// // проверим, есть ли вообще такой AppInWork
// var appInWork = await applicationsInWorkService.GetAsync(applicationInWorkId);
// if (appInWork == null)
// return NotFound();
// return NoContent();
// }
// var response = mapper.Map<JobAutoControlResponse>(obj);
// return Ok(new Response<JobAutoControlResponse>(response, true));
//}
///// <summary>
///// Создать настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <param name="request"></param>
///// <returns></returns>
//[HttpPost(ApiRoutes.JobAutoControl.Create)]
//public async Task<IActionResult> Create([FromRoute] Guid applicationInWorkId, [FromBody] JobAutoControlRequest request)
//{
// var exist = await jobAutoControlService.Get().FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (exist != null)
// return BadRequest(new Response(false, new List<ErrorModel> {
// new ErrorModel { FieldName = nameof(applicationInWorkId), Message = $"Запись с {nameof(applicationInWorkId)}: {applicationInWorkId} уже существует." }
// }));
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var newObj = new DAL.Models.JobAutoControl
// {
// Id = Guid.NewGuid(),
// ApplicationInWorkId = applicationInWorkId,
// CreateNew = request.CreateNew,
// Deactivate = request.Deactivate,
// Activate = request.Activate,
// OnTemplateIsActive = request.OnTemplateIsActive,
// OnScheduleIsActive = request.OnScheduleIsActive,
// OffTemplateIsActive = request.OffTemplateIsActive,
// OffScheduleIsActive = request.OffScheduleIsActive
// };
// // убираем пробелы и дубли
// request.EkMasks.Where(t => t.Trim() != string.Empty).Distinct().ToList().ForEach(mask => newObj.JobEkMasks.Add(new JobEkMask
// {
// Id = Guid.NewGuid(),
// DateCreated = DateTimeOffset.UtcNow,
// Name = mask.Trim(),
// JobAutoControlId = newObj.Id
// }));
// request.EnabledEkStatuses.ForEach(status => newObj.JobAutoControlInEkStatuses.Add(new JobAutoControlInEkStatus
// {
// EkStatusCode = (int)status,
// JobAutoControlId = newObj.Id
// }));
// if (!await jobAutoControlService.CreateAsync(newObj) || !await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при создани записи." } }));
// var locationUri = uriService.GetUri(ApiRoutes.JobAutoControl.Get, ApiRoutes.JobAutoControl.appInWorkId, applicationInWorkId);
// var createdObj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// return Created(locationUri, new Response<JobAutoControlResponse>(mapper.Map<JobAutoControlResponse>(createdObj), true));
//}
///// <summary>
///// Обновить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <param name="request"></param>
///// <returns></returns>
//[HttpPut(ApiRoutes.JobAutoControl.Update)]
//public async Task<IActionResult> Update([FromRoute] Guid applicationInWorkId, [FromBody] JobAutoControlRequest request)
//{
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var orig = await jobAutoControlService.Get()
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (orig == null)
// return BadRequest(new Response(false, new List<ErrorModel> {
// new ErrorModel { FieldName = nameof(applicationInWorkId), Message = $"Запись с {nameof(applicationInWorkId)}: {applicationInWorkId} не существует." }
// }));
// orig.DateModified = DateTimeOffset.UtcNow;
// orig.CreateNew = request.CreateNew;
// orig.Deactivate = request.Deactivate;
// orig.Activate = request.Activate;
// orig.OnTemplateIsActive = request.OnTemplateIsActive;
// orig.OnScheduleIsActive = request.OnScheduleIsActive;
// orig.OffTemplateIsActive = request.OffTemplateIsActive;
// orig.OffScheduleIsActive = request.OffScheduleIsActive;
// orig.JobEkMasks.Clear();
// // убираем пробелы и дубли
// request.EkMasks.Where(t => t.Trim() != string.Empty).Distinct().ToList().ForEach(mask => orig.JobEkMasks.Add(new JobEkMask
// {
// //Id = Guid.NewGuid(), // не пойму почему не нужно это поле. с ним ошибка.
// DateCreated = DateTimeOffset.UtcNow,
// Name = mask.Trim(),
// JobAutoControlId = orig.Id
// }));
// orig.JobAutoControlInEkStatuses.Clear();
// request.EnabledEkStatuses.ForEach(status => orig.JobAutoControlInEkStatuses.Add(new JobAutoControlInEkStatus
// {
// EkStatusCode = (int)status,
// JobAutoControlId = orig.Id
// }));
// if (!await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении записи." } }));
// var updatedObj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// return Ok(new Response<JobAutoControlResponse>(mapper.Map<JobAutoControlResponse>(updatedObj), true));
//}
///// <summary>
///// Удалить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <returns></returns>
//[HttpDelete(ApiRoutes.JobAutoControl.Delete)]
//public async Task<IActionResult> Delete([FromRoute] Guid applicationInWorkId)
//{
// var obj = await jobAutoControlService.Get().FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (obj == null)
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении настроект. Не найден настройки с {nameof(applicationInWorkId)}: {applicationInWorkId}" } }));
// if (!jobAutoControlService.Delete(obj) || !await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении настроек." } }));
// return NoContent();
//}
}
}

5
PARR.API/Controllers/V1/ShortcodeApplyController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1; using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests; using PARR.API.Contracts.V1.Requests;
@@ -7,9 +8,11 @@ using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base; using PARR.API.Controllers.V1.Base;
using PARR.Core.Repositories.Interfaces; using PARR.Core.Repositories.Interfaces;
using PARR.Core.Services.Shortcodes; using PARR.Core.Services.Shortcodes;
using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1 namespace PARR.API.Controllers.V1
{ {
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class ShortcodeApplyController : BaseApiController public class ShortcodeApplyController : BaseApiController
{ {
private readonly ILogger<ShortcodeController> logger; private readonly ILogger<ShortcodeController> logger;

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

@@ -1,7 +1,6 @@
using AutoMapper; using AutoMapper;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using NodaTime;
using PARR.API.Contracts.V1; using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests.BaseRequests; using PARR.API.Contracts.V1.Requests.BaseRequests;
using PARR.API.Contracts.V1.Requests.Queries; using PARR.API.Contracts.V1.Requests.Queries;

5
PARR.API/Controllers/V1/SyncTaskController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using PARR.API.Contracts.V1; using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests; using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Responses.Base; using PARR.API.Contracts.V1.Responses.Base;
@@ -8,11 +9,13 @@ using PARR.API.Settings;
using PARR.Core.Common.Interfaces.RabbitServices; using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Services.MatchingStatusService; using PARR.Core.Services.MatchingStatusService;
using PARR.Domain.Common.Rabbit.Messages; using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Common.Roles;
using PARR.Domain.Entities.Base.History; using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums; using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1 namespace PARR.API.Controllers.V1
{ {
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class SyncTaskController : BaseApiController public class SyncTaskController : BaseApiController
{ {
private readonly ILogger<SyncTaskController> logger; private readonly ILogger<SyncTaskController> logger;

51
PARR.API/Controllers/V1/TaskController.cs Normal file
View File

@@ -0,0 +1,51 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Core.Services.TaskServices.Interfaces;
using PARR.Domain.Common.Roles;
using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Контроллер по управлению Task (задания, очереди)
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class TaskController : BaseApiController
{
private readonly ITaskManagementService taskManagementService;
private readonly IMapper mapper;
public TaskController(
ITaskManagementService taskManagementService,
IMapper mapper
)
{
this.taskManagementService = taskManagementService;
this.mapper = mapper;
}
/// <summary>
/// Получить список активных задач (задания, очереди)
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.Tasks.GetActiveTasks)]
public async Task<IActionResult> GetActiveTasks([FromQuery] TaskTypeEnum? typeCode)
{
var activeTasks = await taskManagementService.GetActiveTasksAsync(typeCode);
if (activeTasks.Count == 0)
return NoContent();
var response = mapper.Map<List<ActiveTaskResponse>>(activeTasks);
return Ok(new Response<List<ActiveTaskResponse>>(response, true));
}
}
}

5
PARR.API/Controllers/V1/TaskStatusController.cs
View File

@@ -11,6 +11,9 @@ using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1 namespace PARR.API.Controllers.V1
{ {
/// <summary>
/// Статусы заданий роботам
/// </summary>
[Authorize(Roles = ParrRoles.EsppRobot.RoleOrAdmin)] [Authorize(Roles = ParrRoles.EsppRobot.RoleOrAdmin)]
public class TaskStatusController : BaseApiController public class TaskStatusController : BaseApiController
{ {
@@ -27,7 +30,7 @@ namespace PARR.API.Controllers.V1
} }
/// <summary> /// <summary>
/// Получить список статусов заданий /// Получить список статусов заданий роботам
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet(ApiRoutes.TaskStatus.GetAll)] [HttpGet(ApiRoutes.TaskStatus.GetAll)]

20
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -6,6 +6,7 @@ using PARR.API.MappingProfiles.Resolvers;
using PARR.Core.Repositories.Interfaces.Schedule; using PARR.Core.Repositories.Interfaces.Schedule;
using PARR.Domain.DTOs.Matching; using PARR.Domain.DTOs.Matching;
using PARR.Domain.DTOs.Shortcode; using PARR.Domain.DTOs.Shortcode;
using PARR.Domain.DTOs.TaskDTO;
using PARR.Domain.DTOs.Workload; using PARR.Domain.DTOs.Workload;
using PARR.Domain.Entities; using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History; using PARR.Domain.Entities.Base.History;
@@ -445,6 +446,25 @@ namespace PARR.API.MappingProfiles
#endregion #endregion
#region Task
//CreateMap<TaskItemBase, TaskItemBaseResponse>()
// .Include<TaskItemBase, TaskItemResponse>()
// .Include<TaskItemBase, ActiveTaskResponse>();
//CreateMap<TaskItemBase, TaskItemResponse>();
CreateMap<ActiveTask, ActiveTaskResponse>();
// ---
CreateMap<TaskType, TaskItemTypeResponse>();
CreateMap<PARR.Domain.DTOs.TaskDTO.TaskStatus, TaskItemStatusResponse>();
#endregion
} }
} }

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> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Folder Include="Infrastructure\" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.2" /> <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 Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces.RabbitServices; using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Repositories.Interfaces.TaskRepositories; using PARR.Core.Repositories.Interfaces.TaskRepositories;
using PARR.Core.Services.TaskServices.Interfaces; using PARR.Core.Services.TaskServices.Interfaces;
using PARR.Domain.Common.Rabbit.Messages; using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.DTOs.TaskDTO;
using PARR.Domain.Entities.Base.History; using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.TaskEntities;
using PARR.Domain.Enums; using PARR.Domain.Enums;
using PARR.Domain.Settings; using PARR.Domain.Settings;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
@@ -19,24 +20,29 @@ namespace PARR.Core.Services.TaskServices.Implementations
private readonly ITaskTypeRepository taskTypeRepository; private readonly ITaskTypeRepository taskTypeRepository;
private readonly ITaskRepository taskRepository; private readonly ITaskRepository taskRepository;
private readonly IRabbitService rabbitService; private readonly IRabbitService rabbitService;
private readonly IMapper mapper;
public TaskManagementService( public TaskManagementService(
ILogger<TaskManagementService> logger, ILogger<TaskManagementService> logger,
ITaskTypeRepository taskTypeRepository, ITaskTypeRepository taskTypeRepository,
ITaskRepository taskRepository, ITaskRepository taskRepository,
IRabbitService rabbitService IRabbitService rabbitService,
IMapper mapper
) )
{ {
this.logger = logger; this.logger = logger;
this.taskTypeRepository = taskTypeRepository; this.taskTypeRepository = taskTypeRepository;
this.taskRepository = taskRepository; this.taskRepository = taskRepository;
this.rabbitService = rabbitService; this.rabbitService = rabbitService;
this.mapper = mapper;
} }
public async Task<Guid> CreateTaskAsync<T>(TaskTypeEnum typeCode, T payload, IHistoryInitiator initiator, IMqSettings mqSettings) 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) if (taskType == null)
{ {
@@ -59,7 +65,7 @@ namespace PARR.Core.Services.TaskServices.Implementations
var payloadStr = PayloadToString(payload); var payloadStr = PayloadToString(payload);
// Создаем новую запись задачи // Создаем новую запись задачи
var task = new TaskItem var task = new Domain.Entities.TaskEntities.TaskItem
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
TypeCode = typeCode, 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> /// <summary>
/// Получить активную singleton задачу указанного типа /// Получить активную singleton задачу указанного типа
/// </summary> /// </summary>
/// <param name="typeCode"></param> /// <param name="typeCode"></param>
/// <returns></returns> /// <returns></returns>
private async Task<TaskItem?> GetActiveSingletonTaskAsync(TaskTypeEnum typeCode) private async Task<Domain.Entities.TaskEntities.TaskItem?> GetActiveSingletonTaskAsync(TaskTypeEnum typeCode)
{ {
return await taskRepository.Get().AsNoTracking() return await taskRepository.Get().AsNoTracking()
.FirstOrDefaultAsync(t => t.TypeCode == typeCode && ( .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.Enums;
using PARR.Domain.Settings; using PARR.Domain.Settings;
@@ -19,5 +20,13 @@ namespace PARR.Core.Services.TaskServices.Interfaces
/// <param name="mqSettings">Настройки очереди</param> /// <param name="mqSettings">Настройки очереди</param>
/// <returns></returns> /// <returns></returns>
Task<Guid> CreateTaskAsync<T>(TaskTypeEnum typeCode, T payload, IHistoryInitiator initiator, IMqSettings mqSettings); 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);
} }
} }

2
PARR.DAL/Context/DataContext.cs
View File

@@ -579,7 +579,7 @@ namespace PARR.DAL.Context
{ {
f.HasData(new Domain.Entities.TaskEntities.TaskType[] f.HasData(new Domain.Entities.TaskEntities.TaskType[]
{ {
new() { Code = TaskTypeEnum.Workload, Name = TaskTypeEnum.Workload.ToString(), Description = "Формирование данных для отчетности - Загруженность", MaxRetries = 2, IsSingleton=true, MaxExecutionTimeMinutes=60, RetentionDays=90 } new() { Code = TaskTypeEnum.Workload, Name = TaskTypeEnum.Workload.ToString(), Description = "Формирование данных для отчетности - Загруженность", MaxRetries = 2, IsSingleton=true, MaxExecutionTimeMinutes=90, RetentionDays=90 }
} }
); );
}); });

12
PARR.Domain/DTOs/TaskDTO/ActiveTask.cs Normal file
View File

@@ -0,0 +1,12 @@
namespace PARR.Domain.DTOs.TaskDTO
{
/// <summary>
/// DTO
/// </summary>
public record ActiveTask : TaskItemBase
{
public required TaskType Type { get; init; }
public required TaskStatus Status { get; init; }
}
}

26
PARR.Domain/DTOs/TaskDTO/TaskItem.cs Normal file
View File

@@ -0,0 +1,26 @@
namespace PARR.Domain.DTOs.TaskDTO
{
/// <summary>
/// DTO
/// </summary>
public record TaskItemBase
{
public Guid Id { get; init; }
public DateTimeOffset DateCreated { get; init; }
public DateTimeOffset? DateModified { get; init; }
public int RetryCount { get; init; }
public DateTimeOffset? ProcessedAt { get; init; }
}
/// <summary>
/// DTO
/// </summary>
public record TaskItem : TaskItemBase
{
//todo:
}
}

16
PARR.Domain/DTOs/TaskDTO/TaskStatus.cs Normal file
View File

@@ -0,0 +1,16 @@
using PARR.Domain.Enums;
namespace PARR.Domain.DTOs.TaskDTO
{
/// <summary>
/// DTO
/// </summary>
public record TaskStatus
{
public TaskItemStatusEnum Code { get; init; }
public required string Name { get; init; }
public required string Description { get; init; }
}
}

36
PARR.Domain/DTOs/TaskDTO/TaskType.cs Normal file
View File

@@ -0,0 +1,36 @@
using PARR.Domain.Enums;
namespace PARR.Domain.DTOs.TaskDTO
{
/// <summary>
/// DTO
/// </summary>
public record TaskType
{
public TaskTypeEnum Code { get; init; }
public required string Name { get; init; }
public required string Description { get; init; }
/// <summary>
/// Максимальное кол-во попыток
/// </summary>
public int MaxRetries { get; init; }
/// <summary>
/// Максимальное время выполнения
/// </summary>
public int MaxExecutionTimeMinutes { get; init; }
/// <summary>
/// Одновременно может быть только одна задача или несколько
/// </summary>
public bool IsSingleton { get; init; }
/// <summary>
/// Сколько дней хранить в БД
/// </summary>
public int RetentionDays { get; init; }
}
}