diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs index 1e12c9b..3d4598d 100644 --- a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs @@ -26,14 +26,22 @@ namespace SecuritySystemFileImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue) + var orders = source.Orders + .Select(x => x.GetViewModel) + .ToList(); + if (model.Id.HasValue) { - return new(); + orders = orders.Where(x => x.Id == model.Id.Value).ToList(); } - return source.Orders - .Where(x => x.Id == model.Id) - .Select(x => GetViewModel(x)) - .ToList(); + if (model.DateFrom.HasValue) + { + orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList(); + } + if (model.DateTo.HasValue) + { + orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); + } + return orders; } public List GetFullList() diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs index 3bc00f8..49affc5 100644 --- a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs @@ -24,19 +24,22 @@ namespace SecuritySystemListImplement.Implements } public List GetFilteredList(OrderSearchModel model) { - var result = new List(); - if (!model.Id.HasValue) + var orders = _source.Orders + .Select(x => x.GetViewModel) + .ToList(); + if (model.Id.HasValue) { - return result; + orders = orders.Where(x => x.Id == model.Id.Value).ToList(); } - foreach (var order in _source.Orders) + if (model.DateFrom.HasValue) { - if (order.Id == model.Id) - { - result.Add(order.GetViewModel); - } + orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList(); } - return result; + if (model.DateTo.HasValue) + { + orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); + } + return orders; } public OrderViewModel? GetElement(OrderSearchModel model) {