replyto

coronabytes · Jan 18, 2024 · 017faf6 · 017faf6
1 parent d66f83b
commit 017faf6
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 25 deletions.
diff --git a/Core.Email.Abstractions/CoreEmailMessage.cs b/Core.Email.Abstractions/CoreEmailMessage.cs
@@ -7,8 +7,11 @@ public class CoreEmailMessage
     public List<string> Cc { get; init; } = new();
     public List<string> Bcc { get; init; } = new();
     public string From { get; init; } = string.Empty;
+    public string ReplyTo { get; init; } = string.Empty;
     public string Subject { get; init; } = string.Empty;
     public string TextBody { get; init; } = string.Empty;
     public string HtmlBody { get; init; } = string.Empty;
     public List<CoreEmailAttachment> Attachments { get; init; } = new();
+
+    public string? ProviderKey { get; set; }
 }
diff --git a/Core.Email.Abstractions/CoreEmailStatus.cs b/Core.Email.Abstractions/CoreEmailStatus.cs
@@ -3,6 +3,7 @@
 public class CoreEmailStatus
 {
     public Guid Id { get; set; }
+    public string? ProviderMessageId { get; set; }
     public bool IsSuccess { get; set; }
     public string Error { get; set; } = string.Empty;
 }
diff --git a/Core.Email.Abstractions/ICoreEmailPersistence.cs b/Core.Email.Abstractions/ICoreEmailPersistence.cs
@@ -6,5 +6,5 @@ public interface ICoreEmailPersistence
 
     public Task<List<CoreEmailMessage>> GetUnsentAsync(CancellationToken cancellationToken = default);
 
-    public Task UpdateStatus(IDictionary<Guid, string> updates, CancellationToken cancellationToken = default);
+    public Task UpdateStatusAsync(IDictionary<Guid, string?> updates, CancellationToken cancellationToken = default);
 }
diff --git a/Core.Email.Provider.Mailjet/MailjetProvider.cs b/Core.Email.Provider.Mailjet/MailjetProvider.cs
@@ -30,6 +30,7 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
             To = x.To.Select(y => new SendContact(y)).ToList(),
             Cc = x.Cc.Select(y => new SendContact(y)).ToList(),
             Bcc = x.Bcc.Select(y => new SendContact(y)).ToList(),
+            ReplyTo = string.IsNullOrEmpty(x.ReplyTo) ? null : new SendContact(x.ReplyTo),
             Subject = x.Subject,
             TextPart = x.TextBody,
             HTMLPart = x.HtmlBody,

diff --git a/Core.Email.Provider.Postmark/PostmarkProvider.cs b/Core.Email.Provider.Postmark/PostmarkProvider.cs
@@ -29,6 +29,7 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
             To = x.To.First(),
             Cc = x.Cc.FirstOrDefault(), // TODO: only one?
             Bcc = x.Bcc.FirstOrDefault(),
+            ReplyTo = x.ReplyTo,
             Subject = x.Subject,
             TextBody = x.TextBody,
             HtmlBody = x.HtmlBody,
@@ -41,9 +42,10 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
             }).ToList()
         })).ConfigureAwait(false);
 
-        return res.Select(x => new CoreEmailStatus
+        return res.Select((x, idx) => new CoreEmailStatus
         {
-            Id = x.MessageID, // TODO: match order?
+            Id = messages[idx].Id,
+            ProviderMessageId = x.MessageID.ToString("N"),
             IsSuccess = x.Status == PostmarkStatus.Success,
             Error = x.Message
         }).ToList();

diff --git a/Core.Email.Provider.SES/SimpleEmailServiceProvider.cs b/Core.Email.Provider.SES/SimpleEmailServiceProvider.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MimeKit;
+using System.Net.Mail;
 
 namespace Core.Email.Provider.SES;
 
@@ -36,6 +37,9 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
                 var m = new MimeMessage();
                 m.From.Add(new MailboxAddress("", message.From));
 
+                if (!string.IsNullOrEmpty(message.ReplyTo))
+                    m.ReplyTo.Add(new MailboxAddress(string.Empty, message.ReplyTo));
+
                 foreach (var to in message.To)
                     m.To.Add(new MailboxAddress(string.Empty, to));
 
@@ -70,6 +74,7 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
                 list.Add(new CoreEmailStatus
                 {
                     Id = message.Id,
+                    ProviderMessageId = res.MessageId,
                     IsSuccess = (int)res.HttpStatusCode >= 200 && (int)res.HttpStatusCode < 300,
                     Error = string.Empty // TODO: ?
                 });

diff --git a/Core.Email.Provider.SMTP/SmtpProvider.cs b/Core.Email.Provider.SMTP/SmtpProvider.cs
@@ -37,6 +37,9 @@ await client.ConnectAsync(_options.Host, _options.Port,
                 var m = new MimeMessage();
                 m.From.Add(new MailboxAddress(string.Empty, message.From));
 
+                if (!string.IsNullOrEmpty(message.ReplyTo))
+                    m.ReplyTo.Add(new MailboxAddress(string.Empty, message.ReplyTo));
+
                 foreach (var to in message.To)
                     m.To.Add(new MailboxAddress(string.Empty, to));
 

diff --git a/Core.Email.Provider.SendGrid/SendGridProvider.cs b/Core.Email.Provider.SendGrid/SendGridProvider.cs
@@ -33,6 +33,9 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
                     new EmailAddress(message.To.First()), message.Subject,
                     message.TextBody, message.HtmlBody);
 
+                if (!string.IsNullOrEmpty(message.ReplyTo))
+                    m.ReplyTo = new EmailAddress(message.ReplyTo);
+
                 // TODO: add other Tos
                 foreach (var cc in message.Cc)
                     m.AddCc(new EmailAddress(cc));
@@ -50,7 +53,8 @@ public async Task<List<CoreEmailStatus>> SendBatchAsync(List<CoreEmailMessage> m
                 {
                     Id = message.Id,
                     IsSuccess = res.IsSuccessStatusCode,
-                    Error = await res.Body.ReadAsStringAsync(CancellationToken.None).ConfigureAwait(false)
+                    Error = await res.Body.ReadAsStringAsync(CancellationToken.None).ConfigureAwait(false),
+
                 });
             }
             catch (Exception e)

