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

PIbd - 21 Bakalskaya E.D. LabWork07 BASE #13

Closed
ekallin wants to merge 26 commits from LabWork07 into LabWork06
pull from: LabWork07
merge into: ekallin:LabWork06
Conversation 1 Commits 26 Files Changed 45 +11 -18
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0ac52e9ee - Show all commits

4
SushiBarBusinessLogic/OrderLogic.cs
View File

@ -153,7 +153,7 @@ namespace SushiBarBusinessLogic.BusinessLogic
{
MailAddress = clientView!.Email,
Subject = $"Заказ под номером {orderView.Id}",
Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} " +
Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} тыщ долларов" +
$"был принят"
};
}
@ -163,7 +163,7 @@ namespace SushiBarBusinessLogic.BusinessLogic
{
MailAddress = clientView!.Email,
Subject = $"Заказ под номером {orderView.Id}",
Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} " +
Text = $"Ваш заказ под номером {orderView.Id} от {orderView.DateCreate} ценой в {orderView.Sum} тыщ долларов " +
$"поменял статус на {orderView.Status}"
};
}

2
SushiBarClientApp/Controllers/HomeController.cs
View File

@ -145,7 +145,7 @@ namespace SushiBarClientApp.Controllers
{
return Redirect("~/Home/Enter");
}
return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId ={ APIClient.Client.Id}"));
return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
}
}

23
SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs
View File

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