From 2c0d6fa67217f74271ba2a4ef25f59582fc85c70 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 14 May 2023 12:59:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D0=A4?= =?UTF-8?q?=D0=98=D0=9D=D0=90=D0=9B=D0=AC=D0=9D=D0=9E=D0=93=D0=9E=20=D0=AD?= =?UTF-8?q?=D0=A2=D0=90=D0=9F=D0=90,=20=D0=92=D0=A3=D0=90=D0=A5=D0=90?= =?UTF-8?q?=D0=A5=D0=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CashierController.cs | 73 +++++++++++++++ .../Controllers/ClientController.cs | 23 +++-- .../Controllers/MainCashierController.cs | 12 --- .../Controllers/MainClientController.cs | 89 ------------------- 4 files changed, 83 insertions(+), 114 deletions(-) create mode 100644 BankYouBankrupt/BankYouBankruptRestAPI/Controllers/CashierController.cs delete mode 100644 BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainCashierController.cs delete mode 100644 BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainClientController.cs diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/CashierController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/CashierController.cs new file mode 100644 index 0000000..9fb86de --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/CashierController.cs @@ -0,0 +1,73 @@ +using BankYouBankruptContracts.BindingModels; +using BankYouBankruptContracts.BusinessLogicsContracts; +using BankYouBankruptContracts.SearchModels; +using BankYouBankruptContracts.ViewModels; +using Microsoft.AspNetCore.Mvc; + +namespace BankYouBankruptRestApi.Controllers +{ + //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода) + [Route("api/[controller]/[action]")] + [ApiController] + public class CashierController : Controller + { + private readonly ILogger _logger; + + private readonly ICashierLogic _cashierLogic; + + public CashierController(ICashierLogic cashierLogic, ILogger logger) + { + _logger = logger; + _cashierLogic = cashierLogic; + } + + [HttpGet] + public CashierViewModel? Login(string login, string password) + { + try + { + //попытка найти запись по переданным логину и паролю + return _cashierLogic.ReadElement(new CashierSearchModel + { + Email = login, + Password = password + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка входа в систему"); + throw; + } + } + + [HttpPost] + public void Register(CashierBindingModel model) + { + try + { + //создание клиента + _cashierLogic.Create(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка регистрации"); + throw; + } + } + + [HttpPost] + public void UpdateData(CashierBindingModel model) + { + try + { + //изменение клиента + _cashierLogic.Update(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка обновления данных"); + throw; + } + } + } +} diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/ClientController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/ClientController.cs index 27e9127..6e052e3 100644 --- a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/ClientController.cs +++ b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/ClientController.cs @@ -1,11 +1,10 @@ -using BankYouBankruptContracts.BusinessLogicsContracts; -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.BusinessLogicsContracts; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.ViewModels; +using BankYouBankruptContracts.BindingModels; +using BankYouBankruptContracts.BusinessLogicsContracts; +using BankYouBankruptContracts.SearchModels; +using BankYouBankruptContracts.ViewModels; using Microsoft.AspNetCore.Mvc; -namespace BlacksmithWorkshopRestApi.Controllers +namespace BankYouBankruptRestApi.Controllers { //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода) [Route("api/[controller]/[action]")] @@ -16,12 +15,10 @@ namespace BlacksmithWorkshopRestApi.Controllers private readonly IClientLogic _clientLogic; - private readonly ICashierLogic _cashierLogic; - - public ClientController(IClientLogic logic, ILogger logger) + public ClientController(IClientLogic clientLogic, ILogger logger) { _logger = logger; - _logic = logic; + _clientLogic = clientLogic; } [HttpGet] @@ -30,7 +27,7 @@ namespace BlacksmithWorkshopRestApi.Controllers try { //попытка найти запись по переданным логину и паролю - return _logic.ReadElement(new ClientSearchModel + return _clientLogic.ReadElement(new ClientSearchModel { Email = login, Password = password @@ -49,7 +46,7 @@ namespace BlacksmithWorkshopRestApi.Controllers try { //создание клиента - _logic.Create(model); + _clientLogic.Create(model); } catch (Exception ex) { @@ -64,7 +61,7 @@ namespace BlacksmithWorkshopRestApi.Controllers try { //изменение клиента - _logic.Update(model); + _clientLogic.Update(model); } catch (Exception ex) { diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainCashierController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainCashierController.cs deleted file mode 100644 index e9f7e05..0000000 --- a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainCashierController.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace BankYouBankruptRestAPI.Controllers -{ - public class MainCashierController : Controller - { - public IActionResult Index() - { - return View(); - } - } -} diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainClientController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainClientController.cs deleted file mode 100644 index 10eea1c..0000000 --- a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/MainClientController.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace BlacksmithWorkshopRestApi.Controllers -{ - /// - /// в этом контроллере логика по заказам и изделиям - /// - - //настройка у контроллера, так как снова используем несколько Post и Get запросов - [Route("api/[controller]/[action]")] - [ApiController] - public class MainClientController : Controller - { - private readonly ILogger _logger; - - private readonly IOrderLogic _order; - - private readonly IManufactureLogic _manufacture; - - public MainClientController(ILogger logger, IOrderLogic order, IManufactureLogic manufacture) - { - _logger = logger; - _order = order; - _manufacture = manufacture; - } - - [HttpGet] - public List? GetManufactureList() - { - try - { - return _manufacture.ReadList(null); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка получения списка изделий"); - throw; - } - } - - [HttpGet] - public ManufactureViewModel? GetManufacture(int manufactureId) - { - try - { - return _manufacture.ReadElement(new ManufactureSearchModel - { - Id = manufactureId - }); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка получения изделия по id={Id}", manufactureId); - throw; - } - } - - [HttpGet] - public List? GetOrders(int clientId) - { - try - { - return _order.ReadList(new OrderSearchModel - { - ClientId = clientId - }); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id}", clientId); - throw; - } - } - - [HttpPost] - public void CreateOrder(OrderBindingModel model) - { - try - { - _order.CreateOrder(model); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка создания заказа"); - throw; - } - } - } -}