Fixes #31 Add "approvals_syncing" to list of mr status that we want t…

…o wait on (#32) Co-authored-by: Fábio Pereira <[email protected]>
unblu · Sep 24, 2024 · 129adbe · 129adbe
1 parent d673fc5
commit 129adbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/_documentation/src/docs/diagrams/technical-workflow.puml b/_documentation/src/docs/diagrams/technical-workflow.puml
@@ -19,7 +19,7 @@ if (incoming request?) then (yes)
                         Timeout to avoid the possibility
                         of getting stuck in the loop forever
                     end note
-                    while(MRStatus == unchecked|checking and countdown > 0?) is (yes)
+                    while(MRStatus == unchecked|checking|preparing|approvals_syncing and countdown > 0?) is (yes)
                         #SkyBlue:decrement countDown by 1;
                         :sleep 1s;
                         note right: Wait for Gitlab to prepare MR

diff --git a/src/main/java/service/GitLabService.java b/src/main/java/service/GitLabService.java
@@ -522,7 +522,7 @@ private MergeRequest getExistingMr(String gitlabEventUUID, MergeRequest mr) {
 	}
 
 	public static boolean isMrReady(String mrStatus, boolean approverExists, Boolean hasConflicts) {
-		return !(mrStatus.matches("unchecked|checking|preparing") ||
+		return !(mrStatus.matches("unchecked|checking|preparing|approvals_syncing") ||
 				(approverExists && mrStatus.matches("not_approved")) ||
 				!(hasConflicts != null && hasConflicts) && mrStatus.matches("broken_status"));
 	}

diff --git a/src/test/java/com/unblu/ucascade/UcascadeTest.java b/src/test/java/com/unblu/ucascade/UcascadeTest.java
@@ -844,6 +844,8 @@ void testMrReady() {
 		Assertions.assertFalse(GitLabService.isMrReady("checking", true, false));
 		Assertions.assertFalse(GitLabService.isMrReady("preparing", false, false));
 		Assertions.assertFalse(GitLabService.isMrReady("preparing", true, false));
+		Assertions.assertFalse(GitLabService.isMrReady("approvals_syncing", false, false));
+		Assertions.assertFalse(GitLabService.isMrReady("approvals_syncing", true, false));
 		Assertions.assertFalse(GitLabService.isMrReady("broken_status", true, false));
 		Assertions.assertFalse(GitLabService.isMrReady("broken_status", false, false));
 		Assertions.assertFalse(GitLabService.isMrReady("broken_status", false, null));