feat(api): HostController.Response Field, Value выделены в отдельные поля
This commit is contained in:
@@ -65,16 +65,18 @@ namespace PARR.API.Controllers.V1
|
||||
//var paginationResponse = new PagedResponse<HostWithApplicationsResponse>(hostResponse, true).GetPaginatedProps(paginationFilter, query);
|
||||
|
||||
IQueryable<Unit> query = unitService.Get()
|
||||
.AsNoTracking()
|
||||
.Include(t => t.UnitValues)
|
||||
.ThenInclude(uv => uv.Value)
|
||||
.Include(tf => tf.UnitValues)
|
||||
.ThenInclude(uv => uv.Field)
|
||||
.OrderBy(t => t.Name);
|
||||
|
||||
if (!string.IsNullOrEmpty(request.Mask))
|
||||
query = query.Where(t => EF.Functions.Like(t.Name.ToLower(), SqlHelpers.RegexToLike(request.Mask)));
|
||||
|
||||
if (request.IsFull)
|
||||
query = query
|
||||
.Include(t => t.UnitValues)
|
||||
.ThenInclude(uv => uv.Value)
|
||||
.Include(tf => tf.UnitValues)
|
||||
.ThenInclude(uv => uv.Field);
|
||||
|
||||
var units = await unitService.GetPage(query, paginationFilter).ToListAsync();
|
||||
|
||||
if (!units.Any())
|
||||
@@ -108,12 +110,12 @@ namespace PARR.API.Controllers.V1
|
||||
//var response = mapper.Map<HostWithApplicationsResponse>(host);
|
||||
|
||||
var unit = await unitService.Get()
|
||||
.AsNoTracking()
|
||||
.Include(t => t.UnitValues)
|
||||
.ThenInclude(uv => uv.Value)
|
||||
.Include(tf => tf.UnitValues)
|
||||
.ThenInclude(uv => uv.Field)
|
||||
.FirstOrDefaultAsync(t => t.Id == id);
|
||||
|
||||
if (unit == null)
|
||||
return NotFound();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user