ekallin/PIbd-21_Bakalskaya_E.D._SushiBar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сдала... :_)

Browse Source
This commit is contained in:
Елена Бакальская 2024-05-06 12:18:40 +04:00
parent f0ac52e9ee
commit c5525345d6
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SushiBarBusinessLogic/MessageInfoLogic.cs
View File

@ -12,15 +12,25 @@ namespace SushiBarBusinessLogic
private readonly ILogger logger; private readonly ILogger logger;
private readonly IMessageInfoStorage messageStorage; private readonly IMessageInfoStorage messageStorage;
private readonly IClientLogic clientLogic;
public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageStorage) public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageStorage, IClientLogic clientLogic)
{ {
this.logger = logger; this.logger = logger;
this.messageStorage = messageStorage; this.messageStorage = messageStorage;
this.clientLogic = clientLogic;
} }
public bool Create(MessageInfoBindingModel model) public bool Create(MessageInfoBindingModel model)
{ {
if(messageStorage.Insert(model) == null) var message = messageStorage.GetElement(new MessageInfoSearchModel { MessageId = model.MessageId});
if (message != null) return false;
var client = clientLogic.ReadElement(new ClientSearchModel{ Email = model.SenderName });
if (client != null)
{
model.ClientId = client.Id;
}
if (messageStorage.Insert(model) == null)
{ {
logger.LogWarning("Insert message operation failed"); logger.LogWarning("Insert message operation failed");
return false; return false;
@ -31,7 +41,7 @@ namespace SushiBarBusinessLogic
public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model) public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
{ {
var list = model == null ? messageStorage.GetFullList() : messageStorage.GetFilteredList(model); var list = model == null ? messageStorage.GetFullList() : messageStorage.GetFilteredList(model);
if(list == null) if (list == null)
{ {
logger.LogWarning("ReadList had returned a null list"); logger.LogWarning("ReadList had returned a null list");
return null; return null;

3
SushiBarBusinessLogic/OrderLogic.cs
View File

@ -71,7 +71,8 @@ namespace SushiBarBusinessLogic.BusinessLogic
_logger.LogWarning("Insert operation failed"); _logger.LogWarning("Insert operation failed");
return false; return false;
} }
var clientView = clientStorage.GetElement(new() { Id = order.ClientId });
var clientView = clientStorage.GetElement(new ClientSearchModel() { Id = order.ClientId });
if (clientView != null) if (clientView != null)
SendMail(clientView, order); SendMail(clientView, order);

13
SushiBarDatabaseImplement/Implements/ClientStorage.cs
View File

@ -37,14 +37,15 @@ namespace SushiBarDatabaseImplement.Implements
public ClientViewModel? Delete(ClientBindingModel model) public ClientViewModel? Delete(ClientBindingModel model)
{ {
using var context = new SushiBarDatabase(); using var context = new SushiBarDatabase();
var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id); var element = context.Clients.FirstOrDefault(c => c.Id == model.Id);
if (element != null) if (element == null)
{ {
context.Clients.Remove(element); return null;
context.SaveChanges();
return element.GetViewModel;
} }
return null; context.Clients.Remove(element);
context.SaveChanges();
return element.GetViewModel;
} }
public ClientViewModel? GetElement(ClientSearchModel model) public ClientViewModel? GetElement(ClientSearchModel model)

3
SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs
View File

@ -50,9 +50,8 @@ namespace SushiBarDatabaseImplement.Implements
public MessageInfoViewModel? Insert(MessageInfoBindingModel model) public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
{ {
using var context = new SushiBarDatabase(); using var context = new SushiBarDatabase();
model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id;
var message = MessageInfo.Create(model); var message = MessageInfo.Create(model);
if (message == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) if (message == null)
{ {
return null; return null;
} }

3
SushiBarRestApi/appsettings.json
View File

@ -13,6 +13,5 @@
"PopHost": "pop.beget.com", "PopHost": "pop.beget.com",
"PopPort": "995", "PopPort": "995",
"MailLogin": "sushishop@ekallin.ru", "MailLogin": "sushishop@ekallin.ru",
"MailPassword": "8j#HWiCBiI*I!" "MailPassword": "8j#HWiCBiI*I"
} }