feat(api): JobGroupResponse
This commit is contained in:
@@ -63,7 +63,7 @@ namespace PARR.API.Controllers.V1
|
|||||||
if (!string.IsNullOrEmpty(filter.Name))
|
if (!string.IsNullOrEmpty(filter.Name))
|
||||||
query = query.Where(t => t.GroupName.ToLower().Contains(filter.Name.ToLower()));
|
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);
|
query = query.Include(t => t.Jobs).ThenInclude(t => t.Tnk);
|
||||||
|
|
||||||
var jobGroups = await groupService.GetPage(query, paginationFilter).ToListAsync();
|
var jobGroups = await groupService.GetPage(query, paginationFilter).ToListAsync();
|
||||||
@@ -71,17 +71,9 @@ namespace PARR.API.Controllers.V1
|
|||||||
if (!jobGroups.Any())
|
if (!jobGroups.Any())
|
||||||
return NoContent();
|
return NoContent();
|
||||||
|
|
||||||
if (filter.IsFull == true)
|
var response = mapper.Map<List<JobGroupResponse>>(jobGroups);
|
||||||
{
|
|
||||||
var responseFull = mapper.Map<List<JobGroupResponse>>(jobGroups);
|
|
||||||
var paginationResponseFull = new PagedResponse<JobGroupResponse>(responseFull, true).GetPaginatedProps(paginationFilter, query);
|
|
||||||
|
|
||||||
return Ok(paginationResponseFull);
|
var paginationResponse = new PagedResponse<JobGroupResponse>(response, true).GetPaginatedProps(paginationFilter, query);
|
||||||
}
|
|
||||||
|
|
||||||
var response = mapper.Map<List<JobGroupBaseResponse>>(jobGroups);
|
|
||||||
|
|
||||||
var paginationResponse = new PagedResponse<JobGroupBaseResponse>(response, true).GetPaginatedProps(paginationFilter, query);
|
|
||||||
|
|
||||||
return Ok(paginationResponse);
|
return Ok(paginationResponse);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user