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

feat(api): Доделал респонс RobotTaskScheduleResponse

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-11 11:10:35 +10:00
parent a4dde4c59a
commit 8ebdcd6d8a
11 changed files with 212 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -42,8 +42,7 @@ namespace PARR.API.Controllers.V1
await robotConfigurationService.FindUnfulfilledTaskAndSetRobotErrorStatusAsync(settingsFromDb.RobotAttemptsNumber, settingsFromDb.RobotWaitTime);
var query = robotConfigurationService.Get()
.Where(t => t.RobotCode == (int)robotCode && t.TaskStatusCode == (int)taskStatusCode)
.AsSplitQuery();
.Where(t => t.RobotCode == (int)robotCode && t.TaskStatusCode == (int)taskStatusCode);
switch (robotCode)
{
@@ -55,11 +54,19 @@ namespace PARR.API.Controllers.V1
.ThenInclude(w => w!.Work)
.ThenInclude(t => t!.Tnk)
.ThenInclude(s => s!.Subprocess)
.ThenInclude(p => p!.Process);
.ThenInclude(p => p!.Process)
.AsSplitQuery();
break;
case RobotsEnum.ScheduleOrder:
// тут не делаем AsSplitQuery, не может подтянуть все таблицы
query = query.Include(t => t.Template)
.ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea);
.ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea)
.Include(t => t.Template)
.ThenInclude(t => t!.ApplicationsInWork)
.ThenInclude(t => t!.EsppSchValues)
.ThenInclude(t => t!.EsppSchTypeConfig)
.ThenInclude(t => t!.EsppSchTypeSchedule)
;
//todo: include
break;
default:
@@ -79,7 +86,8 @@ namespace PARR.API.Controllers.V1
//и что текущая попытка не больше разрешенной(берется из настроек, поле `RobotAttemptsNumber`) - если это так, берется эта запись.
var endDate = DateTimeOffset.UtcNow.Add(-settingsFromDb.RobotWaitTime);
task = await query.FirstOrDefaultAsync(t =>
task = await query
.FirstOrDefaultAsync(t =>
t.RobotStatusCode == (int)RobotStatusEnum.InProgress
&& t.AttemptsNumber < settingsFromDb.RobotAttemptsNumber
&& t.LastRobotStatusUpdated < endDate