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

fix(dal): при формировании групповых шорткодов не хватало include GroupType, изменен ключ кэширования

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-12-24 11:25:25 +10:00
parent bcb2272943
commit b5bbc52473
6 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,7 @@ namespace PARR.API.Controllers.V1
var query = robotConfigurationService.Get()
.AsSplitQuery()
.Where(t => t.RobotCode == (int)robotCode && t.TaskStatusCode == (int)taskStatusCode);
switch (robotCode)
@@ -85,6 +86,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Template)
.ThenInclude(a => a!.Job)
.ThenInclude(t => t!.Group)
.ThenInclude(g => g.GroupType)
.Include(t => t.Template)
.ThenInclude(w => w!.Job)
.ThenInclude(t => t!.Tnk)
@@ -93,7 +95,7 @@ namespace PARR.API.Controllers.V1
query = query
.Include(t => t.Template)
.ThenInclude(t => t.UnitsInTemplate);
.ThenInclude(t => t!.UnitsInTemplate);
break;
@@ -108,6 +110,10 @@ namespace PARR.API.Controllers.V1
.ThenInclude(t => t!.Unit)
.ThenInclude(t => t!.UnitValues)
.ThenInclude(t => t.Value)
.Include(t => t.Template)
.ThenInclude(a => a!.Job)
.ThenInclude(t => t!.Group)
.ThenInclude(g => g.GroupType)
.Include(t => t.Template)
.ThenInclude(a => a!.Job)
.ThenInclude(t => t!.Group)
@@ -129,6 +135,7 @@ namespace PARR.API.Controllers.V1
}
// сортируем по NextRun, чтобы те у которых дата след срабатывания ближе к текущей, выполнились скорее
//query = query.Where(t => t.Template.Job.GroupId == Guid.Parse("8a75030e-d2dc-4006-a773-002db36ebe27"));
query = query.OrderBy(t => t.Template!.NextRun);
RobotConfiguration? task = null;
@@ -203,7 +210,7 @@ namespace PARR.API.Controllers.V1
};
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.FullDescription))
robotTaskTemplateResponse.FullDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.FullDescription , templateForShortcodes);
robotTaskTemplateResponse.FullDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.FullDescription, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.ShortDescription))
robotTaskTemplateResponse.ShortDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.ShortDescription, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.Solution))