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

feat(api): в респонс истории агента добавлена информация о наряде

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-01-22 11:46:49 +10:00
parent 13652ba9aa
commit d241071959
4 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PARR.API/Controllers/V1/AgentHistoryController.cs
View File

@@ -63,7 +63,9 @@ namespace PARR.API.Controllers.V1
IQueryable<AgentHistory> query = agentHistoryService.Get()
.Include(t => t.AgentHistoryLevel)
.Include(t => t.Template);
.Include(t => t.Template)
.Include(t => t.Order).ThenInclude(s => s.OrderStatus)
.Include(t => t.Order).ThenInclude(s => s.NextStatus);
if (request.TemplateId.HasValue)
query = query.Where(t => t.TemplateId == request.TemplateId);
@@ -92,6 +94,8 @@ namespace PARR.API.Controllers.V1
var history = await agentHistoryService.Get()
.Include(t => t.AgentHistoryLevel)
.Include(t => t.Template)
.Include(t => t.Order).ThenInclude(s => s.OrderStatus)
.Include(t => t.Order).ThenInclude(s => s.NextStatus)
.FirstOrDefaultAsync(t => t.Id == id);
if (history == null)
@@ -141,7 +145,12 @@ namespace PARR.API.Controllers.V1
if (!await agentHistoryService.CreateAsync(agentJournal) || !await agentHistoryService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при добавлении записи в историю работы агента." } }));
var createdObject = await agentHistoryService.Get().Include(t => t.AgentHistoryLevel).Include(t => t.Template).FirstAsync(t => t.Id == agentJournal.Id);
var createdObject = await agentHistoryService.Get()
.Include(t => t.AgentHistoryLevel)
.Include(t => t.Template)
.Include(t => t.Order).ThenInclude(s => s.OrderStatus)
.Include(t => t.Order).ThenInclude(s => s.NextStatus)
.FirstAsync(t => t.Id == agentJournal.Id);
var response = mapper.Map<AgentHistoryResponse>(createdObject);
var createdUri = uriService.GetUri(ApiRoutes.AgentHistory.Get, ApiRoutes.AgentHistory.getParam, agentJournal.Id);