diff --git a/Bank/OperatorApp/APIClient.cs b/Bank/OperatorApp/APIClient.cs deleted file mode 100644 index c289e29..0000000 --- a/Bank/OperatorApp/APIClient.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System.Net.Http.Headers; -using System.Text; -using BankContracts.ViewModels; -using Newtonsoft.Json; - -namespace OperatorApp -{ - public class APIClient - { - private static readonly HttpClient _client = new(); - - public static OperatorViewModel? Operator { get; set; } = null; - - public static void Connect(IConfiguration configuration) - { - _client.BaseAddress = new Uri(configuration["IPAddress"]); - _client.DefaultRequestHeaders.Accept.Clear(); - _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - } - - public static T? GetRequest(string requestUrl) - { - var response = _client.GetAsync(requestUrl); - var result = response.Result.Content.ReadAsStringAsync().Result; - if (response.Result.IsSuccessStatusCode) - { - return JsonConvert.DeserializeObject(result); - } - else - { - throw new Exception(result); - } - } - - public static void PostRequest(string requestUrl, T model) - { - var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, "application/json"); - - var response = _client.PostAsync(requestUrl, data); - - var result = response.Result.Content.ReadAsStringAsync().Result; - if (!response.Result.IsSuccessStatusCode) - { - throw new Exception(result); - } - } - - public static void PatchRequest(string requestUrl, T model) - { - var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, "application/json"); - - var response = _client.PatchAsync(requestUrl, data); - - var result = response.Result.Content.ReadAsStringAsync().Result; - if (!response.Result.IsSuccessStatusCode) - { - throw new Exception(result); - } - } - - public static void DeleteRequest(string requestUrl) - { - var response = _client.DeleteAsync(requestUrl); - - var result = response.Result.Content.ReadAsStringAsync().Result; - if (!response.Result.IsSuccessStatusCode) - { - throw new Exception(result); - } - } - } -} diff --git a/Bank/OperatorApp/Controllers/HomeController.cs b/Bank/OperatorApp/Controllers/HomeController.cs index 03e1179..94c66ed 100644 --- a/Bank/OperatorApp/Controllers/HomeController.cs +++ b/Bank/OperatorApp/Controllers/HomeController.cs @@ -24,6 +24,8 @@ namespace OperatorApp.Controllers private readonly ICurrencyLogic _currencyLogic; private readonly AbstractMailWorker _mailWorker; + public static OperatorViewModel? Operator; + public HomeController(ILogger logger, IDealLogic dealLogic, IPaymentLogic paymentLogic, ITransferLogic transferLogic, IOperatorLogic operatorLogic, IReportLogic reportLogic, ICurrencyLogic currencyLogic, AbstractMailWorker mailWorker) { _logger = logger; @@ -38,28 +40,28 @@ namespace OperatorApp.Controllers public IActionResult Index() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { return Redirect("~/Home/Enter"); } - return View(_dealLogic.ReadList(new DealSearchModel { OperatorId = APIClient.Operator.Id })); + return View(_dealLogic.ReadList(new DealSearchModel { OperatorId = HomeController.Operator.Id })); } [HttpGet] public IActionResult Privacy() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - return View(APIClient.Operator); + return View(HomeController.Operator); } [HttpPost] public void Privacy(string login, string password, string lastname, string firstname, string middleName) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return; @@ -70,7 +72,7 @@ namespace OperatorApp.Controllers } _operatorLogic.Update(new OperatorBindingModel { - Id = APIClient.Operator.Id, + Id = HomeController.Operator.Id, LastName = lastname, FirstName = firstname, MiddleName = middleName, @@ -78,11 +80,11 @@ namespace OperatorApp.Controllers Password = password }); - APIClient.Operator.LastName = lastname; - APIClient.Operator.FirstName = firstname; - APIClient.Operator.MiddleName = middleName; - APIClient.Operator.Login = login; - APIClient.Operator.Password = password; + HomeController.Operator.LastName = lastname; + HomeController.Operator.FirstName = firstname; + HomeController.Operator.MiddleName = middleName; + HomeController.Operator.Login = login; + HomeController.Operator.Password = password; Response.Redirect("Index"); } @@ -106,8 +108,8 @@ namespace OperatorApp.Controllers Response.WriteAsync($""); return; } - APIClient.Operator = _operatorLogic.ReadElement(new OperatorSearchModel { Login = login, Password = password }); - if (APIClient.Operator == null) + HomeController.Operator = _operatorLogic.ReadElement(new OperatorSearchModel { Login = login, Password = password }); + if (HomeController.Operator == null) { Response.WriteAsync($""); return; @@ -142,7 +144,7 @@ namespace OperatorApp.Controllers [HttpGet] public IActionResult CreateDeal() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); @@ -153,7 +155,7 @@ namespace OperatorApp.Controllers [HttpPost] public void CreateDeal(int clientid) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return; @@ -161,34 +163,34 @@ namespace OperatorApp.Controllers _dealLogic.Create(new DealBindingModel { ClientId = clientid, - OperatorId = APIClient.Operator.Id, + OperatorId = HomeController.Operator.Id, }); Response.Redirect("Index"); } public IActionResult Payments() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - return View(_paymentLogic.ReadList(new PaymentSearchModel { OperatorId = APIClient.Operator.Id })); + return View(_paymentLogic.ReadList(new PaymentSearchModel { OperatorId = HomeController.Operator.Id })); } [HttpGet] public IActionResult CreatePayment() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - ViewBag.Deals = _dealLogic.ReadList(new DealSearchModel { OperatorId = APIClient.Operator.Id }); + ViewBag.Deals = _dealLogic.ReadList(new DealSearchModel { OperatorId = HomeController.Operator.Id }); return View(); } [HttpPost] public void CreatePayment(List deals) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return; @@ -199,13 +201,13 @@ namespace OperatorApp.Controllers var deal = _dealLogic.ReadElement(new DealSearchModel { Id = id }); if (deal != null) DealPayments.Add(deal.Id, deal); } - _paymentLogic.Create(new PaymentBindingModel { OperatorId = APIClient.Operator.Id, DealPayments = DealPayments, }); + _paymentLogic.Create(new PaymentBindingModel { OperatorId = HomeController.Operator.Id, DealPayments = DealPayments, }); Response.Redirect("Payments"); } [HttpGet] public IActionResult Payment(int id) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); @@ -215,39 +217,39 @@ namespace OperatorApp.Controllers [HttpGet] public IActionResult Transfers() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - return View(_transferLogic.ReadList(new TransferSearchModel { OperatorId = APIClient.Operator.Id })); + return View(_transferLogic.ReadList(new TransferSearchModel { OperatorId = HomeController.Operator.Id })); } [HttpGet] public IActionResult CreateTransfer() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - ViewBag.Payments = _paymentLogic.ReadList(new PaymentSearchModel { OperatorId = APIClient.Operator.Id }); + ViewBag.Payments = _paymentLogic.ReadList(new PaymentSearchModel { OperatorId = HomeController.Operator.Id }); return View(); } [HttpPost] public void CreateTransfer(string amount, int payment) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return; } - _transferLogic.Create(new TransferBindingModel { OperatorId = APIClient.Operator.Id, Amount = (float)Convert.ToDouble(amount), PaymentId = payment }); + _transferLogic.Create(new TransferBindingModel { OperatorId = HomeController.Operator.Id, Amount = (float)Convert.ToDouble(amount), PaymentId = payment }); Response.Redirect("Transfers"); } public void DeleteTransfer(int id) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); } @@ -258,12 +260,12 @@ namespace OperatorApp.Controllers [HttpGet] public IActionResult PaymentsReport() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); } - ViewBag.Payments = _paymentLogic.ReadList(new PaymentSearchModel { OperatorId = APIClient.Operator.Id }); + ViewBag.Payments = _paymentLogic.ReadList(new PaymentSearchModel { OperatorId = HomeController.Operator.Id }); return View(); } @@ -302,7 +304,7 @@ namespace OperatorApp.Controllers [HttpGet] public IActionResult TransfersReport() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); @@ -312,7 +314,7 @@ namespace OperatorApp.Controllers [HttpPost] public IActionResult TransfersReport(DateTime dateFrom, DateTime dateTo, string reptype, string email, string fileName) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); @@ -332,7 +334,7 @@ namespace OperatorApp.Controllers _mailWorker.MailSendAsync(new MailSendInfoBindingModel { Subject = "Отчёт о закупках", - Text = "Для оператора " + APIClient.Operator.LastName + APIClient.Operator.FirstName, + Text = "Для оператора " + HomeController.Operator.LastName + HomeController.Operator.FirstName, MailAddress = email, FileName = fileName, Attachment = report @@ -349,7 +351,7 @@ namespace OperatorApp.Controllers [HttpGet] public IActionResult AddCurrenciesToPayment() { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); return Redirect("/Home/Enter"); @@ -361,7 +363,7 @@ namespace OperatorApp.Controllers [HttpPost] public void AddCurrenciesToPayment(int payment, List currencies) { - if (APIClient.Operator == null) + if (HomeController.Operator == null) { Response.WriteAsync($""); Redirect("/Home/Enter"); diff --git a/Bank/OperatorApp/Program.cs b/Bank/OperatorApp/Program.cs index a47f347..806e945 100644 --- a/Bank/OperatorApp/Program.cs +++ b/Bank/OperatorApp/Program.cs @@ -54,8 +54,6 @@ catch (Exception ex) logger?.LogError(ex, " "); } -APIClient.Connect(builder.Configuration); - // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) {