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

Merge branch 'templte-robot-history' into dev

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-04 15:31:40 +10:00
parent 50d5473404 f435f80636
commit 10fe67a3bb
10 changed files with 258 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,12 @@
public const string templateId = "{templateId}";
}
public static class RobotTemplateHistory
{
public const string GetAll = Base + "/robot-template-histories/";
public const string Create = Base + "/robot-template-histories/";
}
public static class StatusTemplate
{
public const string GetAll = Base + "/template-statuses/";
@@ -86,6 +92,12 @@
public const string GetAll = Base + "/hosts/";
}
public static class RobotHistoryLevel
{
public const string GetAll = Base + "/robot-history-levels/";
}
//public static class Layer
//{
// public const string GetAll = Base + "/layers/";

15
PARR.API/Contracts/V1/Requests/Queries/RobotTemplateHistoryQuery.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace PARR.API.Contracts.V1.Requests.Queries
{
public class RobotTemplateHistoryQuery
{
/// <summary>
/// Фильтр по ИД шаблона
/// </summary>
public Guid? TemplateId { get; set; }
/// <summary>
/// Фильтр по ИД серии
/// </summary>
public Guid? IdSeries { get; set; }
}
}

18
PARR.API/Contracts/V1/Requests/RobotTemplateHistoryRequest.cs Normal file
View File

@@ -0,0 +1,18 @@
namespace PARR.API.Contracts.V1.Requests
{
public class RobotTemplateHistoryRequest
{
public int HistoryLevel { get; set; }
public string? RobotMessage { get; set; }
public string? EsppMessage { get; set; }
public Guid TemplateId { get; set; }
/// <summary>
/// ИД серии - идентификатор полного цикла выполнения роботом текущего задания. Если не передать, сгенерируется автоматически, в дальнейшем в рамках шагов по текущему заданию использовать его.
/// </summary>
public Guid? IdSeries { get; set; }
}
}

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

@@ -0,0 +1,9 @@
namespace PARR.API.Contracts.V1.Responses
{
public class RobotHistoryLevelResponse
{
public int Level { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
}
}

24
PARR.API/Contracts/V1/Responses/RobotTemplateHistoryResponse.cs Normal file
View File

@@ -0,0 +1,24 @@
namespace PARR.API.Contracts.V1.Responses
{
public class RobotTemplateHistoryResponse
{
public Guid Id { get; set; }
public DateTimeOffset Date { get; set; }
public string? RobotMessage { get; set; }
public string? EsppMessage { get; set; }
public int TemplateStatusCode { get; set; }
public Guid TemplateId { get; set; }
public string TemplateName { get; set; } = string.Empty;
public Guid IdSeries { get; set; }
public RobotHistoryLevelResponse? Level { get; set; }
}
}

42
PARR.API/Controllers/V1/RobotHistoryLevelController.cs Normal file
View 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));
}
}
}

116
PARR.API/Controllers/V1/RobotTemplateHistoryController.cs
View File

@@ -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));
}
}
}

27
PARR.API/Controllers/V1/TemplateRobotStatusController.cs
View File

@@ -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}" } }));

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

@@ -85,6 +85,13 @@ namespace PARR.API.MappingProfiles
CreateMap<RobotStatus, RobotStatusResponse>();
CreateMap<RobotHistoryLevel, RobotHistoryLevelResponse>();
CreateMap<RobotTemplateHistory, RobotTemplateHistoryResponse>()
.ForMember(d => d.Level, o => o.MapFrom(s => s.RobotHistoryLevel))
.ForMember(d => d.Date, o => o.MapFrom(s => s.DateCreated))
.ForMember(d => d.TemplateName, o => o.MapFrom(s => s.Template!.Name));
}
}
}

17
PARR.API/Validators/RobotTemplateHistoryRequestValidator.cs Normal file
View File

@@ -0,0 +1,17 @@
using FluentValidation;
using PARR.API.Contracts.V1.Requests;
using PARR.DAL.Contracts;
namespace PARR.API.Validators
{
public class RobotTemplateHistoryRequestValidator : AbstractValidator<RobotTemplateHistoryRequest>
{
public RobotTemplateHistoryRequestValidator()
{
var levels = new List<int> { (int)RobotHistoryLevelEnum.Start, (int)RobotHistoryLevelEnum.Inforamtion, (int)RobotHistoryLevelEnum.Error, (int)RobotHistoryLevelEnum.Complete, (int)RobotHistoryLevelEnum.Breake };
RuleFor(r => r.HistoryLevel).Must(t => levels.Contains(t)).WithMessage($"Допустимые значения: {string.Join(", ", levels)}");
RuleFor(r => r.TemplateId).NotNull().NotEmpty();
}
}
}