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

refactor(api): Удалены лишние таблицы связанные со старой логикой получения заданий роботом.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-06 14:24:58 +10:00
parent 9060db1fe4
commit f2329e9367
24 changed files with 2199 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PARR.DAL/Services/Implementations/RobotTemplateHistoryService.cs
View File

@@ -1,23 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models;
using PARR.DAL.Services.Abstracts;
using PARR.DAL.Services.Interfaces;
namespace PARR.DAL.Services.Implementations
{
internal class RobotTemplateHistoryService : BaseService<RobotTemplateHistory>, IRobotTemplateHistoryService
{
private readonly DataContext dataContext;
public RobotTemplateHistoryService(DataContext dataContext, ILogger<RobotTemplateHistoryService> logger) : base(logger)
{
this.dataContext = dataContext;
}
protected override DbSet<RobotTemplateHistory> EntitySet => dataContext.RobotTemplateHistories;
protected override DataContext EntitiContext => dataContext;
}
}

60
PARR.DAL/Services/Implementations/TemplateService.cs
View File

@@ -35,7 +35,6 @@ namespace PARR.DAL.Services.Implementations
.ThenInclude(t => t!.ResponseArea)
.Include(h => h.Host)
.ThenInclude(t => t!.EkStatus)
.Include(r => r.RobotStatus)
.Include(a => a.ApplicationsInWork)
.ThenInclude(w => w!.Work)
.ThenInclude(t => t!.Tnk)
@@ -43,65 +42,6 @@ namespace PARR.DAL.Services.Implementations
.ThenInclude(p => p!.Process);
}
//TODO: удалить этот метод
#region delete
public async Task CheckAndSetErrorRobotStatusAsync(int robotAttemptsNumber, TimeSpan robotWaitTime)
{
//Ищем `RobotStatusCode` = 22 и `RobotLastStatusUpdated` истекло и `RobotAttemptsNumber` >= допустимого значения из настроек,
//ставим всем этим записям `RobotStatusCode`= 33
var endDate = DateTimeOffset.UtcNow.Add(-robotWaitTime);
var templates = await EntitySet.Where(t =>
t.RobotStatusCode == (int)RobotStatusEnum.InProgress
&& t.RobotAttemptsNumber >= robotAttemptsNumber
&& t.RobotLastStatusUpdated <= endDate
)
.ToListAsync();
if (!templates.Any())
return;
foreach (var template in templates)
{
template.RobotStatusCode = (int)RobotStatusEnum.Error;
template.DateModified = DateTimeOffset.UtcNow;
logger.LogInformation($"Устанавливаю RobotStatus: {RobotStatusEnum.Error} для шаблона {template.Name}");
}
var result = await CommitAsync();
if (!result)
logger.LogError($"Ошибка при сохранении изменений RobotStatus у шаблонов на {RobotStatusEnum.Error}");
}
#endregion
public void ChangeRobotStatus(RobotStatusEnum status, ref Template template)
{
template.RobotStatusCode = (int)status;
switch (status)
{
case RobotStatusEnum.InProgress:
template.RobotAttemptsNumber++;
template.RobotLastStatusUpdated = DateTimeOffset.UtcNow;
break;
//case RobotStatusEnum.Error:
// break;
case RobotStatusEnum.Complete:
template.RobotLastStatusUpdated = DateTimeOffset.UtcNow;
break;
case RobotStatusEnum.Wait:
template.RobotLastStatusUpdated = null;
template.RobotAttemptsNumber = 0;
break;
default:
break;
}
}
public override Task<bool> CreateAsync(Template obj)
{
// добавление роботов для шаблона