From 9bdb960b8002c70b33eb3bf4fe452e3b7f816972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?=
 <raspaev.niko@mail.ru>
Date: Tue, 11 Apr 2023 16:01:49 +0400
Subject: [PATCH] fix

---
 .../Implements/ShopStorage.cs                 |  5 +-
 .../Controllers/ShopController.cs             | 53 ++++++++++++++-----
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs b/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
index 9f2ad1e..f9352d5 100644
--- a/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
+++ b/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
@@ -85,10 +85,7 @@ namespace FoodOrdersDatabaseImplement.Implements
                 }
                 updateShop.Update(model);
                 context.SaveChanges();
-                if (model.ShopDishes.Count != 0)
-                {
-                    updateShop.UpdateDish(context, model);
-                }
+                updateShop.UpdateDish(context, model);
                 transaction.Commit();
                 return updateShop.GetViewModel;
             }
diff --git a/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs b/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
index daa1a87..e2cc34e 100644
--- a/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
+++ b/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
@@ -76,17 +76,46 @@ namespace FoodOrdersRestApi.Controllers
 			}
 		}
 
-		[HttpPost]
-		public void UpdateShop(ShopBindingModel model) => CRUDShop(() => _logic.Update(model));
-		[HttpPost]
-		public void CreateShop(ShopBindingModel model) => CRUDShop(() => _logic.Create(model));
-		[HttpPost]
-		public void DeleteShop(ShopBindingModel model) => CRUDShop(() => _logic.Delete(model));
-
-		[HttpPost]
-		public void AddDishInShop(Tuple<ShopSearchModel, DishViewModel, int> countDishForShop)
-		{
-			CRUDShop(() => _logic.DeliveryDishes(countDishForShop.Item1, countDishForShop.Item2, countDishForShop.Item3));
+        [HttpPost]
+        public void CreateShop(ShopBindingModel model)
+        {
+            try
+            {
+                _logic.Update(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка обновления данных");
+                throw;
+            }
         }
-	}
+
+        [HttpPost]
+        public void DeleteShop(ShopBindingModel model)
+        {
+            try
+            {
+                _logic.Create(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка удаления магазина");
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void AddDishInShop(Tuple<ShopSearchModel, DishViewModel, int> model)
+        {
+            try
+            {
+                _logic.DeliveryDishes(model.Item1, model.Item2, model.Item3);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка добавления суши в магазин");
+                throw;
+            }
+        }
+    }
 }