добавлены контракты

BeautySalon/BeautySalon.sln

@@ -5,6 +5,10 @@ VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeautySalon", "BeautySalon.csproj", "{1D636E61-E3F0-4B64-998C-730FC76731F1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeautySalonDataModels", "..\BeautySalonDataModels\BeautySalonDataModels.csproj", "{3BE3FEC4-6794-4EA7-83BE-D382996DB168}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeautySalonContracts", "..\BeauySalonContracts\BeautySalonContracts.csproj", "{8CBBB8D6-5615-417B-82C5-B069EA84AB3C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +19,14 @@ Global
 		{1D636E61-E3F0-4B64-998C-730FC76731F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D636E61-E3F0-4B64-998C-730FC76731F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D636E61-E3F0-4B64-998C-730FC76731F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BE3FEC4-6794-4EA7-83BE-D382996DB168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BE3FEC4-6794-4EA7-83BE-D382996DB168}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BE3FEC4-6794-4EA7-83BE-D382996DB168}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BE3FEC4-6794-4EA7-83BE-D382996DB168}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CBBB8D6-5615-417B-82C5-B069EA84AB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CBBB8D6-5615-417B-82C5-B069EA84AB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CBBB8D6-5615-417B-82C5-B069EA84AB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CBBB8D6-5615-417B-82C5-B069EA84AB3C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

BeautySalonDataModels/BeautySalonDataModels.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

BeautySalonDataModels/IId.cs

@@ -0,0 +1,7 @@
+namespace BeautySalonDataModels
+{
+    public interface IId
+    {
+        int Id { get; }
+    }
+}

BeautySalonDataModels/Models/IClientModel.cs

@@ -0,0 +1,8 @@
+namespace BeautySalonDataModels.Models
+{
+    public interface IClientModel : IId
+    {
+        string ClientFIO { get; }
+        string PhoneNumber { get; }
+    }
+}

BeautySalonDataModels/Models/IMasterModel.cs

@@ -0,0 +1,9 @@
+namespace BeautySalonDataModels.Models
+{
+    public interface IMasterModel : IId
+    {
+        string MasterFIO { get; }
+        string Specialization { get; }
+        public Dictionary<int, (IServiceModel, int)> MasterServices { get; }
+    }
+}

BeautySalonDataModels/Models/IServiceModel.cs

@@ -0,0 +1,8 @@
+namespace BeautySalonDataModels.Models
+{
+    public interface IServiceModel : IId
+    {
+        string ServiceName { get; }
+        double Cost { get; }
+    }
+}

BeautySalonDataModels/Models/IVisitModel.cs

@@ -0,0 +1,10 @@
+namespace BeautySalonDataModels.Models
+{
+    public interface IVisitModel : IId
+    {
+        DateTime DateOfVisit { get; }
+        int ClientId { get; }
+        int MasterId { get; }
+        int ServiceId { get; }
+    }
+}

BeauySalonContracts/BeautySalonContracts.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BeautySalonDataModels\BeautySalonDataModels.csproj" />
+  </ItemGroup>
+
+</Project>

BeauySalonContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,11 @@
+using BeautySalonDataModels.Models;
+
+namespace BeautySalonContracts.BindingModels
+{
+    public class ClientBindingModel : IClientModel
+    {
+        public int Id { get; set; }
+        public string ClientFIO { get; set; } = string.Empty;
+        public string PhoneNumber { get; set; } = string.Empty;
+    }
+}

BeauySalonContracts/BindingModels/MasterBindingModel.cs

@@ -0,0 +1,11 @@
+using BeautySalonDataModels.Models;
+
+namespace BeautySalonContracts.BindingModels
+{
+    public class MasterBindingModel : IMasterModel
+    {
+        public int Id { get; set; }
+        public string MasterFIO { get; set; } = string.Empty;
+        public string Specialization { get; set; } = string.Empty;    
+    }
+}

BeauySalonContracts/BindingModels/ServiceBindingModel.cs

