Add MessageEditedAndRetried event

Author: SzymonPobiega

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_msg_is_resolved_by_edit.cs

@@ -26,6 +26,7 @@ public async Task Should_publish_notification()
                 .WithEndpoint<MessageReceiver>(b => b.When(async (bus, c) =>
                 {
                     await bus.Subscribe<MessageFailureResolvedByRetry>();
+                    await bus.Subscribe<MessageEditedAndRetried>();
 
                     if (c.HasNativePubSubSupport)
                     {
@@ -77,7 +78,7 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
-                    if (!ctx.MessageResolved)
+                    if (!ctx.MessageResolved || !ctx.MessageEdited)
                     {
                         return false;
                     }
@@ -103,15 +104,17 @@ class EditMessageResolutionContext : ScenarioContext
             public bool MessageResolved { get; set; }
             public string EditedMessageEditOf { get; set; }
             public bool ExternalProcessorSubscribed { get; set; }
-
+            public string EditId { get; set; }
+            public bool MessageEdited { get; set; }
         }
 
         class MessageReceiver : EndpointConfigurationBuilder
         {
             public MessageReceiver() => EndpointSetup<DefaultServerWithoutAudit>(c => c.NoRetries());
 
-            class EditMessageResolutionHandler(EditMessageResolutionContext testContext)
-                : IHandleMessages<EditResolutionMessage>, IHandleMessages<MessageFailureResolvedByRetry>
+            class EditMessageResolutionHandler(EditMessageResolutionContext testContext) : IHandleMessages<EditResolutionMessage>,
+                    IHandleMessages<MessageFailureResolvedByRetry>,
+                    IHandleMessages<MessageEditedAndRetried>
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
                 {
@@ -132,6 +135,14 @@ public Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext
                     testContext.MessageResolved = true;
                     return Task.CompletedTask;
                 }
+
+                public Task Handle(MessageEditedAndRetried message, IMessageHandlerContext context)
+                {
+                    testContext.ResolvedMessageId = message.FailedMessageId;
+                    testContext.EditId = message.EditId;
+                    testContext.MessageEdited = true;
+                    return Task.CompletedTask;
+                }
             }
         }
 

src/ServiceControl/Contracts/MessageFailures/MessageEditedAndRetried.cs

@@ -13,7 +13,9 @@ public class MessageEditedAndRetried : IDomainEvent
 //TODO: Move this to ServiceControl.Contracts package
 namespace ServiceControl.Contracts
 {
-    public class MessageEditedAndRetried
+    using NServiceBus;
+
+    public class MessageEditedAndRetried : IEvent //TODO: Remove interface when moving to contracts package. Needed for conventions
     {
         public string FailedMessageId { get; set; }
         public string RetriedMessageId { get; set; }

src/ServiceControl/Recoverability/Editing/EditHandler.cs

@@ -3,6 +3,8 @@
     using System;
     using System.Linq;
     using System.Threading.Tasks;
+    using Contracts.MessageFailures;
+    using Infrastructure.DomainEvents;
     using MessageFailures;
     using Microsoft.Extensions.Logging;
     using NServiceBus;
@@ -14,12 +16,13 @@
 
     class EditHandler : IHandleMessages<EditAndSend>
     {
-        public EditHandler(IErrorMessageDataStore store, IMessageRedirectsDataStore redirectsStore, IMessageDispatcher dispatcher, ErrorQueueNameCache errorQueueNameCache, ILogger<EditHandler> logger)
+        public EditHandler(IErrorMessageDataStore store, IMessageRedirectsDataStore redirectsStore, IMessageDispatcher dispatcher, ErrorQueueNameCache errorQueueNameCache, IDomainEvents domainEvents, ILogger<EditHandler> logger)
         {
             this.store = store;
             this.redirectsStore = redirectsStore;
             this.dispatcher = dispatcher;
             this.errorQueueNameCache = errorQueueNameCache;
+            this.domainEvents = domainEvents;
             this.logger = logger;
             corruptedReplyToHeaderStrategy = new CorruptedReplyToHeaderStrategy(RuntimeEnvironment.MachineName, logger);
 
@@ -29,6 +32,7 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
         {
             string editRequestIdentifier = context.MessageId;
             FailedMessage failedMessage;
+            string editId;
             using (var session = await store.CreateEditFailedMessageManager())
             {
                 failedMessage = await session.GetFailedMessage(message.FailedMessageId);
@@ -39,7 +43,7 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
                     return;
                 }
 
-                var editId = await session.GetCurrentEditingRequestId(message.FailedMessageId);
+                editId = await session.GetCurrentEditingRequestId(message.FailedMessageId);
                 if (editId == null)
                 {
                     if (failedMessage.Status != FailedMessageStatus.Unresolved)
@@ -64,6 +68,8 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
                 await session.SaveChanges();
             }
 
+
+
             var redirects = await redirectsStore.GetOrCreate();
 
             var attempt = failedMessage.ProcessingAttempts.Last();
@@ -82,6 +88,13 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
                 address = retryTo;
             }
             await DispatchEditedMessage(outgoingMessage, address, context);
+
+            await domainEvents.Raise(new MessageEditedAndRetried
+            {
+                EditId = editId,
+                FailedMessageId = message.FailedMessageId,
+                RetriedMessageId = outgoingMessage.MessageId
+            }, context.CancellationToken);
         }
 
         OutgoingMessage BuildMessage(EditAndSend message)
@@ -123,6 +136,7 @@ Task DispatchEditedMessage(OutgoingMessage editedMessage, string address, IMessa
         readonly IMessageRedirectsDataStore redirectsStore;
         readonly IMessageDispatcher dispatcher;
         readonly ErrorQueueNameCache errorQueueNameCache;
+        readonly IDomainEvents domainEvents;
         readonly ILogger<EditHandler> logger;
     }
 }

src/ServiceControl/Recoverability/ExternalIntegration/MessageEditedAndRetriedPublisher.cs

@@ -1,22 +1,29 @@
 namespace ServiceControl.Recoverability.ExternalIntegration;
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Contracts.MessageFailures;
 using ExternalIntegrations;
 
 class MessageEditedAndRetriedPublisher : EventPublisher<MessageEditedAndRetried,
     MessageEditedAndRetriedPublisher.DispatchContext>
 {
-    protected override DispatchContext CreateDispatchRequest(MessageEditedAndRetried @event)
-    {
-        throw new System.NotImplementedException();
-    }
+    protected override DispatchContext CreateDispatchRequest(MessageEditedAndRetried @event) =>
+        new()
+        {
+            EditId = @event.EditId,
+            FailedMessageId = @event.FailedMessageId,
+            RetriedMessageId = @event.FailedMessageId
+        };
 
-    protected override Task<IEnumerable<object>> PublishEvents(IEnumerable<DispatchContext> contexts)
-    {
-        throw new System.NotImplementedException();
-    }
+    protected override Task<IEnumerable<object>> PublishEvents(IEnumerable<DispatchContext> contexts) =>
+        Task.FromResult(contexts.Select(x => (object)new Contracts.MessageEditedAndRetried
+        {
+            EditId = x.EditId,
+            FailedMessageId = x.FailedMessageId,
+            RetriedMessageId = x.RetriedMessageId
+        }));
 
     public class DispatchContext
     {

src/ServiceControl/Recoverability/RecoverabilityComponent.cs

@@ -87,6 +87,7 @@ public override void Configure(Settings settings, ITransportCustomization transp
             services.AddIntegrationEventPublisher<MessageFailedPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedByRetryPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedManuallyPublisher>();
+            services.AddIntegrationEventPublisher<MessageEditedAndRetriedPublisher>();
 
             //Event log
             services.AddEventLogMapping<FailedMessageArchivedDefinition>();