Тяжело, делал-делал, а в итоге ничего не работает, в итоге все вернул как было, чтобы у Ани не сломалось, оставил только контроллеры :(

This commit is contained in:
Кашин Максим 2023-05-16 00:09:17 +04:00
parent f1f9def74c
commit 4c4d8a878a
6 changed files with 422 additions and 34 deletions

View File

@ -1,4 +1,6 @@
using HostrelHeadwaiterApp.Models; using HostrelHeadwaiterApp.Models;
using HotelContracts.BindingModels;
using HotelContracts.ViewModels;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Diagnostics; using System.Diagnostics;
@ -13,57 +15,218 @@ namespace HostrelHeadwaiterApp.Controllers
_logger = logger; _logger = logger;
} }
public IActionResult CreateDinner()
{
if (APIClient.Headwaiter == null)
{
return Redirect("~/Home/Enter");
}
return View();
}
[HttpPost]
public void CreateDinner(double dinnerPrice, string dinnerName)
{
if (APIClient.Headwaiter == null)
{
throw new Exception("Необходима авторизация");
}
if (string.IsNullOrEmpty(dinnerName))
{
throw new Exception("Введите имя");
}
APIClient.PostRequest("api/main/createdinner", new DinnerBindingModel
{
DinnerPrice = dinnerPrice,
DinnerName = dinnerName,
HeadwaiterId = APIClient.Headwaiter.Id,
});
Response.Redirect("ListDinners");
}
public IActionResult UpdateDinner()
{
if (APIClient.Headwaiter == null)
{
return Redirect("~/Home/Enter");
}
ViewBag.Dinners = APIClient.GetRequest<List<DinnerViewModel>>($"api/main/getdinnerlist?headwaiterId={APIClient.Headwaiter.Id}");
return View();
}
[HttpPost]
public void UpdateDinner(int dinner, string dinnerName, double dinnerPrice)
{
if (APIClient.Headwaiter == null)
{
throw new Exception("Необходима авторизация");
}
if (string.IsNullOrEmpty(dinnerName))
{
throw new Exception("имя не может быть пустым");
}
APIClient.PostRequest("api/main/updatedinner", new DinnerBindingModel
{
Id = dinner,
DinnerName = dinnerName,
DinnerPrice = dinnerPrice,
HeadwaiterId = APIClient.Headwaiter.Id,
});
Response.Redirect("ListDinners");
}
public IActionResult DeleteDinner()
{
if (APIClient.Headwaiter == null)
{
return Redirect("~/Home/Enter");
}
ViewBag.Dinners = APIClient.GetRequest<List<DinnerViewModel>>($"api/main/getdinnerlist?headwaiterId={APIClient.Headwaiter.Id}");
return View();
}
[HttpPost]
public void DeleteDinner(int dinner)
{
if (APIClient.Headwaiter == null)
{
throw new Exception("Необходима авторизация");
}
APIClient.PostRequest("api/main/deletedinner", new DinnerBindingModel
{
Id = dinner
});
Response.Redirect("ListDinners");
}
[HttpGet]
public DinnerViewModel? GetDinner(int dinnerId)
{
if (APIClient.Headwaiter == null)
{
throw new Exception("Необходима авторизация");
}
var result = APIClient.GetRequest<DinnerViewModel>($"api/main/getdinner?dinnerid={dinnerId}");
if (result == null)
{
return default;
}
var dinnerPrice = result.DinnerPrice;
var dinnerName = result.DinnerName;
return result;
}
public IActionResult Index() public IActionResult Index()
{ {
return View(); if (APIClient.Headwaiter == null)
}
public IActionResult Register()
{ {
return Redirect("~/Home/Enter");
}
return View(); return View();
} }
public IActionResult Enter() public IActionResult ListDinners()
{ {
return View(); if (APIClient.Headwaiter == null)
}
public IActionResult Report()
{ {
return View(); return Redirect("~/Home/Enter");
}
return View(APIClient.GetRequest<List<DinnerViewModel>>($"api/main/getdinnerlist?headwaiterId={APIClient.Headwaiter.Id}"));
} }
public IActionResult BindingConferenceBindingAndConference() [HttpGet]
public IActionResult Privacy()
{ {
return View(); if (APIClient.Headwaiter == null)
}
public IActionResult FormationDinner()
{ {
return View(); return Redirect("~/Home/Enter");
}
return View(APIClient.Headwaiter);
} }
public IActionResult ShapingDinnerIntoRooms() [HttpPost]
public void Privacy(string login, string email, string password, string fio, string telephone)
{ {
return View(); if (APIClient.Headwaiter == null)
}
public IActionResult FormationOfDinnerInConferenceBookings()
{ {
return View(); throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
} }
public IActionResult ListOfMealPlans() if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
{ {
return View(); throw new Exception("Введите логин, пароль и ФИО");
} }
APIClient.PostRequest("api/headwaiter/updatedata", new HeadwaiterBindingModel
{
Id = APIClient.Headwaiter.Id,
HeadwaiterFIO = fio,
HeadwaiterLogin = login,
HeadwaiterPassword = password,
HeadwaiterEmail = email,
HeadwaiterNumber = telephone
});
APIClient.Headwaiter.HeadwaiterFIO = fio;
APIClient.Headwaiter.HeadwaiterLogin = login;
APIClient.Headwaiter.HeadwaiterPassword = password;
APIClient.Headwaiter.HeadwaiterEmail = email;
APIClient.Headwaiter.HeadwaiterNumber = telephone;
Response.Redirect("Index");
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error() public IActionResult Error()
{ {
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
} }
[HttpGet]
public IActionResult Enter()
{
return View();
}
[HttpPost]
public void Enter(string login, string password)
{
if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
{
throw new Exception("Введите логин и пароль");
}
APIClient.Headwaiter = APIClient.GetRequest<HeadwaiterViewModel>($"api/headwaiter/login?login={login}&password={password}");
if (APIClient.Headwaiter == null)
{
throw new Exception("Неверный логин/пароль");
}
Response.Redirect("Index");
}
[HttpGet]
public IActionResult Register()
{
return View();
}
[HttpPost]
public void Register(string login, string email, string password, string fio, string telephone)
{
if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
{
throw new Exception("Введите логин, пароль и ФИО");
}
APIClient.PostRequest("api/headwaiter/register", new HeadwaiterBindingModel
{
HeadwaiterFIO = fio,
HeadwaiterLogin = login,
HeadwaiterPassword = password,
HeadwaiterEmail = email,
HeadwaiterNumber = telephone
});
Response.Redirect("Enter");
return;
}
} }
} }

