Refactored SendEmail activity function

Author: jonahandersson

MessageSenderService/Activities/SendEmailActivity.cs

@@ -6,15 +6,16 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using SendGrid;
+using SendGrid.Helpers.Mail;
 
 namespace MessageSenderService.DurableFunctions.Activities
 {
     public static class SendEmailActivity
     {
         [FunctionName("SendEmail")]
-        public static string SendEmail([ActivityTrigger] string serviceBusQueueMessage, ILogger log)
-        {
-         
+        public static async Task<string> SendEmailAsync([ActivityTrigger] string serviceBusQueueMessage, ILogger log)
+        {         
 
             try
             {
@@ -23,15 +24,18 @@ public static string SendEmail([ActivityTrigger] string serviceBusQueueMessage,
                 if (serviceBusQueueMessage != null)
                 {
                     log.LogInformation($"Sending email to recipient with queue message: {serviceBusQueueMessage}.");
-                    var result = SendEmailAsync(serviceBusQueueMessage);
+                    bool result = await SendEmailAsync(serviceBusQueueMessage);
+                    if (result == false)
+                    {
+                       
+                        return $"Email not sent!";
+                    }
+                    else
+                    {
+                        log.LogInformation($"Sending email with message: {serviceBusQueueMessage}");
+                    }
                 }
-
-             
-
-
-              
-                log.LogInformation($"Sending email with message: {serviceBusQueueMessage}");
-                return $"Email sent!";
+                    return $"Email was sent successfully!";
             }
             catch (Exception)
             {
@@ -41,34 +45,38 @@ public static string SendEmail([ActivityTrigger] string serviceBusQueueMessage,
 
         }
 
-        private async Task<bool> SendEmailAsync(string serviceBusQueueMessage)
-        {
-            var apiKey = Environment.GetEnvironmentVariable("SendGrid_API_KEY");
-            var adminEmailAddress = Environment.GetEnvironmentVariable("AdminEmailAddress");
-            var recipientEmailAddress = Environment.GetEnvironmentVariable("RecipientEmailAddress");
-
-            var client = new SendGridClient(apiKey);
-            var emailMessage = new SendGridMessage()
+        private static async Task<bool> SendEmailAsync(string serviceBusQueueMessage)
+        {         
+            try
             {
-                From = new EmailAddress(adminEmailAddress, "Jonah Andersson"),
-                Subject = "Email from Service Bus Receive Function for Azure Back to School 2022!",
-                PlainTextContent = myQueueMessageItem
-            };
+                var apiKey = Environment.GetEnvironmentVariable("SendGrid_API_KEY");
+                var adminEmailAddress = Environment.GetEnvironmentVariable("AdminEmailAddress");
+                var recipientEmailAddress = Environment.GetEnvironmentVariable("RecipientEmailAddress");
 
-            emailMessage.AddTo(new EmailAddress(recipientEmailAddress, "Jonah at Work Email"));
-            var response = await client.SendEmailAsync(emailMessage);
+                var client = new SendGridClient(apiKey);
+                var emailMessage = new SendGridMessage()
+                {
+                    From = new EmailAddress(adminEmailAddress, "Jonah Andersson"),
+                    Subject = "Email from Service Bus Receive Function for Azure Back to School 2022!",
+                    PlainTextContent = serviceBusQueueMessage
+                };
 
-            // A success status code means SendGrid received the email request and will process it.
-            // Errors can still occur when SendGrid tries to send the email. 
-            // If email is not received, use this URL to debug: https://app.sendgrid.com/email_activity 
-            Console.WriteLine(response.IsSuccessStatusCode ? "Email queued successfully!" : "Something went wrong!");
-            try
-            {
+                emailMessage.AddTo(new EmailAddress(recipientEmailAddress, "Jonah at Work Email"));
+                var response = await client.SendEmailAsync(emailMessage);
+
+                // A success status code means SendGrid received the email request and will process it.
+                // Errors can still occur when SendGrid tries to send the email. 
+                // If email is not received, use this URL to debug: https://app.sendgrid.com/email_activity 
+                Console.WriteLine(response.IsSuccessStatusCode ? "Email queued successfully!" : "Something went wrong!");
+
+                if (response.IsSuccessStatusCode)                
+                    return true;
+                else return false;
 
             }
             catch (Exception)
             {
-
+                //TODO: More robust error general handling here  
                 throw;
             }
         }