From 520ea2f1d5834e5ee6311d837ca3f35d1ed3cbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=8F=D1=80=20=D0=90=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=83=D0=BB=D0=BB=D0=BE=D0=B2?= <danuar228@mail.ru>
Date: Mon, 6 Mar 2023 19:44:23 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B2=D1=8B=D0=B1=D0=B8=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D1=8B=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B6=D0=B5=D1=81=D1=82=D0=B2=D1=83=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ConfectionaryFileImplement/OrderStorage.cs          | 11 +++++++++--
 ConfectionaryListImplement/OrderStorage.cs          | 13 ++++++++++---
 .../SearchModels/OrderSearchModel.cs                |  2 +-
 ConfectioneryDatabaseImplement/OrderStorage.cs      |  6 +++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ConfectionaryFileImplement/OrderStorage.cs b/ConfectionaryFileImplement/OrderStorage.cs
index ecd3a9b..160eae9 100644
--- a/ConfectionaryFileImplement/OrderStorage.cs
+++ b/ConfectionaryFileImplement/OrderStorage.cs
@@ -28,6 +28,13 @@ namespace ConfectioneryFileImplement
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            if (model.ImplementerId.HasValue && model.Statusses != null)
+            {
+				return _source.Orders
+                    .FirstOrDefault(x => x.ImplementerId == model.ImplementerId && 
+                                         model.Statusses.Contains(x.Status))
+                    ?.GetViewModel;
+			}
 			if (model.ImplementerId.HasValue)
 			{
 				return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
@@ -55,10 +62,10 @@ namespace ConfectioneryFileImplement
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
-			if (!model.Id.HasValue && model.Status.HasValue)
+			if (!model.Id.HasValue && model.Statusses != null)
 			{
 				return _source.Orders
-					.Where(x => x.Status == model.Status)
+					.Where(x => model.Statusses.Contains(x.Status))
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
diff --git a/ConfectionaryListImplement/OrderStorage.cs b/ConfectionaryListImplement/OrderStorage.cs
index 7159bf2..43fd901 100644
--- a/ConfectionaryListImplement/OrderStorage.cs
+++ b/ConfectionaryListImplement/OrderStorage.cs
@@ -30,7 +30,14 @@ namespace ConfectioneryListImplement
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (model.ImplementerId.HasValue)
+			if (model.ImplementerId.HasValue && model.Statusses != null)
+			{
+				return _source.Orders
+					.FirstOrDefault(x => x.ImplementerId == model.ImplementerId &&
+										 model.Statusses.Contains(x.Status))
+					?.GetViewModel;
+			}
+			if (model.ImplementerId.HasValue)
             {
                 return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
 			}
@@ -65,10 +72,10 @@ namespace ConfectioneryListImplement
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
-            if (!model.Id.HasValue && model.Status.HasValue)
+            if (!model.Id.HasValue && model.Statusses != null)
             {
                 return _source.Orders
-                    .Where(x => x.Status == model.Status)
+                    .Where(x => model.Statusses.Contains(x.Status))
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
diff --git a/ConfectioneryContracts/SearchModels/OrderSearchModel.cs b/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
index 606260e..a593019 100644
--- a/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
+++ b/ConfectioneryContracts/SearchModels/OrderSearchModel.cs
@@ -14,6 +14,6 @@ namespace ConfectioneryContracts.SearchModels
 
         public int? ImplementerId { get; set; }
 
-        public OrderStatus? Status { get; set; }
+        public List<OrderStatus>? Statusses { get; set; }
     }
 }
diff --git a/ConfectioneryDatabaseImplement/OrderStorage.cs b/ConfectioneryDatabaseImplement/OrderStorage.cs
index 14ef8b7..f1e161d 100644
--- a/ConfectioneryDatabaseImplement/OrderStorage.cs
+++ b/ConfectioneryDatabaseImplement/OrderStorage.cs
@@ -33,7 +33,7 @@ namespace ConfectioneryDatabaseImplement.Implements
 					.Include(x => x.Client)
 					.Include(x => x.Implementer)
 					.FirstOrDefault(x =>
-                        (!model.Status.HasValue || model.Status.HasValue && x.Status == model.Status) &&
+                        (model.Statusses == null || model.Statusses != null && model.Statusses.Contains(x.Status)) &&
 						model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
                         model.Id.HasValue            && x.Id == model.Id
                     )
@@ -57,9 +57,9 @@ namespace ConfectioneryDatabaseImplement.Implements
 					.Where(x => model.DateFrom <= x.DateCreate.Date &&
 												  x.DateCreate.Date <= model.DateTo);
 			}
-			else if (model.Status.HasValue)
+			else if (model.Statusses != null)
 			{
-				queryWhere = context.Orders.Where(x => x.Status == model.Status);
+				queryWhere = context.Orders.Where(x => model.Statusses.Contains(x.Status));
 			}
 			else if (model.ClientId.HasValue)
 			{