From eceb3f8f05da03c772c5666a34383c4e15f28997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D1=8C=D1=84=D0=B8=D1=8F=20=D0=A2=D1=83=D0=BA?= =?UTF-8?q?=D0=B0=D0=B5=D0=B2=D0=B0?= Date: Thu, 6 Apr 2023 23:30:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20=D0=B1=D0=B8=D0=B7?= =?UTF-8?q?=D0=BD=D0=B5=D1=81=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- School/School.sln | 6 + .../BusinessLogics/CircleLogic.cs | 101 ++++++++++++ .../BusinessLogics/ClientLogic.cs | 154 ++++++++++++++++++ .../BusinessLogics/EmployeeLogic.cs | 100 ++++++++++++ .../BusinessLogics/LessonLogic.cs | 100 ++++++++++++ .../BusinessLogics/ReportLogic.cs | 0 .../SchoolBusinessLogic.csproj | 9 + .../BindingModels/ExpenseBindingModel.cs | 1 - .../BusinessLogicsContracts/IEmploeeLogic.cs | 19 --- .../BusinessLogicsContracts/IEmployeeLogic.cs | 21 +++ .../StoragesContracts/IEmployeeStorage.cs | 12 +- .../ViewModels/ExpenseViewModel.cs | 1 - .../SchoolDataModels/Models/ICircleModel.cs | 9 + .../SchoolDataModels/Models/IClientModel.cs | 15 ++ .../SchoolDataModels/Models/IEmployeeModel.cs | 15 ++ .../SchoolDataModels/Models/IExpenseModel.cs | 9 +- .../SchoolDataModels/Models/ILessonModel.cs | 14 +- .../SchoolDataModels/Models/IPaymentModel.cs | 15 ++ .../Implements/ClientStorage.cs | 2 +- .../Implements/LessonStorage.cs | 8 +- .../Implements/PaymentStorage.cs | 76 +++------ .../SchoolDatabaseImplements/Models/Client.cs | 2 +- .../Models/Expense.cs | 6 +- 23 files changed, 608 insertions(+), 87 deletions(-) create mode 100644 School/SchoolBusinessLogic/BusinessLogics/CircleLogic.cs create mode 100644 School/SchoolBusinessLogic/BusinessLogics/ClientLogic.cs create mode 100644 School/SchoolBusinessLogic/BusinessLogics/EmployeeLogic.cs create mode 100644 School/SchoolBusinessLogic/BusinessLogics/LessonLogic.cs rename School/{SchoolContracts => SchoolBusinessLogic}/BusinessLogics/ReportLogic.cs (100%) create mode 100644 School/SchoolBusinessLogic/SchoolBusinessLogic.csproj delete mode 100644 School/SchoolContracts/BusinessLogicsContracts/IEmploeeLogic.cs create mode 100644 School/SchoolContracts/BusinessLogicsContracts/IEmployeeLogic.cs diff --git a/School/School.sln b/School/School.sln index 237808a..49e5c64 100644 --- a/School/School.sln +++ b/School/School.sln @@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SchoolContracts", "SchoolCo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SchoolDataModels", "SchoolDataModels\SchoolDataModels.csproj", "{4C8DA0ED-B635-447F-AB51-99136A12854D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchoolBusinessLogic", "SchoolBusinessLogic\SchoolBusinessLogic.csproj", "{1915B99C-5BB8-40E9-AA25-17D881E3E95B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +29,10 @@ Global {4C8DA0ED-B635-447F-AB51-99136A12854D}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C8DA0ED-B635-447F-AB51-99136A12854D}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C8DA0ED-B635-447F-AB51-99136A12854D}.Release|Any CPU.Build.0 = Release|Any CPU + {1915B99C-5BB8-40E9-AA25-17D881E3E95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1915B99C-5BB8-40E9-AA25-17D881E3E95B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1915B99C-5BB8-40E9-AA25-17D881E3E95B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1915B99C-5BB8-40E9-AA25-17D881E3E95B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/School/SchoolBusinessLogic/BusinessLogics/CircleLogic.cs b/School/SchoolBusinessLogic/BusinessLogics/CircleLogic.cs new file mode 100644 index 0000000..a02e351 --- /dev/null +++ b/School/SchoolBusinessLogic/BusinessLogics/CircleLogic.cs @@ -0,0 +1,101 @@ +using Microsoft.Extensions.Logging; +using SchoolContracts.BindingModel; +using SchoolContracts.BusinessLogicsContracts; +using SchoolContracts.SearchModel; +using SchoolContracts.StoragesContracts; +using SchoolContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolBusinessLogic.BusinessLogics +{ + public class CircleLogic : ICircleLogic + { + private readonly ILogger _logger; + private readonly ICircleStorage _circleStorage; + public CircleLogic(ILogger logger, ICircleStorage circleStorage) + { + _logger = logger; + _circleStorage = circleStorage; + } + + public bool Create(CircleBindingModel model) + { + CheckModel(model); + if (_circleStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(CircleBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_circleStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public CircleViewModel? ReadElement(CircleSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id: {Id}", model.Id); + var element = _circleStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement found. Id: {Id}", element.Id); + return element; + } + + public List? ReadList(CircleSearchModel? model) + { + _logger.LogInformation("ReadList. Id: {Id}", model?.Id); + var list = model == null ? _circleStorage.GetFullList() : _circleStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public bool Update(CircleBindingModel model) + { + CheckModel(model); + if (_circleStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + private void CheckModel(CircleBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentException(nameof(model)); + } + if (!withParams) + { + return; + } + _logger.LogInformation("Circle. Id: {Id}", model.Id); + } + } +} diff --git a/School/SchoolBusinessLogic/BusinessLogics/ClientLogic.cs b/School/SchoolBusinessLogic/BusinessLogics/ClientLogic.cs new file mode 100644 index 0000000..d6ca96b --- /dev/null +++ b/School/SchoolBusinessLogic/BusinessLogics/ClientLogic.cs @@ -0,0 +1,154 @@ +using Microsoft.Extensions.Logging; +using SchoolContracts.BindingModel; +using SchoolContracts.BusinessLogicsContracts; +using SchoolContracts.SearchModel; +using SchoolContracts.StoragesContracts; +using SchoolContracts.ViewModels; +using SchoolDatabaseImplement.Implements; + +namespace SchoolBusinessLogic.BusinessLogics +{ + public class ClientLogic : IClientLogic + { + private readonly ILogger _logger; + private readonly IClientStorage _clientStorage; + public ClientLogic(ILogger logger, IClientStorage clientStorage) + { + _logger = logger; + _clientStorage = clientStorage; + } + public bool Create(ClientBindingModel model) + { + CheckModel(model); + if (_clientStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(ClientBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_clientStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public ClientViewModel? ReadElement(ClientSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id: {Id}", model.Id); + var element = _clientStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement found. Id: {Id}", element.Id); + return element; + } + + public List? ReadList(ClientSearchModel? model) + { + _logger.LogInformation("ReadList. Id: {Id}", model?.Id); + var list = model == null ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public bool Update(ClientBindingModel model) + { + CheckModel(model); + if (_clientStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + private void CheckModel(ClientBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentException(nameof(model)); + } + if (!withParams) + { + return; + } + //Введён ли email? + if (string.IsNullOrEmpty(model.ClientEmail)) + { + _logger.LogWarning("Email is empty"); + throw new ArgumentException("Не введён email"); + } + //Логин должен быть больше 35 символов + if (model.ClientEmail.Length > 35) + { + _logger.LogWarning("Email {Email} length > 35", model.ClientEmail); + throw new ArgumentException("Длина email не должна превышать 35 символов"); + } + //Проверяем email на уникальность + var existingClient = _clientStorage.GetElement(new() + { + ClientEmail = model.ClientEmail + }); + if (existingClient != null) + { + _logger.LogWarning("Client with email {Email} already exists", model.ClientEmail); + throw new ArgumentException("Клиент с таким email уже существует"); + } + //Введён ли пароль? + if (string.IsNullOrEmpty(model.ClientPassword)) + { + _logger.LogWarning("Password is empty"); + throw new ArgumentException("Не введён пароль"); + } + //Пароль не должен быть менее 7 и более 30 символов + if (model.ClientPassword.Length < 7 || model.ClientPassword.Length > 30) + { + _logger.LogWarning("Password {Password} length > 30 or < 7", model.ClientPassword); + throw new ArgumentException("Длина пароля должна быть в промежутке между 7 и 30 символами"); + } + //Введено ли имя? + if (string.IsNullOrEmpty(model.ClientName)) + { + _logger.LogWarning("Name is empty"); + throw new ArgumentException("Не введёно имя"); + } + //Имя должно быть не более 30 символов + if (model.ClientName.Length > 30) + { + _logger.LogWarning("Name {Name} length > 30", model.ClientName); + throw new ArgumentException("Длина имени не должна превышать 30 символов"); + } + //Введен ли телефон? + if (string.IsNullOrEmpty(model.ClientPhone)) + { + _logger.LogWarning("Phone is empty"); + throw new ArgumentException("Не введён телефон"); + } + //Телефон должн быть 11 символов + if (model.ClientPhone.Length == 11) + { + _logger.LogWarning("Phone {Phone} length == 11", model.ClientPhone); + throw new ArgumentException("Длина телефона должна быть 11 символов"); + } + _logger.LogInformation("Client. Id: {Id}", model.Id); + } + } +} diff --git a/School/SchoolBusinessLogic/BusinessLogics/EmployeeLogic.cs b/School/SchoolBusinessLogic/BusinessLogics/EmployeeLogic.cs new file mode 100644 index 0000000..b915e38 --- /dev/null +++ b/School/SchoolBusinessLogic/BusinessLogics/EmployeeLogic.cs @@ -0,0 +1,100 @@ +using Microsoft.Extensions.Logging; +using SchoolContracts.BindingModel; +using SchoolContracts.BusinessLogicsContracts; +using SchoolContracts.SearchModel; +using SchoolContracts.StoragesContracts; +using SchoolContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolBusinessLogic.BusinessLogics +{ + public class EmployeeLogic : IEmployeeLogic + { + private readonly ILogger _logger; + private readonly IEmployeeStorage _employeeStorage; + public EmployeeLogic(ILogger logger, IEmployeeStorage employeeStorage) + { + _logger = logger; + _employeeStorage = employeeStorage; + } + public bool Create(EmployeeBindingModel model) + { + CheckModel(model); + if (_employeeStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(EmployeeBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_employeeStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public EmployeeViewModel? ReadElement(EmployeeSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id: {Id}", model.Id); + var element = _employeeStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement found. Id: {Id}", element.Id); + return element; + } + + public List? ReadList(EmployeeSearchModel? model) + { + _logger.LogInformation("ReadList. Id: {Id}", model?.Id); + var list = model == null ? _employeeStorage.GetFullList() : _employeeStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public bool Update(EmployeeBindingModel model) + { + CheckModel(model); + if (_employeeStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + private void CheckModel(EmployeeBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + _logger.LogInformation("Employee. Id: {Id}", model.Id); + } + } +} diff --git a/School/SchoolBusinessLogic/BusinessLogics/LessonLogic.cs b/School/SchoolBusinessLogic/BusinessLogics/LessonLogic.cs new file mode 100644 index 0000000..3878add --- /dev/null +++ b/School/SchoolBusinessLogic/BusinessLogics/LessonLogic.cs @@ -0,0 +1,100 @@ +using Microsoft.Extensions.Logging; +using SchoolContracts.BindingModel; +using SchoolContracts.BusinessLogicsContracts; +using SchoolContracts.SearchModel; +using SchoolContracts.StoragesContracts; +using SchoolContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolBusinessLogic.BusinessLogics +{ + public class LessonLogic : ILessonLogic + { + private readonly ILogger _logger; + private readonly ILessonStorage _lessonStorage; + public LessonLogic(ILogger logger, ILessonStorage lessonStorage) + { + _logger = logger; + _lessonStorage = lessonStorage; + } + public bool Create(LessonBindingModel model) + { + CheckModel(model); + if (_lessonStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(LessonBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_lessonStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public LessonViewModel? ReadElement(LessonSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id: {Id}", model.Id); + var element = _lessonStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement found. Id: {Id}", element.Id); + return element; + } + + public List? ReadList(LessonSearchModel? model) + { + _logger.LogInformation("ReadList. Id: {Id}", model?.Id); + var list = model == null ? _lessonStorage.GetFullList() : _lessonStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public bool Update(LessonBindingModel model) + { + CheckModel(model); + if (_lessonStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + private void CheckModel(LessonBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + _logger.LogInformation("Lesson. Id: {Id}", model.Id); + } + } +} diff --git a/School/SchoolContracts/BusinessLogics/ReportLogic.cs b/School/SchoolBusinessLogic/BusinessLogics/ReportLogic.cs similarity index 100% rename from School/SchoolContracts/BusinessLogics/ReportLogic.cs rename to School/SchoolBusinessLogic/BusinessLogics/ReportLogic.cs diff --git a/School/SchoolBusinessLogic/SchoolBusinessLogic.csproj b/School/SchoolBusinessLogic/SchoolBusinessLogic.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/School/SchoolBusinessLogic/SchoolBusinessLogic.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/School/SchoolContracts/BindingModels/ExpenseBindingModel.cs b/School/SchoolContracts/BindingModels/ExpenseBindingModel.cs index dc8ef5f..b6cc951 100644 --- a/School/SchoolContracts/BindingModels/ExpenseBindingModel.cs +++ b/School/SchoolContracts/BindingModels/ExpenseBindingModel.cs @@ -10,7 +10,6 @@ namespace SchoolContracts.BindingModels public class ExpenseBindingModel : IExpenseModel { public int Id { get; set; } - public string ExpenseName { get; set; } public double Sum { get; set;} } } diff --git a/School/SchoolContracts/BusinessLogicsContracts/IEmploeeLogic.cs b/School/SchoolContracts/BusinessLogicsContracts/IEmploeeLogic.cs deleted file mode 100644 index 2aaf553..0000000 --- a/School/SchoolContracts/BusinessLogicsContracts/IEmploeeLogic.cs +++ /dev/null @@ -1,19 +0,0 @@ -using SchoolContracts.BindingModel; -using SchoolContracts.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SchoolContracts.BusinessLogicsContracts -{ - public interface IEmploeeLogic - { - List Read(EmployeeBindingModel model); - ExpenseViewModel Check(EmployeeBindingModel model); - void CreateOrUpdate(EmployeeBindingModel model); - void Delete(EmployeeBindingModel model); - - } -} diff --git a/School/SchoolContracts/BusinessLogicsContracts/IEmployeeLogic.cs b/School/SchoolContracts/BusinessLogicsContracts/IEmployeeLogic.cs new file mode 100644 index 0000000..af62b78 --- /dev/null +++ b/School/SchoolContracts/BusinessLogicsContracts/IEmployeeLogic.cs @@ -0,0 +1,21 @@ +using SchoolContracts.BindingModel; +using SchoolContracts.SearchModel; +using SchoolContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SchoolContracts.BusinessLogicsContracts +{ + public interface IEmployeeLogic + { + List? ReadList(EmployeeSearchModel? model); + EmployeeViewModel? ReadElement(EmployeeSearchModel model); + bool Create(EmployeeBindingModel model); + bool Update(EmployeeBindingModel model); + bool Delete(EmployeeBindingModel model); + + } +} diff --git a/School/SchoolContracts/StoragesContracts/IEmployeeStorage.cs b/School/SchoolContracts/StoragesContracts/IEmployeeStorage.cs index 6be3e8b..89ce7f1 100644 --- a/School/SchoolContracts/StoragesContracts/IEmployeeStorage.cs +++ b/School/SchoolContracts/StoragesContracts/IEmployeeStorage.cs @@ -11,12 +11,12 @@ namespace SchoolContracts.StoragesContracts { public interface IEmployeeStorage { - List GetFullList(); - List GetFilteredList(EmployeeSearchModel model); - ExpenseViewModel GetElement(EmployeeSearchModel model); - ExpenseViewModel? Insert(EmployeeBindingModel model); - ExpenseViewModel? Update(EmployeeBindingModel model); - ExpenseViewModel? Delete(EmployeeBindingModel model); + List GetFullList(); + List GetFilteredList(EmployeeSearchModel model); + EmployeeViewModel GetElement(EmployeeSearchModel model); + EmployeeViewModel? Insert(EmployeeBindingModel model); + EmployeeViewModel? Update(EmployeeBindingModel model); + EmployeeViewModel? Delete(EmployeeBindingModel model); } } diff --git a/School/SchoolContracts/ViewModels/ExpenseViewModel.cs b/School/SchoolContracts/ViewModels/ExpenseViewModel.cs index 8da6d0b..08d88c4 100644 --- a/School/SchoolContracts/ViewModels/ExpenseViewModel.cs +++ b/School/SchoolContracts/ViewModels/ExpenseViewModel.cs @@ -10,7 +10,6 @@ namespace SchoolContracts.ViewModels public class ExpenseViewModel : IExpenseModel { public int Id { get; set; } - public string ExpenseName { get; set; } = string.Empty; public double Sum { get; set; } } } diff --git a/School/SchoolDataModels/Models/ICircleModel.cs b/School/SchoolDataModels/Models/ICircleModel.cs index 16712f9..3877751 100644 --- a/School/SchoolDataModels/Models/ICircleModel.cs +++ b/School/SchoolDataModels/Models/ICircleModel.cs @@ -6,9 +6,18 @@ using System.Threading.Tasks; namespace SchoolDataModels.Models { + /// + /// Кружок + /// public interface ICircleModel : IId { + /// + /// Дата начала + /// public DateTime DateStart { get;} + /// + /// Id клиента + /// public int ClientId { get;} } } diff --git a/School/SchoolDataModels/Models/IClientModel.cs b/School/SchoolDataModels/Models/IClientModel.cs index 27b2a4e..9b13c59 100644 --- a/School/SchoolDataModels/Models/IClientModel.cs +++ b/School/SchoolDataModels/Models/IClientModel.cs @@ -6,11 +6,26 @@ using System.Threading.Tasks; namespace SchoolDataModels.Models { + /// + /// Клиент + /// public interface IClientModel : IId { + /// + /// Имя + /// public string ClientName { get; } + /// + /// Email + /// public string ClientEmail { get; } + /// + /// Телефон + /// public string ClientPhone { get; } + /// + /// Пароль + /// public string ClientPassword { get; } } } diff --git a/School/SchoolDataModels/Models/IEmployeeModel.cs b/School/SchoolDataModels/Models/IEmployeeModel.cs index 2bc46da..573e456 100644 --- a/School/SchoolDataModels/Models/IEmployeeModel.cs +++ b/School/SchoolDataModels/Models/IEmployeeModel.cs @@ -6,11 +6,26 @@ using System.Threading.Tasks; namespace SchoolDataModels.Models { + /// + /// Сотрудник + /// public interface IEmployeeModel : IId { + /// + /// Имя + /// public string EmployeeName { get; set; } + /// + /// Пароль + /// public string EmployeePassword { get; set; } + /// + /// Email + /// public string EmployeeEmail { get; set; } + /// + /// Телефон + /// public string EmployeePhone { get; set; } } } diff --git a/School/SchoolDataModels/Models/IExpenseModel.cs b/School/SchoolDataModels/Models/IExpenseModel.cs index 642cdc6..cb27b6d 100644 --- a/School/SchoolDataModels/Models/IExpenseModel.cs +++ b/School/SchoolDataModels/Models/IExpenseModel.cs @@ -6,9 +6,14 @@ using System.Threading.Tasks; namespace SchoolDataModels.Models { + /// + /// Затрата на кружок + /// public interface IExpenseModel : IId { - public string ExpenseName { get; set; } - public double Sum { get; set; } + /// + /// Сумма затраты + /// + public double Sum { get; } } } diff --git a/School/SchoolDataModels/Models/ILessonModel.cs b/School/SchoolDataModels/Models/ILessonModel.cs index 55074dc..69e78dd 100644 --- a/School/SchoolDataModels/Models/ILessonModel.cs +++ b/School/SchoolDataModels/Models/ILessonModel.cs @@ -1,9 +1,21 @@ namespace SchoolDataModels.Models { - public interface ILessonModel : IId + /// + /// Занятие + /// + public interface ILessonModel : IId { + /// + /// Название + /// public string LessonName { get; set; } + /// + /// Стоимость + /// public double LessonPrice { get; set; } + /// + /// Id Сотрудника + /// public int EmployeeId { get; set; } } } \ No newline at end of file diff --git a/School/SchoolDataModels/Models/IPaymentModel.cs b/School/SchoolDataModels/Models/IPaymentModel.cs index d217011..174bda9 100644 --- a/School/SchoolDataModels/Models/IPaymentModel.cs +++ b/School/SchoolDataModels/Models/IPaymentModel.cs @@ -6,11 +6,26 @@ using System.Threading.Tasks; namespace SchoolDataModels.Models { + /// + /// Оплата + /// public interface IPaymentModel : IId { + /// + /// Сумма + /// public double Sum { get; set; } + /// + /// Остатки + /// public double Remains { get; set; } + /// + /// Дата платежа + /// public DateTime? DateOfPayment { get; set; } + /// + /// Id занятия + /// public int LessonId { get; set; } } } diff --git a/School/SchoolDatabaseImplements/Implements/ClientStorage.cs b/School/SchoolDatabaseImplements/Implements/ClientStorage.cs index 1f1bb74..63e7d2b 100644 --- a/School/SchoolDatabaseImplements/Implements/ClientStorage.cs +++ b/School/SchoolDatabaseImplements/Implements/ClientStorage.cs @@ -72,7 +72,7 @@ namespace SchoolDatabaseImplement.Implements } context.Clients.Add(newClient); context.SaveChanges(); - return newClient.GetViewModel(); + return newClient.GetViewModel; } public ClientViewModel? Update(ClientBindingModel model) { diff --git a/School/SchoolDatabaseImplements/Implements/LessonStorage.cs b/School/SchoolDatabaseImplements/Implements/LessonStorage.cs index cf09706..cf0b9f1 100644 --- a/School/SchoolDatabaseImplements/Implements/LessonStorage.cs +++ b/School/SchoolDatabaseImplements/Implements/LessonStorage.cs @@ -19,14 +19,16 @@ namespace SchoolDatabaseImplement.Implements { using var context = new SchoolDatabase(); return context.Lessons - .Select(x => x.GetViewModel) - .ToList(); + .Include (x => x.Employee) + .Select(x => x.GetViewModel) + .ToList(); } public List GetFilteredList(LessonSearchModel model) { using var context = new SchoolDatabase(); return context.Lessons .Where(x => x.Id == model.Id) + .Include(x => x.Employee) .Select(x => x.GetViewModel) .ToList(); } @@ -36,11 +38,13 @@ namespace SchoolDatabaseImplement.Implements if (model.Id.HasValue)//сначала ищем по Id { return context.Lessons + .Include(x => x.Employee) .FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; } if (!string.IsNullOrEmpty(model.LessonName))//затем по названию { return context.Lessons + .Include(x => x.Employee) .FirstOrDefault(x => x.LessonName == model.LessonName)?.GetViewModel; } return null; diff --git a/School/SchoolDatabaseImplements/Implements/PaymentStorage.cs b/School/SchoolDatabaseImplements/Implements/PaymentStorage.cs index 69941a3..0d3f590 100644 --- a/School/SchoolDatabaseImplements/Implements/PaymentStorage.cs +++ b/School/SchoolDatabaseImplements/Implements/PaymentStorage.cs @@ -31,35 +31,31 @@ namespace SchoolDatabaseImplement.Implements return null; } using var context = new SchoolDatabase(); - var list = context.Payments.Where(rec => rec.LessonId == model.LessonId) + var list = context.Payments.Where(x => x.LessonId == model.LessonId) .OrderBy(x => x.DateOfPayment) - .Include(rec => rec.Lesson); + .Include(x => x.Lesson); return list - .Select(rec => new PaymentViewModel + .Select(x => new PaymentViewModel { - DateOfPayment = rec.DateOfPayment, - Id = rec.Id, - Remains = rec.Remains, - Sum = rec.Sum, - LessonId = rec.LessonId - + DateOfPayment = x.DateOfPayment, + Id = x.Id, + Remains = x.Remains, + Sum = x.Sum, + LessonId = x.LessonId }) .ToList(); } - - public PaymentViewModel GetElement(PaymentSearchModel model) { if (model == null) { return null; } - var context = new SchoolDatabase(); + using var context = new SchoolDatabase(); { - var payment = context.Payments.Include(rec => rec.Lesson) - .FirstOrDefault(rec => rec.LessonId == model.LessonId); - return payment != null ? - new PaymentViewModel + var payment = context.Payments.Include(x=> x.Lesson) + .FirstOrDefault(x => x.LessonId == model.LessonId); + return payment != null? new PaymentViewModel { DateOfPayment = payment.DateOfPayment, Id = payment.Id, @@ -70,43 +66,25 @@ namespace SchoolDatabaseImplement.Implements null; } } - public PaymentViewModel GetElementFirstLast(/*PaymentDateBindingModel model*/) - { - //TODO - //if (model == null) - //{ - // return null; - //} - //var context = new SchoolDatabase(); - //{ - // return new PaymentViewModel() - // { - // Remains = context.Payments.Include(rec => rec.Lesson) - // .Where(x => x.DateOfPayment > model.DateFrom || x.DateOfPayment < model.DateTo).Sum(x => x.Sum) - // }; - - //} - return null; - } public PaymentViewModel? Insert(PaymentBindingModel model) { - //TODO - //var newPayment = Payment.Create(model); - //if(newPayment == null) - //{ - // return null; - //} - //var context = new SchoolDatabase(); - //context.Payments.Add(newPayment); - //context.SaveChanges(); - //return newPayment.GetViewModel; - return null; + var context = new SchoolDatabase(); + var newPayment = Payment.Create(context, model); + if (newPayment == null) + { + return null; + } + context.Payments.Add(newPayment); + context.SaveChanges(); + return newPayment.GetViewModel; } public PaymentViewModel? Update(PaymentBindingModel model) { var context = new SchoolDatabase(); - var element = context.Payments.FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Payments. + Include(x => x.Lesson) + .FirstOrDefault(rec => rec.Id == model.Id); if (element == null) { throw new Exception("Оплата не найдена"); @@ -115,13 +93,13 @@ namespace SchoolDatabaseImplement.Implements context.SaveChanges(); return element.GetViewModel; } - - public PaymentViewModel? Delete(PaymentBindingModel model) { var context = new SchoolDatabase(); - var element = context.Payments.FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Payments + .Include(x => x.Lesson) + .FirstOrDefault(rec => rec.Id == model.Id); if (element != null) { context.Payments.Remove(element); diff --git a/School/SchoolDatabaseImplements/Models/Client.cs b/School/SchoolDatabaseImplements/Models/Client.cs index 33614c5..fd13da6 100644 --- a/School/SchoolDatabaseImplements/Models/Client.cs +++ b/School/SchoolDatabaseImplements/Models/Client.cs @@ -51,7 +51,7 @@ namespace SchoolDatabaseImplement.Models ClientPassword = model.ClientPassword; ClientPhone = model.ClientPhone; } - public ClientViewModel? GetViewModel() => new() + public ClientViewModel GetViewModel => new() { Id = Id, ClientName = ClientName, diff --git a/School/SchoolDatabaseImplements/Models/Expense.cs b/School/SchoolDatabaseImplements/Models/Expense.cs index a6e6f4e..81683af 100644 --- a/School/SchoolDatabaseImplements/Models/Expense.cs +++ b/School/SchoolDatabaseImplements/Models/Expense.cs @@ -11,11 +11,9 @@ namespace SchoolDatabaseImplement.Models { public class Expense : IExpenseModel { - public int Id { get; set; } + public int Id { get; private set; } [Required] - public string ExpenseName { get; set; } = string.Empty; - [Required] - public double Sum { get; set; } + public double Sum { get; private set; } [ForeignKey("ExpenseId")] public virtual List CircleExpenses { get; set; } = new(); }