refactoring

src/Bss.Platform.Notifications/DependencyInjection.cs

@@ -37,8 +37,7 @@ private static IServiceCollection AddEmailSender(
             throw new ArgumentException("Test email address is not provided");
         }
 
-        return services.AddScoped<IEmailSender, TestEmailSender>()
-                       .AddScoped<IRedirectService, RedirectService>();
+        return services.AddScoped<IEmailSender, EmailSenderTest>();
     }
 
     private static IServiceCollection AddMailMessageSenders(this IServiceCollection services, NotificationSenderOptions settings)

src/Bss.Platform.Notifications/Services/EmailSender.cs

@@ -17,7 +17,7 @@ public async Task<MailMessage> SendAsync(EmailModel emailModel, CancellationToke
             await sender.SendAsync(message, token);
         }
 
-        if (auditService != null)
+        if (auditService is not null)
         {
             await auditService.LogAsync(message, token);
         }

src/Bss.Platform.Notifications/Services/RedirectService.cs → src/Bss.Platform.Notifications/Services/EmailSenderTest.cs

@@ -7,9 +7,21 @@
 
 namespace Bss.Platform.Notifications.Services;
 
-internal class RedirectService(IOptions<NotificationSenderOptions> settings) : IRedirectService
+internal class EmailSenderTest(
+    IEnumerable<IMailMessageSender> senders,
+    IOptions<NotificationSenderOptions> settings,
+    IAuditService? auditService = null)
+    : EmailSender(senders, auditService)
 {
-    public void Redirect(MailMessage message)
+    protected override MailMessage Convert(EmailModel model)
+    {
+        var message = base.Convert(model);
+        this.ChangeRecipients(message);
+
+        return message;
+    }
+
+    private void ChangeRecipients(MailMessage message)
     {
         AddRecipientsToBody(message);
 
@@ -21,14 +33,6 @@ public void Redirect(MailMessage message)
         }
     }
 
-    private static void ClearRecipients(MailMessage message)
-    {
-        message.To.Clear();
-        message.CC.Clear();
-        message.Bcc.Clear();
-        message.ReplyToList.Clear();
-    }
-
     private static void AddRecipientsToBody(MailMessage message)
     {
         var originalRecipients =
@@ -39,4 +43,12 @@ private static void AddRecipientsToBody(MailMessage message)
 
         message.Body = $"{originalRecipients}{message.Body}";
     }
+
+    private static void ClearRecipients(MailMessage message)
+    {
+        message.To.Clear();
+        message.CC.Clear();
+        message.Bcc.Clear();
+        message.ReplyToList.Clear();
+    }
 }