Merge request approvals support (#36)

Author: pepakriz

src/GitlabApi.ts

@@ -88,6 +88,11 @@ export interface MergeRequestInfo extends MergeRequest {
 	merge_error: string | null;
 }
 
+export interface MergeRequestApprovals {
+	approvals_required: number;
+	approvals_left: number;
+}
+
 export interface DiscussionNote {
 	resolved: boolean;
 	resolvable: boolean;
@@ -142,6 +147,10 @@ export class GitlabApi {
 		return this.sendRequestWithMultiResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}/pipelines`, RequestMethod.Get);
 	}
 
+	public async getMergeRequestApprovals(projectId: number, mergeRequestIid: number): Promise<MergeRequestApprovals> {
+		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}/approvals`, RequestMethod.Get);
+	}
+
 	public async updateMergeRequest(projectId: number, mergeRequestIid: number, data: MergeRequestUpdateData): Promise<MergeRequestInfo> {
 		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}`, RequestMethod.Put, data);
 	}

src/MergeRequestAcceptor.ts

@@ -1,6 +1,6 @@
 import {
 	GitlabApi,
-	MergeRequest,
+	MergeRequest, MergeRequestApprovals,
 	MergeRequestInfo, MergeRequestPipeline,
 	MergeState,
 	MergeStatus,
@@ -19,6 +19,7 @@ export enum AcceptMergeRequestResultKind {
 	FailedPipeline,
 	InvalidPipeline,
 	WaitingPipeline,
+	WaitingForApprovals,
 	Unauthorized,
 }
 
@@ -65,6 +66,12 @@ interface WaitingPipelineResponse extends Response {
 	pipeline: MergeRequestPipeline;
 }
 
+interface WaitingForApprovalsResponse extends Response {
+	kind: AcceptMergeRequestResultKind.WaitingForApprovals;
+	mergeRequestInfo: MergeRequestInfo;
+	approvals: MergeRequestApprovals;
+}
+
 interface UnauthorizedResponse extends Response {
 	kind: AcceptMergeRequestResultKind.Unauthorized;
 	mergeRequestInfo: MergeRequestInfo;
@@ -77,6 +84,7 @@ export type AcceptMergeRequestResult = SuccessResponse
 	| FailedPipelineResponse
 	| InvalidPipelineResponse
 	| WaitingPipelineResponse
+	| WaitingForApprovalsResponse
 	| UnauthorizedResponse;
 
 interface AcceptMergeRequestOptions {
@@ -268,6 +276,16 @@ 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

@@ -101,6 +101,17 @@ const resolveMergeRequestResult = async (result: AcceptMergeRequestResult) => {
 		return;
 	}
 
+	if (result.kind === AcceptMergeRequestResultKind.WaitingForApprovals) {
+		console.log(`[MR] Merge request is waiting for approvals, assigning back`);
+
+		await Promise.all([
+			assignToAuthorAndResetLabels(gitlabApi, mergeRequestInfo),
+			sendNote(gitlabApi, mergeRequestInfo, `Merge request is waiting for approvals. Required ${result.approvals.approvals_required}, but ${result.approvals.approvals_left} left.`),
+		]);
+
+		return;
+	}
+
 	if (result.kind === AcceptMergeRequestResultKind.InvalidPipeline) {
 		const message = result.pipeline === null
 			? `Merge request can't be merged. Pipeline does not exist`