Merge branch 'labWork4' into labWork5

SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs

@@ -15,7 +15,9 @@ namespace SushiBarFileImplement.Implements
         }
         public List<OrderViewModel> GetFullList()
         {
-            return source.Orders.Select(x => AttachSushiName(x.GetViewModel)).ToList();
+            return source.Orders
+                .Select(x => AttachSushiName(x.GetViewModel))
+                .ToList();
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
@@ -23,9 +25,13 @@ namespace SushiBarFileImplement.Implements
             {
                 return new();
             }
-            return source.Orders.Where(x =>
-            x.Id == model.Id).Select(x =>
-            AttachSushiName(x.GetViewModel)).ToList();
+            return source.Orders
+                .Where(o =>
+                    (model.Id.HasValue && o.Id == model.Id) ||
+                    (model.DateFrom.HasValue && model.DateTo.HasValue &&
+                    model.DateFrom < o.DateCreate && o.DateCreate < model.DateTo))
+                .Select(x => AttachSushiName(x.GetViewModel))
+                .ToList();
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
@@ -33,8 +39,8 @@ namespace SushiBarFileImplement.Implements
             {
                 return null;
             }
-            return AttachSushiName(source.Orders.FirstOrDefault(x =>
-            (x.Id == model.Id))?.GetViewModel);
+            return AttachSushiName(source.Orders
+                .FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel);
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {

SushiBar/SushiBarListImplement/Implements/OrderStorage.cs

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