diff --git a/.version b/.version index 3565f57..55f5571 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.27.33.54 \ No newline at end of file +0.27.34.55 \ No newline at end of file diff --git a/Netina.Api/Controllers/OrderController.cs b/Netina.Api/Controllers/OrderController.cs index aa65725..65e8297 100644 --- a/Netina.Api/Controllers/OrderController.cs +++ b/Netina.Api/Controllers/OrderController.cs @@ -40,8 +40,8 @@ public class OrderController : ICarterModule private async Task ConfirmOrderStepAsync(Guid id, [FromQuery] OrderStatus nextOrderStatus, [FromQuery]string? trackingCode, [FromServices] IMediator mediator, CancellationToken cancellationToken) => TypedResults.Ok(await mediator.Send(new ConfirmOrderStepCommand(id, nextOrderStatus,TrackingCode:trackingCode), cancellationToken)); - public async Task GetAllAsync(IMediator mediator, [FromQuery]long? selectedDate, [FromQuery] OrderStatus? orderStatus, [FromQuery] OrderQueryDateFilter? dateFilter, [FromQuery] int page = 0, CancellationToken cancellationToken = default) - => TypedResults.Ok(await mediator.Send(new GetOrdersQuery(Page:page, SelectedDate: selectedDate, OrderStatus:orderStatus, DateFilter:dateFilter), cancellationToken)); + public async Task GetAllAsync(IMediator mediator, [FromQuery]string? factorCode, [FromQuery]long? selectedDate, [FromQuery] OrderStatus? orderStatus, [FromQuery] OrderQueryDateFilter? dateFilter, [FromQuery] int page = 0, CancellationToken cancellationToken = default) + => TypedResults.Ok(await mediator.Send(new GetOrdersQuery(Page:page, FactorCode:factorCode , SelectedDate: selectedDate, OrderStatus:orderStatus, DateFilter:dateFilter), cancellationToken)); public async Task GetAsync(IMediator mediator, Guid id, CancellationToken cancellationToken = default) { diff --git a/Netina.Domain/CommandQueries/Queries/OrderQueries.cs b/Netina.Domain/CommandQueries/Queries/OrderQueries.cs index f4e6e1f..2e0075a 100644 --- a/Netina.Domain/CommandQueries/Queries/OrderQueries.cs +++ b/Netina.Domain/CommandQueries/Queries/OrderQueries.cs @@ -4,4 +4,4 @@ public sealed record GetOrderLDtoQuery(Guid Id) : IRequest; public sealed record GetUserOrdersQuery(Guid CustomerId = default) : IRequest>; public sealed record GetOrderQuery(Guid Id) : IRequest; -public sealed record GetOrdersQuery(OrderQueryDateFilter? DateFilter, OrderStatus? OrderStatus,long? SelectedDate, int Page = 0) : IRequest>; \ No newline at end of file +public sealed record GetOrdersQuery(OrderQueryDateFilter? DateFilter, OrderStatus? OrderStatus,long? SelectedDate,string? FactorCode, int Page = 0) : IRequest>; \ No newline at end of file diff --git a/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs b/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs index 392d2d6..39374a4 100644 --- a/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs +++ b/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs @@ -18,6 +18,9 @@ public class GetOrdersQueryHandler : IRequestHandler() .TableNoTracking; + if (request.FactorCode != null) + orders = orders.Where(o => o.FactorCode.Trim().ToUpper().Contains(request.FactorCode.Trim().ToUpper())); + if (request.DateFilter != null) { switch (request.DateFilter)