fix: query for queued prs after removing from queue (#47)

src/helpers/manage-merge-queue.ts

@@ -13,24 +13,25 @@ limitations under the License.
 
 import * as core from '@actions/core';
 import { FIRST_QUEUED_PR_LABEL, QUEUED_FOR_MERGE_PREFIX, READY_FOR_MERGE_PR_LABEL } from '../constants';
-import { PullRequest, PullRequestSearchResults } from '../types';
+import { PullRequest } from '../types';
 import { context } from '@actions/github';
 import { map } from 'bluebird';
 import { octokit } from '../octokit';
+import { removeLabelIfExists } from './remove-label';
 import { setCommitStatus } from './set-commit-status';
 import { updateMergeQueue } from '../utils/update-merge-queue';
 
 export const manageMergeQueue = async () => {
-  const {
-    data: { items, total_count: queuePosition }
-  } = await getQueuedPrData();
   const issue_number = context.issue.number;
   const { data: pullRequest } = await octokit.pulls.get({ pull_number: issue_number, ...context.repo });
   if (pullRequest.merged || !pullRequest.labels.find(label => label.name === READY_FOR_MERGE_PR_LABEL)) {
     core.info('This PR is not in the merge queue.');
-    return removePRFromQueue(pullRequest, items);
+    return removePRFromQueue(pullRequest);
   }
 
+  const {
+    data: { total_count: queuePosition }
+  } = await getQueuedPrData();
   const isFirstQueuePosition = queuePosition === 1 || pullRequest.labels.find(label => label.name === FIRST_QUEUED_PR_LABEL);
   return Promise.all([
     octokit.issues.addLabels({
@@ -47,17 +48,14 @@ export const manageMergeQueue = async () => {
   ]);
 };
 
-const removePRFromQueue = async (pullRequest: PullRequest, queuedPrs: PullRequestSearchResults) => {
+const removePRFromQueue = async (pullRequest: PullRequest) => {
   const queueLabel = pullRequest.labels.find(label => label.name?.startsWith(QUEUED_FOR_MERGE_PREFIX))?.name;
   if (queueLabel) {
-    await map([READY_FOR_MERGE_PR_LABEL, queueLabel], label =>
-      octokit.issues.removeLabel({
-        name: label,
-        issue_number: pullRequest.number,
-        ...context.repo
-      })
-    );
-    await updateMergeQueue(queuedPrs);
+    await map([READY_FOR_MERGE_PR_LABEL, queueLabel], label => removeLabelIfExists(label, pullRequest.number));
+    const {
+      data: { items }
+    } = await getQueuedPrData();
+    await updateMergeQueue(items);
   }
 };
 

src/helpers/remove-label.ts

@@ -19,11 +19,13 @@ interface RemoveLabel {
   label: string;
 }
 
-export const removeLabel = ({ label }: RemoveLabel) =>
+export const removeLabel = ({ label }: RemoveLabel) => removeLabelIfExists(label, context.issue.number);
+
+export const removeLabelIfExists = (labelName: string, issue_number: number) =>
   octokit.issues
     .removeLabel({
-      name: label,
-      issue_number: context.issue.number,
+      name: labelName,
+      issue_number,
       ...context.repo
     })
     .catch(error => {

src/utils/update-merge-queue.ts

@@ -3,6 +3,7 @@ import { QUEUED_FOR_MERGE_PREFIX } from '../constants';
 import { context } from '@actions/github';
 import { map } from 'bluebird';
 import { octokit } from '../octokit';
+import { removeLabelIfExists } from '../helpers/remove-label';
 
 export const updateMergeQueue = (queuedPrs: PullRequestSearchResults) => {
   const prsSortedByQueuePosition = queuedPrs
@@ -28,11 +29,7 @@ export const updateMergeQueue = (queuedPrs: PullRequestSearchResults) => {
         issue_number: pull_number,
         ...context.repo
       }),
-      octokit.issues.removeLabel({
-        name: label,
-        issue_number: pull_number,
-        ...context.repo
-      })
+      removeLabelIfExists(label, pull_number)
     ]);
   });
 };

test/helpers/manage-merge-queue.test.ts

@@ -16,9 +16,11 @@ import { READY_FOR_MERGE_PR_LABEL } from '../../src/constants';
 import { context } from '@actions/github';
 import { manageMergeQueue } from '../../src/helpers/manage-merge-queue';
 import { octokit } from '../../src/octokit';
+import { removeLabelIfExists } from '../../src/helpers/remove-label';
 import { setCommitStatus } from '../../src/helpers/set-commit-status';
 import { updateMergeQueue } from '../../src/utils/update-merge-queue';
 
+jest.mock('../../src/helpers/remove-label');
 jest.mock('../../src/helpers/set-commit-status');
 jest.mock('../../src/utils/update-merge-queue');
 jest.mock('@actions/core');
@@ -28,8 +30,7 @@ jest.mock('@actions/github', () => ({
     rest: {
       pulls: { get: jest.fn() },
       issues: {
-        addLabels: jest.fn(),
-        removeLabel: jest.fn()
+        addLabels: jest.fn()
       },
       search: { issuesAndPullRequests: jest.fn() }
     }
@@ -63,16 +64,8 @@ describe('manageMergeQueue', () => {
     });
 
     it('should call remove label with correct params', () => {
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: READY_FOR_MERGE_PR_LABEL,
-        issue_number: 123,
-        ...context.repo
-      });
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: 'QUEUED FOR MERGE #1',
-        issue_number: 123,
-        ...context.repo
-      });
+      expect(removeLabelIfExists).toHaveBeenCalledWith(READY_FOR_MERGE_PR_LABEL, 123);
+      expect(removeLabelIfExists).toHaveBeenCalledWith('QUEUED FOR MERGE #1', 123);
     });
 
     it('should call updateMergeQueue with correct params', () => {
@@ -105,16 +98,8 @@ describe('manageMergeQueue', () => {
     });
 
     it('should call remove label with correct params', () => {
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: READY_FOR_MERGE_PR_LABEL,
-        issue_number: 123,
-        ...context.repo
-      });
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: 'QUEUED FOR MERGE #2',
-        issue_number: 123,
-        ...context.repo
-      });
+      expect(removeLabelIfExists).toHaveBeenCalledWith(READY_FOR_MERGE_PR_LABEL, 123);
+      expect(removeLabelIfExists).toHaveBeenCalledWith('QUEUED FOR MERGE #2', 123);
     });
 
     it('should call updateMergeQueue with correct params', () => {

test/utils/update-merge-queue.test.ts

@@ -14,8 +14,10 @@ limitations under the License.
 import { PullRequestSearchResults } from '../../src/types';
 import { context } from '@actions/github';
 import { octokit } from '../../src/octokit';
+import { removeLabelIfExists } from '../../src/helpers/remove-label';
 import { updateMergeQueue } from '../../src/utils/update-merge-queue';
 
+jest.mock('../../src/helpers/remove-label');
 jest.mock('@actions/core');
 jest.mock('@actions/github', () => ({
   context: { repo: { repo: 'repo', owner: 'owner' }, issue: { number: 123 } },
@@ -24,7 +26,6 @@ jest.mock('@actions/github', () => ({
       pulls: { get: jest.fn() },
       issues: {
         addLabels: jest.fn(),
-        removeLabel: jest.fn(),
         listLabelsOnIssue: jest.fn()
       },
       search: { issuesAndPullRequests: jest.fn() }
@@ -62,16 +63,8 @@ describe('updateMergeQueue', () => {
     });
 
     it('should call remove label with correct params', () => {
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: 'QUEUED FOR MERGE #2',
-        issue_number: 123,
-        ...context.repo
-      });
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        name: 'QUEUED FOR MERGE #3',
-        issue_number: 456,
-        ...context.repo
-      });
+      expect(removeLabelIfExists).toHaveBeenCalledWith('QUEUED FOR MERGE #2', 123);
+      expect(removeLabelIfExists).toHaveBeenCalledWith('QUEUED FOR MERGE #3', 456);
     });
   });
 
@@ -104,16 +97,8 @@ describe('updateMergeQueue', () => {
     });
 
     it('should call remove label with correct params', () => {
-      expect(octokit.issues.removeLabel).not.toHaveBeenCalledWith({
-        issue_number: 123,
-        name: 'QUEUED FOR MERGE #1',
-        ...context.repo
-      });
-      expect(octokit.issues.removeLabel).toHaveBeenCalledWith({
-        issue_number: 456,
-        name: 'QUEUED FOR MERGE #3',
-        ...context.repo
-      });
+      expect(removeLabelIfExists).not.toHaveBeenCalledWith('QUEUED FOR MERGE #1', 123);
+      expect(removeLabelIfExists).toHaveBeenCalledWith('QUEUED FOR MERGE #3', 456);
     });
   });