Refactor and fixes email activity

Author: jonahandersson

MessageSenderService/Activities/SendEmailActivity.cs

@@ -14,28 +14,16 @@ namespace MessageSenderService.DurableFunctions.Activities
     public static class SendEmailActivity
     {
         [FunctionName("SendEmail")]
-        public static async Task<string> SendEmailAsync([ActivityTrigger] string serviceBusQueueMessage, ILogger log)
+        public static async Task<bool> SendEmail([ActivityTrigger] string serviceBusQueueMessage, ILogger log)
         {         
 
             try
             {
                 log.LogInformation($"SendEmailActivity trigged from the durable orchestratoion");
 
-                if (serviceBusQueueMessage != null)
-                {
-                    log.LogInformation($"Sending email to recipient with queue message: {serviceBusQueueMessage}.");
-                    bool result = await SendEmailAsync(serviceBusQueueMessage);
-                    if (result == false)
-                    {
-                       
-                        return $"Email not sent!";
-                    }
-                    else
-                    {
-                        log.LogInformation($"Sending email with message: {serviceBusQueueMessage}");
-                    }
-                }
-                    return $"Email was sent successfully!";
+                log.LogInformation($"Sending email to recipient with queue message: {serviceBusQueueMessage}.");
+                bool result = await SendEmailAsync(serviceBusQueueMessage);
+                return result;
             }
             catch (Exception)
             {

MessageSenderService/ClientFunctions/ServiceBusQueueTrigger.cs

@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Azure.ServiceBus;
+using Microsoft.Azure;
 
 namespace MessageSenderService.DurableFunctions.ClientFunctions
 {
@@ -25,7 +25,7 @@ public static async Task ServiceBusTriggerFunction(
                 log.LogInformation($"C# ServiceBus queue trigger function processed message: {myServiceBusQueueItem}");
 
                 // When the service bus is triggered by a new queue message it initiates the orchestrator 
-                string orchestrationInstanceId = await starter.StartNewAsync("ServiceBusQueueOrchestator", null);
+                string orchestrationInstanceId = await starter.StartNewAsync("ServiceBusQueueOrchestrator", myServiceBusQueueItem);
 
                 log.LogInformation($"Started orchestration with ID = '{orchestrationInstanceId}'.");
             }

MessageSenderService/MessageSenderService.DurableFunctions.csproj

@@ -2,11 +2,13 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <UserSecretsId>42b7f619-019d-4b7f-bdb7-ddaf57a5d22f</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.10.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.8.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
     <PackageReference Include="SendGrid" Version="9.28.1" />
   </ItemGroup>

MessageSenderService/Orchestrators/ServiceBusOrchestratorFunction.cs

@@ -2,26 +2,38 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Extensions.DurableTask;
-
+using Microsoft.Extensions.Logging;
+using System;
 
 namespace MessageSenderService.DurableFunctions.Orchestrators
 {
 
     //TODO - Use fan out fan in pattern
     public static class ServiceBusOrchestratorFunction
     {
-        [FunctionName("ServiceBusQueueOrchestator")]
-        public static async Task<List<string>> RunOrchestrator(
-          [OrchestrationTrigger] IDurableOrchestrationContext context)
+        [FunctionName("ServiceBusQueueOrchestrator")]
+        public static async Task<string> RunOrchestrator([OrchestrationTrigger] IDurableOrchestrationContext context, ILogger logger)
         {
-            var resultOutputLogs = new List<string>();
-            var serviceBusQueueMessage = context.GetInput<string>();
 
-            // Call the activity function and pass queue message
-            resultOutputLogs.Add(await context.CallActivityAsync<string>("SendEmail", serviceBusQueueMessage));
-          
-            //Return output for logs 
-            return resultOutputLogs;
+            try
+            {
+                var serviceBusQueueMessage = context.GetInput<string>();
+
+                if (serviceBusQueueMessage != null)
+                {
+                    // Call the activity function and pass queue message
+                  await context.CallActivityAsync<bool>("SendEmail", serviceBusQueueMessage);
+
+                }              
+                return $"Done with the orchestration with Durable Context Id:  {context.InstanceId}";
+            }
+            catch (Exception ex)
+            {
+                //TODO Handle possible errors and do a retry if needed or retry a function
+                logger.LogError($"Something went wrong " + ex.Message);
+                throw;
+            }
+        
         }
 
     }