Added concurrency support

Author: bartekwasielak

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

@@ -1,5 +1,6 @@
 namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
 {
+    using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting;
@@ -101,9 +102,11 @@ public async Task Should_publish_notification()
             {
                 Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
                 Assert.That(context.EditedMessageEditOf, Is.EqualTo(context.OriginalMessageFailureId));
-                Assert.That(context.FirstMessageFailedFailedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.MessageFailedFailedMessageIds.Count, Is.EqualTo(2));
+                Assert.That(context.MessageFailedFailedMessageIds, Is.Unique);
+                Assert.That(context.MessageFailedFailedMessageIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
                 Assert.That(context.RetryFailedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
-                Assert.That(context.SecondMessageFailedFailedMessageId, Is.EqualTo(context.EditedMessageFailureId));
+                Assert.That(context.MessageFailedFailedMessageIds, Has.Some.EqualTo(context.EditedMessageFailureId));
             });
         }
 
@@ -118,11 +121,10 @@ public class EditMessageResolutionContext : ScenarioContext
             public string EditedMessageEditOf { get; set; }
             public bool ExternalProcessorSubscribed { get; set; }
             public bool MessageResolved { get; set; }
-            public string FirstMessageFailedFailedMessageId { get; set; }
-            public string SecondMessageFailedFailedMessageId { get; set; }
             public bool MessageFailedResolved { get; set; }
             public string RetryFailedMessageId { get; set; }
             public bool EditAndRetryHandled { get; set; }
+            public List<string> MessageFailedFailedMessageIds { get; } = [];
         }
 
         public class MessageReceiver : EndpointConfigurationBuilder
@@ -164,13 +166,9 @@ public Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext
 
                 public Task Handle(MessageFailed message, IMessageHandlerContext context)
                 {
-                    if (testContext.FirstMessageFailedFailedMessageId == null)
+                    testContext.MessageFailedFailedMessageIds.Add(message.FailedMessageId);
+                    if (testContext.MessageFailedFailedMessageIds.Count == 2)
                     {
-                        testContext.FirstMessageFailedFailedMessageId = message.FailedMessageId;
-                    }
-                    else
-                    {
-                        testContext.SecondMessageFailedFailedMessageId = message.FailedMessageId;
                         testContext.MessageFailedResolved = true;
                     }
                     return Task.CompletedTask;

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

@@ -1,5 +1,6 @@
 namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
 {
+    using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting;
@@ -119,12 +120,16 @@ public async Task Should_publish_notification()
 
             Assert.Multiple(() =>
             {
-                Assert.That(context.FirstMessageFailedFailedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.FailedMessageFailedMessageIds.Count, Is.EqualTo(2));
+                Assert.That(context.FailedMessageFailedMessageIds, Is.Unique);
+                Assert.That(context.FailedMessageFailedMessageIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
                 Assert.That(context.EditedMessageEditOf1, Is.EqualTo(context.OriginalMessageFailureId));
-                Assert.That(context.SecondMessageFailedEditOf, Is.EqualTo(context.OriginalMessageFailureId));
-                Assert.That(context.FirstRetryFailedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.FailedMessageFailedMessageIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.RetryFailedMessageIds.Count, Is.EqualTo(2));
+                Assert.That(context.RetryFailedMessageIds, Is.Unique);
+                Assert.That(context.RetryFailedMessageIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
                 Assert.That(context.EditedMessageEditOf2, Is.EqualTo(context.SecondMessageFailureId));
-                Assert.That(context.SecondRetryFailedMessageId, Is.EqualTo(context.SecondMessageFailureId));
+                Assert.That(context.RetryFailedMessageIds, Has.Some.EqualTo(context.SecondMessageFailureId));
             });
         }
 
@@ -142,11 +147,9 @@ public class EditMessageResolutionContext : ScenarioContext
             public string EditedMessageEditOf2 { get; set; }
             public string EditedMessageEditOf1 { get; set; }
             public bool ExternalProcessorSubscribed { get; set; }
-            public string FirstMessageFailedFailedMessageId { get; set; }
-            public string SecondMessageFailedEditOf { get; set; }
-            public string FirstRetryFailedMessageId { get; set; }
-            public string SecondRetryFailedMessageId { get; set; }
             public bool EditAndRetryHandled { get; set; }
+            public List<string> RetryFailedMessageIds { get;  } = [];
+            public List<string> FailedMessageFailedMessageIds { get; } = [];
         }
 
         public class MessageReceiver : EndpointConfigurationBuilder
@@ -179,27 +182,20 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
 
                 public Task Handle(MessageFailed message, IMessageHandlerContext context)
                 {
-                    if (testContext.FirstMessageFailedFailedMessageId == null)
+                    testContext.FailedMessageFailedMessageIds.Add(message.FailedMessageId);
+                    if (testContext.FailedMessageFailedMessageIds.Count == 2)
                     {
-                        testContext.FirstMessageFailedFailedMessageId = message.FailedMessageId;
-                    }
-                    else
-                    {
-                        testContext.SecondMessageFailedEditOf = message.MessageDetails.Headers["ServiceControl.EditOf"];
                         testContext.MessageResolved = true;
                     }
                     return Task.CompletedTask;
                 }
 
                 public Task Handle(MessageEditedAndRetried message, IMessageHandlerContext context)
                 {
-                    if (testContext.FirstRetryFailedMessageId == null)
-                    {
-                        testContext.FirstRetryFailedMessageId = message.FailedMessageId;
-                    }
-                    else
+
+                    testContext.RetryFailedMessageIds.Add(message.FailedMessageId);
+                    if (testContext.RetryFailedMessageIds.Count == 2)
                     {
-                        testContext.SecondRetryFailedMessageId = message.FailedMessageId;
                         testContext.EditAndRetryHandled = true;
                     }
                     return Task.CompletedTask;