From f47e53df7df965c0f5943c2b52fce750b684e824 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Sun, 24 Mar 2024 21:50:48 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=80=D0=B5=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B9=20=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/OrderStorage.cs                | 20 ++++++++++++------
 .../Implements/OrderStorage.cs                | 21 +++++++++++--------
 2 files changed, 26 insertions(+), 15 deletions(-)

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<OrderViewModel> 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<OrderViewModel> 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<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            var result = new List<OrderViewModel>();
-            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)
         {