From ed47c9c6e891cf9eaaf24b1be1abbc0c77d91f6e Mon Sep 17 00:00:00 2001
From: dasha <amayashimizu89@gmail.com>
Date: Wed, 19 Apr 2023 17:49:38 +0400
Subject: [PATCH] =?UTF-8?q?=3F=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B5=3F=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B8=D1=81=D0=B5=D0=BC?=
 =?UTF-8?q?=20=D0=B2=20=D0=B2=D0=B5=D0=B1=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MailWorker/AbstractMailWorker.cs                   | 10 ++++++++--
 .../SushiBarBusinessLogic/MailWorker/MailKitWorker.cs  |  2 +-
 SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml     |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/SushiBar/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs b/SushiBar/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs
index 52a9624..3afe6fb 100644
--- a/SushiBar/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs
+++ b/SushiBar/SushiBarBusinessLogic/MailWorker/AbstractMailWorker.cs
@@ -1,6 +1,7 @@
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
+using SushiBarBusinessLogic.BusinessLogics;
 
 namespace SushiBarBusinessLogic.MailWorker
 {
@@ -20,12 +21,15 @@ namespace SushiBarBusinessLogic.MailWorker
 
         private readonly IMessageInfoLogic _messageInfoLogic;
 
+        private readonly IClientLogic _clientLogic;
+
         private readonly ILogger _logger;
 
-        public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic)
+        public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
         {
             _logger = logger;
             _messageInfoLogic = messageInfoLogic;
+            _clientLogic = clientLogic;
         }
 
         public void MailConfig(MailConfigBindingModel config)
@@ -36,7 +40,8 @@ namespace SushiBarBusinessLogic.MailWorker
             _smtpClientPort = config.SmtpClientPort;
             _popHost = config.PopHost;
             _popPort = config.PopPort;
-            _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
+            _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}",
+                _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
         }
 
         public async void MailSendAsync(MailSendInfoBindingModel info)
@@ -81,6 +86,7 @@ namespace SushiBarBusinessLogic.MailWorker
             _logger.LogDebug("Check Mail: {Count} new mails", list.Count);
             foreach (var mail in list)
             {
+                mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
                 _messageInfoLogic.Create(mail);
             }
         }
diff --git a/SushiBar/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs b/SushiBar/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs
index 645528c..b3934aa 100644
--- a/SushiBar/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs
+++ b/SushiBar/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs
@@ -11,7 +11,7 @@ namespace SushiBarBusinessLogic.MailWorker
 {
     public class MailKitWorker : AbstractMailWorker
     {
-        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
+        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
 
         protected override async Task SendMailAsync(MailSendInfoBindingModel info)
         {
diff --git a/SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml b/SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml
index aa313fa..bf1b6d4 100644
--- a/SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml
+++ b/SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml
@@ -7,7 +7,7 @@
 }
 
 <div class="text-center">
-	<h1 class="display-4">Заказы</h1>
+	<h1 class="display-4">Письма</h1>
 </div>