From beffbdab69d404a50a2fa604736c0f5f591d3c15 Mon Sep 17 00:00:00 2001
From: Viltskaa <andrewstyou@gmail.com>
Date: Tue, 14 Feb 2023 09:35:24 +0400
Subject: [PATCH] FIX

---
 .../BusinessLogics/OrderLogic.cs                  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs b/SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
index a85d1ec..d6d2cda 100644
--- a/SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -46,14 +46,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
 
         public bool FinishOrder(OrderBindingModel model)
         {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_orderStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
+            return UpdateStatus(model, OrderStatus.Issued);
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -77,13 +70,17 @@ namespace SushiBarBusinessLogic.BusinessLogics
         private bool UpdateStatus(OrderBindingModel model, OrderStatus status)
         {
             CheckModel(model);
+
+            var order = _orderStorage.GetElement(new OrderSearchModel() { Id = model.Id });
+
             if (model.Status + 1 != status)
             {
                 _logger.LogWarning("Status update operation failed");
                 return false;
             }
             model.Status = status;
-            if (model.Status == OrderStatus.Issued)
+            model.DateImplement = order?.DateImplement;
+            if (model.Status == OrderStatus.Ready)
             {
                 model.DateImplement = DateTime.Now;
             }