From 80e158418c7927e172f409b5def1f579a5cd8c45 Mon Sep 17 00:00:00 2001
From: Lilli Szafranski <lilli@khanacademy.org>
Date: Tue, 4 Jun 2024 11:12:25 -0700
Subject: [PATCH] [draft-bug] commenting out the buggy code to test it

---
 dist/index.js           |  2 +-
 src/runOnPullRequest.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index cd00097..09f6f83 100755
--- a/dist/index.js
+++ b/dist/index.js
@@ -52,7 +52,7 @@ var _interopRequireDefault=__nccwpck_require__(93298);Object.defineProperty(expo
 /***/ 2795:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
-var _interopRequireDefault=__nccwpck_require__(93298);Object.defineProperty(exports, "__esModule", ({value:true}));exports.runOnPullRequest=void 0;var _regenerator=_interopRequireDefault(__nccwpck_require__(69032));var _extends2=_interopRequireDefault(__nccwpck_require__(39042));var _utils=__nccwpck_require__(88869);var _setup=__nccwpck_require__(82604);var _constants=__nccwpck_require__(6303);function _createForOfIteratorHelperLoose(o,allowArrayLike){var it;if(typeof Symbol==="undefined"||o[Symbol.iterator]==null){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;return function(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]};};}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}it=o[Symbol.iterator]();return it.next.bind(it);}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen);}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++){arr2[i]=arr[i];}return arr2;}var updatePullRequestComment=function updatePullRequestComment(comment,notifyees,reviewers,requiredReviewers){var body;return _regenerator.default.async(function updatePullRequestComment$(_context){while(1){switch(_context.prev=_context.next){case 0:body=_constants.GERALD_COMMENT_HEADER;body+=(0,_utils.makeCommentBody)({peopleToFiles:notifyees,header:_constants.GERALD_COMMENT_NOTIFIED_HEADER,tagPerson:true});body+=(0,_utils.makeCommentBody)({peopleToFiles:reviewers,header:_constants.GERALD_COMMENT_REVIEWERS_HEADER,tagPerson:false});body+=(0,_utils.makeCommentBody)({peopleToFiles:requiredReviewers,header:_constants.GERALD_COMMENT_REQ_REVIEWERS_HEADER,tagPerson:false});if(!body.match(_constants.MATCH_COMMENT_HEADER_REGEX)){_context.next=15;break;}body+=_constants.GERALD_COMMENT_FOOTER;if(!comment){_context.next=11;break;}_context.next=9;return _regenerator.default.awrap(_setup.extraPermGithub.issues.updateComment((0,_extends2.default)({},_setup.ownerAndRepo,{comment_id:comment.id,body:body})));case 9:_context.next=13;break;case 11:_context.next=13;return _regenerator.default.awrap(_setup.extraPermGithub.issues.createComment((0,_extends2.default)({},_setup.ownerAndRepo,{issue_number:_setup.context.issue.number,body:body})));case 13:_context.next=18;break;case 15:if(!comment){_context.next=18;break;}_context.next=18;return _regenerator.default.awrap(_setup.extraPermGithub.issues.deleteComment((0,_extends2.default)({},_setup.ownerAndRepo,{comment_id:comment.id})));case 18:case"end":return _context.stop();}}},null,null,null,Promise);};var makeReviewRequests=function makeReviewRequests(reviewers,teamReviewers){var _await$extraPermGithu,reviews,alreadyReviewed,unfulfilledReviewers,unfulfilledTeams,_iterator,_step,team,_await$extraPermGithu2,membership,members,_iterator2,_step2,reviewer;return _regenerator.default.async(function makeReviewRequests$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:_context2.next=2;return _regenerator.default.awrap(_setup.extraPermGithub.pulls.listReviews((0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number})));case 2:_await$extraPermGithu=_context2.sent;reviews=_await$extraPermGithu.data;alreadyReviewed=reviews.map(function(review){return review.user.login;});unfulfilledReviewers=reviewers.filter(function(reviewer){return!alreadyReviewed.includes(reviewer);});unfulfilledTeams=teamReviewers;_iterator=_createForOfIteratorHelperLoose(teamReviewers);case 8:if((_step=_iterator()).done){_context2.next=25;break;}team=_step.value;_context2.next=12;return _regenerator.default.awrap(_setup.extraPermGithub.teams.listMembersInOrg({org:_setup.ownerAndRepo.owner,team_slug:team}));case 12:_await$extraPermGithu2=_context2.sent;membership=_await$extraPermGithu2.data;members=membership.map(function(member){return member.login;});_iterator2=_createForOfIteratorHelperLoose(alreadyReviewed);case 16:if((_step2=_iterator2()).done){_context2.next=23;break;}reviewer=_step2.value;if(!members.includes(reviewer)){_context2.next=21;break;}unfulfilledTeams.splice(unfulfilledTeams.indexOf(team),1);return _context2.abrupt("break",23);case 21:_context2.next=16;break;case 23:_context2.next=8;break;case 25:_context2.next=27;return _regenerator.default.awrap(_setup.extraPermGithub.pulls.requestReviewers((0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number,reviewers:unfulfilledReviewers,team_reviewers:unfulfilledTeams})));case 27:case"end":return _context2.stop();}}},null,null,null,Promise);};var runOnPullRequest=function runOnPullRequest(){var filesChanged,fileDiffs,fileContents,notified,_getReviewers,reviewers,requiredReviewers,existingComments,_parseExistingComment,megaComment,removedJustNames,_getFilteredLists,actualReviewers,teamReviewers;return _regenerator.default.async(function runOnPullRequest$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:if(process.env.ALL_CHANGED_FILES){_context3.next=2;break;}throw new Error("no ALL_CHANGED_FILES variable found; it must be set up before gerald runs!");case 2:filesChanged=JSON.parse(process.env.ALL_CHANGED_FILES);_context3.next=5;return _regenerator.default.awrap((0,_utils.getFileDiffs)('origin/'+_setup.context.payload.pull_request.base.ref));case 5:fileDiffs=_context3.sent;_context3.next=8;return _regenerator.default.awrap((0,_utils.getFileContents)('origin/'+_setup.context.payload.pull_request.base.ref));case 8:fileContents=_context3.sent;notified=(0,_utils.getNotified)(filesChanged,fileDiffs,fileContents,_setup.context.payload.pull_request.user.login,_constants.PULL_REQUEST);_getReviewers=(0,_utils.getReviewers)(filesChanged,fileDiffs,fileContents,_setup.context.payload.pull_request.user.login),reviewers=_getReviewers.reviewers,requiredReviewers=_getReviewers.requiredReviewers;_context3.next=13;return _regenerator.default.awrap(_setup.extraPermGithub.issues.listComments((0,_extends2.default)({},_setup.ownerAndRepo,{issue_number:_setup.context.issue.number})));case 13:existingComments=_context3.sent;_parseExistingComment=(0,_utils.parseExistingComments)(existingComments),megaComment=_parseExistingComment.megaComment,removedJustNames=_parseExistingComment.removedJustNames;_getFilteredLists=(0,_utils.getFilteredLists)(reviewers,requiredReviewers,notified,removedJustNames),actualReviewers=_getFilteredLists.actualReviewers,teamReviewers=_getFilteredLists.teamReviewers;_context3.next=18;return _regenerator.default.awrap((0,_utils.maybeRemoveReviewRequests)(removedJustNames,(0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number}),_setup.extraPermGithub));case 18:_context3.next=20;return _regenerator.default.awrap(makeReviewRequests(actualReviewers,teamReviewers));case 20:_context3.next=22;return _regenerator.default.awrap(updatePullRequestComment(megaComment,notified,reviewers,requiredReviewers));case 22:case"end":return _context3.stop();}}},null,null,null,Promise);};exports.runOnPullRequest=runOnPullRequest;
+var _interopRequireDefault=__nccwpck_require__(93298);Object.defineProperty(exports, "__esModule", ({value:true}));exports.runOnPullRequest=void 0;var _regenerator=_interopRequireDefault(__nccwpck_require__(69032));var _extends2=_interopRequireDefault(__nccwpck_require__(39042));var _utils=__nccwpck_require__(88869);var _setup=__nccwpck_require__(82604);var _constants=__nccwpck_require__(6303);function _createForOfIteratorHelperLoose(o,allowArrayLike){var it;if(typeof Symbol==="undefined"||o[Symbol.iterator]==null){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;return function(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]};};}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}it=o[Symbol.iterator]();return it.next.bind(it);}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen);}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++){arr2[i]=arr[i];}return arr2;}var updatePullRequestComment=function updatePullRequestComment(comment,notifyees,reviewers,requiredReviewers){var body;return _regenerator.default.async(function updatePullRequestComment$(_context){while(1){switch(_context.prev=_context.next){case 0:body=_constants.GERALD_COMMENT_HEADER;body+=(0,_utils.makeCommentBody)({peopleToFiles:notifyees,header:_constants.GERALD_COMMENT_NOTIFIED_HEADER,tagPerson:true});body+=(0,_utils.makeCommentBody)({peopleToFiles:reviewers,header:_constants.GERALD_COMMENT_REVIEWERS_HEADER,tagPerson:false});body+=(0,_utils.makeCommentBody)({peopleToFiles:requiredReviewers,header:_constants.GERALD_COMMENT_REQ_REVIEWERS_HEADER,tagPerson:false});if(!body.match(_constants.MATCH_COMMENT_HEADER_REGEX)){_context.next=15;break;}body+=_constants.GERALD_COMMENT_FOOTER;if(!comment){_context.next=11;break;}_context.next=9;return _regenerator.default.awrap(_setup.extraPermGithub.issues.updateComment((0,_extends2.default)({},_setup.ownerAndRepo,{comment_id:comment.id,body:body})));case 9:_context.next=13;break;case 11:_context.next=13;return _regenerator.default.awrap(_setup.extraPermGithub.issues.createComment((0,_extends2.default)({},_setup.ownerAndRepo,{issue_number:_setup.context.issue.number,body:body})));case 13:_context.next=18;break;case 15:if(!comment){_context.next=18;break;}_context.next=18;return _regenerator.default.awrap(_setup.extraPermGithub.issues.deleteComment((0,_extends2.default)({},_setup.ownerAndRepo,{comment_id:comment.id})));case 18:case"end":return _context.stop();}}},null,null,null,Promise);};var makeReviewRequests=function makeReviewRequests(reviewers,teamReviewers){var _await$extraPermGithu,reviews,alreadyReviewed,unfulfilledReviewers,unfulfilledTeams,_iterator,_step,team,_await$extraPermGithu2,membership,members;return _regenerator.default.async(function makeReviewRequests$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:_context2.next=2;return _regenerator.default.awrap(_setup.extraPermGithub.pulls.listReviews((0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number})));case 2:_await$extraPermGithu=_context2.sent;reviews=_await$extraPermGithu.data;alreadyReviewed=reviews.map(function(review){return review.user.login;});unfulfilledReviewers=reviewers.filter(function(reviewer){return!alreadyReviewed.includes(reviewer);});unfulfilledTeams=teamReviewers;_iterator=_createForOfIteratorHelperLoose(teamReviewers);case 8:if((_step=_iterator()).done){_context2.next=17;break;}team=_step.value;_context2.next=12;return _regenerator.default.awrap(_setup.extraPermGithub.teams.listMembersInOrg({org:_setup.ownerAndRepo.owner,team_slug:team}));case 12:_await$extraPermGithu2=_context2.sent;membership=_await$extraPermGithu2.data;members=membership.map(function(member){return member.login;});case 15:_context2.next=8;break;case 17:_context2.next=19;return _regenerator.default.awrap(_setup.extraPermGithub.pulls.requestReviewers((0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number,reviewers:unfulfilledReviewers,team_reviewers:unfulfilledTeams})));case 19:case"end":return _context2.stop();}}},null,null,null,Promise);};var runOnPullRequest=function runOnPullRequest(){var filesChanged,fileDiffs,fileContents,notified,_getReviewers,reviewers,requiredReviewers,existingComments,_parseExistingComment,megaComment,removedJustNames,_getFilteredLists,actualReviewers,teamReviewers;return _regenerator.default.async(function runOnPullRequest$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:if(process.env.ALL_CHANGED_FILES){_context3.next=2;break;}throw new Error("no ALL_CHANGED_FILES variable found; it must be set up before gerald runs!");case 2:filesChanged=JSON.parse(process.env.ALL_CHANGED_FILES);_context3.next=5;return _regenerator.default.awrap((0,_utils.getFileDiffs)('origin/'+_setup.context.payload.pull_request.base.ref));case 5:fileDiffs=_context3.sent;_context3.next=8;return _regenerator.default.awrap((0,_utils.getFileContents)('origin/'+_setup.context.payload.pull_request.base.ref));case 8:fileContents=_context3.sent;notified=(0,_utils.getNotified)(filesChanged,fileDiffs,fileContents,_setup.context.payload.pull_request.user.login,_constants.PULL_REQUEST);_getReviewers=(0,_utils.getReviewers)(filesChanged,fileDiffs,fileContents,_setup.context.payload.pull_request.user.login),reviewers=_getReviewers.reviewers,requiredReviewers=_getReviewers.requiredReviewers;_context3.next=13;return _regenerator.default.awrap(_setup.extraPermGithub.issues.listComments((0,_extends2.default)({},_setup.ownerAndRepo,{issue_number:_setup.context.issue.number})));case 13:existingComments=_context3.sent;_parseExistingComment=(0,_utils.parseExistingComments)(existingComments),megaComment=_parseExistingComment.megaComment,removedJustNames=_parseExistingComment.removedJustNames;_getFilteredLists=(0,_utils.getFilteredLists)(reviewers,requiredReviewers,notified,removedJustNames),actualReviewers=_getFilteredLists.actualReviewers,teamReviewers=_getFilteredLists.teamReviewers;_context3.next=18;return _regenerator.default.awrap((0,_utils.maybeRemoveReviewRequests)(removedJustNames,(0,_extends2.default)({},_setup.ownerAndRepo,{pull_number:_setup.context.issue.number}),_setup.extraPermGithub));case 18:_context3.next=20;return _regenerator.default.awrap(makeReviewRequests(actualReviewers,teamReviewers));case 20:_context3.next=22;return _regenerator.default.awrap(updatePullRequestComment(megaComment,notified,reviewers,requiredReviewers));case 22:case"end":return _context3.stop();}}},null,null,null,Promise);};exports.runOnPullRequest=runOnPullRequest;
 
 /***/ }),
 
diff --git a/src/runOnPullRequest.js b/src/runOnPullRequest.js
index 962bdc5..a2018bf 100644
--- a/src/runOnPullRequest.js
+++ b/src/runOnPullRequest.js
@@ -93,13 +93,13 @@ const makeReviewRequests = async (reviewers: Array<string>, teamReviewers: Array
         });
         const members = membership.map(member => member.login);
 
-        // if a requested team has a review from a member, consider it fulfilled
-        for (const reviewer of alreadyReviewed) {
-            if (members.includes(reviewer)) {
-                unfulfilledTeams.splice(unfulfilledTeams.indexOf(team), 1);
-                break;
-            }
-        }
+        // // if a requested team has a review from a member, consider it fulfilled
+        // for (const reviewer of alreadyReviewed) {
+        //     if (members.includes(reviewer)) {
+        //         unfulfilledTeams.splice(unfulfilledTeams.indexOf(team), 1);
+        //         break;
+        //     }
+        // }
     }
 
     await extraPermGithub.pulls.requestReviewers({