From 86fa2bf37509b3abbf7da19a6b62b274403a23b9 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Mon, 22 Apr 2024 10:58:35 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D1=85=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=20=D0=BF=D0=BE=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=D1=83=20=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchModels/OrderSearchModel.cs                     | 5 ++++-
 .../Implements/OrderStorage.cs                           | 9 +++++++++
 .../Implements/OrderStorage.cs                           | 8 ++++++++
 .../Implements/OrderStorage.cs                           | 8 ++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs b/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs
index 9d9142a..c1ba2fb 100644
--- a/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs
+++ b/SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs
@@ -1,4 +1,6 @@
-namespace SecuritySystemContracts.SearchModels
+using SecuritySystemDataModels.Enums;
+
+namespace SecuritySystemContracts.SearchModels
 {
     public class OrderSearchModel
     {
@@ -7,5 +9,6 @@
         public DateTime? DateTo { get; set; }
         public int? ClientId { get; set; }
         public int? ImplementerId {  get; set; }
+        public OrderStatus? Status { get; set; }
     }
 }
diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs
index f371691..d27bb1b 100644
--- a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs
+++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs
@@ -25,12 +25,21 @@ namespace SecuritySystemDatabaseImplement.Implements
             var orders = context.Orders
             .Include(x => x.Secure)
             .Include(x => x.Client)
+            .Include(x => x.Implementer)
             .Select(x => x.GetViewModel)
             .ToList();
             if (model.Id.HasValue)
             {
                 orders = orders.Where(x => x.Id == model.Id.Value).ToList();
             }
+            if (model.Status.HasValue)
+            {
+                orders = orders.Where(x => x.Status == model.Status.Value).ToList();
+            }
+            if (model.ImplementerId.HasValue)
+            {
+                orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList();
+            }
             if (model.DateFrom.HasValue)
             {
                 orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList();
diff --git a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
index a6374b5..4e8e820 100644
--- a/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
+++ b/SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
@@ -33,6 +33,14 @@ namespace SecuritySystemFileImplement.Implements
             {
                 orders = orders.Where(x => x.Id == model.Id.Value).ToList();
             }
+            if (model.Status.HasValue)
+            {
+                orders = orders.Where(x => x.Status == model.Status.Value).ToList();
+            }
+            if (model.ImplementerId.HasValue)
+            {
+                orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList();
+            }
             if (model.DateFrom.HasValue)
             {
                 orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList();
diff --git a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
index 7ceed9a..28977ce 100644
--- a/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
+++ b/SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
@@ -31,6 +31,14 @@ namespace SecuritySystemListImplement.Implements
             {
                 orders = orders.Where(x => x.Id == model.Id.Value).ToList();
             }
+            if (model.Status.HasValue)
+            {
+                orders = orders.Where(x => x.Status == model.Status.Value).ToList();
+            }
+            if (model.ImplementerId.HasValue)
+            {
+                orders = orders.Where(x => x.ImplementerId == model.ImplementerId.Value).ToList();
+            }
             if (model.DateFrom.HasValue)
             {
                 orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList();