diff --git a/PARR.API/Contracts/V1/ApiRoutes.cs b/PARR.API/Contracts/V1/ApiRoutes.cs index cc114b48..85a74f1c 100644 --- a/PARR.API/Contracts/V1/ApiRoutes.cs +++ b/PARR.API/Contracts/V1/ApiRoutes.cs @@ -97,6 +97,14 @@ public const string GetAll = Base + "/robot-history-levels/"; } + public static class RobotTask + { + public const string GetByRobotAndStatusTask = Base + "/robot-tasks/" + robotCode + "/statuses/" + taskStatusCode; + + public const string robotCode = "{robotCode}"; + public const string taskStatusCode = "{taskStatusCode}"; + } + //public static class Layer //{ diff --git a/PARR.API/Contracts/V1/Responses/RobotConfigurationResponse.cs b/PARR.API/Contracts/V1/Responses/RobotConfigurationResponse.cs new file mode 100644 index 00000000..166d30cc --- /dev/null +++ b/PARR.API/Contracts/V1/Responses/RobotConfigurationResponse.cs @@ -0,0 +1,7 @@ +namespace PARR.API.Contracts.V1.Responses +{ + public class RobotConfigurationResponse + { + + } +} diff --git a/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs b/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs new file mode 100644 index 00000000..50619a56 --- /dev/null +++ b/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs @@ -0,0 +1,7 @@ +namespace PARR.API.Contracts.V1.Responses +{ + public class RobotTaskScheduleResponse + { + //TODO: + } +} diff --git a/PARR.API/Contracts/V1/Responses/RobotTaskTemplateResponse.cs b/PARR.API/Contracts/V1/Responses/RobotTaskTemplateResponse.cs new file mode 100644 index 00000000..d85f86c4 --- /dev/null +++ b/PARR.API/Contracts/V1/Responses/RobotTaskTemplateResponse.cs @@ -0,0 +1,31 @@ +namespace PARR.API.Contracts.V1.Responses +{ + public class RobotTaskTemplateResponse + { + public bool IsActive { get; set; } + public required string ClosingCode { get; set; } + public required string FullDescription { get; set; } + public required string ShortDescription { get; set; } + public required string Solution { get; set; } + public required string ResponseArea { get; set; } + public required string TemplateDuration { get; set; } + public required string Initiator { get; set; } + public required string WorkGroup { get; set; } + public required string Ek { get; set; } + public required string Name { get; set; } + public required string Category { get; set; } + + + public required string ProcessName { get; set; } + public required string ProcessEsppId { get; set; } + + public required string SubprocessName { get; set; } + public required string SubprocessEsppId { get; set; } + + public required string TnkName { get; set; } + public required string TnkEsppId { get; set; } + + public required string WorkName { get; set; } + public required string WorkEsppId { get; set; } + } +} diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs new file mode 100644 index 00000000..e94214c9 --- /dev/null +++ b/PARR.API/Controllers/V1/RobotTaskController.cs @@ -0,0 +1,109 @@ +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.Contracts; +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces; + +namespace PARR.API.Controllers.V1 +{ + public class RobotTaskController : BaseApiController + { + private readonly IMapper mapper; + private readonly SettingsFromDb settingsFromDb; + private readonly IRobotConfigurationService robotConfigurationService; + + public RobotTaskController( + IMapper mapper, + SettingsFromDb settingsFromDb, + IRobotConfigurationService robotConfigurationService + ) + { + this.mapper = mapper; + this.settingsFromDb = settingsFromDb; + this.robotConfigurationService = robotConfigurationService; + } + + + /// + /// Получить задание для робота по коду робота и по статусу задания + /// + /// + /// + /// + [HttpGet(ApiRoutes.RobotTask.GetByRobotAndStatusTask)] + public async Task GetByRobotAndStatusTask([FromRoute] RobotsEnum robotCode, [FromRoute] TaskStatusEnum taskStatusCode) + { + //Ищем все задания с превышенным кол-вом попыток и с просроченным временем и ставим им статус ошибки + await robotConfigurationService.FindUnfulfilledTaskAndSetRobotErrorStatusAsync(settingsFromDb.RobotAttemptsNumber, settingsFromDb.RobotWaitTime); + + var query = robotConfigurationService.Get() + .Where(t => t.RobotCode == (int)robotCode && t.TaskStatusCode == (int)taskStatusCode) + .AsSplitQuery(); + + switch (robotCode) + { + case RobotsEnum.TemplateOrder: + query = query.Include(t => t.Template) + .ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea) + .Include(t => t.Template) + .ThenInclude(t => t!.Host) + .Include(t => t.Template) + .ThenInclude(a => a!.ApplicationsInWork) + .ThenInclude(w => w!.Work) + .ThenInclude(t => t!.Tnk) + .ThenInclude(s => s!.Subprocess) + .ThenInclude(p => p!.Process); + break; + case RobotsEnum.ScheduleOrder: + //todo: include + break; + default: + break; + } + + RobotConfiguration? task = null; + + //ищем задание в ожидании, если нашли, выбираем ее + task = await query.FirstOrDefaultAsync(t => t.RobotStatusCode == (int)RobotStatusEnum.Wait); + + if (task == null) + { + //ищем задания в работе, которые можно перезапустить + //Поиск пои `RobotStatusCode` = 22. + //Далее проверяется `LastStatusUpdated`, что время последнего смены статуса не превышает допустимого(берется из настроек, поле `RobotWaitTime`) + //и что текущая попытка не больше разрешенной(берется из настроек, поле `RobotAttemptsNumber`) - если это так, берется эта запись. + + var endDate = DateTimeOffset.UtcNow.Add(-settingsFromDb.RobotWaitTime); + task = await query.FirstOrDefaultAsync(t => + t.RobotStatusCode == (int)RobotStatusEnum.InProgress + && t.AttemptsNumber < settingsFromDb.RobotAttemptsNumber + && t.LastStatusUpdated < endDate + ); + } + + if (task == null) + return NotFound(); + + //TODO: сделать маппинг!!! + + switch (robotCode) + { + case RobotsEnum.TemplateOrder: + //RobotTaskTemplateResponse + return Ok(new Response(mapper.Map(task), true)); + case RobotsEnum.ScheduleOrder: + //RobotTaskScheduleResponse + return Ok(new Response(mapper.Map(task), true)); + default: + break; + } + + return BadRequest(); + } + } +} diff --git a/PARR.API/Controllers/V1/RobotTemplateHistoryController.cs b/PARR.API/Controllers/V1/RobotTemplateHistoryController.cs index 372189c6..b41f1e94 100644 --- a/PARR.API/Controllers/V1/RobotTemplateHistoryController.cs +++ b/PARR.API/Controllers/V1/RobotTemplateHistoryController.cs @@ -95,29 +95,31 @@ namespace PARR.API.Controllers.V1 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 - }; + //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 { new ErrorModel { Message = $"Ошибка при добавлении записи в историю" } })); + //if (!await historyService.CreateAsync(historyItem) || !await historyService.CommitAsync()) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при добавлении записи в историю" } })); - var createdObj = await historyService.Get() - .Include(t => t.Template) - .Include(t => t.RobotHistoryLevel) - .FirstOrDefaultAsync(t => t.Id == historyItem.Id); + //var createdObj = await historyService.Get() + // .Include(t => t.Template) + // .Include(t => t.RobotHistoryLevel) + // .FirstOrDefaultAsync(t => t.Id == historyItem.Id); - var response = mapper.Map(createdObj); - var createdUri = uriService.GetAllUri(ApiRoutes.RobotTemplateHistory.GetAll) + $"?{nameof(RobotTemplateHistoryQuery.IdSeries)}={createdObj!.IdSeries}"; + //var response = mapper.Map(createdObj); + //var createdUri = uriService.GetAllUri(ApiRoutes.RobotTemplateHistory.GetAll) + $"?{nameof(RobotTemplateHistoryQuery.IdSeries)}={createdObj!.IdSeries}"; - return Created(createdUri, new Response(response, true)); + //return Created(createdUri, new Response(response, true)); + + return Ok("Доделать"); } } diff --git a/PARR.API/Controllers/V1/TemplateController.cs b/PARR.API/Controllers/V1/TemplateController.cs index f6fc2569..13ee4049 100644 --- a/PARR.API/Controllers/V1/TemplateController.cs +++ b/PARR.API/Controllers/V1/TemplateController.cs @@ -51,14 +51,14 @@ namespace PARR.API.Controllers.V1 { switch (filter.StatusCode.Value) { - case (int)StatusTemplateEnum.Ok: - query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Ok); + case (int)TaskStatusEnum.Ok: + query = query.Where(t => t.StatusCode == (int)TaskStatusEnum.Ok); break; - case (int)StatusTemplateEnum.Creating: - query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Creating); + case (int)TaskStatusEnum.Creating: + query = query.Where(t => t.StatusCode == (int)TaskStatusEnum.Creating); break; - case (int)StatusTemplateEnum.Updating: - query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Updating); + case (int)TaskStatusEnum.Updating: + query = query.Where(t => t.StatusCode == (int)TaskStatusEnum.Updating); break; default: break; @@ -170,7 +170,7 @@ namespace PARR.API.Controllers.V1 if (template == null) return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Не найден шаблон с id: {id}" } })); - template.StatusCode = (int)StatusTemplateEnum.Ok; + template.StatusCode = (int)TaskStatusEnum.Ok; if (!await templateService.CommitAsync()) return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при изменении статуса у шаблона с id: {id}" } })); diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 0e99ef8e..eb3e866b 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -63,7 +63,7 @@ namespace PARR.API.MappingProfiles // === Template === - CreateMap(); + CreateMap(); CreateMap() .ForMember(d => d.Code, o => o.MapFrom(s => s.RobotStatus!.Code)) diff --git a/PARR.DAL/Context/DataContext.cs b/PARR.DAL/Context/DataContext.cs index ac84092d..45de5bc6 100644 --- a/PARR.DAL/Context/DataContext.cs +++ b/PARR.DAL/Context/DataContext.cs @@ -33,7 +33,7 @@ namespace PARR.DAL.Context public DbSet Settings { get; set; } public DbSet RawDataEKs { get; set; } public DbSet