From e04cb36da62558c1ce76169adca14d28b0a28a44 Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Tue, 26 Mar 2024 22:32:46 +0400 Subject: [PATCH] gabella --- .../Implements/OrderStorage.cs | 11 ++++++++--- .../Implements/OrderStorage.cs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs index 8df2a2b..9763d0e 100644 --- a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs +++ b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs @@ -34,9 +34,14 @@ model) return new(); } return source.Orders - .Where(x => x.Id == model.Id) - .Select( x => AccessIceCreamStorage( x.GetViewModel)) - .ToList(); + .Where(x => ( + (!model.Id.HasValue || x.Id == model.Id) && + (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) && + (!model.DateTo.HasValue || x.DateCreate <= model.DateTo) + ) + ) + .Select(x => x.GetViewModel) + .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) diff --git a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs index d10184b..12d1b4e 100644 --- a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs +++ b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs @@ -37,7 +37,7 @@ namespace IceCreamShopListImplement.Implements } foreach (var order in _source.Orders) { - if (order.Id == model.Id) + if ((model.Id.HasValue && order.Id == model.Id) || (model.DateFrom.HasValue && model.DateTo.HasValue && (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo))) { result.Add(AccessIceCreamStorage(order.GetViewModel)); }