Implement PR reviewed checks

constants.js

@@ -8,6 +8,7 @@ const editEvent = 'edited';
 const issuesLabelEvent = 'issues_labeled';
 const issuesAssignedEvent = 'issues_assigned';
 const pushEvent = 'push';
+const pullRequestReviewEvent = 'pr-review';
 const checkCompletedEvent = 'check_completed';
 
 const claCheck = 'cla-check';
@@ -27,6 +28,7 @@ const modelCheck = 'model-check';
 const issuesLabelCheck = 'issues-labeled-check';
 const issuesAssignedCheck = 'issues-assigned-check';
 const forcePushCheck = 'force-push-check';
+const pullRequestReviewCheck = 'pr-review-check';
 const ciFailureCheck = 'ci-failure-check';
 const updateWithDevelopCheck = 'update-with-develop-check';
 
@@ -66,6 +68,7 @@ const checksWhitelist = {
     [issuesAssignedEvent]: [issuesAssignedCheck],
     [unlabelEvent]: [datastoreLabelCheck],
     [pushEvent]: [forcePushCheck],
+    [pullRequestReviewEvent]: [pullRequestReviewCheck],
     [checkCompletedEvent]: [ciFailureCheck]
   },
   'oppiabot': {
@@ -92,6 +95,7 @@ module.exports.editEvent = editEvent;
 module.exports.issuesLabelEvent = issuesLabelEvent;
 module.exports.issuesAssignedEvent = issuesAssignedEvent;
 module.exports.pushEvent = pushEvent;
+module.exports.pullRequestReviewEvent = pullRequestReviewEvent;
 module.exports.checkCompletedEvent = checkCompletedEvent;
 
 module.exports.claCheck = claCheck;
@@ -109,6 +113,7 @@ module.exports.datastoreLabelCheck = datastoreLabelCheck;
 module.exports.prLabelCheck = prLabelCheck;
 module.exports.prTemplateCheck = prTemplateCheck;
 module.exports.forcePushCheck = forcePushCheck;
+module.exports.pullRequestReviewCheck = pullRequestReviewCheck;
 module.exports.ciFailureCheck = ciFailureCheck;
 module.exports.updateWithDevelopCheck = updateWithDevelopCheck;
 

index.js

@@ -9,6 +9,7 @@ const checkPullRequestJobModule = require('./lib/checkPullRequestJob');
 const checkPullRequestTemplateModule = require('./lib/checkPullRequestTemplate');
 const checkCriticalPullRequestModule = require('./lib/checkCriticalPullRequest');
 const checkBranchPushModule = require('./lib/checkBranchPush');
+const checkPullRequestReviewModule = require('./lib/checkPullRequestReview');
 const ciCheckModule = require('./lib/ciChecks');
 
 const constants = require('./constants');
@@ -83,6 +84,9 @@ const runChecks = async (context, checkEvent) => {
           case constants.prTemplateCheck:
             await checkPullRequestTemplateModule.checkTemplate(context);
             break;
+          case constants.pullRequestReviewCheck:
+            await checkPullRequestReviewModule.handlePullRequestReview(context);
+            break;
           case constants.ciFailureCheck:
             await ciCheckModule.handleFailure(context);
             break;
@@ -202,6 +206,13 @@ module.exports = (oppiabot) => {
     }
   });
 
