From 9b1c5ce5b9921c832e068ec59c043e35ee42aa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Wed, 20 Nov 2024 12:58:58 +0400 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0=20search=20?= =?UTF-8?q?=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B5=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=20=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D0=BB=D0=B8=D1=89=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternetShopContracts/LogicContracts/IOrderLogic.cs | 2 +- .../InternetShopContracts/LogicContracts/IProductLogic.cs | 2 +- .../InternetShopContracts/StorageContracts/IOrderStorage.cs | 2 +- .../InternetShopContracts/StorageContracts/IProductStorage.cs | 2 +- InternetShop/InternetShopDatabase/Storages/OrderStorage.cs | 2 +- InternetShop/InternetShopDatabase/Storages/ProductStorage.cs | 2 +- InternetShop/InternetShopLogics/Logics/OrderLogic.cs | 3 +-- InternetShop/InternetShopLogics/Logics/ProductLogic.cs | 3 +-- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/InternetShop/InternetShopContracts/LogicContracts/IOrderLogic.cs b/InternetShop/InternetShopContracts/LogicContracts/IOrderLogic.cs index abf9878..11ac7c7 100644 --- a/InternetShop/InternetShopContracts/LogicContracts/IOrderLogic.cs +++ b/InternetShop/InternetShopContracts/LogicContracts/IOrderLogic.cs @@ -10,6 +10,6 @@ namespace InternetShopContracts.LogicsContracts OrderViewModel? ReadElement(OrderSearchModel model); bool Create(OrderBindingModel model); bool Update(OrderBindingModel model); - bool Delete(OrderBindingModel model); + bool Delete(OrderSearchModel model); } } diff --git a/InternetShop/InternetShopContracts/LogicContracts/IProductLogic.cs b/InternetShop/InternetShopContracts/LogicContracts/IProductLogic.cs index 7a21197..8278d14 100644 --- a/InternetShop/InternetShopContracts/LogicContracts/IProductLogic.cs +++ b/InternetShop/InternetShopContracts/LogicContracts/IProductLogic.cs @@ -10,6 +10,6 @@ namespace InternetShopContracts.LogicsContracts ProductViewModel? ReadElement(ProductSearchModel model); bool Create(ProductBindingModel model); bool Update(ProductBindingModel model); - bool Delete(ProductBindingModel model); + bool Delete(ProductSearchModel model); } } diff --git a/InternetShop/InternetShopContracts/StorageContracts/IOrderStorage.cs b/InternetShop/InternetShopContracts/StorageContracts/IOrderStorage.cs index e8f9060..d464835 100644 --- a/InternetShop/InternetShopContracts/StorageContracts/IOrderStorage.cs +++ b/InternetShop/InternetShopContracts/StorageContracts/IOrderStorage.cs @@ -11,6 +11,6 @@ namespace InternetShopContracts.StorageContracts OrderViewModel? GetElement(OrderSearchModel model); OrderViewModel? Insert(OrderBindingModel model); OrderViewModel? Update(OrderBindingModel model); - OrderViewModel? Delete(OrderBindingModel model); + OrderViewModel? Delete(OrderSearchModel model); } } diff --git a/InternetShop/InternetShopContracts/StorageContracts/IProductStorage.cs b/InternetShop/InternetShopContracts/StorageContracts/IProductStorage.cs index 3ba8ad0..c842227 100644 --- a/InternetShop/InternetShopContracts/StorageContracts/IProductStorage.cs +++ b/InternetShop/InternetShopContracts/StorageContracts/IProductStorage.cs @@ -11,6 +11,6 @@ namespace InternetShopContracts.StorageContracts ProductViewModel? GetElement(ProductSearchModel model); ProductViewModel? Insert(ProductBindingModel model); ProductViewModel? Update(ProductBindingModel model); - ProductViewModel? Delete(ProductBindingModel model); + ProductViewModel? Delete(ProductSearchModel model); } } diff --git a/InternetShop/InternetShopDatabase/Storages/OrderStorage.cs b/InternetShop/InternetShopDatabase/Storages/OrderStorage.cs index d0c99e4..11824f9 100644 --- a/InternetShop/InternetShopDatabase/Storages/OrderStorage.cs +++ b/InternetShop/InternetShopDatabase/Storages/OrderStorage.cs @@ -8,7 +8,7 @@ namespace InternetShopDatabase.Storages { public class OrderStorage : IOrderStorage { - public OrderViewModel? Delete(OrderBindingModel model) + public OrderViewModel? Delete(OrderSearchModel model) { using var context = new InternetShopDatabase(); var item = context.Orders.FirstOrDefault(rec => rec.Id == model.Id); diff --git a/InternetShop/InternetShopDatabase/Storages/ProductStorage.cs b/InternetShop/InternetShopDatabase/Storages/ProductStorage.cs index c9d63cb..2d8939d 100644 --- a/InternetShop/InternetShopDatabase/Storages/ProductStorage.cs +++ b/InternetShop/InternetShopDatabase/Storages/ProductStorage.cs @@ -8,7 +8,7 @@ namespace InternetShopDatabase.Storages { public class ProductStorage : IProductStorage { - public ProductViewModel? Delete(ProductBindingModel model) + public ProductViewModel? Delete(ProductSearchModel model) { using var context = new InternetShopDatabase(); var item = context.Products.FirstOrDefault(rec => rec.Id == model.Id); diff --git a/InternetShop/InternetShopLogics/Logics/OrderLogic.cs b/InternetShop/InternetShopLogics/Logics/OrderLogic.cs index 6a4e751..3e7aaf3 100644 --- a/InternetShop/InternetShopLogics/Logics/OrderLogic.cs +++ b/InternetShop/InternetShopLogics/Logics/OrderLogic.cs @@ -25,9 +25,8 @@ namespace InternetShopLogics.Logics return true; } - public bool Delete(OrderBindingModel model) + public bool Delete(OrderSearchModel model) { - CheckModel(model, false); if (_orderStorage.Delete(model) == null) { return false; diff --git a/InternetShop/InternetShopLogics/Logics/ProductLogic.cs b/InternetShop/InternetShopLogics/Logics/ProductLogic.cs index b180fb5..0312c4d 100644 --- a/InternetShop/InternetShopLogics/Logics/ProductLogic.cs +++ b/InternetShop/InternetShopLogics/Logics/ProductLogic.cs @@ -25,9 +25,8 @@ namespace InternetShopLogics.Logics return true; } - public bool Delete(ProductBindingModel model) + public bool Delete(ProductSearchModel model) { - CheckModel(model, false); if (_productStorage.Delete(model) == null) { return false;