Modernize repo and allow choosing of User Groups conditionally

.tool-versions

@@ -0,0 +1 @@
+nodejs 20.13.1

__tests__/handler.test.ts

@@ -599,6 +599,52 @@ describe('handlePullRequest', () => {
     expect(addAssigneesSpy).not.toBeCalled()
   })
 
+  test('adds reviewers to pull request from two different groups if review groups are enabled and user is in group', async () => {
+    // MOCKS
+    ;(github.getOctokit as jest.Mock).mockImplementation(() => ({
+      rest: {
+        pulls: {
+          requestReviewers: async () => {},
+        },
+        issues: {
+          addAssignees: async () => {},
+        },
+      },
+    }))
+
+    const client = github.getOctokit('token')
+
+    const requestReviewersSpy = jest.spyOn(
+      client.rest.pulls,
+      'requestReviewers'
+    )
+
+    const addAssigneesSpy = jest.spyOn(client.rest.issues, 'addAssignees')
+
+    // GIVEN
+    const config = {
+      addAssignees: false,
+      addReviewers: true,
+      useReviewGroups: true,
+      numberOfReviewers: 1,
+      reviewGroups: {
+        groupA: ['pr-creator', 'group1-user1', 'group1-user2', 'group1-user3'],
+        groupB: ['group2-user1', 'group2-user2', 'group2-user3'],
+      },
+      chooseOnlyUserGroups: true,
+    } as any
+
+    // WHEN
+    await handler.handlePullRequest(client, context, config)
+
+    // THEN
+    expect(requestReviewersSpy.mock.calls[0][0]?.reviewers).toHaveLength(1)
+    expect(requestReviewersSpy.mock.calls[0][0]?.reviewers![0]).toMatch(
+      /group1/
+    )
+    expect(addAssigneesSpy).not.toBeCalled()
+  })
+
   test('adds all reviewers from a group that has less members than the number of reviews requested', async () => {
     // MOCKS
     ;(github.getOctokit as jest.Mock).mockImplementation(() => ({

action.yml

@@ -1,6 +1,6 @@
 name: 'Auto Assign Action'
 description: 'Add reviewers to pull requests when pull requests are opened.'
-author: 'Kentaro Matsushita'
+author: 'Arush Shankar'
 inputs:
   repo-token:
     description: 'A token for the repo'

package.json

@@ -21,7 +21,8 @@
     "@actions/core": "^1.6.0",
     "@actions/github": "^5.0.0",
     "js-yaml": "^3.13.1",
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.20",
+    "yarn": "^1.22.22"
   },
   "devDependencies": {
     "@octokit/webhooks-types": "7.5.1",
@@ -41,5 +42,6 @@
   },
   "lint-staged": {
     "*.ts": "prettier --write"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

src/handler.ts

@@ -22,6 +22,7 @@ export interface Config {
   reviewGroups: { [key: string]: string[] }
   assigneeGroups: { [key: string]: string[] }
   runOnDraft?: boolean
+  chooseOnlyUserGroups?: boolean
 }
 
 export async function handlePullRequest(

src/utils.ts

@@ -4,7 +4,13 @@ import { Config } from './handler'
 import { Client } from './types'
 
 export function chooseReviewers(owner: string, config: Config): string[] {
-  const { useReviewGroups, reviewGroups, numberOfReviewers, reviewers } = config
+  const {
+    useReviewGroups,
+    reviewGroups,
+    numberOfReviewers,
+    reviewers,
+    chooseOnlyUserGroups = false,
+  } = config
   let chosenReviewers: string[] = []
   const useGroups: boolean =
     useReviewGroups && Object.keys(reviewGroups).length > 0
@@ -13,7 +19,8 @@ export function chooseReviewers(owner: string, config: Config): string[] {
     chosenReviewers = chooseUsersFromGroups(
       owner,
       reviewGroups,
-      numberOfReviewers
+      numberOfReviewers,
+      chooseOnlyUserGroups
     )
   } else {
     chosenReviewers = chooseUsers(reviewers, numberOfReviewers, owner)
@@ -95,11 +102,17 @@ export function includesSkipKeywords(
 export function chooseUsersFromGroups(
   owner: string,
   groups: { [key: string]: string[] } | undefined,
-  desiredNumber: number
+  desiredNumber: number,
+  chooseOnlyUserGroups: boolean = false
 ): string[] {
   let users: string[] = []
   for (const group in groups) {
-    users = users.concat(chooseUsers(groups[group], desiredNumber, owner))
+    if (
+      !chooseOnlyUserGroups ||
+      (chooseOnlyUserGroups && groups[group].includes(owner))
+    ) {
+      users = users.concat(chooseUsers(groups[group], desiredNumber, owner))
+    }
   }
   return users
 }

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target": "es6",
+    "lib": ["es2016"],
     "module": "commonjs",
     "outDir": "./lib",
     "rootDir": "./src",