diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/EmployeeLogic.cs b/CarCenter/CarCenterBusinessLogic/BusinessLogics/EmployeeLogic.cs index 6ab3fa6..b37c26f 100644 --- a/CarCenter/CarCenterBusinessLogic/BusinessLogics/EmployeeLogic.cs +++ b/CarCenter/CarCenterBusinessLogic/BusinessLogics/EmployeeLogic.cs @@ -19,10 +19,9 @@ namespace CarCenterBusinessLogic.BusinessLogics _logger = logger; _employeeStorage = EmployeeStorage; } - public bool Create(EmployeeBindingModel model) + public bool Create(EmployeeBindingModel? model) { CheckModel(model); - model.EmployeeSales = new(); var result = _employeeStorage.Insert(model); @@ -35,7 +34,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return true; } - public bool Delete(EmployeeBindingModel model) + public bool Delete(EmployeeBindingModel? model) { CheckModel(model, false); @@ -52,7 +51,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return true; } - public EmployeeViewModel? ReadElement(EmployeeSearchModel model) + public EmployeeViewModel? ReadElement(EmployeeSearchModel? model) { if (model == null) { @@ -91,7 +90,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return list; } - public bool Update(EmployeeBindingModel model) + public bool Update(EmployeeBindingModel? model) { CheckModel(model); @@ -104,7 +103,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return true; } - private void CheckModel(EmployeeBindingModel model, bool withParams = true) + private void CheckModel(EmployeeBindingModel? model, bool withParams = true) { if (model == null) { @@ -121,6 +120,17 @@ namespace CarCenterBusinessLogic.BusinessLogics throw new ArgumentNullException("Нет ФИО сотрудника", nameof(model.EmployeeFIO)); } + if (string.IsNullOrEmpty(model.EmployeePost)) + { + throw new ArgumentNullException("Нет должности сотрудника", nameof(model.EmployeePost)); + } + + if (model.EmployeeSalary < 0) + { + throw new ArgumentNullException("Зарплата не может быть меньше 0", nameof(model.EmployeeSalary)); + } + + _logger.LogInformation("Employee. EmployeeFIO:{EmployeeFIO}.EmployeePost:{ EmployeePost}. Id: { Id}", model.EmployeeFIO, model.EmployeePost, model.Id); } } diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/PreSaleWorkLogic.cs b/CarCenter/CarCenterBusinessLogic/BusinessLogics/PreSaleWorkLogic.cs index 2715e29..9084574 100644 --- a/CarCenter/CarCenterBusinessLogic/BusinessLogics/PreSaleWorkLogic.cs +++ b/CarCenter/CarCenterBusinessLogic/BusinessLogics/PreSaleWorkLogic.cs @@ -12,19 +12,16 @@ namespace CarCenterBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IPreSaleWorkStorage _PreSaleWorkStorage; - private readonly IManagerLogic _managerLogic; - public PreSaleWorkLogic(ILogger logger, IPreSaleWorkStorage PreSaleWorkStorage, IManagerLogic ManagerLogic) + public PreSaleWorkLogic(ILogger logger, IPreSaleWorkStorage PreSaleWorkStorage) { _logger = logger; _PreSaleWorkStorage = PreSaleWorkStorage; - _managerLogic = ManagerLogic; } public bool Create(PreSaleWorkBindingModel model) { CheckModel(model); - model.PreSaleWorkSales = new(); var result = _PreSaleWorkStorage.Insert(model); @@ -54,7 +51,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return true; } - public PreSaleWorkViewModel? ReadElement(PreSaleWorkSearchModel model) + public PreSaleWorkViewModel? ReadElement(PreSaleWorkSearchModel? model) { if (model == null) { @@ -93,7 +90,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return list; } - public bool Update(PreSaleWorkBindingModel model) + public bool Update(PreSaleWorkBindingModel? model) { CheckModel(model); @@ -106,7 +103,7 @@ namespace CarCenterBusinessLogic.BusinessLogics return true; } - private void CheckModel(PreSaleWorkBindingModel model, bool withParams = true) + private void CheckModel(PreSaleWorkBindingModel? model, bool withParams = true) { if (model == null) { diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/SaleLogic.cs b/CarCenter/CarCenterBusinessLogic/BusinessLogics/SaleLogic.cs index b89612c..68de098 100644 --- a/CarCenter/CarCenterBusinessLogic/BusinessLogics/SaleLogic.cs +++ b/CarCenter/CarCenterBusinessLogic/BusinessLogics/SaleLogic.cs @@ -11,13 +11,11 @@ namespace CarCenterBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly ISaleStorage _SaleStorage; - private readonly IManagerLogic _managerLogic; - public SaleLogic(ILogger logger, ISaleStorage SaleStorage, IManagerLogic ManagerLogic) + public SaleLogic(ILogger logger, ISaleStorage SaleStorage) { _logger = logger; _SaleStorage = SaleStorage; - _managerLogic = ManagerLogic; } public bool Create(SaleBindingModel model) @@ -59,7 +57,7 @@ namespace CarCenterBusinessLogic.BusinessLogics throw new ArgumentNullException(nameof(model)); } - _logger.LogInformation("ReadElement. SaleFIO:{SaleFIO}.Id:{Id}", model.SaleDate, model.Id); + _logger.LogInformation("ReadElement. SaleName:{SaleName}.Id:{Id}", model.SaleName, model.Id); var element = _SaleStorage.GetElement(model); @@ -76,7 +74,7 @@ namespace CarCenterBusinessLogic.BusinessLogics public List? ReadList(SaleSearchModel? model) { - _logger.LogInformation("ReadList. SaleFIO:{SaleFIO}.Id:{ Id}", model?.SaleDate, model?.Id); + _logger.LogInformation("ReadList. SaleName:{SaleName}.Id:{ Id}", model?.SaleName, model?.Id); var list = model == null ? _SaleStorage.GetFullList() : _SaleStorage.GetFilteredList(model);