Vyacheslav/CourseWork_Hotel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.is.ulstu.ru/Vyacheslav/CourseWork_Hotel

Browse Source
This commit is contained in:
Анна Забродина 2024-04-30 22:46:33 +04:00
commit 7668554357
26 changed files with 389 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Hotel/HotelBusinessLogic/BusinessLogics/ConferenceBookingLogic.cs
View File

@ -58,39 +58,6 @@ namespace HotelBusinessLogic.BusinessLogics
return element; return element;
} }
public bool AddLunchToConferenceBooking(ConferenceBookingSearchModel model, ILunchModel lunch)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("AddLunchToConferenceBooking. NameHall:{NameHall}.Id:{ Id}", model.NameHall, model.Id);
var element = _conferenceBookingStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("AddLunchToConferenceBooking element not found");
return false;
}
_logger.LogInformation("AddLunchToConferenceBooking find. Id:{Id}", element.Id);
element.ConferenceBookingLunches[lunch.Id] = lunch;
_conferenceBookingStorage.Update(new()
{
Id = element.Id,
NameHall = element.NameHall,
BookingDate = element.BookingDate,
ConferenceId = element.ConferenceId,
HeadwaiterId = element.HeadwaiterId,
ConferenceBookingLunches = element.ConferenceBookingLunches
});
return true;
}
public bool Create(ConferenceBookingBindingModel model) public bool Create(ConferenceBookingBindingModel model)
{ {
CheckModel(model); CheckModel(model);

32
Hotel/HotelBusinessLogic/BusinessLogics/ConferenceLogic.cs
View File

@ -58,38 +58,6 @@ namespace HotelBusinessLogic.BusinessLogics
return element; return element;
} }
public bool AddMemberToConference(ConferenceSearchModel model, IMemberModel member)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("AddMemberToConference. ConferenceName:{ConferenceName}.Id:{ Id}", model.ConferenceName, model.Id);
var element = _conferenceStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("AddMemberToConference element not found");
return false;
}
_logger.LogInformation("AddMemberToConference find. Id:{Id}", element.Id);
element.ConferenceMembers[member.Id] = member;
_conferenceStorage.Update(new()
{
Id = element.Id,
ConferenceName = element.ConferenceName,
StartDate = element.StartDate,
OrganiserId = element.OrganiserId,
ConferenceMembers = element.ConferenceMembers,
});
return true;
}
public bool Create(ConferenceBindingModel model) public bool Create(ConferenceBindingModel model)
{ {
CheckModel(model); CheckModel(model);

32
Hotel/HotelBusinessLogic/BusinessLogics/MealPlanLogic.cs
View File

@ -58,38 +58,6 @@ namespace HotelBusinessLogic.BusinessLogics
return element; return element;
} }
public bool AddMemberToMealPlan(MealPlanSearchModel model, IMemberModel member)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("AddMemberToMealPlan. MealPlanName:{MealPlanName}.Id:{ Id}", model.MealPlanName, model.Id);
var element = _mealPlanStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("AddMemberToMealPlan element not found");
return false;
}
_logger.LogInformation("AddMemberToMealPlan find. Id:{Id}", element.Id);
element.MealPlanMembers[member.Id] = member;
_mealPlanStorage.Update(new()
{
Id = element.Id,
MealPlanName = element.MealPlanName,
MealPlanPrice = element.MealPlanPrice,
OrganiserId = element.OrganiserId,
MealPlanMembers = element.MealPlanMembers
});
return true;
}
public bool Create(MealPlanBindingModel model) public bool Create(MealPlanBindingModel model)
{ {
CheckModel(model); CheckModel(model);

53
Hotel/HotelBusinessLogic/BusinessLogics/RoomLogic.cs
View File

@ -58,48 +58,11 @@ namespace HotelBusinessLogic.BusinessLogics
return element; return element;
} }
public bool AddLunchToRoom(RoomSearchModel model, ILunchModel lunch)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("AddLunchToRoom. RoomName:{RoomName}.Id:{ Id}", model.RoomName, model.Id);
var element = _roomStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("AddLunchToRoom element not found");
return false;
}
_logger.LogInformation("AddLunchToRoom find. Id:{Id}", element.Id);
element.RoomLunches[lunch.Id] = lunch;
_roomStorage.Update(new()
{
Id = element.Id,
RoomName = element.RoomName,
RoomPrice = element.RoomPrice,
RoomFrame = element.RoomFrame,
MealPlanId = element.MealPlanId,
HeadwaiterId = element.HeadwaiterId,
RoomLunches = element.RoomLunches,
});
return true;
}
public bool Create(RoomBindingModel model) public bool Create(RoomBindingModel model)
{ {
CheckModel(model); CheckModel(model);
model.RoomLunches = new();
var result = _roomStorage.Insert(model); if (_roomStorage.Insert(model) == null)
if (result == null)
{ {
_logger.LogWarning("Insert operation failed"); _logger.LogWarning("Insert operation failed");
return false; return false;
@ -127,9 +90,7 @@ namespace HotelBusinessLogic.BusinessLogics
_logger.LogInformation("Delete. Id:{Id}", model.Id); _logger.LogInformation("Delete. Id:{Id}", model.Id);
var result = _roomStorage.Delete(model); if (_roomStorage.Delete(model) == null)
if (result == null)
{ {
_logger.LogWarning("Delete operation failed"); _logger.LogWarning("Delete operation failed");
return false; return false;
@ -166,6 +127,16 @@ namespace HotelBusinessLogic.BusinessLogics
throw new ArgumentNullException("Стоимость комнаты не может быть меньше 0", nameof(model.RoomPrice)); throw new ArgumentNullException("Стоимость комнаты не может быть меньше 0", nameof(model.RoomPrice));
} }
var element = _roomStorage.GetElement(new RoomSearchModel
{
RoomName = model.RoomName
});
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Услуга с таким названием уже есть");
}
_logger.LogInformation("Room. RoomName:{RoomName}.RoomFrame:{ RoomFrame}.RoomPrice:{ RoomPrice}. Id: { Id}", model.RoomName, model.RoomFrame, model.RoomPrice, model.Id); _logger.LogInformation("Room. RoomName:{RoomName}.RoomFrame:{ RoomFrame}.RoomPrice:{ RoomPrice}. Id: { Id}", model.RoomName, model.RoomFrame, model.RoomPrice, model.Id);
} }
} }

