From c2143fc67649ea382f488ae83807c47de9a09318 Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 22 Jun 2023 03:39:54 +0300 Subject: [PATCH] fix --- .../Controllers/HomeController.cs | 98 ++++++------------- 1 file changed, 29 insertions(+), 69 deletions(-) diff --git a/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs b/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs index d4ad59a..3873b66 100644 --- a/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs +++ b/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs @@ -3,6 +3,7 @@ using FluentNHibernate; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using System.Diagnostics; +using TravelCompanyBusinessLogic.BusinessLogic.TouristLogics; using TravelCompanyBusinessLogic.BusinessLogics; using TravelCompanyClientApp.Models; using TravelCompanyContracts.BindingModels; @@ -27,20 +28,20 @@ namespace TravelCompanyClientApp.Controllers private readonly ITravelLogic _travellogic; private readonly IReportLogic _reportlogic; private readonly IOperatorLogic _operatorlogic; + private readonly ITourLogic _tourLogic; + private readonly IGuideLogic _guidelogic; public HomeController(ILogger logger,ITouristLogic logic, ITravelLogic travelLogic,IReportLogic reportLogic - ,IOperatorLogic operatorLogic) + ,IOperatorLogic operatorLogic, ITourLogic tourLogic, IGuideLogic guideLogic) { _logger = logger; _logic = logic; _travellogic = travelLogic; _reportlogic = reportLogic; _operatorlogic = operatorLogic; - - if (_operatorlogic.ReadList(null).Count == 0) - { - - } + _tourLogic = tourLogic; + _guidelogic = guideLogic; + LoadFromJson(); } [HttpGet] @@ -221,82 +222,41 @@ namespace TravelCompanyClientApp.Controllers public List LoadGuidesFromJson(string jsonFilePath) { string jsonData = System.IO.File.ReadAllText(jsonFilePath); - var jsonObject = JsonConvert.DeserializeObject>>(jsonData); - var guides = jsonObject["service"]; + var jsonObject = JsonConvert.DeserializeObject>>(jsonData); + var guides = jsonObject["guide"]; return guides; } - - [HttpGet] - public IActionResult Index() - { - if (APIClient.Client == null) - { - if (_juristLogic.ReadList(null) != null) - { - string jsonFilePath = "automatic.json"; - List jurists = LoadJuristsFromJson(jsonFilePath); - List services = LoadServicesFromJson(jsonFilePath); - - foreach (var jurist in jurists) - { - _juristLogic.Create(jurist); - } - - foreach (var service in services) - { - _serviceLogic.Create(service); - } - } - - return Redirect("~/Home/Enter"); - } - return View(_meetingLogic.ReadList(new MeetingSearchModel { ClientId = APIClient.Client.Id })); - } - - public List LoadJuristsFromJson(string jsonFilePath) + public List LoadOperatorsFromJson(string jsonFilePath) { string jsonData = System.IO.File.ReadAllText(jsonFilePath); - var jsonObject = JsonConvert.DeserializeObject>>(jsonData); - var jurists = jsonObject["jurist"]; - return jurists; + var jsonObject = JsonConvert.DeserializeObject>>(jsonData); + var operators = jsonObject["operator"]; + return operators; } - public List LoadServicesFromJson(string jsonFilePath) + public void LoadFromJson() { - string jsonData = System.IO.File.ReadAllText(jsonFilePath); - var jsonObject = JsonConvert.DeserializeObject>>(jsonData); - var services = jsonObject["service"]; - return services; - } - - /* [HttpGet] - public IActionResult Index() - { - if (APIClient.Client == null) + if (_operatorlogic.ReadList(null).Count==0) { - if (_juristLogic.ReadList(null) != null) + string jsonFilePath = "automatic.json"; + List tours = LoadToursFromJson(jsonFilePath); + List guides = LoadGuidesFromJson(jsonFilePath); + List operators = LoadOperatorsFromJson(jsonFilePath); + foreach (var o in operators) { - string jsonFilePath = "automatic.json"; - List jurists = LoadJuristsFromJson(jsonFilePath); - List services = LoadServicesFromJson(jsonFilePath); - - foreach (var jurist in jurists) - { - _juristLogic.Create(jurist); - } - - foreach (var service in services) - { - _serviceLogic.Create(service); - } + _operatorlogic.Create(o); + } + foreach (var t in tours) + { + _tourLogic.Create(t); } - return Redirect("~/Home/Enter"); + foreach (var g in guides) + { + _guidelogic.Create(g); + } } - return View(_meetingLogic.ReadList(new MeetingSearchModel { ClientId = APIClient.Client.Id })); } -2.txt -2 кб*/ } } \ No newline at end of file