diff --git a/SushiBarBusinessLogic/OrderLogic.cs b/SushiBarBusinessLogic/OrderLogic.cs index 3a717a0..9bdf3da 100644 --- a/SushiBarBusinessLogic/OrderLogic.cs +++ b/SushiBarBusinessLogic/OrderLogic.cs @@ -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}" }; } diff --git a/SushiBarClientApp/Controllers/HomeController.cs b/SushiBarClientApp/Controllers/HomeController.cs index 23d2aa2..5e90f4a 100644 --- a/SushiBarClientApp/Controllers/HomeController.cs +++ b/SushiBarClientApp/Controllers/HomeController.cs @@ -145,7 +145,7 @@ namespace SushiBarClientApp.Controllers { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/client/getmessages?clientId ={ APIClient.Client.Id}")); + return View(APIClient.GetRequest>($"api/client/getmessages?clientId={APIClient.Client.Id}")); } } diff --git a/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs b/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs index a01ecb1..6c413c6 100644 --- a/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs @@ -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; } } }