View File

@ -1,9 +1,12 @@
using HostrelHeadwaiterApp;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
// Add services to the container. // Add services to the container.
builder.Services.AddControllersWithViews(); builder.Services.AddControllersWithViews();
var app = builder.Build(); var app = builder.Build();
APIClient.Connect(builder.Configuration);
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment()) if (!app.Environment.IsDevelopment())

View File

@ -5,5 +5,6 @@
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning"
} }
}, },
"AllowedHosts": "*" "AllowedHosts": "*",
"IPAddress": "http://localhost:5079/"
} }

View File

@ -0,0 +1,67 @@
using HotelContracts.BindingModels;
using HotelContracts.BusinessLogicsContracts;
using HotelContracts.SearchModels;
using HotelContracts.ViewModels;
using Microsoft.AspNetCore.Mvc;
namespace HotelRestApi.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
public class HeadwaiterController : Controller
{
private readonly ILogger _logger;
private readonly IHeadwaiterLogic _logic;
public HeadwaiterController(IHeadwaiterLogic logic, ILogger<HeadwaiterController> logger)
{
_logger = logger;
_logic = logic;
}
[HttpGet]
public HeadwaiterViewModel? Login(string login, string password)
{
try
{
return _logic.ReadElement(new HeadwaiterSearchModel
{
HeadwaiterEmail = login,
HeadwaiterPassword = password
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка входа в систему");
throw;
}
}
[HttpPost]
public void Register(HeadwaiterBindingModel model)
{
try
{
_logic.Create(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка регистрации");
throw;
}
}
[HttpPost]
public void UpdateData(HeadwaiterBindingModel model)
{
try
{
_logic.Update(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка обновления данных");
throw;
}
}
}
}

View File

@ -16,13 +16,19 @@ namespace HotelRestApi.Controllers
private readonly IConferenceLogic _conference; private readonly IConferenceLogic _conference;
private readonly IMemberLogic _member; private readonly IMemberLogic _member;
private readonly IMealPlanLogic _mealPlan; private readonly IMealPlanLogic _mealPlan;
private readonly IDinnerLogic _dinner;
private readonly IConferenceBookingLogic _conferenceBooking;
private readonly IRoomLogic _room;
public MainController(ILogger<MainController> logger, IConferenceLogic conference, IMemberLogic member, IMealPlanLogic mealPlan) public MainController(ILogger<MainController> logger, IConferenceLogic conference, IMemberLogic member, IMealPlanLogic mealPlan, IDinnerLogic dinner, IConferenceBookingLogic conferenceBooking, IRoomLogic room)
{ {
_logger = logger; _logger = logger;
_conference = conference; _conference = conference;
_member = member; _member = member;
_mealPlan = mealPlan; _mealPlan = mealPlan;
_dinner = dinner;
_conferenceBooking = conferenceBooking;
_room = room;
} }
[HttpGet] [HttpGet]
@ -76,6 +82,57 @@ namespace HotelRestApi.Controllers
} }
} }
[HttpGet]
public List<DinnerViewModel>? GetDinnerList(int headwaiterId)
{
try
{
return _dinner.ReadList(new DinnerSearchModel
{
HeadwaiterId = headwaiterId,
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка обедов");
throw;
}
}
[HttpGet]
public List<ConferenceBookingViewModel>? GetConferenceBookingList(int headwaiterId)
{
try
{
return _conferenceBooking.ReadList(new ConferenceBookingSearchModel
{
HeadwaiterId = headwaiterId,
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка бронирования по конференциям");
throw;
}
}
[HttpGet]
public List<RoomViewModel>? GetRoomPlanList(int headwaiterId)
{
try
{
return _room.ReadList(new RoomSearchModel
{
HeadwaiterId = headwaiterId,
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка номеров");
throw;
}
}
[HttpPost] [HttpPost]
public void UpdateMember(MemberBindingModel model) public void UpdateMember(MemberBindingModel model)
{ {
@ -135,6 +192,65 @@ namespace HotelRestApi.Controllers
} }
} }
[HttpPost]
public void UpdateDinner(DinnerBindingModel model)
{
try
{
_dinner.Update(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка обновления данных обеда");
throw;
}
}
[HttpGet]
public DinnerViewModel? GetDinner(int dinnerId)
{
try
{
return _dinner.ReadElement(new DinnerSearchModel
{
Id = dinnerId
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения обеда по id={Id}", dinnerId);
throw;
}
}
[HttpPost]
public void CreateDinner(DinnerBindingModel model)
{
try
{
_dinner.Create(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка создания обеда");
throw;
}
}
[HttpPost]
public void DeleteDinner(DinnerBindingModel model)
{
try
{
_dinner.Delete(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка удаления обеда");
throw;
}
}
[HttpPost] [HttpPost]
public void CreateConference(ConferenceBindingModel model) public void CreateConference(ConferenceBindingModel model)
{ {
@ -162,5 +278,33 @@ namespace HotelRestApi.Controllers
throw; throw;
} }
} }
[HttpPost]
public void CreateRoom(RoomBindingModel model)
{
try
{
_room.Create(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка создания комнаты");
throw;
}
}
[HttpPost]
public void CreateConferenceBooking(ConferenceBookingBindingModel model)
{
try
{
_conferenceBooking.Create(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка создания бронирования конференций");
throw;
}
}
} }
} }

View File

@ -22,6 +22,16 @@ builder.Services.AddTransient<IMealPlanLogic, MealPlanLogic>();
builder.Services.AddTransient<IMemberLogic, MemberLogic>(); builder.Services.AddTransient<IMemberLogic, MemberLogic>();
builder.Services.AddTransient<IConferenceLogic, ConferenceLogic>(); builder.Services.AddTransient<IConferenceLogic, ConferenceLogic>();
builder.Services.AddTransient<IHeadwaiterStorage, HeadwaiterStorage>();
builder.Services.AddTransient<IDinnerStorage, DinnerStorage>();
builder.Services.AddTransient<IRoomStorage, RoomStorage>();
builder.Services.AddTransient<IConferenceBookingStorage, ConferenceBookingStorage>();
builder.Services.AddTransient<IHeadwaiterLogic, HeadwaiterLogic>();
builder.Services.AddTransient<IDinnerLogic, DinnerLogic>();
builder.Services.AddTransient<IRoomLogic, RoomLogic>();
builder.Services.AddTransient<IConferenceBookingLogic, ConferenceBookingLogic>();
//builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>(); //builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
builder.Services.AddControllers(); builder.Services.AddControllers();