From 4178c24cd24179455ce43628ed4fdaeefcb6565c 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: Sun, 9 Apr 2023 23:24:30 +0400
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=82=20=D1=82=D0=B5=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D1=8C=20=D0=B2=D1=81=D1=91=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FoodOrdersDatabaseImplement/Implements/ShopStorage.cs  | 5 ++++-
 FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs | 7 ++++---
 FoodOrders/FoodOrdersShopApp/Controllers/HomeController.cs | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs b/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
index f9352d5..9f2ad1e 100644
--- a/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
+++ b/FoodOrders/FoodOrdersDatabaseImplement/Implements/ShopStorage.cs
@@ -85,7 +85,10 @@ namespace FoodOrdersDatabaseImplement.Implements
                 }
                 updateShop.Update(model);
                 context.SaveChanges();
-                updateShop.UpdateDish(context, model);
+                if (model.ShopDishes.Count != 0)
+                {
+                    updateShop.UpdateDish(context, model);
+                }
                 transaction.Commit();
                 return updateShop.GetViewModel;
             }
diff --git a/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs b/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
index 48a2d9b..daa1a87 100644
--- a/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
+++ b/FoodOrders/FoodOrdersRestApi/Controllers/ShopController.cs
@@ -1,5 +1,6 @@
 using FoodOrdersContracts.BindingModels;
 using FoodOrdersContracts.BusinessLogicsContracts;
+using FoodOrdersContracts.SearchModels;
 using FoodOrdersContracts.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
@@ -83,9 +84,9 @@ namespace FoodOrdersRestApi.Controllers
 		public void DeleteShop(ShopBindingModel model) => CRUDShop(() => _logic.Delete(model));
 
 		[HttpPost]
-		public void AddDishInShop(Tuple<DishViewModel, int> countDishForShop)
+		public void AddDishInShop(Tuple<ShopSearchModel, DishViewModel, int> countDishForShop)
 		{
-			CRUDShop(() => _logic.AddDishes(countDishForShop.Item1, countDishForShop.Item2));
-		}
+			CRUDShop(() => _logic.DeliveryDishes(countDishForShop.Item1, countDishForShop.Item2, countDishForShop.Item3));
+        }
 	}
 }
diff --git a/FoodOrders/FoodOrdersShopApp/Controllers/HomeController.cs b/FoodOrders/FoodOrdersShopApp/Controllers/HomeController.cs
index eb01989..95c31ca 100644
--- a/FoodOrders/FoodOrdersShopApp/Controllers/HomeController.cs
+++ b/FoodOrders/FoodOrdersShopApp/Controllers/HomeController.cs
@@ -70,7 +70,7 @@ namespace FoodOrdersShopApp.Controllers
         }
 
         [HttpPost]
-        public void Create(string shopname, string address, int maxCount)
+        public void Create(string name, string address, int maxCount)
         {
             if (APIClient.IsAccessAllowed is false)
             {
@@ -80,7 +80,7 @@ namespace FoodOrdersShopApp.Controllers
             {
                 throw new Exception("Количество и сумма должны быть больше 0");
             }
-            if (string.IsNullOrEmpty(shopname))
+            if (string.IsNullOrEmpty(name))
             {
                 throw new Exception($"Имя магазина не должно быть пустым");
             }
@@ -90,7 +90,7 @@ namespace FoodOrdersShopApp.Controllers
             }
             APIClient.PostRequest("api/shop/createshop", new ShopBindingModel
             {
-                ShopName = shopname,
+                ShopName = name,
                 Address = address,
                 Capacity = maxCount,
             });