From f2a6d479605ef026818b879cfb209d9910ea1e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D1=8F?=
 <VladimirMorozov.73@yandex.ru>
Date: Mon, 1 May 2023 23:23:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B8=D1=81=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessLogics/OrderLogic.cs                          | 4 ++--
 .../AbstractAutoBusinessLogic/MailWorker/MailKitWorker.cs | 8 ++++++--
 .../AutoPlantClientApp/Controllers/HomeController.cs      | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/AutomobilePlant/AbstractAutoBusinessLogic/BusinessLogics/OrderLogic.cs b/AutomobilePlant/AbstractAutoBusinessLogic/BusinessLogics/OrderLogic.cs
index db5a00d..2781273 100644
--- a/AutomobilePlant/AbstractAutoBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/AutomobilePlant/AbstractAutoBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -51,8 +51,8 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
             _mailKitWorker.MailSendAsync(new MailSendInfoBindingModel
             {
                 MailAddress = (_clientStorage.GetElement(new ClientSearchModel { Id = newOrder.ClientId})).Email,
-                Subject = $"Заказ номер {model.Id}",
-                Text = "Ваш заказ успешно принят"
+                Subject = $"Заказ номер",
+                Text = $"Ваш заказ успешно принят. Машина: {model.CarName} в количестве: {model.Count} выйдет на сумму: {model.Sum}"
             });
             return true;
         }
diff --git a/AutomobilePlant/AbstractAutoBusinessLogic/MailWorker/MailKitWorker.cs b/AutomobilePlant/AbstractAutoBusinessLogic/MailWorker/MailKitWorker.cs
index 951a136..f77bd88 100644
--- a/AutomobilePlant/AbstractAutoBusinessLogic/MailWorker/MailKitWorker.cs
+++ b/AutomobilePlant/AbstractAutoBusinessLogic/MailWorker/MailKitWorker.cs
@@ -7,12 +7,15 @@ using Microsoft.Extensions.Logging;
 using System.Net;
 using System.Net.Mail;
 using System.Text;
+using AutomobilePlantContracts.StoragesContracts;
+using AutomobilePlantContracts.SearchModel;
 
 namespace AutomobilePlantBusinessLogic.MailWorker
 {
     public class MailKitWorker : AbstractMailWorker
     {
-        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
+        private readonly IClientStorage _clientStorage;
+        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientStorage clientStorage) : base(logger, messageInfoLogic) { _clientStorage = clientStorage; }
 
         protected override async Task SendMailAsync(MailSendInfoBindingModel info)
         {
@@ -58,11 +61,12 @@ namespace AutomobilePlantBusinessLogic.MailWorker
                             list.Add(new MessageInfoBindingModel
                             {
                                 DateDelivery = DateTime.SpecifyKind(message.Date.DateTime, DateTimeKind.Utc),
+                                ClientId = _clientStorage.GetElement(new ClientSearchModel { Email = mail.Address }).Id,
                                 MessageId = message.MessageId,
                                 SenderName = mail.Address,
                                 Subject = message.Subject,
                                 Body = message.TextBody
-                            });
+                            }); ;
                         }
                     }
                 }
diff --git a/AutomobilePlant/AutoPlantClientApp/Controllers/HomeController.cs b/AutomobilePlant/AutoPlantClientApp/Controllers/HomeController.cs
index 4366ab0..df03f46 100644
--- a/AutomobilePlant/AutoPlantClientApp/Controllers/HomeController.cs
+++ b/AutomobilePlant/AutoPlantClientApp/Controllers/HomeController.cs
@@ -154,7 +154,7 @@ namespace AutoPlantClientApp.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}"));
         }
     }
 }
\ No newline at end of file