feat(api): добавлена фильтрация для подпроцесса, тнк, работы по ИД родителя
This commit is contained in:
@@ -46,54 +46,22 @@ namespace PARR.API.Controllers.V1
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Создать подпроцесс
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost(ApiRoutes.Subprocess.Create)]
|
||||
public async Task<IActionResult> Create([FromBody] SubprocessRequest request)
|
||||
{
|
||||
var resultValidate = await validator.ValidateAsync(request);
|
||||
if (!resultValidate.IsValid)
|
||||
return BadRequest(new Response(resultValidate.Errors));
|
||||
|
||||
var existName = await subprocessService.Get().FirstOrDefaultAsync(t => t.Name == request.Name);
|
||||
if (existName != null)
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.Name), Message = $"Подпроцесс с именем \"{request.Name}\" уже существует." } }));
|
||||
|
||||
var subprocess = new Subprocess
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
Name = request.Name,
|
||||
EsppId = request.EsppId,
|
||||
ProcessId = request.ProcessId,
|
||||
};
|
||||
|
||||
if (!await subprocessService.CreateAsync(subprocess) || !await subprocessService.CommitAsync())
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при записи нового подпроцесса в базу данных" } }));
|
||||
|
||||
logger.LogInformation($"Пользователь {User.Identity?.Name} добавил подпроцесс: {subprocess.Name}, {subprocess.EsppId}, {subprocess.ProcessId}");
|
||||
|
||||
var locationUri = uriService.GetUri(ApiRoutes.Subprocess.Get, ApiRoutes.Subprocess.getParam, subprocess.Id);
|
||||
|
||||
return Created(locationUri, new Response<SubprocessResponse>(mapper.Map<SubprocessResponse>(subprocess), true));
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Список подпроцессов постранично
|
||||
/// </summary>
|
||||
/// <param name="paginationQuery"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet(ApiRoutes.Subprocess.GetAll)]
|
||||
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery)
|
||||
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] SubprocessQuery filter)
|
||||
{
|
||||
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
|
||||
|
||||
IQueryable<Subprocess> query = subprocessService.Get()
|
||||
.OrderBy(t => t.Name);
|
||||
|
||||
if (filter.ProcessId.HasValue)
|
||||
query = query.Where(t => t.ProcessId == filter.ProcessId.Value);
|
||||
|
||||
var subprocesses = await subprocessService.GetPage(query, paginationFilter).ToListAsync();
|
||||
|
||||
if (!subprocesses.Any())
|
||||
@@ -147,6 +115,44 @@ namespace PARR.API.Controllers.V1
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Создать подпроцесс
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost(ApiRoutes.Subprocess.Create)]
|
||||
public async Task<IActionResult> Create([FromBody] SubprocessRequest request)
|
||||
{
|
||||
var resultValidate = await validator.ValidateAsync(request);
|
||||
if (!resultValidate.IsValid)
|
||||
return BadRequest(new Response(resultValidate.Errors));
|
||||
|
||||
var existName = await subprocessService.Get().FirstOrDefaultAsync(t => t.Name == request.Name);
|
||||
if (existName != null)
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.Name), Message = $"Подпроцесс с именем \"{request.Name}\" уже существует." } }));
|
||||
|
||||
var subprocess = new Subprocess
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
Name = request.Name,
|
||||
EsppId = request.EsppId,
|
||||
ProcessId = request.ProcessId,
|
||||
};
|
||||
|
||||
if (!await subprocessService.CreateAsync(subprocess) || !await subprocessService.CommitAsync())
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при записи нового подпроцесса в базу данных" } }));
|
||||
|
||||
logger.LogInformation($"Пользователь {User.Identity?.Name} добавил подпроцесс: {subprocess.Name}, {subprocess.EsppId}, {subprocess.ProcessId}");
|
||||
|
||||
var locationUri = uriService.GetUri(ApiRoutes.Subprocess.Get, ApiRoutes.Subprocess.getParam, subprocess.Id);
|
||||
|
||||
return Created(locationUri, new Response<SubprocessResponse>(mapper.Map<SubprocessResponse>(subprocess), true));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Обновить подпроцесс
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user