1
Hotel/HotelContracts/BusinessLogicsContracts/IConferenceBookingLogic.cs
View File

@ -9,7 +9,6 @@ namespace HotelContracts.BusinessLogicsContracts
{ {
List<ConferenceBookingViewModel>? ReadList(ConferenceBookingSearchModel? model); List<ConferenceBookingViewModel>? ReadList(ConferenceBookingSearchModel? model);
ConferenceBookingViewModel? ReadElement(ConferenceBookingSearchModel model); ConferenceBookingViewModel? ReadElement(ConferenceBookingSearchModel model);
bool AddLunchToConferenceBooking(ConferenceBookingSearchModel model, ILunchModel lunch);
bool Create(ConferenceBookingBindingModel model); bool Create(ConferenceBookingBindingModel model);
bool Update(ConferenceBookingBindingModel model); bool Update(ConferenceBookingBindingModel model);
bool Delete(ConferenceBookingBindingModel model); bool Delete(ConferenceBookingBindingModel model);

1
Hotel/HotelContracts/BusinessLogicsContracts/IConferenceLogic.cs
View File

@ -9,7 +9,6 @@ namespace HotelContracts.BusinessLogicsContracts
{ {
List<ConferenceViewModel>? ReadList(ConferenceSearchModel? model); List<ConferenceViewModel>? ReadList(ConferenceSearchModel? model);
ConferenceViewModel? ReadElement(ConferenceSearchModel model); ConferenceViewModel? ReadElement(ConferenceSearchModel model);
bool AddMemberToConference(ConferenceSearchModel model, IMemberModel member);
bool Create(ConferenceBindingModel model); bool Create(ConferenceBindingModel model);
bool Update(ConferenceBindingModel model); bool Update(ConferenceBindingModel model);
bool Delete(ConferenceBindingModel model); bool Delete(ConferenceBindingModel model);

1
Hotel/HotelContracts/BusinessLogicsContracts/IMealPlanLogic.cs
View File

@ -9,7 +9,6 @@ namespace HotelContracts.BusinessLogicsContracts
{ {
List<MealPlanViewModel>? ReadList(MealPlanSearchModel? model); List<MealPlanViewModel>? ReadList(MealPlanSearchModel? model);
MealPlanViewModel? ReadElement(MealPlanSearchModel model); MealPlanViewModel? ReadElement(MealPlanSearchModel model);
bool AddMemberToMealPlan(MealPlanSearchModel model, IMemberModel member);
bool Create(MealPlanBindingModel model); bool Create(MealPlanBindingModel model);
bool Update(MealPlanBindingModel model); bool Update(MealPlanBindingModel model);
bool Delete(MealPlanBindingModel model); bool Delete(MealPlanBindingModel model);

1
Hotel/HotelContracts/BusinessLogicsContracts/IRoomLogic.cs
View File

@ -9,7 +9,6 @@ namespace HotelContracts.BusinessLogicsContracts
{ {
List<RoomViewModel>? ReadList(RoomSearchModel? model); List<RoomViewModel>? ReadList(RoomSearchModel? model);
RoomViewModel? ReadElement(RoomSearchModel model); RoomViewModel? ReadElement(RoomSearchModel model);
bool AddLunchToRoom(RoomSearchModel model, ILunchModel lunch);
bool Create(RoomBindingModel model); bool Create(RoomBindingModel model);
bool Update(RoomBindingModel model); bool Update(RoomBindingModel model);
bool Delete(RoomBindingModel model); bool Delete(RoomBindingModel model);

8
Hotel/HotelContracts/ViewModels/ConferenceBookingViewModel.cs
View File

@ -19,13 +19,5 @@ namespace HotelContracts.ViewModels
public Dictionary<int, ILunchModel> ConferenceBookingLunches { get; set; } public Dictionary<int, ILunchModel> ConferenceBookingLunches { get; set; }
public Dictionary<int, IConferenceBookingModel> ConferenceConferenceBookings { get; set; } = new(); public Dictionary<int, IConferenceBookingModel> ConferenceConferenceBookings { get; set; } = new();
public ConferenceBookingViewModel() { }
[JsonConstructor]
public ConferenceBookingViewModel(Dictionary<int, LunchViewModel> ConferenceBookingLunches, Dictionary<int, ConferenceBookingViewModel> ConferenceConferenceBookings)
{
this.ConferenceBookingLunches = ConferenceBookingLunches.ToDictionary(x => x.Key, x => x.Value as ILunchModel);
this.ConferenceConferenceBookings = ConferenceConferenceBookings.ToDictionary(x => x.Key, x => x.Value as IConferenceBookingModel);
}
} }
} }

8
Hotel/HotelContracts/ViewModels/ConferenceViewModel.cs
View File

@ -18,13 +18,5 @@ namespace HotelContracts.ViewModels
public int OrganiserId { get; set; } public int OrganiserId { get; set; }
public Dictionary<int, IMemberModel> ConferenceMembers { get; set; } = new(); public Dictionary<int, IMemberModel> ConferenceMembers { get; set; } = new();
public ConferenceViewModel() { }
[JsonConstructor]
public ConferenceViewModel(Dictionary<int, MemberViewModel> ConferenceMembers)
{
this.ConferenceMembers = ConferenceMembers.ToDictionary(x => x.Key, x => x.Value as IMemberModel);
}
} }
} }

