feta(api): unitFieldValue поиск по имени
This commit is contained in:
@@ -445,7 +445,9 @@
|
|||||||
{
|
{
|
||||||
public const string GetAll = Base + "/unit-fields/";
|
public const string GetAll = Base + "/unit-fields/";
|
||||||
public const string Get = Base + "/unit-fields/" + getParam;
|
public const string Get = Base + "/unit-fields/" + getParam;
|
||||||
public const string GetAllValues = Base + "/unit-fields/" + getParam + "/values";
|
|
||||||
|
// todo: этот маршрут нужно вынести в отдельны класс маршрутов
|
||||||
|
public const string GetAllValues = Base + "/unit-fields/" + "{fieldId}" + "/values";
|
||||||
|
|
||||||
public const string getParam = "{id}";
|
public const string getParam = "{id}";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
namespace PARR.API.Contracts.V1.Requests.Queries
|
||||||
|
{
|
||||||
|
public class UnitFieldValueQuery
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Маска значения (%коммутатор%)
|
||||||
|
/// </summary>
|
||||||
|
public string? Mask { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,17 +17,14 @@ namespace PARR.API.Controllers.V1
|
|||||||
[Authorize(Roles = ParrRoles.Administrator.Role)]
|
[Authorize(Roles = ParrRoles.Administrator.Role)]
|
||||||
public class UnitFieldController : BaseApiController
|
public class UnitFieldController : BaseApiController
|
||||||
{
|
{
|
||||||
private readonly ILogger<JobController> logger;
|
|
||||||
private readonly IUnitFieldService unitFieldService;
|
private readonly IUnitFieldService unitFieldService;
|
||||||
private readonly IMapper mapper;
|
private readonly IMapper mapper;
|
||||||
|
|
||||||
public UnitFieldController(
|
public UnitFieldController(
|
||||||
ILogger<JobController> logger,
|
|
||||||
IUnitFieldService unitFieldService,
|
IUnitFieldService unitFieldService,
|
||||||
IMapper mapper
|
IMapper mapper
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
|
||||||
this.unitFieldService = unitFieldService;
|
this.unitFieldService = unitFieldService;
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,10 @@ using PARR.API.Contracts.V1.Responses;
|
|||||||
using PARR.API.Contracts.V1.Responses.Base;
|
using PARR.API.Contracts.V1.Responses.Base;
|
||||||
using PARR.API.Controllers.V1.Base;
|
using PARR.API.Controllers.V1.Base;
|
||||||
using PARR.API.Extensions;
|
using PARR.API.Extensions;
|
||||||
|
using PARR.BLL.Helpers;
|
||||||
using PARR.Constants;
|
using PARR.Constants;
|
||||||
using PARR.DAL.DomainModels;
|
using PARR.DAL.DomainModels;
|
||||||
|
using PARR.DAL.Models.Unit;
|
||||||
using PARR.DAL.Services.Interfaces.Unit;
|
using PARR.DAL.Services.Interfaces.Unit;
|
||||||
|
|
||||||
namespace PARR.API.Controllers.V1
|
namespace PARR.API.Controllers.V1
|
||||||
@@ -20,21 +22,15 @@ namespace PARR.API.Controllers.V1
|
|||||||
[Authorize(Roles = ParrRoles.Administrator.Role)]
|
[Authorize(Roles = ParrRoles.Administrator.Role)]
|
||||||
public class UnitFieldValueController : BaseApiController
|
public class UnitFieldValueController : BaseApiController
|
||||||
{
|
{
|
||||||
private readonly ILogger<TnkController> logger;
|
|
||||||
private readonly IMapper mapper;
|
private readonly IMapper mapper;
|
||||||
private readonly IUnitFieldService unitFieldService;
|
|
||||||
private readonly IUnitFieldValueService unitFieldValueService;
|
private readonly IUnitFieldValueService unitFieldValueService;
|
||||||
|
|
||||||
public UnitFieldValueController(
|
public UnitFieldValueController(
|
||||||
ILogger<TnkController> logger,
|
|
||||||
IMapper mapper,
|
IMapper mapper,
|
||||||
IUnitFieldService unitFieldService,
|
|
||||||
IUnitFieldValueService unitFieldValueService
|
IUnitFieldValueService unitFieldValueService
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
this.unitFieldService = unitFieldService;
|
|
||||||
this.unitFieldValueService = unitFieldValueService;
|
this.unitFieldValueService = unitFieldValueService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,14 +40,17 @@ namespace PARR.API.Controllers.V1
|
|||||||
/// <param name="paginationQuery"></param>
|
/// <param name="paginationQuery"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet(ApiRoutes.UnitField.GetAllValues)]
|
[HttpGet(ApiRoutes.UnitField.GetAllValues)]
|
||||||
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromRoute] Guid id)
|
public async Task<IActionResult> GetAll([FromRoute] Guid fieldId, [FromQuery] PaginationQuery paginationQuery, [FromQuery] UnitFieldValueQuery filter)
|
||||||
{
|
{
|
||||||
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
|
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
|
||||||
|
|
||||||
var query = unitFieldValueService.Get()
|
IQueryable<UnitFieldValue> query = unitFieldValueService.Get()
|
||||||
.Where(t => t.UnitInValues.Any(t => t.FieldId == id))
|
.Where(t => t.UnitInValues.Any(t => t.FieldId == fieldId))
|
||||||
.OrderBy(t => t.Value);
|
.OrderBy(t => t.Value);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(filter.Mask))
|
||||||
|
query = query.Where(t => EF.Functions.Like(t.Value!.ToLower(), SqlHelpers.RegexToLike(filter.Mask)));
|
||||||
|
|
||||||
var fieldValues = await unitFieldValueService.GetPage(query, paginationFilter).ToListAsync();
|
var fieldValues = await unitFieldValueService.GetPage(query, paginationFilter).ToListAsync();
|
||||||
|
|
||||||
if (!fieldValues.Any())
|
if (!fieldValues.Any())
|
||||||
|
|||||||
Reference in New Issue
Block a user