From 85125ab6e7deea6b6946c442b16e346c19edc48e Mon Sep 17 00:00:00 2001
From: Green-Ranger11 <junior.eteuati@gmail.com>
Date: Tue, 15 Mar 2022 12:48:24 +1300
Subject: [PATCH] [Fix] display review status first as output now shows check
 status

---
 utils/evaluatePullRequest.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/utils/evaluatePullRequest.js b/utils/evaluatePullRequest.js
index fcfaf41..c8241df 100644
--- a/utils/evaluatePullRequest.js
+++ b/utils/evaluatePullRequest.js
@@ -25,6 +25,15 @@ module.exports = function evaluatePullRequest(response, requiredChecks) {
 	if (!doesPRHaveConflicts(response)) {
 		return pullRequestStatus.CONFLICT;
 	}
+
+	if (reviewDecision === 'CHANGES_REQUESTED') {
+		return pullRequestStatus.REVIEW_DISAPPROVED;
+	}
+
+	if (reviewDecision === 'REVIEW_REQUIRED') {
+		return viewerCanMergeAsAdmin ? pullRequestStatus.BYPASSABLE : pullRequestStatus.REVIEW_REQUIRED;
+	}
+
 	const { failure, pending } = evaluateChecks(response, requiredChecks);
 
 	if (failure.some((f) => f.isRequired)) {
@@ -35,11 +44,5 @@ module.exports = function evaluatePullRequest(response, requiredChecks) {
 		return pullRequestStatus.STATUS_PENDING;
 	}
 
-	if (reviewDecision === 'CHANGES_REQUESTED') {
-		return pullRequestStatus.REVIEW_DISAPPROVED;
-	} else if (reviewDecision === 'REVIEW_REQUIRED') {
-		return viewerCanMergeAsAdmin ? pullRequestStatus.BYPASSABLE : pullRequestStatus.REVIEW_REQUIRED;
-	}
-
 	return pullRequestStatus.MERGEABLE;
 };