spacyboy/CourseWork_CarCenter
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправила MainController

Browse Source
This commit is contained in:
Nastya_Kozlova
2024-04-30 00:33:22 +04:00
parent bb202799f6
commit 8321ae0bb4
4 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CarCenter/CarCenterBusinessLogic/BusinessLogics/AdministratorLogic.cs
View File

@@ -141,7 +141,7 @@ namespace CarCenterBusinessLogic.BusinessLogics
throw new ArgumentNullException("Нет номера телефона администратора", nameof(model.AdministratorNumber));
}
if (model.AdministratorEmail.Length > _loginMaxLength || !Regex.IsMatch(model.AdministratorEmail, @"([a-zA-Z0-9]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]+)"))
if (model.AdministratorLogin.Length > _loginMaxLength)
{
throw new Exception($"В качестве логина должна быть указана почта и иметь длинну не более {_loginMaxLength} символов");
}
@@ -156,8 +156,7 @@ namespace CarCenterBusinessLogic.BusinessLogics
throw new ArgumentNullException("Нет пароля администратора", nameof(model.AdministratorPassword));
}
if (model.AdministratorPassword.Length > _passwordMaxLength || model.AdministratorPassword.Length < _passwordMinLength
|| !Regex.IsMatch(model.AdministratorPassword, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$"))
if (model.AdministratorPassword.Length > _passwordMaxLength || model.AdministratorPassword.Length < _passwordMinLength)
{
throw new Exception($"Пароль длиной от {_passwordMinLength} до {_passwordMaxLength} должен состоять из цифр, букв и небуквенных символов");
}

2
CarCenter/CarCenterDataBaseImplement/CarCenterDataBase.cs
View File

@@ -9,7 +9,7 @@ namespace CarCenterDataBaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
optionsBuilder.UseSqlServer(@"Data Source=WIN-GKU3FFNUNO6;Initial Catalog=CarCenterDataBase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=CarCenterDataBase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);

66
CarCenter/CarCenterRestApi/Controllers/MainController.cs
View File

@@ -295,22 +295,22 @@ namespace CarCenterRestApi.Controllers
}
}
//[HttpGet]
//public Tuple<EmployeeViewModel, List<Tuple<DateTime, double>>>? GetEmployee(int employeeId)
//{
// try
// {
// var elem = _employee.ReadElement(new EmployeeSearchModel { Id = employeeId });
// if (elem == null)
// return null;
// return Tuple.Create(elem, elem.EmployeeSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList());
// }
// catch (Exception ex)
// {
// _logger.LogError(ex, "Ошибка получения сотрудника по id={Id}", employeeId);
// throw;
// }
//}
[HttpGet]
public Tuple<EmployeeViewModel, List<Tuple<DateTime?, string>>>? GetEmployee(int employeeId)
{
try
{
var elem = _employee.ReadElement(new EmployeeSearchModel { Id = employeeId });
if (elem == null)
return null;
return Tuple.Create(elem, elem.EmployeeSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList());
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения сотрудника по id={Id}", employeeId);
throw;
}
}
[HttpPost]
public void DeleteEmployee(EmployeeBindingModel model)
@@ -369,23 +369,23 @@ namespace CarCenterRestApi.Controllers
}
}
//[HttpGet]
//public Tuple<PreSaleWorkViewModel, List<Tuple<DateTime, double>>, List<Tuple<string, string>>>? GetPreSaleWork(int preSaleWorkId)
//{
// try
// {
// using var context = new CarCenterDataBase();
// var elem = _preSaleWork.ReadElement(new PreSaleWorkSearchModel { Id = preSaleWorkId });
// if (elem == null)
// return null;
// return Tuple.Create(elem, elem.PreSaleWorkSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList(), context.Equipments.Where(x => x.PreSaleWorkId == elem.Id).Select(x => Tuple.Create(x.EquipmentName, x.EquipmentPrice)).ToList());
// }
// catch (Exception ex)
// {
// _logger.LogError(ex, "Ошибка получения препродажной работы по id={Id}", preSaleWorkId);
// throw;
// }
//}
[HttpGet]
public Tuple<PreSaleWorkViewModel, List<Tuple<DateTime?, string>>, List<Tuple<string, double>>>? GetPreSaleWork(int preSaleWorkId)
{
try
{
using var context = new CarCenterDataBase();
var elem = _preSaleWork.ReadElement(new PreSaleWorkSearchModel { Id = preSaleWorkId });
if (elem == null)
return null;
return Tuple.Create(elem, elem.PreSaleWorkSales.Select(x => Tuple.Create(x.Value.SaleDate, x.Value.SalePrice)).ToList(), context.Equipments.Where(x => x.PreSaleWorkId == elem.Id).Select(x => Tuple.Create(x.EquipmentName, x.EquipmentPrice)).ToList());
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения препродажной работы по id={Id}", preSaleWorkId);
throw;
}
}
[HttpPost]
public void DeletePreSaleWork(PreSaleWorkBindingModel model)

2
CarCenter/CarCenterRestApi/log4net.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<log4net>
<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
<file value="c:/temp/HotelRestApi.log" />
<file value="c:/temp/CarCenterRestApi.log" />
<appendToFile value="true" />
<maximumFileSize value="100KB" />
<maxSizeRollBackups value="2" />