lab4..

Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs

@@ -20,12 +20,13 @@ namespace ConfectioneryFileImplement.Implements
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
             return source.Orders
-               .Where(x => x.Id == model.Id)
+			   .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 => AccessPastryStorage(x.GetViewModel))
                .ToList();
         }

Confectionery/ConfectioneryListImplement/Implements/OrderStorage.cs

@@ -24,13 +24,11 @@ namespace ConfectioneryListImplement.Implements
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             var result = new List<OrderViewModel>();
-            if (!model.Id.HasValue)
-            {
-                return result;
-            }
             foreach (var order in _source.Orders)
             {
-                if (order.Id == model.Id)
+				if ((!model.Id.HasValue || order.Id == model.Id) &&
+                    (!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) &&
+				    (!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
 				{
                     result.Add(AccessPastryStorage(order.GetViewModel));
                 }