9
Hotel/HotelContracts/ViewModels/MealPlanViewModel.cs
View File

@ -19,14 +19,5 @@ namespace HotelContracts.ViewModels
public Dictionary<int, IMemberModel> MealPlanMembers { get; set; } = new(); public Dictionary<int, IMemberModel> MealPlanMembers { get; set; } = new();
public Dictionary<int, IRoomModel> MealPlanRooms { get; set; } = new(); public Dictionary<int, IRoomModel> MealPlanRooms { get; set; } = new();
public MealPlanViewModel() { }
[JsonConstructor]
public MealPlanViewModel(Dictionary<int, MemberViewModel> MealPlanMembers, Dictionary<int, RoomViewModel> MealPlanRooms)
{
this.MealPlanMembers = MealPlanMembers.ToDictionary(x => x.Key, x => x.Value as IMemberModel);
this.MealPlanRooms = MealPlanRooms.ToDictionary(x => x.Key, x => x.Value as IRoomModel);
}
} }
} }

8
Hotel/HotelContracts/ViewModels/RoomViewModel.cs
View File

@ -22,13 +22,5 @@ namespace HotelContracts.ViewModels
public int HeadwaiterId { get; set; } public int HeadwaiterId { get; set; }
public Dictionary<int, ILunchModel> RoomLunches { get; set; } public Dictionary<int, ILunchModel> RoomLunches { get; set; }
public RoomViewModel() { }
[JsonConstructor]
public RoomViewModel(Dictionary<int, LunchViewModel> RoomLunches)
{
this.RoomLunches = RoomLunches.ToDictionary(x => x.Key, x => x.Value as ILunchModel);
}
} }
} }

2
Hotel/HotelDataBaseImplement/HotelDataBase.cs
View File

@ -10,7 +10,7 @@ namespace HotelDataBaseImplement
{ {
if (optionsBuilder.IsConfigured == false) if (optionsBuilder.IsConfigured == false)
{ {
optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-7DB3VEN\SQLEXPRESS;Initial Catalog=HotelDataBase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-M2G96S06\SQLEXPRESS;Initial Catalog=HotelDataBase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
} }
base.OnConfiguring(optionsBuilder); base.OnConfiguring(optionsBuilder);
} }

6
Hotel/HotelDataBaseImplement/Models/Conference.cs
View File

@ -28,10 +28,8 @@ namespace HotelDataBaseImplement.Models
{ {
if (_conferenceMembers == null) if (_conferenceMembers == null)
{ {
using var context = new HotelDataBase(); _conferenceMembers = Members.ToDictionary(x => x.MemberId, x => (x.Member as IMemberModel));
_conferenceMembers = Members.ToDictionary(x => x.MemberId, x => (context.Members }
.FirstOrDefault(y => y.Id == x.MemberId)! as IMemberModel));
}
return _conferenceMembers; return _conferenceMembers;
} }
} }

7
Hotel/HotelDataBaseImplement/Models/ConferenceBooking.cs
View File

@ -27,11 +27,8 @@ namespace HotelDataBaseImplement.Models
{ {
if (_conferenceBookingLunches == null) if (_conferenceBookingLunches == null)
{ {
using var context = new HotelDataBase(); _conferenceBookingLunches = Lunches.ToDictionary(x => x.LunchId, x => (x.Lunch as ILunchModel));
_conferenceBookingLunches = Lunches }
.ToDictionary(x => x.LunchId, x => (context.Lunches
.FirstOrDefault(y => y.Id == x.LunchId)! as ILunchModel));
}
return _conferenceBookingLunches; return _conferenceBookingLunches;
} }
} }

6
Hotel/HotelDataBaseImplement/Models/MealPlan.cs
View File

@ -29,10 +29,8 @@ namespace HotelDataBaseImplement.Models
{ {
if (_mealPlanMembers == null) if (_mealPlanMembers == null)
{ {
using var context = new HotelDataBase(); _mealPlanMembers = Members.ToDictionary(x => x.MemberId, x => (x.Member as IMemberModel));
_mealPlanMembers = Members.ToDictionary(x => x.MemberId, x => (context.Members }
.FirstOrDefault(y => y.Id == x.MemberId)! as IMemberModel));
}
return _mealPlanMembers; return _mealPlanMembers;
} }
} }

4
Hotel/HotelDataBaseImplement/Models/Room.cs
View File

@ -37,9 +37,7 @@ namespace HotelDataBaseImplement.Models
{ {
if (_roomLunches == null) if (_roomLunches == null)
{ {
using var context = new HotelDataBase(); _roomLunches = Lunches.ToDictionary(x => x.LunchId, x => (x.Lunch as ILunchModel));
_roomLunches = Lunches.ToDictionary(x => x.LunchId, x => (context.Lunches
.FirstOrDefault(y => y.Id == x.LunchId)! as ILunchModel));
} }
return _roomLunches; return _roomLunches;
} }

93
Hotel/HotelHeadwaiterApp/Controllers/HomeController.cs
View File

