Updated IMessagePublisher and Dispatch contract to allow for setting more properties of the underlying ServiceBusMessage (#111)

Co-authored-by: Benjamin SPETH <bspeth@ecovadis.com>

Author: benspeth

docs/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.7.0
+- Changed
+  - Updated IMessagePublisher and Dispatch contract to allow for setting more properties of the underlying ServiceBusMessage 
+
 ## 5.6.1
 - fixed
   - Fixed an issue with dispatching messages when the Enabled flag is set to false.

src/Ev.ServiceBus.Abstractions/Dispatch.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace Ev.ServiceBus.Abstractions;
@@ -11,21 +12,18 @@ public Dispatch(object payload)
         ApplicationProperties = new Dictionary<string, object>();
     }
 
-    public Dispatch(object payload, IDispatchContext context)
-    {
-        SessionId = context.SessionId;
-        CorrelationId = context.CorrelationId;
-        MessageId = context.MessageId;
-        DiagnosticId = context.DiagnosticId ?? Activity.Current?.Id;
-        ApplicationProperties = new Dictionary<string, object>(context.ApplicationProperties);
-        Payload = payload;
-    }
-
     public object Payload { get; }
     public string? SessionId { get; set; }
     public string? CorrelationId { get; set; }
     public string? MessageId { get; set; }
     public string? DiagnosticId { get; set; }
+    public string? PartitionKey { get; set; }
+    public string? TransactionPartitionKey { get; set; }
+    public string? ReplyToSessionId { get; set; }
+    public TimeSpan? TimeToLive { get; set; }
+    public string? Subject { get; set; }
+    public string? To { get; set; }
+    public string? ReplyTo { get; set; }
+    public DateTimeOffset? ScheduledEnqueueTime { get; set; }
     public IDictionary<string,object> ApplicationProperties { get; }
 }
-

src/Ev.ServiceBus.Abstractions/IDispatchContext.cs

@@ -25,5 +25,5 @@ public interface IMessagePublisher
     /// <param name="messageDto">The object to send through Service Bus</param>
     /// <param name="messageContextConfiguration">Configurator of message context</param>
     /// <typeparam name="TMessagePayload">A type of object that is registered within Ev.ServiceBus</typeparam>
-    void Publish<TMessagePayload>(TMessagePayload messageDto, Action<IDispatchContext> messageContextConfiguration);
+    void Publish<TMessagePayload>(TMessagePayload messageDto, Action<Dispatch> messageContextConfiguration);
 }

src/Ev.ServiceBus.Abstractions/IMessagePublisher.cs

@@ -261,6 +261,26 @@ private ServiceBusMessage CreateMessage(
         }
 
         message.SessionId = dispatch.SessionId;
+        if (dispatch.PartitionKey is not null)
+        {
+            message.PartitionKey = dispatch.PartitionKey;
+        }
+        message.TransactionPartitionKey = dispatch.TransactionPartitionKey;
+        message.ReplyToSessionId = dispatch.ReplyToSessionId;
+        if (dispatch.TimeToLive is not null)
+        {
+            message.TimeToLive = dispatch.TimeToLive.Value;
+        }
+        if (dispatch.Subject is not null)
+        {
+            message.Subject = dispatch.Subject;
+        }
+        message.To = dispatch.To;
+        message.ReplyTo = dispatch.ReplyTo;
+        if (dispatch.ScheduledEnqueueTime is not null)
+        {
+            message.ScheduledEnqueueTime = dispatch.ScheduledEnqueueTime.Value;
+        }
 
         var originalCorrelationId = _messageMetadataAccessor.Metadata?.CorrelationId ?? Guid.NewGuid().ToString();
         message.CorrelationId = dispatch.CorrelationId ?? originalCorrelationId;

src/Ev.ServiceBus/Dispatch/DispatchContext.cs

@@ -67,7 +67,7 @@ public void Publish<TMessagePayload>(TMessagePayload messageDto, string sessionI
     /// <inheritdoc />
     public void Publish<TMessagePayload>(
         TMessagePayload messageDto,
-        Action<IDispatchContext> messageContextConfiguration)
+        Action<Abstractions.Dispatch> messageContextConfiguration)
     {
         if (messageDto == null)
         {
@@ -78,17 +78,9 @@ public void Publish<TMessagePayload>(
         {
             throw new ArgumentNullException(nameof(messageContextConfiguration));
         }
+        var dispatch = new Abstractions.Dispatch(messageDto);
+        messageContextConfiguration.Invoke(dispatch);
 
-        var context = new DispatchContext();
-
-        messageContextConfiguration.Invoke(context);
-
-        _dispatchesToSend.Add(new Abstractions.Dispatch(messageDto, context)
-        {
-            SessionId = context.SessionId,
-            CorrelationId = context.CorrelationId,
-            MessageId = context.MessageId,
-            DiagnosticId = context.DiagnosticId ?? Activity.Current?.Id
-        });
+        _dispatchesToSend.Add(dispatch);
     }
 }