feat(api): Контроллер управления историей робота. Контролпер по получению списка уровней истории робота
This commit is contained in:
Mikhail Trubnikov
42
PARR.API/Controllers/V1/RobotHistoryLevelController.cs
Normal file
42
PARR.API/Controllers/V1/RobotHistoryLevelController.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
using AutoMapper;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
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.DAL.Services.Interfaces;
|
||||
|
||||
namespace PARR.API.Controllers.V1
|
||||
{
|
||||
public class RobotHistoryLevelController : BaseApiController
|
||||
{
|
||||
private readonly IMapper mapper;
|
||||
private readonly IRobotHistoryLevelService robotHistoryLevelService;
|
||||
|
||||
public RobotHistoryLevelController(
|
||||
IMapper mapper,
|
||||
IRobotHistoryLevelService robotHistoryLevelService
|
||||
)
|
||||
{
|
||||
this.mapper = mapper;
|
||||
this.robotHistoryLevelService = robotHistoryLevelService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Получить список уровней истории работы робота
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet(ApiRoutes.RobotHistoryLevel.GetAll)]
|
||||
public async Task<IActionResult> GetAll()
|
||||
{
|
||||
var levels = await robotHistoryLevelService.Get()
|
||||
.OrderBy(t => t.Level)
|
||||
.ToListAsync();
|
||||
|
||||
var response = mapper.Map<List<RobotHistoryLevelResponse>>(levels);
|
||||
|
||||
return Ok(new Response<List<RobotHistoryLevelResponse>>(response, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,124 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using AutoMapper;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PARR.API.Contracts.V1;
|
||||
using PARR.API.Contracts.V1.Requests;
|
||||
using PARR.API.Contracts.V1.Requests.Queries;
|
||||
using PARR.API.Contracts.V1.Responses;
|
||||
using PARR.API.Contracts.V1.Responses.Base;
|
||||
using PARR.API.Controllers.V1.Base;
|
||||
using PARR.API.Extensions;
|
||||
using PARR.API.Services.Interfaces;
|
||||
using PARR.DAL.DomainModels;
|
||||
using PARR.DAL.Models;
|
||||
using PARR.DAL.Services.Interfaces;
|
||||
|
||||
namespace PARR.API.Controllers.V1
|
||||
{
|
||||
public class RobotTemplateHistoryController : BaseApiController
|
||||
{
|
||||
// get
|
||||
private readonly IValidator<RobotTemplateHistoryRequest> validator;
|
||||
private readonly ITemplateService templateService;
|
||||
private readonly IRobotTemplateHistoryService historyService;
|
||||
private readonly IMapper mapper;
|
||||
private readonly IUriService uriService;
|
||||
|
||||
public RobotTemplateHistoryController(
|
||||
IValidator<RobotTemplateHistoryRequest> validator,
|
||||
ITemplateService templateService,
|
||||
IRobotTemplateHistoryService historyService,
|
||||
IMapper mapper,
|
||||
IUriService uriService
|
||||
)
|
||||
{
|
||||
this.validator = validator;
|
||||
this.templateService = templateService;
|
||||
this.historyService = historyService;
|
||||
this.mapper = mapper;
|
||||
this.uriService = uriService;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Получить историю робота шаблонов
|
||||
/// </summary>
|
||||
/// <param name="paginationQuery"></param>
|
||||
/// <param name="filter"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet(ApiRoutes.RobotTemplateHistory.GetAll)]
|
||||
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] RobotTemplateHistoryQuery filter)
|
||||
{
|
||||
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
|
||||
|
||||
IQueryable<RobotTemplateHistory> query = historyService.Get()
|
||||
.Include(t => t.Template)
|
||||
.Include(t => t.RobotHistoryLevel)
|
||||
.OrderByDescending(t => t.DateCreated).ThenBy(t => t.IdSeries);
|
||||
|
||||
if (filter.IdSeries != null)
|
||||
query = query.Where(t => t.IdSeries == filter.IdSeries);
|
||||
|
||||
if (filter.TemplateId != null)
|
||||
query = query.Where(t => t.TemplateId == filter.TemplateId);
|
||||
|
||||
|
||||
var history = await historyService.GetPage(query, paginationFilter).ToListAsync();
|
||||
|
||||
if (!history.Any())
|
||||
return NoContent();
|
||||
|
||||
var response = mapper.Map<List<RobotTemplateHistoryResponse>>(history);
|
||||
var paginationResponse = new PagedResponse<RobotTemplateHistoryResponse>(response, true).GetPaginatedProps(paginationFilter, query);
|
||||
|
||||
return Ok(paginationResponse);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Добавить историю робота шаблонов
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost(ApiRoutes.RobotTemplateHistory.Create)]
|
||||
public async Task<IActionResult> Create([FromBody] RobotTemplateHistoryRequest request)
|
||||
{
|
||||
var resultValidate = await validator.ValidateAsync(request);
|
||||
if (!resultValidate.IsValid)
|
||||
return BadRequest(new Response(resultValidate.Errors));
|
||||
|
||||
var template = await templateService.GetAsync(request.TemplateId);
|
||||
|
||||
if (template == null)
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не найден шаблон с id: {request.TemplateId}" } }));
|
||||
|
||||
if (request.IdSeries == null)
|
||||
request.IdSeries = Guid.NewGuid();
|
||||
|
||||
var historyItem = new RobotTemplateHistory
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
HistoryLevel = request.HistoryLevel,
|
||||
RobotMessage = request.RobotMessage,
|
||||
EsppMessage = request.EsppMessage,
|
||||
TemplateId = request.TemplateId,
|
||||
TemplateStatusCode = template.StatusCode,
|
||||
IdSeries = request.IdSeries.Value
|
||||
};
|
||||
|
||||
if (!await historyService.CreateAsync(historyItem) || !await historyService.CommitAsync())
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при добавлении записи в историю" } }));
|
||||
|
||||
var createdObj = await historyService.Get()
|
||||
.Include(t => t.Template)
|
||||
.Include(t => t.RobotHistoryLevel)
|
||||
.FirstOrDefaultAsync(t => t.Id == historyItem.Id);
|
||||
|
||||
var response = mapper.Map<RobotTemplateHistoryResponse>(createdObj);
|
||||
var createdUri = uriService.GetAllUri(ApiRoutes.RobotTemplateHistory.GetAll) + $"?{nameof(RobotTemplateHistoryQuery.IdSeries)}={createdObj!.IdSeries}";
|
||||
|
||||
return Created(createdUri, new Response<RobotTemplateHistoryResponse>(response, true));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,33 +75,6 @@ namespace PARR.API.Controllers.V1
|
||||
// изменение статуса
|
||||
templateService.ChangeRobotStatus(enumStatus, ref template);
|
||||
|
||||
//switch (request.Code)
|
||||
//{
|
||||
// case (int)RobotStatusEnum.InProgress:
|
||||
// template.RobotAttemptsNumber++;
|
||||
// template.RobotStatusCode = request.Code;
|
||||
// template.RobotLastStatusUpdated = DateTimeOffset.UtcNow;
|
||||
// break;
|
||||
// case (int)RobotStatusEnum.Error:
|
||||
// template.RobotStatusCode = request.Code;
|
||||
// break;
|
||||
// case (int)RobotStatusEnum.Complete:
|
||||
// template.RobotStatusCode = request.Code;
|
||||
// template.RobotLastStatusUpdated = DateTimeOffset.UtcNow;
|
||||
// break;
|
||||
// case (int)RobotStatusEnum.Wait:
|
||||
// template.RobotStatusCode = request.Code;
|
||||
// template.RobotLastStatusUpdated = null;
|
||||
// template.RobotAttemptsNumber = 0;
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
//}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (!await templateService.CommitAsync())
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении статуса шаблону {templateId}" } }));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user