@ -4,6 +4,7 @@ using HotelContracts.BindingModels;
using HotelContracts.SearchModels; using HotelContracts.SearchModels;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement.Models; using HotelDataBaseImplement.Models;
using HotelDataModels.Models;
using HotelHeadwaiterApp.Models; using HotelHeadwaiterApp.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
@ -235,20 +236,21 @@ namespace HotelHeadwaiterApp.Controllers
{ {
return Redirect("~/Home/Enter"); return Redirect("~/Home/Enter");
} }
return View(APIClient.GetRequest<List<RoomViewModel>>($"api/room/getroomlist?headwaiterId={APIClient.Headwaiter.Id}")); return View(APIClient.GetRequest<List<RoomViewModel>>($"api/room/getrooms?headwaiterId={APIClient.Headwaiter.Id}"));
} }
public IActionResult CreateRoom() public IActionResult CreateRoom()
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {
return Redirect("~/Home/Enter"); return Redirect("~/Home/Enter");
} }
ViewBag.Lunches = APIClient.GetRequest<List<LunchViewModel>>($"api/lunch/getlunches");
return View(); return View();
} }
[HttpPost] [HttpPost]
public void CreateRoom(string roomName, double roomPrice, string roomFrame) public void CreateRoom(string roomName, string roomFrame, double roomPrice, List<int> lunches)
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {
@ -266,12 +268,18 @@ namespace HotelHeadwaiterApp.Controllers
{ {
throw new Exception("Цена не может быть отрицательной"); throw new Exception("Цена не может быть отрицательной");
} }
Dictionary<int, ILunchModel> a = new Dictionary<int, ILunchModel>();
foreach (int lunch in lunches)
{
a.Add(lunch, new LunchSearchModel { Id = lunch } as ILunchModel);
}
APIClient.PostRequest("api/room/createroom", new RoomBindingModel APIClient.PostRequest("api/room/createroom", new RoomBindingModel
{ {
RoomName = roomName, RoomName = roomName,
RoomPrice = roomPrice, RoomPrice = roomPrice,
RoomFrame = roomFrame, RoomFrame = roomFrame,
HeadwaiterId = APIClient.Headwaiter.Id, HeadwaiterId = APIClient.Headwaiter.Id,
RoomLunches = a
}); });
Response.Redirect("ListRooms"); Response.Redirect("ListRooms");
} }
@ -282,12 +290,13 @@ namespace HotelHeadwaiterApp.Controllers
{ {
return Redirect("~/Home/Enter"); return Redirect("~/Home/Enter");
} }
ViewBag.Rooms = APIClient.GetRequest<List<RoomViewModel>>($"api/room/getroomlist?headwaiterId={APIClient.Headwaiter.Id}"); ViewBag.Rooms = APIClient.GetRequest<List<RoomViewModel>>($"api/room/getrooms?headwaiterId={APIClient.Headwaiter.Id}");
ViewBag.Lunches = APIClient.GetRequest<List<LunchViewModel>>($"api/lunch/getlunches");
return View(); return View();
} }
[HttpPost] [HttpPost]
public void UpdateRoom(int room, string roomName, double roomPrice, string roomFrame) public void UpdateRoom(int room, string roomName, double roomPrice, string roomFrame, List<int> lunches)
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {
@ -305,70 +314,40 @@ namespace HotelHeadwaiterApp.Controllers
{ {
throw new Exception("Цена не может быть отрицательной"); throw new Exception("Цена не может быть отрицательной");
} }
Dictionary<int, ILunchModel> a = new Dictionary<int, ILunchModel>();
foreach (int lunch in lunches)
{
a.Add(lunch, new LunchSearchModel { Id = lunch } as ILunchModel);
}
APIClient.PostRequest("api/room/updateroom", new RoomBindingModel APIClient.PostRequest("api/room/updateroom", new RoomBindingModel
{ {
Id = room, Id = room,
RoomName = roomName, RoomName = roomName,
RoomPrice = roomPrice, RoomPrice = roomPrice,
RoomFrame = roomFrame, RoomFrame = roomFrame,
HeadwaiterId = APIClient.Headwaiter.Id HeadwaiterId = APIClient.Headwaiter.Id,
RoomLunches = a
}); });
Response.Redirect("ListRooms"); Response.Redirect("ListRooms");
} }
[HttpGet] [HttpGet]
public Tuple<RoomViewModel, string>? GetRoom(int roomId) public Tuple<RoomViewModel, List<string>>? GetRoom(int roomId)
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {
throw new Exception("Необходима авторизация"); throw new Exception("Необходима авторизация");
} }
var result = APIClient.GetRequest<Tuple<RoomViewModel, List<Tuple<string, string>>>>($"api/room/getroombyid?roomId={roomId}"); var result = APIClient.GetRequest<Tuple<RoomViewModel, List<string>>>($"api/room/getroom?roomId={roomId}");
if (result == null) if (result == null)
{ {
return default; return default;
} }
string table = "";
for (int i = 0; i < result.Item2.Count; i++)
{
var lunchName = result.Item2[i].Item1;
var lunchPrice = result.Item2[i].Item2;
table += "<tr style=\"height: 44px\">";
table += $"<td class=\"u-border-1 u-border-grey-30 u-table-cell\">{lunchName}</td>";
table += $"<td class=\"u-border-1 u-border-grey-30 u-table-cell\">{lunchPrice}</td>";
table += "</tr>";
}
return Tuple.Create(result.Item1, table);
}
public IActionResult AddLunchToRoom() return result;
{ }
if (APIClient.Headwaiter == null)
{
return Redirect("~/Home/Enter");
}
return View(Tuple.Create(APIClient.GetRequest<List<RoomViewModel>>($"api/room/getroomlist?headwaiterId={APIClient.Headwaiter.Id}"),
APIClient.GetRequest<List<LunchViewModel>>($"api/lunch/getlunchlist?headwaiterId={APIClient.Headwaiter.Id}")));
}
[HttpPost] public IActionResult DeleteRoom()
public void AddLunchToRoom(int room, int[] lunch)
{
if (APIClient.Headwaiter == null)
{
throw new Exception("Необходима авторизация");
}
for (int i = 0; i < lunch.Length; i++)
{
APIClient.PostRequest("api/room/AddLunchToRoom", Tuple.Create(
new RoomSearchModel() { Id = room },
new LunchViewModel() { Id = lunch[i] }
));
}
Response.Redirect("ListRooms");
}
public IActionResult DeleteRoom()
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {

76
Hotel/HotelHeadwaiterApp/Views/Home/CreateRoom.cshtml
View File

@ -1,7 +1,4 @@
@using HotelContracts.ViewModels; @{
@using HotelDataModels.Models;
@{
ViewData["Title"] = "CreateRoom"; ViewData["Title"] = "CreateRoom";
} }
@ -16,15 +13,6 @@
placeholder="Введите название комнаты" placeholder="Введите название комнаты"
name="roomName" name="roomName"
class="form-control" /> class="form-control" />
<br>
<div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-2">Цена комнаты</label>
</div>
<input type="number"
placeholder="Введите цену комнаты"
name="roomPrice"
class="form-control" />
<br>
<div class="form-group"> <div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-2">Корпус</label> <label class="u-label u-text-custom-color-1 u-label-2">Корпус</label>
</div> </div>
@ -32,51 +20,27 @@
placeholder="Введите корпус комнаты" placeholder="Введите корпус комнаты"
name="roomFrame" name="roomFrame"
class="form-control" /> class="form-control" />
<br> <div class="form-group">
<div class="u-table u-table-responsive u-table-1"> <label class="u-label u-text-custom-color-1 u-label-2">Цена комнаты</label>
<label class="u-label u-text-custom-color-1 u-label-1">Обеды для номеров</label> </div>
<table class="table"> <input type="number"
<thead class="thead-dark"> placeholder="Введите цену комнаты"
<tr style="height: 44px"> name="roomPrice"
<th class="u-border-1 u-border-grey-50 u-table-cell"> class="form-control" />
Обед <div class="form-group">
</th> <label class="u-label u-text-custom-color-1 u-label-2">Обеды</label>
<th class="u-border-1 u-border-grey-50 u-table-cell"> </div>
Цена <div class="form-group">
</th> <div class="col-8">
</tr> <select name="lunches" class="form-control" multiple size="6" id="lunches">
</thead> @foreach (var lunch in ViewBag.Lunches)
<tbody class="u-table-body" id="table-elements"> {
</tbody> <option value="@lunch.Id">@lunch.LunchName</option>
</table> }
</select>
</div>
</div> </div>
<div class="u-container-layout u-container-layout-2"> <div class="u-container-layout u-container-layout-2">
<input type="submit" value="Сохранить" class="btn btn-outline-dark text-center d-flex justify-content-md-center" /> <input type="submit" value="Сохранить" class="btn btn-outline-dark text-center d-flex justify-content-md-center" />
</div> </div>
</form> </form>
@section Scripts
{
<script>
function check() {
var room = $('#room').val();
if (room) {
$.ajax({
method: "GET",
url: "/Home/GetRoom",
data: { roomId: room },
success: function (result) {
$('#roomName').val(result.item1.roomName);
$('#roomPrice').val(result.item1.roomPrice);
$('#roomFrame').val(result.item1.roomFrame);
$('#table-elements').html(result.item2);
}
});
};
}
check();
$('#room').on('change', function () {
check();
});
</script>
}

45
Hotel/HotelHeadwaiterApp/Views/Home/UpdateRoom.cshtml
View File

@ -21,6 +21,14 @@
name="roomName" name="roomName"
class="form-control" /> class="form-control" />
</div> </div>
<div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-1">Корпус</label>
<input type="text"
id="roomFrame"
placeholder="Введите название корпуса"
name="roomFrame"
class="form-control" />
</div>
<div class="form-group"> <div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-2">Цена комнаты</label> <label class="u-label u-text-custom-color-1 u-label-2">Цена комнаты</label>
<input type="number" <input type="number"
@ -30,29 +38,17 @@
class="form-control" /> class="form-control" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-1">Корпус</label> <label class="u-label u-text-custom-color-1 u-label-2">Обеды</label>
<input type="text"
id="roomFrame"
placeholder="Введите название корпуса"
name="roomFrame"
class="form-control" />
</div> </div>
<div class="u-table u-table-responsive u-table-1"> <div class="form-group">
<label class="u-label u-text-custom-color-1 u-label-1">Обеды для номеров</label> <div class="col-8">
<table class="table"> <select name="lunches" class="form-control" multiple size="6" id="lunches">
<thead class="thead-dark"> @foreach (var lunch in ViewBag.Lunches)
<tr style="height: 44px"> {
<th class="u-border-1 u-border-grey-50 u-table-cell"> <option value="@lunch.Id">@lunch.LunchName</option>
Обед }
</th> </select>
<th class="u-border-1 u-border-grey-50 u-table-cell"> </div>
Цена
</th>
</tr>
</thead>
<tbody class="u-table-body" id="table-elements">
</tbody>
</table>
</div> </div>
<br> <br>
<div class="u-container-layout u-container-layout-2"> <div class="u-container-layout u-container-layout-2">
@ -74,7 +70,10 @@
$('#roomName').val(result.item1.roomName); $('#roomName').val(result.item1.roomName);
$('#roomPrice').val(result.item1.roomPrice); $('#roomPrice').val(result.item1.roomPrice);
$('#roomFrame').val(result.item1.roomFrame); $('#roomFrame').val(result.item1.roomFrame);
$('#table-elements').html(result.item2); $.map(result.item2, function (n) {
console.log("#" + n);
$("#" + n).attr("selected", "selected")
});
} }
}); });
}; };

