Merge branch 'LabWork06_Base' into LabWork07_Base

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -70,7 +70,8 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
                 DateCreate = viewModel.DateCreate,
                 DateImplement = viewModel.DateImplement,
                 Count = viewModel.Count,
-                Sum = viewModel.Sum
+                Sum = viewModel.Sum,
+				ImplementerId = viewModel.ImplementerId
 			};
 
             if (rawModel.ImplementerId.HasValue)

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -54,7 +54,7 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
             {
                 return;
             }
-            await RunOrderInWork(implementer, orders);
+            await RunOrderInWork(implementer);
 
 			await Task.Run(() =>
 			{
@@ -98,31 +98,33 @@ namespace AutomobilePlantBusinessLogic.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)
+			if (_orderLogic == null || implementer == null)
 			{
 				return;
 			}
 			try
 			{
-                // Выбираем из всех заказов тот, который выполняется данным исполнителем
-                var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
+				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);
 				// доделываем работу
-				await Task.Delay(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+				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
 				});
 				// отдыхаем
-				await Task.Delay(implementer.Qualification * _rnd.Next(10, 100));
+				Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
 			}
 			// заказа может не быть, просто игнорируем ошибку
 			catch (InvalidOperationException ex)

AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/OrderStorage.cs

@@ -16,10 +16,6 @@ namespace AutomobilePlantDatabaseImplement.Implements
     {
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
             using var context = new AutomobilePlantDatabase();
             return context.Orders
                     .Include(x => x.Car)

AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Order.cs

@@ -83,8 +83,8 @@ namespace AutomobilePlantDatabaseImplement.Models
                     DateImplement = DateImplement,
                     Id = Id,
                     Status = Status,
-                    CarName = Car.CarName,
-                    ClientFIO = Client.ClientFIO,
+					CarName = Car?.CarName ?? string.Empty,
+					ClientFIO = Client?.ClientFIO ?? string.Empty,
 					ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
 				};
             }