From fdfa0d5e29fceb8dfc68dccd25fb55217d2c6880 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Thu, 4 Sep 2025 16:03:30 +1000 Subject: [PATCH] feat(api): JobGroupResponse --- PARR.API/Controllers/V1/JobGroupController.cs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/PARR.API/Controllers/V1/JobGroupController.cs b/PARR.API/Controllers/V1/JobGroupController.cs index d0c66f03..1b882e59 100644 --- a/PARR.API/Controllers/V1/JobGroupController.cs +++ b/PARR.API/Controllers/V1/JobGroupController.cs @@ -63,7 +63,7 @@ namespace PARR.API.Controllers.V1 if (!string.IsNullOrEmpty(filter.Name)) query = query.Where(t => t.GroupName.ToLower().Contains(filter.Name.ToLower())); - if (filter.IsFull) + if (filter.IsFull)//TODO а зачем он тогда вообще??? query = query.Include(t => t.Jobs).ThenInclude(t => t.Tnk); var jobGroups = await groupService.GetPage(query, paginationFilter).ToListAsync(); @@ -71,17 +71,9 @@ namespace PARR.API.Controllers.V1 if (!jobGroups.Any()) return NoContent(); - if (filter.IsFull == true) - { - var responseFull = mapper.Map>(jobGroups); - var paginationResponseFull = new PagedResponse(responseFull, true).GetPaginatedProps(paginationFilter, query); + var response = mapper.Map>(jobGroups); - return Ok(paginationResponseFull); - } - - var response = mapper.Map>(jobGroups); - - var paginationResponse = new PagedResponse(response, true).GetPaginatedProps(paginationFilter, query); + var paginationResponse = new PagedResponse(response, true).GetPaginatedProps(paginationFilter, query); return Ok(paginationResponse); }