115
Hotel/HotelRestApi/Controllers/ConferenceBookingController.cs
View File

@ -19,72 +19,55 @@ namespace HotelRestApi.Controllers
_conferenceBooking = conferenceBooking; _conferenceBooking = conferenceBooking;
} }
[HttpGet] [HttpGet]
public List<ConferenceBookingViewModel>? GetConferenceBookingList(int headwaiterId) public List<ConferenceBookingViewModel>? GetConferenceBookings(int? headwaiterId = null)
{ {
try try
{ {
return _conferenceBooking.ReadList(new ConferenceBookingSearchModel List<ConferenceBookingViewModel> res;
if (!headwaiterId.HasValue)
{ {
HeadwaiterId = headwaiterId, res = _conferenceBooking.ReadList(null);
}); }
} else
catch (Exception ex) {
{ res = _conferenceBooking.ReadList(new ConferenceBookingSearchModel { HeadwaiterId = headwaiterId });
_logger.LogError(ex, "Ошибка получения списка бронирования по конференции"); }
throw; foreach (var conferencebooking in res)
} {
} conferencebooking.ConferenceBookingLunches = null!;
}
[HttpGet] return res;
public ConferenceBookingViewModel? GetConferenceBookingById(int conferenceBookingId) }
{ catch (Exception ex)
try {
{ _logger.LogError(ex, "Ошибка получения списка бронирований по конференциям");
var elem = _conferenceBooking.ReadElement(new ConferenceBookingSearchModel throw;
{ }
Id = conferenceBookingId }
});
[HttpGet]
public Tuple<ConferenceBookingViewModel, List<string>>? GetConferenceBooking(int conferencebookingId)
{
try
{
var elem = _conferenceBooking.ReadElement(new ConferenceBookingSearchModel { Id = conferencebookingId });
if (elem == null) if (elem == null)
{ {
return null; return null;
} }
var res = Tuple.Create(elem, elem.ConferenceBookingLunches.Select(x => x.Value.LunchName).ToList());
res.Item1.ConferenceBookingLunches = null!;
return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения бронирования по конференции по id={Id}", conferencebookingId);
throw;
}
}
return elem; [HttpPost]
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения по id={Id}", conferenceBookingId);
throw;
}
}
[HttpGet]
public Tuple<ConferenceBookingViewModel, List<Tuple<string, double>>>? GetConferenceBooking(int conferenceBookingId)
{
try
{
var elem = _conferenceBooking.ReadElement(new ConferenceBookingSearchModel
{
Id = conferenceBookingId
});
if (elem == null)
{
return null;
}
return Tuple.Create(elem, elem.ConferenceBookingLunches.Select(x => Tuple.Create(x.Value.LunchName, x.Value.LunchPrice)).ToList());
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения по id={Id}", conferenceBookingId);
throw;
}
}
[HttpPost]
public void CreateConferenceBooking(ConferenceBookingBindingModel model) public void CreateConferenceBooking(ConferenceBookingBindingModel model)
{ {
try try
@ -127,19 +110,5 @@ namespace HotelRestApi.Controllers
throw; throw;
} }
} }
[HttpPost]
public void AddLunchToConferenceBooking(Tuple<ConferenceBookingSearchModel, LunchViewModel> model)
{
try
{
_conferenceBooking.AddLunchToConferenceBooking(model.Item1, model.Item2);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка добавления обеда в бронирование по конференции.");
throw;
}
}
} }
} }