@@ -0,0 +1,11 @@
+using BeautySalonDataModels.Models;
+
+namespace BeautySalonContracts.BindingModels
+{
+    public class ServiceBindingModel : IServiceModel
+    {
+        public int Id { get; set; }
+        public string ServiceName { get; set; } = string.Empty;
+        public double Cost { get; set; }       
+    }
+}

BeauySalonContracts/BindingModels/VisitBindingModel.cs

@@ -0,0 +1,13 @@
+using BeautySalonDataModels.Models;
+
+namespace BeautySalonContracts.BindingModels
+{
+    public class VisitBindingModel : IVisitModel
+    {
+        public int Id { get; set; }
+        public DateTime DateOfVisit { get; set; }
+        public int ClientId { get; set; }
+        public int MasterId { get; set; }
+        public int ServiceId { get; set; }
+    }
+}

BeauySalonContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,15 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.BusinessLogicsContracts
+{
+    public interface IClientLogic
+    {
+        List<ClientViewModel>? ReadList(ClientSearchModel? model);
+        ClientViewModel? ReadElement(ClientSearchModel model);
+        bool Create(ClientBindingModel model);
+        bool Update(ClientBindingModel model);
+        bool Delete(ClientBindingModel model);
+    }
+}

BeauySalonContracts/BusinessLogicsContracts/IMasterLogic.cs

@@ -0,0 +1,15 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.BusinessLogicsContracts
+{
+    public interface IMasterLogic
+    {
+        List<MasterViewModel>? ReadList(MasterSearchModel? model);
+        MasterViewModel? ReadElement(MasterSearchModel model);
+        bool Create(MasterBindingModel model);
+        bool Update(MasterBindingModel model);
+        bool Delete(MasterBindingModel model);
+    }
+}

BeauySalonContracts/BusinessLogicsContracts/IServiceLogic.cs

@@ -0,0 +1,15 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.BusinessLogicsContracts
+{
+    public interface IServiceLogic
+    {
+        List<ServiceViewModel>? ReadList(ServiceSearchModel? model);
+        ServiceViewModel? ReadElement(ServiceSearchModel model);
+        bool Create(ServiceBindingModel model);
+        bool Update(ServiceBindingModel model);
+        bool Delete(ServiceBindingModel model);
+    }
+}

BeauySalonContracts/BusinessLogicsContracts/IVisitLogic.cs

@@ -0,0 +1,15 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.BusinessLogicsContracts
+{
+    public interface IVisitLogic
+    {
+        List<VisitViewModel>? ReadList(VisitSearchModel? model);
+        VisitViewModel? ReadElement(VisitSearchModel model);
+        bool Create(VisitBindingModel model);
+        bool Update(VisitBindingModel model);
+        bool Delete(VisitBindingModel model);
+    }
+}

BeauySalonContracts/SearchModels/ClientSearchModel.cs

@@ -0,0 +1,9 @@
+namespace BeautySalonContracts.SearchModels
+{
+    public class ClientSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ClientFIO { get; set; }
+        public string? PhoneNumber { get; set; }
+    }
+}

BeauySalonContracts/SearchModels/MasterSearchModel.cs

@@ -0,0 +1,9 @@
+namespace BeautySalonContracts.SearchModels
+{
+    public class MasterSearchModel
+    {
+        public int? Id { get; set; }
+        public string? MasterFIO { get; set; }
+        public string? Specilization { get; set; }
+    }
+}

BeauySalonContracts/SearchModels/ServiceSearchModel.cs

@@ -0,0 +1,8 @@
+namespace BeautySalonContracts.SearchModels
+{
+    public class ServiceSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ServiceName { get; set; }
+    }
+}

BeauySalonContracts/SearchModels/VisitSearchModel.cs

@@ -0,0 +1,7 @@
+namespace BeautySalonContracts.SearchModels
+{
+    public class VisitSearchModel
+    {
+        public int? Id { get; set; }
+    }
+}

BeauySalonContracts/StoragesContracts/IClientStorage.cs

@@ -0,0 +1,16 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.StoragesContracts
+{
+    public interface IClientStorage
+    {
+        List<ClientViewModel> GetFullList();
+        List<ClientViewModel> GetFilteredList(ClientSearchModel model);
+        ClientViewModel? GetElement(ClientSearchModel model);
+        ClientViewModel? Insert(ClientBindingModel model);
+        ClientViewModel? Update(ClientBindingModel model);
+        ClientViewModel? Delete(ClientBindingModel model);
+    }
+}

