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

feat(api): SyncTaskController, обновлен метод для отправки задания в matcher. Теперь метод универсальный.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-19 14:06:44 +10:00
parent a03b882880
commit 80ece823ca
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,12 +492,16 @@
#endregion
#region SyncTask
public static class SyncTask
{
public const string MatchTemplatesForJob = Base + "/sync-tasks/jobs/{jobId}/match-templates";
public const string MatchTemplatesForJobGroup = Base + "/sync-tasks/job-groups/{jobGroupId}/match-templates";
public const string MatchTemplatesForTemplate = Base + "/sync-tasks/templates/{templateId}/match-templates";
public const string MatchTemplates = Base + "/sync-tasks/match-templates";
//public const string MatchTemplatesForJob = Base + "/sync-tasks/jobs/{jobId}/match-templates";
//public const string MatchTemplatesForJobGroup = Base + "/sync-tasks/job-groups/{jobGroupId}/match-templates";
//public const string MatchTemplatesForTemplate = Base + "/sync-tasks/templates/{templateId}/match-templates";
}
#endregion

9
PARR.API/Contracts/V1/Requests/MatchTemplatesForJobRequest.cs
View File

@@ -1,9 +0,0 @@
using PARR.Constants;
namespace PARR.API.Contracts.V1.Requests
{
public class MatchTemplatesForJobRequest
{
public TemplateMatcherActionEnum Action { get; set; }
}
}

13
PARR.API/Contracts/V1/Requests/MatchTemplatesRequest.cs Normal file
View File

@@ -0,0 +1,13 @@
using PARR.Constants;
namespace PARR.API.Contracts.V1.Requests
{
public class MatchTemplatesRequest
{
public Guid ObjectId { get; set; }
public SyncTaskEntityTypeEnum EntityType { get; set; }
public TemplateMatcherActionEnum Action { get; set; }
}
}

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

@@ -3,7 +3,6 @@ using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Implementations;
using PARR.API.Services.Interfaces;
using PARR.API.Settings;
using PARR.BLL.Domain.Mq;
@@ -38,22 +37,26 @@ namespace PARR.API.Controllers.V1
}
/// <summary>
/// Сопоставить текущие шаблоны для Job, создать недостущие шаблоны
/// Отправить задание в Matcher
/// </summary>
[HttpPost(ApiRoutes.SyncTask.MatchTemplatesForJob)]
public async Task<IActionResult> MatchTemplatesForJob([FromRoute] Guid jobId, [FromBody] MatchTemplatesForJobRequest request)
[HttpPost(ApiRoutes.SyncTask.MatchTemplates)]
public async Task<IActionResult> MatchTemplatesForJob([FromBody] MatchTemplatesRequest request)
{
//todo: Валидатор! Валидатор то забыли!!!
//24b3529a-dd43-444a-b10e-ac54fefd046a
var matchTemplateTask = new TemplateMatcherMq
{
Id = jobId,
EntityType = Constants.SyncTaskEntityTypeEnum.Job,
Id = request.ObjectId,
// EntityType = Constants.SyncTaskEntityTypeEnum.Job,
EntityType = request.EntityType,
Action = request.Action,
Initiator = new HistoryInitiator
{
InitiatorIp = clientService.GetClientIp()?.ToString(),
InitiatorParrComponentId = ParrComponentsEnum.Api,
InitiatorComment = $"Отправлен запрос из GUI, action: {request.Action.ToString()}"
InitiatorComment = $"Отправлен запрос из GUI, action: {request.Action.ToString()}, entityType: {request.EntityType.ToString()}"
}
};
@@ -66,9 +69,9 @@ namespace PARR.API.Controllers.V1
if (!result.IsSuccess)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка отправки сообщения в очередь" } }));
var createdUri = uriService.GetAllUri(ApiRoutes.SyncTask.MatchTemplatesForJob);
//var createdUri = uriService.GetAllUri(ApiRoutes.SyncTask.MatchTemplatesForJob);
return Created(createdUri, new Response<string?>(null, true, new List<ErrorModel>(), "Отправлен запрос на сопоставление шаблонов и Job"));
return Created("", new Response<string?>(null, true, new List<ErrorModel>(), "Отправлен запрос на сопоставление шаблонов"));
}
}
}