113
Hotel/HotelRestApi/Controllers/ConferenceController.cs
View File

@ -2,6 +2,7 @@
using HotelContracts.BusinessLogicsContracts; using HotelContracts.BusinessLogicsContracts;
using HotelContracts.SearchModels; using HotelContracts.SearchModels;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace HotelRestApi.Controllers namespace HotelRestApi.Controllers
@ -19,59 +20,55 @@ namespace HotelRestApi.Controllers
_conference = conference; _conference = conference;
} }
[HttpGet] [HttpGet]
public List<ConferenceViewModel>? GetConferenceList(int organiserId) public List<ConferenceViewModel>? GetConferences(int? organiserId = null)
{ {
try try
{ {
return _conference.ReadList(new ConferenceSearchModel List<ConferenceViewModel> res;
{ if (!organiserId.HasValue)
OrganiserId = organiserId, {
}); res = _conference.ReadList(null);
} }
catch (Exception ex) else
{ {
_logger.LogError(ex, "Ошибка получения списка конференций"); res = _conference.ReadList(new ConferenceSearchModel { OrganiserId = organiserId });
throw; }
} foreach (var conference in res)
} {
conference.ConferenceMembers = null!;
}
return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения конференций");
throw;
}
}
[HttpGet] [HttpGet]
public List<ConferenceViewModel>? GetConferences() public Tuple<ConferenceViewModel, List<string>>? GetConference(int conferenceId)
{ {
try try
{ {
return _conference.ReadList(null); var elem = _conference.ReadElement(new ConferenceSearchModel { Id = conferenceId });
} if (elem == null)
catch (Exception ex) {
{ return null;
_logger.LogError(ex, "Ошибка получения списка конференций"); }
throw; var res = Tuple.Create(elem, elem.ConferenceMembers.Select(x => $"{x.Value.MemberSurname} {x.Value.MemberName} {x.Value.MemberPatronymic}").ToList());
} res.Item1.ConferenceMembers = null!;
} return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения конференции по id={Id}", conferenceId);
throw;
}
}
[HttpGet] [HttpPost]
public Tuple<ConferenceViewModel, List<Tuple<string, string>>>? GetConference(int conferenceId)
{
try
{
var elem = _conference.ReadElement(new ConferenceSearchModel { Id = conferenceId });
if (elem == null)
{
return null;
}
var members = elem.ConferenceMembers.Select(x => Tuple.Create($"{x.Value.MemberSurname} {x.Value.MemberName} {x.Value.MemberPatronymic}", x.Value.MemberPhoneNumber)).ToList();
return Tuple.Create(elem, members);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения конференции по id={Id}", conferenceId);
throw;
}
}
[HttpPost]
public void CreateConference(ConferenceBindingModel model) public void CreateConference(ConferenceBindingModel model)
{ {
try try
@ -113,19 +110,5 @@ namespace HotelRestApi.Controllers
throw; throw;
} }
} }
[HttpPost]
public void AddMemberToConference(Tuple<ConferenceSearchModel, MemberViewModel> model)
{
try
{
_conference.AddMemberToConference(model.Item1, model.Item2);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка добавления участника в конференцию.");
throw;
}
}
} }
} }

