Pavel_Sorokin/PIbd-21_Sorokin_P.V._Shipyard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Павел Сорокин 2023-04-30 18:12:09 +04:00
parent 27dbec9dcd
commit 96019a5916
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shipyard/ShipyardBusinessLogic/BusinessLogics/ClientLogic.cs
View File

@ -108,7 +108,7 @@ namespace ShipyardBusinessLogic.BusinessLogics
{
throw new ArgumentNullException("У клиента отсутствует пароль", nameof(model.Email));
}
if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$")
if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$"))
{
throw new ArgumentException("Неправильно введенный email", nameof(model.Email));
}

6
Shipyard/ShipyardBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -21,10 +21,9 @@ namespace ShipyardBusinessLogic.BusinessLogics
private readonly IOrderStorage _orderStorage;
private readonly AbstractMailWorker _mailWorker;
private readonly IClientLogic _clientLogic;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker,IClientLogic clientLogic)
private readonly IShopLogic _shopLogic;
private readonly IShipStorage _shipStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic,IShipStorage shipStorage)
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic,IShipStorage shipStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
{
_logger = logger;
_orderStorage = orderStorage;
@ -129,9 +128,8 @@ namespace ShipyardBusinessLogic.BusinessLogics
CheckModel(model,false);
var result = _orderStorage.Update(model);
if (result == null)
CheckModel(model, false);
if (_orderStorage.Update(model) == null)
{
model.Status--;
_logger.LogWarning("Change status operation failed");
return false;
}