+  oppiabot.on('pull_request_review.submitted', async (context) => {
+    if(checkWhitelistedAccounts(context)) {
+      console.log('A Pull Request got reviewed');
+      await runChecks(context, constants.pullRequestReviewEvent);
+    }
+  });
+
   oppiabot.on('check_suite.completed', async (context) => {
     if(checkWhitelistedAccounts(context)) {
       // eslint-disable-next-line no-console

lib/checkBranchPush.js

@@ -15,13 +15,10 @@
 /**
  * @fileoverview File to handle checks when a branch gets forced pushed.
  */
+
+const { sleep } = require('./utils');
+
 const WHITELISTED_BRANCH_PREFIXES = ['develop', 'release-'];
-/**
- * @param {Number} ms - Sleep time.
- */
-const sleep = (ms) => {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 /**
  * @param {import('probot').Context} context
  */

lib/checkMergeConflicts.js

@@ -1,9 +1,7 @@
+const { sleep } = require('./utils');
 const mergeConflictLabel = "PR: don't merge - HAS MERGE CONFLICTS";
 const mergeConflictLabelArray = [mergeConflictLabel];
 const mergeAllPRsWithDevelopLabel = 'PR: require post-merge sync to HEAD';
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 
 /**
  * @param {import('probot').Context} context

lib/checkPullRequestLabels.js

@@ -15,16 +15,19 @@
 /**
  * @fileoverview File to handle checks when a PR gets labeled.
  */
-const { DATASTORE_LABEL } = require('./utils');
+const {
+  DATASTORE_LABEL,
+  getProjectOwnerFromLabel,
+  canAssignProjectOwner,
+  getChangelogLabelFromPullRequest
+} = require('./utils');
 const {
   releaseCoordinators: RELEASE_COORDINATORS,
   SERVER_JOBS_ADMIN,
 } = require('../userWhitelist.json');
 const PR_LABELS = ['dependencies',  'stale'];
 const DEFAULT_CHANGELOG_LABEL = 'PR CHANGELOG: Miscellaneous -- @ankita240796';
-const LABELS_EXCLUDED_FROM_CODEOWNER_ASSIGNMENT = [
-  'PR CHANGELOG: Angular Migration'
-]
+
 /**
  * This function tests a changelog label against a regex.
  *
@@ -38,40 +41,6 @@ var matchChangelogLabelWithRegex = function(changelogLabel) {
   return regExpForChangelogLabel.test(changelogLabel);
 };
 
-/**
- * This function checks if the project owner can be assigned to a PR.
- *
- * @param {import('probot').Octokit.PullsGetResponse} pullRequest
- * @param {String} changelogLabel
- */
-const canAssignProjectOwner = (pullRequest, changelogLabel) => {
-  // Check if the changelog label is excluded from codeowner assignment.
-  const isLabelExcluded = LABELS_EXCLUDED_FROM_CODEOWNER_ASSIGNMENT.some(
-    (label) => changelogLabel.startsWith(label)
-  );
-  if (isLabelExcluded) {
-    return true;
-  }
-  const projectOwner = getProjectOwner(changelogLabel);
-  const reviewers = pullRequest.requested_reviewers.map(
-    reviewer => reviewer.login
-  );
-  const canReview = reviewers.includes(projectOwner);
-
-  return canReview;
-};
-
-/**
- * This function is used to obtain the project owner from a changelog label.
- *
- * @param {String} changelogLabel
- */
-const getProjectOwner = (changelogLabel) => {
-  const labelSubstrings = changelogLabel.split('@');
-  const projectOwner = labelSubstrings[labelSubstrings.length - 1].trim();
-  return projectOwner
-};
-
 
 /**
  * This function assigns pull request to the appropriate reviewers.
@@ -81,7 +50,7 @@ const getProjectOwner = (changelogLabel) => {
 const assignAllCodeowners = async (context) => {
   // Github automatically requests for review from codeowners.
   /**
-   * @type {import('probot').Octokit.PullsGetResponse} context
+   * @type {import('probot').Octokit.PullsGetResponse} pullRequest
    */
   const pullRequest = context.payload.pull_request;
   const assignees = pullRequest.requested_reviewers.map(
@@ -176,7 +145,7 @@ module.exports.checkAssignee = async function(context) {
       return;
     }
 
-    const projectOwner = getProjectOwner(changelogLabel);
+    const projectOwner = getProjectOwnerFromLabel(changelogLabel);
 
     const shouldAssignProjectOwner = canAssignProjectOwner(
       pullRequest, changelogLabel);
@@ -222,15 +191,9 @@ module.exports.checkChangelogLabel = async function(context) {
       ' ...'
   );
 
-  var labels = pullRequest.labels;
   var userName = pullRequest.user.login;
-  var changelogLabel = '';
-  var hasChangelogLabel = labels.some(function(label) {
-    if (label.name.trim().toUpperCase().startsWith('PR CHANGELOG')) {
-      changelogLabel = label.name.trim();
-      return true;
-    }
-  });
+  var changelogLabel = getChangelogLabelFromPullRequest(pullRequest);
+  var hasChangelogLabel = Boolean(changelogLabel);
 
   // If the PR has a changelog label, no action is required.
   if (hasChangelogLabel) {