80
Hotel/HotelRestApi/Controllers/LunchController.cs
View File

@ -19,55 +19,43 @@ namespace HotelRestApi.Controllers
_lunch = lunch; _lunch = lunch;
} }
[HttpGet] [HttpGet]
public List<LunchViewModel>? GetLunchList(int headwaiterId) public List<LunchViewModel>? GetLunches(int? headwaiterId = null)
{ {
try try
{ {
return _lunch.ReadList(new LunchSearchModel if (!headwaiterId.HasValue)
{ {
HeadwaiterId = headwaiterId, return _lunch.ReadList(null);
}); }
} return _lunch.ReadList(new LunchSearchModel
catch (Exception ex) {
{ HeadwaiterId = headwaiterId
_logger.LogError(ex, "Ошибка получения списка обедов"); });
throw; }
} catch (Exception ex)
} {
_logger.LogError(ex, "Ошибка получения списка обедов");
throw;
}
}
[HttpGet] [HttpGet]
public List<LunchViewModel>? GetLunches() public LunchViewModel GetLunch(int lunchId)
{ {
try try
{ {
return _lunch.ReadList(null); var elem = _lunch.ReadElement(new LunchSearchModel { Id = lunchId });
} return elem;
catch (Exception ex) }
{ catch (Exception ex)
_logger.LogError(ex, "Ошибка получения списка обедов"); {
throw; _logger.LogError(ex, "Ошибка получения обеда по id={Id}", lunchId);
} throw;
} }
}
[HttpGet] [HttpPost]
public LunchViewModel? GetLunchById(int lunchId)
{
try
{
return _lunch.ReadElement(new LunchSearchModel
{
Id = lunchId
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения обеда по id={Id}", lunchId);
throw;
}
}
[HttpPost]
public void CreateLunch(LunchBindingModel model) public void CreateLunch(LunchBindingModel model)
{ {
try try

69
Hotel/HotelRestApi/Controllers/MealPlanController.cs
View File

@ -3,6 +3,7 @@ using HotelContracts.BusinessLogicsContracts;
using HotelContracts.SearchModels; using HotelContracts.SearchModels;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement; using HotelDataBaseImplement;
using HotelDataBaseImplement.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace HotelRestApi.Controllers namespace HotelRestApi.Controllers
@ -20,38 +21,46 @@ namespace HotelRestApi.Controllers
_mealPlan = mealPlan; _mealPlan = mealPlan;
} }
[HttpGet]
public List<MealPlanViewModel>? GetMealPlanList(int organiserId)
{
try
{
return _mealPlan.ReadList(new MealPlanSearchModel
{
OrganiserId = organiserId,
});
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка планов питания");
throw;
}
}
[HttpGet] [HttpGet]
public Tuple<MealPlanViewModel, List<Tuple<string, string, string, string>>>? GetMealPlan(int mealPlanId) public List<MealPlanViewModel>? GetMealPlans(int? organiserId = null)
{
try
{
List<MealPlanViewModel> res;
if (!organiserId.HasValue)
{
res = _mealPlan.ReadList(null);
}
else
{
res = _mealPlan.ReadList(new MealPlanSearchModel { OrganiserId = organiserId });
}
foreach (var mealPlan in res)
{
mealPlan.MealPlanMembers = null!;
}
return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения конференций");
throw;
}
}
[HttpGet]
public Tuple<MealPlanViewModel, List<string>>? GetMealPlan(int mealPlanId)
{ {
try try
{ {
using var context = new HotelDataBase();
var elem = _mealPlan.ReadElement(new MealPlanSearchModel { Id = mealPlanId }); var elem = _mealPlan.ReadElement(new MealPlanSearchModel { Id = mealPlanId });
if (elem == null) if (elem == null)
{ {
return null; return null;
} }
var res = Tuple.Create(elem, elem.MealPlanMembers.Select(x => $"{x.Value.MemberSurname} {x.Value.MemberName} {x.Value.MemberPatronymic}").ToList());
var members = elem.MealPlanMembers.Select(x => Tuple.Create(x.Value.MemberSurname, x.Value.MemberName, x.Value.MemberPatronymic, x.Value.MemberPhoneNumber)).ToList(); res.Item1.MealPlanMembers = null!;
return res;
return Tuple.Create(elem, members);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -102,19 +111,5 @@ namespace HotelRestApi.Controllers
throw; throw;
} }
} }
[HttpPost]
public void AddMemberToMealPlan(Tuple<MealPlanSearchModel, MemberViewModel> model)
{
try
{
_mealPlan.AddMemberToMealPlan(model.Item1, model.Item2);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка добавления участника в план питания.");
throw;
}
}
} }
} }

69
Hotel/HotelRestApi/Controllers/MemberController.cs
View File

