From 58b7de8dfd76cd5dcc3e6e1d2ac64dbb89ebc984 Mon Sep 17 00:00:00 2001
From: shadowik <zahar.mark@bk.ru>
Date: Thu, 4 May 2023 10:26:38 +0400
Subject: [PATCH] Fix

---
 .../BusinessLogics/OrderLogic.cs              | 24 +++++++++----------
 .../BusinessLogics/WorkModeling.cs            |  3 ++-
 ...ner.cs => 20230504051520_init.Designer.cs} |  2 +-
 ...3204906_init.cs => 20230504051520_init.cs} |  0
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename Pizzeria/PizzeriaDatabaseImplement/Migrations/{20230503204906_init.Designer.cs => 20230504051520_init.Designer.cs} (99%)
 rename Pizzeria/PizzeriaDatabaseImplement/Migrations/{20230503204906_init.cs => 20230504051520_init.cs} (100%)

diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs
index b67ca3a..5f6f245 100644
--- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -41,16 +41,17 @@ namespace PizzeriaBusinessLogic.BusinessLogics
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
-            _logger.LogInformation("ReadList. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
+                _logger.LogInformation("ReadList. 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 list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
+                var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
+                if (list == null)
+                {
+                    _logger.LogWarning("ReadList return null list");
+                    return null;
+                }
+                _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+                return list;
+           
         }
         public bool CreateOrder(OrderBindingModel model)
         {
@@ -92,12 +93,11 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                     Count = model.Count
                 }))
                 {
-                    if (model.Status == OrderStatus.Готов)
+                    if (model.Status == OrderStatus.Готов || model.Status == OrderStatus.Ожидает)
                     {
                         model.Status = OrderStatus.Ожидает;
-                        UpdateOrder(model);
+                        return UpdateOrder(model);
                     }
-                    throw new ArgumentException("Недостаточно места в магазинах для поставки");
                 }
                 model.Status = OrderStatus.Выдан;
                 return UpdateOrder(model);
diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/WorkModeling.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/WorkModeling.cs
index 75b9023..16d44d9 100644
--- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/WorkModeling.cs
+++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/WorkModeling.cs
@@ -36,12 +36,13 @@ namespace PizzeriaBusinessLogic.BusinessLogics
                 return;
             }
             var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Выдан });
-            int count = _orderLogic.ReadList(new OrderSearchModel()).Count;
+            int count = _orderLogic.ReadList(null).Count;
             if (orders == null || count == orders.Count)
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
             }
+            orders = _orderLogic.ReadList(null);
             _logger.LogDebug("DoWork for {Count} orders", orders.Count);
             foreach (var implementer in implementers)
             {
diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503204906_init.Designer.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230504051520_init.Designer.cs
similarity index 99%
rename from Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503204906_init.Designer.cs
rename to Pizzeria/PizzeriaDatabaseImplement/Migrations/20230504051520_init.Designer.cs
index 45dc7af..e444f9a 100644
--- a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503204906_init.Designer.cs
+++ b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230504051520_init.Designer.cs
@@ -12,7 +12,7 @@ using PizzeriaDatabaseImplement;
 namespace PizzeriaDatabaseImplement.Migrations
 {
     [DbContext(typeof(PizzeriaDatabase))]
-    [Migration("20230503204906_init")]
+    [Migration("20230504051520_init")]
     partial class init
     {
         /// <inheritdoc />
diff --git a/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503204906_init.cs b/Pizzeria/PizzeriaDatabaseImplement/Migrations/20230504051520_init.cs
similarity index 100%
rename from Pizzeria/PizzeriaDatabaseImplement/Migrations/20230503204906_init.cs
rename to Pizzeria/PizzeriaDatabaseImplement/Migrations/20230504051520_init.cs