Exui 3114 tool to improve pr reviews v10 (#15)

* updated package version

* fix for changesRequested bug

* improved module packaging and tidied up entry point

Author: chrisjones-hmcts

prBot/dist/index.js

@@ -0,0 +1,20 @@
+const prBot = require('./prBot');
+
+module.exports = {
+    validateEnvironment: prBot.validateEnvironment,
+    sleep: prBot.sleep,
+    loadEventData: prBot.loadEventData,
+    httpRequest: prBot.httpRequest,
+    github: prBot.github,
+    slack: prBot.slack,
+    stateManager: prBot.stateManager,
+    repostApprovalList: prBot.repostApprovalList,
+    formatPRMessage: prBot.formatPRMessage,
+    handlePROpened: prBot.handlePROpened,
+    handlePRReview: prBot.handlePRReview,
+    handlePRChangesRequested: prBot.handlePRChangesRequested,
+    handlePRClosed: prBot.handlePRClosed,
+    run: prBot.run,
+    CONFIG: prBot.CONFIG,
+    ENV: prBot.ENV
+}

prBot/dist/prBot.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const https = require('https');
 const fs = require('fs');
 
@@ -302,8 +304,6 @@ const stateManager = {
         }
       }
     }
-    
-    
   }
 }
 
@@ -318,7 +318,7 @@ async function repostApprovalList() {
 
   Object.entries(state.repositories).forEach(([repo, data]) => {
     Object.values(data.pullRequests).forEach(pr => {
-      if (pr.status === 'needs_approval' || pr.changesRequested) {
+      if (pr.status === 'needs_approval' || pr.status === 'changes_requested') {
         needsApproval.push({
           ...pr,
           repository: repo
@@ -336,7 +336,7 @@ async function repostApprovalList() {
   let message = '';
 
   needsApproval.forEach(pr => {
-    const emoji = pr.changesRequested ? '🔧 ' : '';
+    const emoji = pr.status === 'changes_requested' ? '🔧 ' : '';
     message += formatPRMessage(pr.number, pr.author, pr.title, pr.repository, pr.approvals, emoji) + '\n\n';
   });
 
@@ -417,14 +417,22 @@ async function handlePRReview(event) {
 }
 
 async function handlePRChangesRequested(event) {
-  const { prNumber, repo, reviewState } = event;
+  const { prNumber, prAuthor, repo, prTitle, reviewState } = event;
+
+  const approvalCount = await github.getReviews(repo, prNumber);
 
   if (reviewState !== 'changes_requested') {
     return;
   }
 
   await stateManager.updatePR(repo, prNumber, {
-    changesRequested: true,
+    number: prNumber,
+    title: prTitle,
+    author: prAuthor,
+    url: `https://github.com/${repo}/pull/${prNumber}`,
+    status: reviewState,
+    approvals: approvalCount,
+    createdAt: new Date().toISOString(),
   });
 
   await repostApprovalList();
@@ -438,7 +446,7 @@ async function handlePRClosed(event) {
   await repostApprovalList();
 }
 
-async function main() {
+async function run() {
   validateEnvironment();
   const event = loadEventData();
 
@@ -468,4 +476,25 @@ async function main() {
   }
 }
 
-main();
+module.exports = {
+  CONFIG,
+  ENV,
+  validateEnvironment,
+  sleep,
+  loadEventData,
+  httpRequest,
+  github,
+  slack,
+  stateManager,
+  repostApprovalList,
+  formatPRMessage,
+  handlePROpened,
+  handlePRReview,
+  handlePRChangesRequested,
+  handlePRClosed,
+  run
+}
+
+if (require.main === module) {
+  run();
+}

prBot/package.json

@@ -2,7 +2,10 @@
   "name": "@hmcts/pr-bot",
   "version": "1.0.5",
   "description": "A bot to be used in Github Actions which posts to Slack contextual information about pull requests.",
-  "main": "dist/prBot.js",
+  "main": "dist/index.js",
+  "bin": {
+    "pr-bot": "dist/prBot.js"
+  },
   "scripts": {
     "start": "node dist/prBot.js"
   },