Extracted checking failed message id

Author: bartekwasielak

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

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ServiceControl.AcceptanceTesting;
+using ServiceControl.AcceptanceTests;
+using ServiceControl.MessageFailures.Api;
+
+public static class FailedMessageExtensions
+{
+    internal static async Task<string> GetOnlyFailedUnresolvedMessageId(this AcceptanceTest test)
+    {
+        var allFailedMessages =
+            await test.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
+        if (!allFailedMessages.HasResult)
+        {
+            return null;
+        }
+
+        if (allFailedMessages.Item.Count != 1)
+        {
+            return null;
+        }
+
+        return allFailedMessages.Item.First().Id;
+    }
+}

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

@@ -32,19 +32,13 @@ public async Task Should_publish_notification()
 
                     if (!ctx.EditedAndRetriedMessage)
                     {
-                        var allFailedMessages =
-                            await this.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
-                        if (!allFailedMessages.HasResult)
+                        var failedMessagedId = await this.GetOnlyFailedUnresolvedMessageId();
+                        if (failedMessagedId == null)
                         {
                             return false;
                         }
 
-                        if (allFailedMessages.Item.Count != 1)
-                        {
-                            return false;
-                        }
-
-                        ctx.OriginalMessageFailureId = allFailedMessages.Item.First().Id;
+                        ctx.OriginalMessageFailureId = failedMessagedId;
                         ctx.EditedAndRetriedMessage = true;
 
                         string editedMessage = JsonSerializer.Serialize(new EditResolutionMessage
@@ -66,19 +60,13 @@ public async Task Should_publish_notification()
 
                     if (!ctx.RetriedMessage)
                     {
-                        var allFailedMessagesAfterEdit =
-                            await this.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
-                        if (!allFailedMessagesAfterEdit.HasResult)
-                        {
-                            return false;
-                        }
-
-                        if (allFailedMessagesAfterEdit.Item.Count != 1)
+                        var failedMessageIdAfterId = await this.GetOnlyFailedUnresolvedMessageId();
+                        if (failedMessageIdAfterId == null)
                         {
                             return false;
                         }
 
-                        ctx.EditedMessageFailureId = allFailedMessagesAfterEdit.Item.First().Id;
+                        ctx.EditedMessageFailureId = failedMessageIdAfterId;
                         ctx.RetriedMessage = true;
 
                         await this.Post<object>($"/api/errors/{ctx.EditedMessageFailureId}/retry");

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

@@ -33,19 +33,13 @@ public async Task Should_publish_notification()
 
                     if (!ctx.EditedMessage)
                     {
-                        var allFailedMessages =
-                            await this.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
-                        if (!allFailedMessages.HasResult)
+                        var failedEditedMessage = await this.GetOnlyFailedUnresolvedMessageId();
+                        if (failedEditedMessage == null)
                         {
                             return false;
                         }
 
-                        if (allFailedMessages.Item.Count != 1)
-                        {
-                            return false;
-                        }
-
-                        ctx.OriginalMessageFailureId = allFailedMessages.Item.First().Id;
+                        ctx.OriginalMessageFailureId = failedEditedMessage;
 
                         ctx.EditedMessage = true;
                         string editedMessage = JsonSerializer.Serialize(new EditResolutionMessage

src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs

@@ -8,6 +8,7 @@
     using AcceptanceTesting;
     using AcceptanceTesting.EndpointTemplates;
     using AcceptanceTests;
+    using ExternalIntegration;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
     using NUnit.Framework;
@@ -32,18 +33,13 @@ public async Task A_new_message_failure_is_created()
 
                     if (!ctx.EditedMessage)
                     {
-                        var allFailedMessages = await this.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
-                        if (!allFailedMessages.HasResult)
+                        var failedMessageId = await this.GetOnlyFailedUnresolvedMessageId();
+                        if (failedMessageId == null)
                         {
                             return false;
                         }
 
-                        if (allFailedMessages.Item.Count != 1)
-                        {
-                            return false;
-                        }
-
-                        ctx.OriginalMessageFailureId = allFailedMessages.Item.First().Id;
+                        ctx.OriginalMessageFailureId = failedMessageId;
 
                         ctx.EditedMessage = true;
                         var editedMessageInternalId = Guid.NewGuid().ToString();
@@ -71,23 +67,18 @@ public async Task A_new_message_failure_is_created()
                         return false;
                     }
 
-                    var allFailedMessagesAfterEdit = await this.TryGet<IList<FailedMessageView>>($"/api/errors/?status=unresolved");
-                    if (!allFailedMessagesAfterEdit.HasResult)
-                    {
-                        return false;
-                    }
-
-                    if (allFailedMessagesAfterEdit.Item.Count != 1)
+                    var failedMessageIdAfterEdit = await this.GetOnlyFailedUnresolvedMessageId();
+                    if (failedMessageIdAfterEdit == null)
                     {
                         return false;
                     }
 
-                    if (allFailedMessagesAfterEdit.Item.First().Id == ctx.OriginalMessageFailureId)
+                    if (failedMessageIdAfterEdit == ctx.OriginalMessageFailureId)
                     {
                         return false;
                     }
 
-                    ctx.EditedMessageFailureId = allFailedMessagesAfterEdit.Item.First().Id;
+                    ctx.EditedMessageFailureId = failedMessageIdAfterEdit;
 
                     ctx.OriginalMessageFailure = (await this.TryGet<FailedMessage>($"/api/errors/{ctx.OriginalMessageFailureId}")).Item;
                     ctx.EditedMessageFailure = (await this.TryGet<FailedMessage>($"/api/errors/{ctx.EditedMessageFailureId}")).Item;