Check approvals before MR loop (#37)

Author: pepakriz

src/MergeRequestAcceptor.ts

@@ -151,6 +151,16 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			throw new Error(`Unexpected MR status: ${mergeRequestInfo.state}`);
 		}
 
+		const approvals = await gitlabApi.getMergeRequestApprovals(mergeRequestInfo.project_id, mergeRequestInfo.iid);
+		if (approvals.approvals_left > 0) {
+			return {
+				kind: AcceptMergeRequestResultKind.WaitingForApprovals,
+				mergeRequestInfo,
+				user,
+				approvals,
+			};
+		}
+
 		if (mergeRequestInfo.rebase_in_progress) {
 			console.log(`[MR][${mergeRequestInfo.iid}] Still rebasing`);
 			await Promise.all(tasks);
@@ -276,16 +286,6 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			}
 		}
 
-		const approvals = await gitlabApi.getMergeRequestApprovals(mergeRequestInfo.project_id, mergeRequestInfo.iid);
-		if (approvals.approvals_left > 0) {
-			return {
-				kind: AcceptMergeRequestResultKind.WaitingForApprovals,
-				mergeRequestInfo,
-				user,
-				approvals,
-			};
-		}
-
 		console.log(`[MR][${mergeRequestInfo.iid}] Calling merge request`);
 		const response = await gitlabApi.sendRawRequest(`/api/v4/projects/${mergeRequestInfo.project_id}/merge_requests/${mergeRequestInfo.iid}/merge`, RequestMethod.Put, {
 			should_remove_source_branch: options.removeBranchAfterMerge,

src/index.ts

@@ -163,6 +163,18 @@ const runMergeRequestCheckerLoop = async (user: User) => {
 			return;
 		}
 
+		const approvals = await gitlabApi.getMergeRequestApprovals(mergeRequest.project_id, mergeRequest.iid);
+		if (approvals.approvals_left > 0) {
+			console.log(`[MR] Merge request is waiting for approvals, assigning back`);
+
+			await Promise.all([
+				assignToAuthorAndResetLabels(gitlabApi, mergeRequest),
+				sendNote(gitlabApi, mergeRequest, `Merge request is waiting for approvals. Required ${approvals.approvals_required}, but ${approvals.approvals_left} left.`),
+			]);
+
+			return;
+		}
+
 		const mergeRequestDiscussions = await gitlabApi.getMergeRequestDiscussions(mergeRequest.project_id, mergeRequest.iid);
 		const unresolvedDiscussion = mergeRequestDiscussions.find((mergeRequestDiscussion: MergeRequestDiscussion) => {
 			return mergeRequestDiscussion.notes.find((discussionNote: DiscussionNote) => (discussionNote.resolvable && !discussionNote.resolved)) !== undefined;