From e3682318d3d3f489d7a8521e17a54cb330a95f4b 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 18:30:09 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B8=D0=BC=D0=B8=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=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=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ConfectionaryBusinessLogic/WorkModeling.cs     | 13 +++++++++++--
 ConfectioneryDatabaseImplement/OrderStorage.cs |  7 ++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ConfectionaryBusinessLogic/WorkModeling.cs b/ConfectionaryBusinessLogic/WorkModeling.cs
index 0104a6d..c7467c3 100644
--- a/ConfectionaryBusinessLogic/WorkModeling.cs
+++ b/ConfectionaryBusinessLogic/WorkModeling.cs
@@ -38,8 +38,17 @@ namespace ConfectioneryBusinessLogic
 			var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
 			if (orders == null || orders.Count == 0)
 			{
-				_logger.LogWarning("DoWork. Orders is null or empty");
-				return;
+				var workingOrders = _orderLogic.ReadList(new() { Status = OrderStatus.Выполняется });
+				if (workingOrders == null || workingOrders.Count == 0)
+				{
+					_logger.LogWarning("DoWork. Orders is null or empty");
+					return;
+				}
+				else
+				{
+					_logger.LogWarning("DoWork. Еще есть заказы в работе");
+					orders = workingOrders;
+				}
 			}
 			_logger.LogDebug("DoWork for {Count} orders", orders.Count);
 			foreach (var implementer in implementers)
diff --git a/ConfectioneryDatabaseImplement/OrderStorage.cs b/ConfectioneryDatabaseImplement/OrderStorage.cs
index d00fcca..14ef8b7 100644
--- a/ConfectioneryDatabaseImplement/OrderStorage.cs
+++ b/ConfectioneryDatabaseImplement/OrderStorage.cs
@@ -28,11 +28,12 @@ namespace ConfectioneryDatabaseImplement.Implements
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
             using var context = new ConfectioneryDatabase();
-            // Находим первого либо по айди заказа, либо по айди исполнителя, исходя из того что есть в модели
+            // Находим первого либо по айди заказа, либо по айди исполнителя, либо по айди исполнителя и статусу заказа, исходя из того что есть в модели
 			return context.Orders
 					.Include(x => x.Client)
 					.Include(x => x.Implementer)
 					.FirstOrDefault(x =>
+                        (!model.Status.HasValue || model.Status.HasValue && x.Status == model.Status) &&
 						model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
                         model.Id.HasValue            && x.Id == model.Id
                     )
@@ -56,10 +57,6 @@ namespace ConfectioneryDatabaseImplement.Implements
 					.Where(x => model.DateFrom <= x.DateCreate.Date &&
 												  x.DateCreate.Date <= model.DateTo);
 			}
-            else if (model.Status.HasValue && model.ImplementerId.HasValue)
-            {
-                queryWhere = context.Orders.Where(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status);
-            }
 			else if (model.Status.HasValue)
 			{
 				queryWhere = context.Orders.Where(x => x.Status == model.Status);