@ -2,6 +2,7 @@
using HotelContracts.BusinessLogicsContracts; using HotelContracts.BusinessLogicsContracts;
using HotelContracts.SearchModels; using HotelContracts.SearchModels;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace HotelRestApi.Controllers namespace HotelRestApi.Controllers
@ -19,41 +20,43 @@ namespace HotelRestApi.Controllers
_member = member; _member = member;
} }
[HttpGet] [HttpGet]
public List<MemberViewModel>? GetMemberList(int organiserId) public List<MemberViewModel>? GetMembers(int? organiserId = null)
{ {
try try
{ {
return _member.ReadList(new MemberSearchModel if (!organiserId.HasValue)
{ {
OrganiserId = organiserId, return _member.ReadList(null);
}); }
} return _member.ReadList(new MemberSearchModel
catch (Exception ex) {
{ OrganiserId = organiserId
_logger.LogError(ex, "Ошибка получения списка участников"); });
throw; }
} catch (Exception ex)
} {
_logger.LogError(ex, "Ошибка получения списка участников");
throw;
}
}
[HttpGet] [HttpGet]
public MemberViewModel? GetMember(int memberId) public MemberViewModel GetMember(int lunchId)
{ {
try try
{ {
return _member.ReadElement(new MemberSearchModel var elem = _member.ReadElement(new MemberSearchModel { Id = lunchId });
{ return elem;
Id = memberId }
}); catch (Exception ex)
} {
catch (Exception ex) _logger.LogError(ex, "Ошибка получения обеда по id={Id}", lunchId);
{ throw;
_logger.LogError(ex, "Ошибка получения участника по id={Id}", memberId); }
throw; }
}
}
[HttpPost] [HttpPost]
public void CreateMember(MemberBindingModel model) public void CreateMember(MemberBindingModel model)
{ {
try try

211
Hotel/HotelRestApi/Controllers/RoomController.cs
View File

@ -2,126 +2,113 @@
using HotelContracts.BusinessLogicsContracts; using HotelContracts.BusinessLogicsContracts;
using HotelContracts.SearchModels; using HotelContracts.SearchModels;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement.Models;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace HotelRestApi.Controllers namespace HotelRestApi.Controllers
{ {
[Route("api/[controller]/[action]")] [Route("api/[controller]/[action]")]
[ApiController] [ApiController]
public class RoomController : Controller public class RoomController : Controller
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IRoomLogic _room; private readonly IRoomLogic _room;
public RoomController(ILogger<RoomController> logger, IRoomLogic room) public RoomController(ILogger<RoomController> logger, IRoomLogic room)
{ {
_logger = logger; _logger = logger;
_room = room; _room = room;
} }
[HttpGet] [HttpGet]
public List<RoomViewModel>? GetRoomList(int headwaiterId) public List<RoomViewModel> GetRooms(int? headwaiterId = null)
{ {
try try
{ {
return _room.ReadList(new RoomSearchModel List<RoomViewModel> res;
{ if (!headwaiterId.HasValue)
HeadwaiterId = headwaiterId, {
}); res = _room.ReadList(null);
} }
catch (Exception ex) else
{ {
_logger.LogError(ex, "Ошибка получения списка номеров"); res = _room.ReadList(new RoomSearchModel { HeadwaiterId = headwaiterId });
throw; }
} foreach (var service in res)
} {
service.RoomLunches = null;
}
return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка номеров");
throw;
}
}
[HttpGet] [HttpGet]
public List<RoomViewModel>? GetRooms() public Tuple<RoomViewModel, List<string>>? GetRoom(int roomId)
{ {
try try
{ {
return _room.ReadList(null); var elem = _room.ReadElement(new RoomSearchModel { Id = roomId });
} if (elem == null)
catch (Exception ex) {
{ return null;
_logger.LogError(ex, "Ошибка получения списка номеров"); }
throw; var res = Tuple.Create(elem, elem.RoomLunches.Select(x => x.Value.LunchName).ToList());
} res.Item1.RoomLunches = null!;
} return res;
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения номера по id={Id}", roomId);
throw;
}
}
[HttpGet] [HttpPost]
public RoomViewModel? GetRoomById(int roomId) public void CreateRoom(RoomBindingModel model)
{ {
try try
{ {
return _room.ReadElement(new RoomSearchModel _room.Create(model);
{ }
Id = roomId catch (Exception ex)
}); {
} _logger.LogError(ex, "Ошибка создания номера");
catch (Exception ex) throw;
{ }
_logger.LogError(ex, "Ошибка получения номера по id={Id}", roomId); }
throw;
}
}
[HttpPost] [HttpPost]
public void CreateRoom(RoomBindingModel model) public void UpdateRoom(RoomBindingModel model)
{ {
try try
{ {
_room.Create(model); model.RoomLunches = null!;
} _room.Update(model);
catch (Exception ex) }
{ catch (Exception ex)
_logger.LogError(ex, "Ошибка создания номера"); {
throw; _logger.LogError(ex, "Ошибка обновления данных номера");
} throw;
} }
}
[HttpPost] [HttpPost]
public void UpdateRoom(RoomBindingModel model) public void DeleteRoom(RoomBindingModel model)
{ {
try try
{ {
model.RoomLunches = null!; _room.Delete(model);
_room.Update(model); }
} catch (Exception ex)
catch (Exception ex) {
{ _logger.LogError(ex, "Ошибка удаления номера");
_logger.LogError(ex, "Ошибка обновления данных номера"); throw;
throw; }
} }
} }
[HttpPost]
public void DeleteRoom(RoomBindingModel model)
{
try
{
_room.Delete(model);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка удаления номера");
throw;
}
}
[HttpPost]
public void AddLunchToRoom(Tuple<RoomSearchModel, LunchViewModel> model)
{
try
{
_room.AddLunchToRoom(model.Item1, model.Item2);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка добавления обеда к номеру.");
throw;
}
}
}
} }