No null value for number of approved (#26)

* No null value for number of approved * Replace creation of the extra Optional by an equivalent logic without it, for readability reasons --------- Co-authored-by: Fábio Pereira <[email protected]>
unblu · Feb 23, 2024 · a216a79 · a216a79
1 parent 4ab5242
commit a216a79
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/service/GitLabService.java b/src/main/java/service/GitLabService.java
@@ -341,9 +341,10 @@ private boolean isMergeRequestApproved(String gitlabEventUUID, MergeRequest mr)
 		final Long project = mr.getProjectId();
 		final Long mrNumber = mr.getIid();
 		try {
-			return gitlab.getMergeRequestApi()
+			Integer approvalsLeft = gitlab.getMergeRequestApi()
 					.getApprovals(project, mrNumber)
-					.getApprovalsLeft() <= 0;
+					.getApprovalsLeft();
+			return approvalsLeft == null || approvalsLeft <= 0;
 		} catch (GitLabApiException e) {
 			assignMrToCascadeResponsible(gitlabEventUUID, mr);
 			throw new IllegalStateException(String.format("GitlabEvent: '%s' | Cannot retrieve approvals for merge request '!%d' in project '%d'", gitlabEventUUID, mrNumber, project), e);