diff --git a/Core.Email.Tests/EmailTest.cs b/Core.Email.Tests/EmailTest.cs
@@ -1,3 +1,4 @@
+using System.Text;
 using Core.Email.Abstractions;
 using Core.Email.Provider.Mailjet;
 using Core.Email.Provider.Postmark;
@@ -36,12 +37,20 @@ public async Task Test1()
         var from = config["TestSetup:From"];
         var to = config["TestSetup:To"];
 
-        await email.SendAsync(new CoreEmailMessage
+        var res = await email.SendAsync(new CoreEmailMessage
         {
             To = [to!],
             From = from!,
-            Subject = "Transactional Mail Test 3",
-            TextBody = "Transactional Mail Test 3"
+            Subject = "Transactional Mail Test 5",
+            TextBody = "Transactional Mail Test 5",
+            Attachments = [new CoreEmailAttachment
+            {
+                Name = "File.txt",
+                ContentType = "text/plain",
+                Content = "Hello World!"u8.ToArray()
+            }]
         });
+
+        Assert.True(res.IsSuccess);
     }
 }
diff --git a/Core.Email/CoreEmailService.cs b/Core.Email/CoreEmailService.cs
@@ -7,29 +7,30 @@ namespace Core.Email;
 
 internal class CoreEmailService(IServiceProvider serviceProvider, IConfiguration config) : BackgroundService, ICoreEmail
 {
-    public ICoreEmailProvider? Provider { get; init; } =
-        serviceProvider.GetKeyedService<ICoreEmailProvider>(config["Email:Default"]);
+    private ICoreEmailProvider? _defaultProvider = serviceProvider.GetKeyedService<ICoreEmailProvider>(config["Email:Default"]);
 
-    public ICoreEmailPersistence? Persistence { get; init; }
+    private ICoreEmailPersistence? _persistence = serviceProvider.GetService<ICoreEmailPersistence>();
 
     public async Task<CoreEmailStatus> SendAsync(CoreEmailMessage message,
         CancellationToken cancellationToken = default)
     {
-        if (Provider == null)
-            throw new InvalidOperationException("default provider not found");
+        var provider = message.ProviderKey != null ? serviceProvider.GetKeyedService<ICoreEmailProvider>(message.ProviderKey) : _defaultProvider;
 
-        if (Persistence != null)
+        if (provider == null)
+            throw new InvalidOperationException($"provider \"{message.ProviderKey ?? "Default"}\" not found");
+
+        if (_persistence != null)
         {
-            await Persistence.StoreBatchAsync([message], cancellationToken);
-            return new CoreEmailStatus { Id = message.Id, IsSuccess = true }; // TODO: ?
+            await _persistence.StoreBatchAsync([message], cancellationToken);
+            return new CoreEmailStatus { Id = message.Id, IsSuccess = true };
         }
 
-        return (await Provider.SendBatchAsync([message], cancellationToken)).First();
+        return (await provider.SendBatchAsync([message], cancellationToken)).First();
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        if (Persistence == null || Provider == null)
+        if (_persistence == null)
             return;
 
         while (!stoppingToken.IsCancellationRequested)
@@ -39,16 +40,25 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             if (stoppingToken.IsCancellationRequested)
                 break;
 
-            // TODO: redis lock
-
             try
             {
-                var messages = await Persistence.GetUnsentAsync(CancellationToken.None);
-                await Provider.SendBatchAsync(messages, CancellationToken.None);
+                var messages = await _persistence.GetUnsentAsync(CancellationToken.None);
+                foreach (var grouping in messages.GroupBy(x=>x.ProviderKey))
+                {
+                    var key = grouping.Key;
+                    var provider = key != null ? serviceProvider.GetKeyedService<ICoreEmailProvider>(key) : _defaultProvider;
+
+                    if (provider == null)
+                        continue;
+
+                    var res = await provider.SendBatchAsync(messages, CancellationToken.None);
+                    var updates = res.ToDictionary(x => x.Id, x => x.IsSuccess ? null : x.Error);
+                    await _persistence.UpdateStatusAsync(updates, CancellationToken.None);
+                }
             }
             catch (Exception e)
             {
-                //
+                // TODO: 
             }
         }
     }

diff --git a/README.md b/README.md
@@ -7,15 +7,13 @@ dotnet add package Core.Email.Provider.SES
 ```
 
 # .NET Transactional E-Mail Abstraction Layer
-- open source (Apache 2.0)
 - common providers
   - smtp via mailkit
   - aws ses
   - mailjet
   - sendgrid
   - postmark
 - TODO
-  - attachments
   - bounce handlers  
 
 # Usage
@@ -68,6 +66,12 @@ await email.SendAsync(new CoreEmailMessage
   To = ["[email protected]"],
   From = "[email protected]",
   Subject = "Transactional Mail Subject",
-  TextBody = "Transactional Mail Body"
+  TextBody = "Transactional Mail Body",
+  Attachments = [new CoreEmailAttachment
+  {
+    Name = "File.txt",
+    ContentType = "text/plain",
+    Content = "Hello World!"u8.ToArray()
+  }]
 });
 ```