fix attempt

Author: bartekwasielak

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

@@ -21,7 +21,7 @@ public ErrorSender() =>
                 {
                     c.NoDelayedRetries();
                     //TODO: Get back to this to determine whether or not this duplication for simulating the production code is really needed
-                    //c.ReportSuccessfulRetriesToServiceControl();
+                    c.ReportSuccessfulRetriesToServiceControl();
                 });
 
             public class AHandler : IHandleMessages<AMessage>

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

@@ -13,7 +13,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     using ServiceControl.MessageFailures.Api;
     using JsonSerializer = System.Text.Json.JsonSerializer;
 
-    class When_a_failed_msg_is_resolved_by_edit : ExternalIntegrationAcceptanceTest
+    class When_a_failed_msg_is_resolved_by_edit : AcceptanceTest
     {
         [Test]
         public async Task Should_publish_notification()

src/ServiceControl/MessageFailures/Handlers/LegacyMessageFailureResolvedHandler.cs

@@ -11,8 +11,8 @@
     /// This class handles legacy messages that mark a failed message as successfully retried. For further details go to message definitions.
     /// </summary>
     class LegacyMessageFailureResolvedHandler :
-        IHandleMessages<MarkMessageFailureResolvedByRetry>,
-        IHandleMessages<MessageFailureResolvedByRetry>
+        IHandleMessages<MarkMessageFailureResolvedByRetry>
+    // IHandleMessages<MessageFailureResolvedByRetry>
     {
         public LegacyMessageFailureResolvedHandler(IErrorMessageDataStore store, IDomainEvents domainEvents)
         {
@@ -31,15 +31,15 @@ await domainEvents.Raise(new MessageFailureResolvedByRetry
         }
 
         // This is only needed because we might get this from legacy not yet converted instances
-        public async Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext context)
-        {
-            await MarkAsResolvedByRetry(message.FailedMessageId, message.AlternativeFailedMessageIds);
-            await domainEvents.Raise(new MessageFailureResolvedByRetry
-            {
-                AlternativeFailedMessageIds = message.AlternativeFailedMessageIds,
-                FailedMessageId = message.FailedMessageId
-            }, context.CancellationToken);
-        }
+        // public async Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext context)
+        // {
+        //     await MarkAsResolvedByRetry(message.FailedMessageId, message.AlternativeFailedMessageIds);
+        //     await domainEvents.Raise(new MessageFailureResolvedByRetry
+        //     {
+        //         AlternativeFailedMessageIds = message.AlternativeFailedMessageIds,
+        //         FailedMessageId = message.FailedMessageId
+        //     }, context.CancellationToken);
+        // }
 
         async Task MarkAsResolvedByRetry(string primaryId, string[] messageAlternativeFailedMessageIds)
         {