ол

SushiBar/SushiBarBusinessLogic_/BusinessLogics/OrderLogic.cs

@@ -15,10 +15,10 @@ namespace SushiBarBusinessLogic.BusinessLogics
 {
 	public class OrderLogic : IOrderLogic
 	{
+
 			private readonly ILogger _logger;
 			private readonly IOrderStorage _orderStorage;
 			static readonly object _locker = new object();
-        
 			private readonly IShopStorage _shopStorage;
 
 			public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
@@ -27,6 +27,25 @@ namespace SushiBarBusinessLogic.BusinessLogics
 				_orderStorage = orderStorage;
 				_shopStorage = shopStorage;
 			}
+
+			public OrderViewModel? ReadElement(OrderSearchModel model)
+			{
+				if (model == null)
+				{
+					throw new ArgumentNullException(nameof(model));
+				}
+				_logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+					model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id);
+				var element = _orderStorage.GetElement(model);
+				if (element == null)
+				{
+					_logger.LogWarning("ReadElement element not found");
+					return null;
+				}
+				_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+				return element;
+			}
+
 			public List<OrderViewModel>? ReadList(OrderSearchModel? model)
 			{
 				_logger.LogInformation("ReadList. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
@@ -40,6 +59,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
 				_logger.LogInformation("ReadList. Count:{Count}", list.Count);
 				return list;
 			}
+
 			public bool CreateOrder(OrderBindingModel model)
 			{
 				CheckModel(model);
@@ -94,6 +114,46 @@ namespace SushiBarBusinessLogic.BusinessLogics
 				}
 			}
 
+			private void CheckModel(OrderBindingModel model, bool withParams = true)
+			{
+				if (model == null)
+				{
+					throw new ArgumentNullException(nameof(model));
+				}
+				if (!withParams)
+				{
+					return;
+				}
+				if (model.Count <= 0)
+				{
+					throw new ArgumentException("Колличество пиццы в заказе не может быть меньше 1", nameof(model.Count));
+				}
+				if (model.Sum <= 0)
+				{
+					throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
+				}
+				if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+				{
+					throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
+				}
+				_logger.LogInformation("Sushi. SushiId:{SushiId}.Count:{Count}.Sum:{Sum}Id:{Id}",
+					model.SushiId, model.Count, model.Sum, model.Id);
+			}
+			private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
+			{
+				model = FillOrderBindingModel(model);
+
+				if (requiredStatus - model.Status == 1)
+				{
+					model.Status = requiredStatus;
+					if (model.Status == OrderStatus.Готов)
+						model.DateImplement = DateTime.Now;
+					return UpdateOrder(model);
+				}
+				_logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+				throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+			}
+
 			private OrderBindingModel FillOrderBindingModel(OrderBindingModel model)
 			{
 				CheckModel(model, false);
@@ -120,91 +180,6 @@ namespace SushiBarBusinessLogic.BusinessLogics
 				return model;
 			}
 
-		private void CheckModel(OrderBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Колличество суши в заказе не может быть меньше 1", nameof(model.Count));
-            }
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
-            }
-            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
-            {
-                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
-            }
-            _logger.LogInformation("Sushi. SushiId:{SushiId}.Count:{Count}.Sum:{Sum}Id:{Id}",
-                model.SushiId, model.Count, model.Sum, model.Id);
-        }
-
-        private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
-        {
-            CheckModel(model, false);
-            var element = _orderStorage.GetElement(new OrderSearchModel()
-            {
-                Id = model.Id
-            });
-            if (element == null)
-            {
-                throw new InvalidOperationException(nameof(element));
-            }
-            model.DateCreate = element.DateCreate;
-            model.SushiId = element.SushiId;
-            model.DateImplement = element.DateImplement;
-            model.ClientId = element.ClientId;
-            if (!model.ImplementerId.HasValue)
-            {
-                model.ImplementerId = element.ImplementerId;
-            }
-            model.Status = element.Status;
-            model.Count = element.Count;
-            model.Sum = element.Sum;
-            if (requiredStatus - model.Status == 1)
-            {
-                model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Готов)
-                {
-                    model.DateImplement = DateTime.Now;
-                }
-                if (_orderStorage.Update(model) == null)
-                {
-                    _logger.LogWarning("Update operation failed");
-                    return false;
-                }
-                return true;
-            }
-            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
-        
-        }
-
-        public OrderViewModel? ReadElement(OrderSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
-                model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id);
-            var element = _orderStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
 			private bool UpdateOrder(OrderBindingModel model)
 			{
 				if (_orderStorage.Update(model) == null)

SushiBar/SushiBarBusinessLogic_/WorkModeling .cs

@@ -36,7 +36,8 @@ namespace SushiBarBusinessLogic
                 return;
             }
             var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-            if (orders == null || orders.Count == 0)
+			
+			if (orders == null )
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
@@ -77,6 +78,7 @@ namespace SushiBarBusinessLogic
                         {
                             Id = order.Id
                         });
+						_orderLogic.DeliveryOrder(new OrderBindingModel { Id = order.Id });
 					}
                     // кто-то мог уже перехватить заказ, игнорируем ошибку
                     catch (InvalidOperationException ex)