Move contract to correct place

Author: SzymonPobiega

src/ServiceControl/Contracts/MessageFailures/MessageEditedAndRetried.cs

@@ -5,20 +5,5 @@
     public class MessageEditedAndRetried : IDomainEvent
     {
         public string FailedMessageId { get; set; }
-        public string RetriedMessageId { get; set; }
-        public string EditId { get; set; }
-    }
-}
-
-//TODO: Move this to ServiceControl.Contracts package
-namespace ServiceControl.Contracts
-{
-    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; }
-        public string EditId { get; set; }
     }
 }

src/ServiceControl/Recoverability/Editing/EditHandler.cs

@@ -87,9 +87,7 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
 
             await domainEvents.Raise(new MessageEditedAndRetried
             {
-                EditId = editId,
-                FailedMessageId = message.FailedMessageId,
-                RetriedMessageId = outgoingMessage.MessageId
+                FailedMessageId = message.FailedMessageId
             }, context.CancellationToken);
         }
 

src/ServiceControl/Recoverability/ExternalIntegration/MessageEditedAndRetriedPublisher.cs

@@ -12,24 +12,18 @@ class MessageEditedAndRetriedPublisher : EventPublisher<MessageEditedAndRetried,
     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) =>
         Task.FromResult(contexts.Select(x => (object)new Contracts.MessageEditedAndRetried
         {
-            EditId = x.EditId,
             FailedMessageId = x.FailedMessageId,
-            RetriedMessageId = x.RetriedMessageId
         }));
 
     public class DispatchContext
     {
         public string FailedMessageId { get; set; }
-        public string RetriedMessageId { get; set; }
-        public string EditId { get; set; }
     }
 
 }