BeauySalonContracts/StoragesContracts/IMasterStorage.cs

@@ -0,0 +1,16 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.StoragesContracts
+{
+    public interface IMasterStorage
+    {
+        List<MasterViewModel> GetFullList();
+        List<MasterViewModel> GetFilteredList(MasterSearchModel model);
+        MasterViewModel? GetElement(MasterSearchModel model);
+        MasterViewModel? Insert(MasterBindingModel model);
+        MasterViewModel? Update(MasterBindingModel model);
+        MasterViewModel? Delete(MasterBindingModel model);
+    }
+}

BeauySalonContracts/StoragesContracts/IServiceStorage.cs

@@ -0,0 +1,16 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.StoragesContracts
+{
+    public interface IServiceStorage
+    {
+        List<ServiceViewModel> GetFullList();
+        List<ServiceViewModel> GetFilteredList(ServiceSearchModel model);
+        ServiceViewModel? GetElement(ServiceSearchModel model);
+        ServiceViewModel? Insert(ServiceBindingModel model);
+        ServiceViewModel? Update(ServiceBindingModel model);
+        ServiceViewModel? Delete(ServiceBindingModel model);
+    }
+}

BeauySalonContracts/StoragesContracts/IVisitStorage.cs

@@ -0,0 +1,16 @@
+using BeautySalonContracts.BindingModels;
+using BeautySalonContracts.SearchModels;
+using BeautySalonContracts.ViewModels;
+
+namespace BeautySalonContracts.StoragesContracts
+{
+    public interface IVisitStorage
+    {
+        List<VisitViewModel> GetFullList();
+        List<VisitViewModel> GetFilteredList(VisitSearchModel model);
+        VisitViewModel? GetElement(VisitSearchModel model);
+        VisitViewModel? Insert(VisitBindingModel model);
+        VisitViewModel? Update(VisitBindingModel model);
+        VisitViewModel? Delete(VisitBindingModel model);
+    }
+}

BeauySalonContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,14 @@
+using BeautySalonDataModels.Models;
+using System.ComponentModel;
+
+namespace BeautySalonContracts.ViewModels
+{
+    public class ClientViewModel : IClientModel
+    {
+        public int Id { get; set; }
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
+        [DisplayName("Номер телефона")]
+        public string PhoneNumber { get; set; } = string.Empty;
+    }
+}

BeauySalonContracts/ViewModels/MasterViewModel.cs

@@ -0,0 +1,15 @@
+using BeautySalonDataModels.Models;
+using System.ComponentModel;
+
+namespace BeautySalonContracts.ViewModels
+{
+    public class MasterViewModel : IMasterModel
+    {
+        public int Id { get; set; }
+        [DisplayName("ФИО мастера")]
+        public string MasterFIO { get; set; } = string.Empty;
+        [DisplayName("Специализация")]
+        public string Specialization { get; set; } = string.Empty;
+        public Dictionary<int, (IServiceModel, int)> MasterServices { get; set; } = new();        
+    }
+}

BeauySalonContracts/ViewModels/ServiceViewModel.cs

@@ -0,0 +1,14 @@
+using BeautySalonDataModels.Models;
+using System.ComponentModel;
+
+namespace BeautySalonContracts.ViewModels
+{
+    public class ServiceViewModel : IServiceModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название услуги")]
+        public string ServiceName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
+        public double Cost { get; set; }
+    }
+}

BeauySalonContracts/ViewModels/VisitViewModel.cs

@@ -0,0 +1,13 @@
+using BeautySalonDataModels.Models;
+
+namespace BeautySalonContracts.ViewModels
+{
+    public class VisitViewModel : IVisitModel
+    {
+        public int Id { get; set; }
+        public DateTime DateOfVisit { get; set; }
+        public int ClientId { get; set; }
+        public int MasterId { get; set; }
+        public int ServiceId { get; set; }
+    }
+}