From 645cdb306f4a3ff57985624ea042d45d6ec87636 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Sat, 6 Apr 2024 23:54:12 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B5=20=D0=B2=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B5=20=D0=B2=20=D1=81=D0=BF?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BE=D1=87=D0=BD=D0=BE=D0=B5=20=D1=85=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D0=B8=D0=B7=D0=B5=20=D0=B8=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2=D0=BE=D0=B5=20=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D1=89=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/OrderStorage.cs                         |  4 ++++
 .../SecuritySystemFileImplement/Models/Order.cs        |  1 +
 .../Implements/OrderStorage.cs                         |  4 ++++
 .../SecuritySystemListImplement/Models/Order.cs        | 10 +---------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
index 3d4598d..a6374b5 100644
--- a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
+++ b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
@@ -41,6 +41,10 @@ namespace SecuritySystemFileImplement.Implements
             {
                 orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
             }
+            if (model.ClientId.HasValue)
+            {
+                orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
+            }
             return orders;
         }
 
diff --git a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs
index 85908a2..975a4ab 100644
--- a/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs
+++ b/SecuritySystem/SecuritySystemFileImplement/Models/Order.cs
@@ -10,6 +10,7 @@ namespace SecuritySystemFileImplement.Models
     {
         public int Id { get; private set; }
         public int SecureId { get; private set; }
+        public int ClientId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
index 49affc5..7ceed9a 100644
--- a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
+++ b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
@@ -39,6 +39,10 @@ namespace SecuritySystemListImplement.Implements
             {
                 orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
             }
+            if (model.ClientId.HasValue)
+            {
+                orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
+            }
             return orders;
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
diff --git a/SecuritySystem/SecuritySystemListImplement/Models/Order.cs b/SecuritySystem/SecuritySystemListImplement/Models/Order.cs
index 47bc31d..514dfa9 100644
--- a/SecuritySystem/SecuritySystemListImplement/Models/Order.cs
+++ b/SecuritySystem/SecuritySystemListImplement/Models/Order.cs
@@ -7,19 +7,13 @@ namespace SecuritySystemListImplement.Models
     public class Order
     {
         public int SecureId { get; private set; }
-
+        public int ClientId { get; private set; }
         public int Count { get; private set; }
-
         public double Sum { get; private set; }
-
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-
         public DateTime DateCreate { get; private set; } = DateTime.Now;
-
         public DateTime? DateImplement { get; private set; }
-
         public int Id { get; private set; }
-
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -37,7 +31,6 @@ namespace SecuritySystemListImplement.Models
                 DateImplement = model.DateImplement,
             };
         }
-
         public void Update(OrderBindingModel? model)
         {
             if (model == null)
@@ -47,7 +40,6 @@ namespace SecuritySystemListImplement.Models
             Status = model.Status;
             DateImplement = model.DateImplement;
         }
-
         public OrderViewModel GetViewModel => new()
         {
             SecureId = SecureId,