From 826bee7db62b05f511f09abf1aceddf3c30d2e9b Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tstanciu@totalsoft.ro>
Date: Sat, 21 Jan 2023 04:41:05 +0200
Subject: [PATCH] removed duplicated method

---
 src/Correo.Abstractions/Extensions/ModelExtensions.cs | 5 ++++-
 src/Correo.MailKit/MailKitSmtpClient.cs               | 7 ++-----
 src/Correo.Mailgun/MailgunService.cs                  | 5 +----
 src/Correo.NetSmtpClient/NetSmtpClient.cs             | 7 ++-----
 src/Correo.SendGrid/SendGridService.cs                | 5 +----
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/Correo.Abstractions/Extensions/ModelExtensions.cs b/src/Correo.Abstractions/Extensions/ModelExtensions.cs
index a5f3acb..6fc3d9a 100644
--- a/src/Correo.Abstractions/Extensions/ModelExtensions.cs
+++ b/src/Correo.Abstractions/Extensions/ModelExtensions.cs
@@ -5,7 +5,10 @@ namespace Correo.Abstractions.Extensions
 {
     public static class ModelExtensions
     {
-        public static string Log(this IEnumerable<EmailMessage.MailAddress> addresses)
+        private static string Log(this IEnumerable<EmailMessage.MailAddress> addresses)
             => addresses != null ? string.Join(',', addresses.Select(z => z.Address)) : string.Empty;
+
+        public static string Log(this EmailMessage message)
+            => $"Email sent: Subject: {message.Subject}; From: {message.From.Address}; To: {message.To.Log()}; Cc: {message.Cc.Log()}; Bcc: {message.Bcc.Log()};";
     }
 }
diff --git a/src/Correo.MailKit/MailKitSmtpClient.cs b/src/Correo.MailKit/MailKitSmtpClient.cs
index 3a2d2b2..c5cd92d 100644
--- a/src/Correo.MailKit/MailKitSmtpClient.cs
+++ b/src/Correo.MailKit/MailKitSmtpClient.cs
@@ -47,17 +47,14 @@ namespace Correo.MailKit
         {
             var mailMessage = message.ToMailMessage();
             _smtpClient.Send(mailMessage);
-            Log(message);
+            _logger.LogInformation(message.Log());
         }
 
         public async Task SendEmailAsync(EmailMessage message, CancellationToken token = default)
         {
             var mailMessage = message.ToMailMessage();
             await _smtpClient.SendAsync(mailMessage, token);
-            Log(message);
+            _logger.LogInformation(message.Log());
         }
-
-        private void Log(EmailMessage message)
-            => _logger.LogInformation($"Email sent: Subject: {message.Subject}; From: {message.From.Address}; To: {message.To.Log()}; Cc: {message.Cc.Log()}; Bcc: {message.Bcc.Log()};");
     }
 }
diff --git a/src/Correo.Mailgun/MailgunService.cs b/src/Correo.Mailgun/MailgunService.cs
index 4534780..55d7576 100644
--- a/src/Correo.Mailgun/MailgunService.cs
+++ b/src/Correo.Mailgun/MailgunService.cs
@@ -65,15 +65,12 @@ namespace Correo.Mailgun
             if (response.IsSuccessful)
             {
                 _logger.LogInformation($"Mailgun response: {response.Data.Message} {response.Data.Id}");
-                Log(message);
+                _logger.LogInformation(message.Log());
             }
             else
             {
                 throw new Exception($"Mailgun error: {response.Data.Message}");
             }
         }
-
-        private void Log(EmailMessage message)
-            => _logger.LogInformation($"Email sent: Subject: {message.Subject}; From: {message.From.Address}; To: {message.To.Log()}; Cc: {message.Cc.Log()}; Bcc: {message.Bcc.Log()};");
     }
 }
diff --git a/src/Correo.NetSmtpClient/NetSmtpClient.cs b/src/Correo.NetSmtpClient/NetSmtpClient.cs
index d7d79d2..9275290 100644
--- a/src/Correo.NetSmtpClient/NetSmtpClient.cs
+++ b/src/Correo.NetSmtpClient/NetSmtpClient.cs
@@ -49,17 +49,14 @@ namespace Correo.NetSmtpClient
         {
             var mailMessage = message.ToMailMessage();
             _smtpClient.Send(mailMessage);
-            Log(message);
+            _logger.LogInformation(message.Log());
         }
 
         public async Task SendEmailAsync(EmailMessage message, CancellationToken token = default)
         {
             var mailMessage = message.ToMailMessage();
             await _smtpClient.SendMailAsync(mailMessage, token);
-            Log(message);
+            _logger.LogInformation(message.Log());
         }
-
-        private void Log(EmailMessage message)
-            => _logger.LogInformation($"Email sent: Subject: {message.Subject}; From: {message.From.Address}; To: {message.To.Log()}; Cc: {message.Cc.Log()}; Bcc: {message.Bcc.Log()};");
     }
 }
diff --git a/src/Correo.SendGrid/SendGridService.cs b/src/Correo.SendGrid/SendGridService.cs
index 2c67d9d..49755bc 100644
--- a/src/Correo.SendGrid/SendGridService.cs
+++ b/src/Correo.SendGrid/SendGridService.cs
@@ -36,7 +36,7 @@ namespace Correo.SendGrid
             var mailMessage = message.ToSendGridMessage();
             var response = await _client.SendEmailAsync(mailMessage, token);
             if (response.IsSuccessStatusCode)
-                Log(message);
+                _logger.LogInformation(message.Log());
             else
             {
                 var body = await response.DeserializeResponseBodyAsync();
@@ -52,8 +52,5 @@ namespace Correo.SendGrid
                 throw new Exception(response.StatusCode.ToString());
             }
         }
-
-        private void Log(EmailMessage message)
-            => _logger.LogInformation($"Email sent: Subject: {message.Subject}; From: {message.From.Address}; To: {message.To.Log()}; Cc: {message.Cc.Log()}; Bcc: {message.Bcc.Log()};");
     }
 }