From c0aa47fd2eb5a73502839d1bfd81fde44ee759c1 Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Fri, 21 Apr 2023 09:13:38 +0400
Subject: [PATCH 1/2] fix

---
 .../BusinessLogics/WorkModeling.cs            | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
index 05aee6a..fb80072 100644
--- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
@@ -54,7 +54,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
             {
                 return;
             }
-            await RunOrderInWork(implementer, orders);
+            await RunOrderInWork(implementer);
 
 			await Task.Run(() =>
 			{
@@ -98,43 +98,46 @@ namespace LawFirmBusinessLogic.BusinessLogics
 			});
         }
 
-        private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
+        private async Task RunOrderInWork(ImplementerViewModel implementer)
         {
-            if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
-            {
-                return;
-            }
-            try
-            {
-                // Выбираем из всех заказов тот, который выполняется данным исполнителем
-                var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
-                if (runOrder == null)
-                {
-                    return;
-                }
+			if (_orderLogic == null || implementer == null)
+			{
+				return;
+			}
+			try
+			{
+				var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
+				{
+					ImplementerId = implementer.Id,
+					Status = OrderStatus.Выполняется
+				}));
+				if (runOrder == null)
+				{
+					return;
+				}
+				_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
+				// доделываем работу
+				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
+				_orderLogic.FinishOrder(new OrderBindingModel
+				{
+					Id = runOrder.Id
+				});
+				// отдыхаем
+				Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+			}
+			// заказа может не быть, просто игнорируем ошибку
+			catch (InvalidOperationException ex)
+			{
+				_logger.LogWarning(ex, "Error try get work");
+			}
+			// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
+			catch (Exception ex)
+			{	
+				_logger.LogError(ex, "Error while do work");
+				throw;
+			}
+		}
 
-                _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
-                // доделываем работу
-                Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
-                _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-                _orderLogic.FinishOrder(new OrderBindingModel
-                {
-                    Id = runOrder.Id
-                });
-                // отдыхаем
-                Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-            }
-            // заказа может не быть, просто игнорируем ошибку
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogWarning(ex, "Error try get work");
-            }
-            // а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error while do work");
-                throw;
-            }
-        }
-    }
+	}
 }

From 23f2fbf3eb8c671d4c74bb62a71ad374f16a5fcf Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Fri, 21 Apr 2023 12:23:35 +0400
Subject: [PATCH 2/2] fix

---
 LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs | 2 +-
 LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
index fb80072..97bcce5 100644
--- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
@@ -119,7 +119,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
 				// доделываем работу
 				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
 				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-				_orderLogic.FinishOrder(new OrderBindingModel
+				_orderLogic.DeliveryOrder(new OrderBindingModel
 				{
 					Id = runOrder.Id
 				});
diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
index 6a6127d..2ab8057 100644
--- a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
+++ b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
@@ -16,10 +16,6 @@ namespace LawFirmDatabaseImplement.Implements
     {
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
             using var context = new LawFirmDatabase();
             return context.Orders
                     .Include(x => x.Document)