From f0ac52e9ee5f3510c5d6ace524bf88b7dbc05b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Mon, 6 May 2024 00:43:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B1=D0=BE=D0=B3=20=D1=82=D1=8B=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B9,=20=D0=BE=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=98=20=D0=A1=D0=9D=D0=9E=D0=92?=
 =?UTF-8?q?=D0=90=20=D0=9F=D0=A0=D0=9E=D0=91=D0=95=D0=9B!!!!=20=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=D0=B0=20=D0=B2=D1=81?=
 =?UTF-8?q?=D0=B5-=D1=82=D0=B0=D0=BA=D0=B8=20=D1=80=D0=B5=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BC=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=B2=D1=81=D1=82=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BE=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BA=D0=B2=D0=B0=D1=82=D0=BD=D1=8B=D0=B9=20=D0=B2=D1=81?=
 =?UTF-8?q?=D1=91,=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=81=20=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B4=D0=BD=D1=8F=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SushiBarBusinessLogic/OrderLogic.cs           |  4 ++--
 .../Controllers/HomeController.cs             |  2 +-
 .../Implements/MessageInfoStorage.cs          | 23 +++++++------------
 3 files changed, 11 insertions(+), 18 deletions(-)

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<List<MessageInfoViewModel>>($"api/client/getmessages?clientId ={ APIClient.Client.Id}"));
+            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"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;
         }
     }
 }