diff --git a/Hotel/Hotel.sln b/Hotel/Hotel.sln index a7e50b2..fedf05d 100644 --- a/Hotel/Hotel.sln +++ b/Hotel/Hotel.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotelView", "HotelView\Hote EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotelDataModels", "HotelDataModels\HotelDataModels.csproj", "{311319D0-3CD8-48F0-8258-017FBD83728D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotelContracts", "HotelContracts\HotelContracts.csproj", "{85D5192D-24CF-48CD-800F-BE5E02B738B6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {311319D0-3CD8-48F0-8258-017FBD83728D}.Debug|Any CPU.Build.0 = Debug|Any CPU {311319D0-3CD8-48F0-8258-017FBD83728D}.Release|Any CPU.ActiveCfg = Release|Any CPU {311319D0-3CD8-48F0-8258-017FBD83728D}.Release|Any CPU.Build.0 = Release|Any CPU + {85D5192D-24CF-48CD-800F-BE5E02B738B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85D5192D-24CF-48CD-800F-BE5E02B738B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85D5192D-24CF-48CD-800F-BE5E02B738B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85D5192D-24CF-48CD-800F-BE5E02B738B6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Hotel/HotelContracts/BindingModels/BookingBindingModel.cs b/Hotel/HotelContracts/BindingModels/BookingBindingModel.cs new file mode 100644 index 0000000..ec0ffab --- /dev/null +++ b/Hotel/HotelContracts/BindingModels/BookingBindingModel.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HotelDataModels.Enums; +using HotelDataModels.Models; + +namespace HotelContracts.BindingModels +{ + public class BookingBindingModel : IBookingModel + { + public int Id { get; set; } + public int RoomId { get; set; } + + public int ClientId { get; set; } + + public DateTime ArrivalDate { get; set; } = DateTime.Now; + + public DateTime DepartureDate { get; set; } = DateTime.Now; + + public int NumberHoursSpent { get; set; } + + public AcceptanceStatus Status { get; set; } = AcceptanceStatus.Неизвестен; + + public int TotalCost { get; set; } + } +} diff --git a/Hotel/HotelContracts/BindingModels/ClientBindingModel.cs b/Hotel/HotelContracts/BindingModels/ClientBindingModel.cs new file mode 100644 index 0000000..4cba649 --- /dev/null +++ b/Hotel/HotelContracts/BindingModels/ClientBindingModel.cs @@ -0,0 +1,24 @@ +using HotelDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BindingModels +{ + public class ClientBindingModel : IClientModel + { + public int Id { get; set; } + + public string Name { get; set; } = string.Empty; + + public string Surname { get; set; } = string.Empty; + + public DateTime DateOfBirth { get; set; } = DateTime.Now; + + public string PhoneNumber { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + } +} diff --git a/Hotel/HotelContracts/BindingModels/PostBindingModel.cs b/Hotel/HotelContracts/BindingModels/PostBindingModel.cs new file mode 100644 index 0000000..6a0df7f --- /dev/null +++ b/Hotel/HotelContracts/BindingModels/PostBindingModel.cs @@ -0,0 +1,16 @@ +using HotelDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BindingModels +{ + public class PostBindingModel : IPostModel + { + public int Id { get; set; } + + public string PostName { get; set; } = string.Empty; + } +} diff --git a/Hotel/HotelContracts/BindingModels/RoomBindingModel.cs b/Hotel/HotelContracts/BindingModels/RoomBindingModel.cs new file mode 100644 index 0000000..da1ee7f --- /dev/null +++ b/Hotel/HotelContracts/BindingModels/RoomBindingModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HotelDataModels.Models; + +namespace HotelContracts.BindingModels +{ + public class RoomBindingModel : IRoomModel + { + public int Id { get; set; } + + public int WorkerId { get; set; } + + public int Number { get; set; } + + public int Floor { get; set; } + + public int NumberOfBeds { get; set; } + + public string Condition { get; set; } = string.Empty; + + public int Cost { get; set; } + } +} diff --git a/Hotel/HotelContracts/BindingModels/WorkerBindingModel.cs b/Hotel/HotelContracts/BindingModels/WorkerBindingModel.cs new file mode 100644 index 0000000..f6cbc21 --- /dev/null +++ b/Hotel/HotelContracts/BindingModels/WorkerBindingModel.cs @@ -0,0 +1,26 @@ +using HotelDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BindingModels +{ + public class WorkerBindingModel : IWorkerModel + { + public int Id { get; set; } + + public int PostId { get; set; } + + public string FIO { get; set; } = string.Empty; + + public DateTime DateOfBirth { get; set; } = DateTime.Now; + + public int WorkExperience { get; set; } + + public int Salary { get; set; } + + public string Phone { get; set; } = string.Empty; + } +} diff --git a/Hotel/HotelContracts/BusinessLogicsContracts/IBookingLogic.cs b/Hotel/HotelContracts/BusinessLogicsContracts/IBookingLogic.cs new file mode 100644 index 0000000..c6c18d5 --- /dev/null +++ b/Hotel/HotelContracts/BusinessLogicsContracts/IBookingLogic.cs @@ -0,0 +1,21 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BusinessLogicsContracts +{ + public interface IBookingLogic + { + List? ReadList(BookingSearchModel? model); + BookingViewModel? ReadElement(BookingSearchModel model); + + bool Create(BookingBindingModel model); + bool Update(BookingBindingModel model); + bool Delete(BookingBindingModel model); + } +} diff --git a/Hotel/HotelContracts/BusinessLogicsContracts/IClientLogic.cs b/Hotel/HotelContracts/BusinessLogicsContracts/IClientLogic.cs new file mode 100644 index 0000000..9a80921 --- /dev/null +++ b/Hotel/HotelContracts/BusinessLogicsContracts/IClientLogic.cs @@ -0,0 +1,21 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BusinessLogicsContracts +{ + public interface IClientLogic + { + List? ReadList(ClientSearchModel? model); + ClientViewModel? ReadElement(ClientSearchModel model); + + bool Create(ClientBindingModel model); + bool Update(ClientBindingModel model); + bool Delete(ClientBindingModel model); + } +} diff --git a/Hotel/HotelContracts/BusinessLogicsContracts/IPostLogic.cs b/Hotel/HotelContracts/BusinessLogicsContracts/IPostLogic.cs new file mode 100644 index 0000000..080c618 --- /dev/null +++ b/Hotel/HotelContracts/BusinessLogicsContracts/IPostLogic.cs @@ -0,0 +1,21 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BusinessLogicsContracts +{ + public interface IPostLogic + { + List? ReadList(PostSearchModel? model); + PostViewModel? ReadElement(PostSearchModel model); + + bool Create(PostBindingModel model); + bool Update(PostBindingModel model); + bool Delete(PostBindingModel model); + } +} diff --git a/Hotel/HotelContracts/BusinessLogicsContracts/IRoomLogic.cs b/Hotel/HotelContracts/BusinessLogicsContracts/IRoomLogic.cs new file mode 100644 index 0000000..3f39e6b --- /dev/null +++ b/Hotel/HotelContracts/BusinessLogicsContracts/IRoomLogic.cs @@ -0,0 +1,21 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BusinessLogicsContracts +{ + public interface IRoomLogic + { + List? ReadList(RoomSearchModel? model); + RoomViewModel? ReadElement(RoomSearchModel model); + + bool Create(RoomBindingModel model); + bool Update(RoomBindingModel model); + bool Delete(RoomBindingModel model); + } +} diff --git a/Hotel/HotelContracts/BusinessLogicsContracts/IWorkerLogic.cs b/Hotel/HotelContracts/BusinessLogicsContracts/IWorkerLogic.cs new file mode 100644 index 0000000..d9f7f19 --- /dev/null +++ b/Hotel/HotelContracts/BusinessLogicsContracts/IWorkerLogic.cs @@ -0,0 +1,21 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.BusinessLogicsContracts +{ + public interface IWorkerLogic + { + List? ReadList(WorkerSearchModel? model); + WorkerViewModel? ReadElement(WorkerSearchModel model); + + bool Create(WorkerBindingModel model); + bool Update(WorkerBindingModel model); + bool Delete(WorkerBindingModel model); + } +} diff --git a/Hotel/HotelContracts/HotelContracts.csproj b/Hotel/HotelContracts/HotelContracts.csproj new file mode 100644 index 0000000..fc239c9 --- /dev/null +++ b/Hotel/HotelContracts/HotelContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/Hotel/HotelContracts/SearchModels/BookingSearchModel.cs b/Hotel/HotelContracts/SearchModels/BookingSearchModel.cs new file mode 100644 index 0000000..5954ac8 --- /dev/null +++ b/Hotel/HotelContracts/SearchModels/BookingSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.SearchModels +{ + public class BookingSearchModel + { + public int? Id { get; set; } + + } +} diff --git a/Hotel/HotelContracts/SearchModels/ClientSearchModel.cs b/Hotel/HotelContracts/SearchModels/ClientSearchModel.cs new file mode 100644 index 0000000..fe8d7dc --- /dev/null +++ b/Hotel/HotelContracts/SearchModels/ClientSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.SearchModels +{ + public class ClientSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/Hotel/HotelContracts/SearchModels/PostSearchModel.cs b/Hotel/HotelContracts/SearchModels/PostSearchModel.cs new file mode 100644 index 0000000..fb66b90 --- /dev/null +++ b/Hotel/HotelContracts/SearchModels/PostSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.SearchModels +{ + public class PostSearchModel + { + public int? Id { get; set; } + public string? PostName { get; set; } + } +} diff --git a/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs b/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs new file mode 100644 index 0000000..c328218 --- /dev/null +++ b/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.SearchModels +{ + public class RoomSearchModel + { + public int? Id { get; set; } + public int? Number { get; set; } + } +} diff --git a/Hotel/HotelContracts/SearchModels/WorkerSearchModel.cs b/Hotel/HotelContracts/SearchModels/WorkerSearchModel.cs new file mode 100644 index 0000000..c3b079f --- /dev/null +++ b/Hotel/HotelContracts/SearchModels/WorkerSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.SearchModels +{ + public class WorkerSearchModel + { + public int? Id { get; set; } + public int? FIO { get; set; } + } +} diff --git a/Hotel/HotelContracts/StoragesContracts/IBookingStorage.cs b/Hotel/HotelContracts/StoragesContracts/IBookingStorage.cs new file mode 100644 index 0000000..4310288 --- /dev/null +++ b/Hotel/HotelContracts/StoragesContracts/IBookingStorage.cs @@ -0,0 +1,22 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.StoragesContracts +{ + public interface IBookingStorage + { + List GetFullList(); + List GetFilteredList(BookingSearchModel model); + + BookingViewModel? GetElement(BookingSearchModel model); + BookingViewModel? Insert(BookingBindingModel model); + BookingViewModel? Update(BookingBindingModel model); + BookingViewModel? Delete(BookingBindingModel model); + } +} diff --git a/Hotel/HotelContracts/StoragesContracts/IClientStorage.cs b/Hotel/HotelContracts/StoragesContracts/IClientStorage.cs new file mode 100644 index 0000000..80188f4 --- /dev/null +++ b/Hotel/HotelContracts/StoragesContracts/IClientStorage.cs @@ -0,0 +1,22 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.StoragesContracts +{ + public interface IClientStorage + { + List GetFullList(); + List GetFilteredList(ClientSearchModel model); + + ClientViewModel? GetElement(ClientSearchModel model); + ClientViewModel? Insert(ClientBindingModel model); + ClientViewModel? Update(ClientBindingModel model); + ClientViewModel? Delete(ClientBindingModel model); + } +} diff --git a/Hotel/HotelContracts/StoragesContracts/IPostStorage.cs b/Hotel/HotelContracts/StoragesContracts/IPostStorage.cs new file mode 100644 index 0000000..e7fe666 --- /dev/null +++ b/Hotel/HotelContracts/StoragesContracts/IPostStorage.cs @@ -0,0 +1,22 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.StoragesContracts +{ + public interface IPostStorage + { + List GetFullList(); + List GetFilteredList(PostSearchModel model); + + PostViewModel? GetElement(PostSearchModel model); + PostViewModel? Insert(PostBindingModel model); + PostViewModel? Update(PostBindingModel model); + PostViewModel? Delete(PostBindingModel model); + } +} diff --git a/Hotel/HotelContracts/StoragesContracts/IRoomStorage.cs b/Hotel/HotelContracts/StoragesContracts/IRoomStorage.cs new file mode 100644 index 0000000..5d06650 --- /dev/null +++ b/Hotel/HotelContracts/StoragesContracts/IRoomStorage.cs @@ -0,0 +1,22 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.StoragesContracts +{ + public interface IRoomStorage + { + List GetFullList(); + List GetFilteredList(RoomSearchModel model); + + RoomViewModel? GetElement(RoomSearchModel model); + RoomViewModel? Insert(RoomBindingModel model); + RoomViewModel? Update(RoomBindingModel model); + RoomViewModel? Delete(RoomBindingModel model); + } +} diff --git a/Hotel/HotelContracts/StoragesContracts/IWorkerStorage.cs b/Hotel/HotelContracts/StoragesContracts/IWorkerStorage.cs new file mode 100644 index 0000000..0a95f26 --- /dev/null +++ b/Hotel/HotelContracts/StoragesContracts/IWorkerStorage.cs @@ -0,0 +1,22 @@ +using HotelContracts.BindingModels; +using HotelContracts.SearchModels; +using HotelContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.StoragesContracts +{ + public interface IWorkerStorage + { + List GetFullList(); + List GetFilteredList(WorkerSearchModel model); + + WorkerViewModel? GetElement(WorkerSearchModel model); + WorkerViewModel? Insert(WorkerBindingModel model); + WorkerViewModel? Update(WorkerBindingModel model); + WorkerViewModel? Delete(WorkerBindingModel model); + } +} diff --git a/Hotel/HotelContracts/ViewModels/BookingViewModel.cs b/Hotel/HotelContracts/ViewModels/BookingViewModel.cs new file mode 100644 index 0000000..dd0a134 --- /dev/null +++ b/Hotel/HotelContracts/ViewModels/BookingViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.ViewModels +{ + public class BookingViewModel + { + } +} diff --git a/Hotel/HotelContracts/ViewModels/ClientViewModel.cs b/Hotel/HotelContracts/ViewModels/ClientViewModel.cs new file mode 100644 index 0000000..6c295f0 --- /dev/null +++ b/Hotel/HotelContracts/ViewModels/ClientViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.ViewModels +{ + public class ClientViewModel + { + } +} diff --git a/Hotel/HotelContracts/ViewModels/PostViewModel.cs b/Hotel/HotelContracts/ViewModels/PostViewModel.cs new file mode 100644 index 0000000..82a2ffc --- /dev/null +++ b/Hotel/HotelContracts/ViewModels/PostViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.ViewModels +{ + public class PostViewModel + { + } +} diff --git a/Hotel/HotelContracts/ViewModels/RoomViewModel.cs b/Hotel/HotelContracts/ViewModels/RoomViewModel.cs new file mode 100644 index 0000000..adff0c9 --- /dev/null +++ b/Hotel/HotelContracts/ViewModels/RoomViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.ViewModels +{ + public class RoomViewModel + { + } +} diff --git a/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs b/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs new file mode 100644 index 0000000..cc9daf1 --- /dev/null +++ b/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs @@ -0,0 +1,26 @@ +using HotelDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HotelContracts.ViewModels +{ + public class WorkerViewModel : IWorkerModel + { + public int Id { get; set; } + + public int PostId { get; set; } + + public string FIO { get; set; } = string.Empty; + + public DateTime DateOfBirth { get; set; } = DateTime.Now; + + public int WorkExperience { get; set; } + + public int Salary { get; set; } + + public string Phone { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/Hotel/HotelDataModels/Enums/AcceptanceStatus.cs b/Hotel/HotelDataModels/Enums/AcceptanceStatus.cs index 9649496..3d5143d 100644 --- a/Hotel/HotelDataModels/Enums/AcceptanceStatus.cs +++ b/Hotel/HotelDataModels/Enums/AcceptanceStatus.cs @@ -9,7 +9,7 @@ namespace HotelDataModels.Enums public enum AcceptanceStatus { Неизвестен = -1, - Получин = 0, + Обработка = 0, Принимается = 1, Принят = 2 } diff --git a/Hotel/HotelDataModels/Models/IBooking.cs b/Hotel/HotelDataModels/Models/IBookingModel.cs similarity index 82% rename from Hotel/HotelDataModels/Models/IBooking.cs rename to Hotel/HotelDataModels/Models/IBookingModel.cs index e9a85c8..6b477fa 100644 --- a/Hotel/HotelDataModels/Models/IBooking.cs +++ b/Hotel/HotelDataModels/Models/IBookingModel.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; namespace HotelDataModels.Models { - public interface IBooking : IId + public interface IBookingModel : IId { int RoomId { get; } int ClientId { get; } DateTime ArrivalDate { get; } DateTime DepartureDate { get; } int NumberHoursSpent { get; } - AcceptanceStatus Status { get; } + Enums.AcceptanceStatus Status { get; } int TotalCost { get; } } } diff --git a/Hotel/HotelDataModels/Models/IClient.cs b/Hotel/HotelDataModels/Models/IClientModel.cs similarity index 73% rename from Hotel/HotelDataModels/Models/IClient.cs rename to Hotel/HotelDataModels/Models/IClientModel.cs index b5f753d..cf60ec2 100644 --- a/Hotel/HotelDataModels/Models/IClient.cs +++ b/Hotel/HotelDataModels/Models/IClientModel.cs @@ -7,11 +7,13 @@ using System.Threading.Tasks; namespace HotelDataModels.Models { - public interface IClient : IId + public interface IClientModel : IId { string Name { get; } string Surname { get; } - DateOnly DateOfBirth { get; } + DateTime DateOfBirth { get; } string PhoneNumber { get; } + + string Password { get; } } } diff --git a/Hotel/HotelDataModels/Models/IPost.cs b/Hotel/HotelDataModels/Models/IPostModel.cs similarity index 84% rename from Hotel/HotelDataModels/Models/IPost.cs rename to Hotel/HotelDataModels/Models/IPostModel.cs index 5092d8a..2206af8 100644 --- a/Hotel/HotelDataModels/Models/IPost.cs +++ b/Hotel/HotelDataModels/Models/IPostModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace HotelDataModels.Models { - public interface IPost : IId + public interface IPostModel : IId { string PostName { get; } } diff --git a/Hotel/HotelDataModels/Models/IRoom.cs b/Hotel/HotelDataModels/Models/IRoomModel.cs similarity index 82% rename from Hotel/HotelDataModels/Models/IRoom.cs rename to Hotel/HotelDataModels/Models/IRoomModel.cs index 2c43de7..0f45ce6 100644 --- a/Hotel/HotelDataModels/Models/IRoom.cs +++ b/Hotel/HotelDataModels/Models/IRoomModel.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace HotelDataModels.Models { - public interface IRoom : IId + public interface IRoomModel : IId { - int MaidId { get; } + int WorkerId { get; } int Number { get; } int Floor { get; } int NumberOfBeds { get; } diff --git a/Hotel/HotelDataModels/Models/IWorker.cs b/Hotel/HotelDataModels/Models/IWorkerModel.cs similarity index 64% rename from Hotel/HotelDataModels/Models/IWorker.cs rename to Hotel/HotelDataModels/Models/IWorkerModel.cs index ec758c1..cea68c1 100644 --- a/Hotel/HotelDataModels/Models/IWorker.cs +++ b/Hotel/HotelDataModels/Models/IWorkerModel.cs @@ -6,13 +6,11 @@ using System.Threading.Tasks; namespace HotelDataModels.Models { - public interface IWorker : IId + public interface IWorkerModel : IId { int PostId { get; } - string Surname { get; } - string Name { get; } - string Patronymic { get; } - DateOnly DateOfBirth { get; } + string FIO { get; } + DateTime DateOfBirth { get; } int WorkExperience { get; } int Salary { get; } string Phone { get; }