Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add team assignment to request_review action #574

Merged
merged 3 commits into from Aug 7, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion __fixtures__/e2e/pr.payload.json
Expand Up @@ -124,7 +124,20 @@
}
],
"requested_teams": [

{
"id": 1,
"node_id": "MDQ6VGVhbTE=",
"url": "https://api.github.com/teams/1",
"html_url": "https://github.com/orgs/github/teams/justice-league",
"name": "Justice League",
"slug": "justice-league",
"description": "A great team.",
"privacy": "closed",
"permission": "admin",
"members_url": "https://api.github.com/teams/1/members{/member}",
"repositories_url": "https://api.github.com/teams/1/repos",
"parent": null
}
],
"labels": [
{
Expand Down
1 change: 1 addition & 0 deletions __fixtures__/unit/helper.js
Expand Up @@ -41,6 +41,7 @@ module.exports = {
updated_at: options.updatedAt ? moment(options.updatedAt) : moment(),
milestone: (options.milestone) ? options.milestone : null,
requested_reviewers: options.requestedReviewers ? options.requestedReviewers : [],
requested_teams: options.requestedTeams ? options.requestedTeams : [],
base: {
repo: {
full_name: options.baseRepo ? options.baseRepo : 'owner/test',
Expand Down
34 changes: 34 additions & 0 deletions __tests__/unit/actions/request_review.test.js
Expand Up @@ -67,6 +67,40 @@ test('that non collaborator is not requested reviews', async () => {
expect(context.octokit.pulls.requestReviewers.mock.calls.length).toBe(0)
})

test('that requested teams are not requested again', async () => {
const requester = new RequestReview()
const options = {
requestedTeams: [{ slug: 'developers' }]
}

const teamSettings = {
teams: ['developers']
}

const context = createMockContext(options)

await requester.afterValidate(context, teamSettings, result)
expect(context.octokit.pulls.requestReviewers.mock.calls.length).toBe(0)
})

test('that requested team reviewers are added', async () => {
const requester = new RequestReview()
const options = {
requestedTeams: [{ slug: 'justice-league' }]
}

const teamSettings = {
reviewers: ['shine2lay'],
teams: ['developers']
}

const context = createMockContext(options)

await requester.afterValidate(context, teamSettings, result)
expect(context.octokit.pulls.requestReviewers.mock.calls.length).toBe(1)
expect(context.octokit.pulls.requestReviewers.mock.calls[0][0].team_reviewers[0]).toBe('developers')
})

const createMockContext = (options) => {
const context = Helper.mockContext(options)

Expand Down
5 changes: 4 additions & 1 deletion docs/actions/request_review.rst
@@ -1,12 +1,15 @@
Request Review
^^^^^^^^^^^^^^^

You can request specific reviews from specific reviewers, teams, or both

::

- do: request_review
reviewers: ['name1', 'name2']
teams: ['developers'] # team names without organization

Supported Events:
::

'pull_request.*', 'issues.*'
'pull_request.*', 'issues.*'
1 change: 1 addition & 0 deletions docs/changelog.rst
@@ -1,5 +1,6 @@
CHANGELOG
=====================================
| August 6, 2021 : feat: Add team assignment to request_review action `#574 <https://github.com/mergeability/mergeable/pull/574>`_
| July 19, 2021 : feat: Add ignore_drafts option to ignore drafts in stale validator `#565 <https://github.com/mergeability/mergeable/issues/565>`_
| July 12, 2021 : feat: Filter specific status of files in changeset `#550 <https://github.com/mergeability/mergeable/issues/550>`_
| June 26, 2021 : feat: Add `payload` filter `#398 <https://github.com/mergeability/mergeable/issues/398>`_
Expand Down
13 changes: 10 additions & 3 deletions lib/actions/request_review.js
Expand Up @@ -17,7 +17,7 @@ class RequestReview extends Action {

const requestedReviewer = payload.requested_reviewers.map(reviewer => reviewer.login)

let reviewers = settings.reviewers
let reviewers = settings.reviewers || []

// remove author since they can not be requested for a review
reviewers = reviewers.filter(reviewer => reviewer !== payload.user.login)
Expand All @@ -31,13 +31,20 @@ class RequestReview extends Action {
// remove anyone in the array that is not a collaborator
const collaboratorsToRequest = _.intersection(reviewerToRequest, collaborators)

if (collaboratorsToRequest.length === 0) {
const requestedTeams = payload.requested_teams.map(team => team.slug)

const teams = settings.teams || []

const teamsToRequest = _.difference(teams, requestedTeams)

if (collaboratorsToRequest.length === 0 && teamsToRequest.length === 0) {
return
}
return this.githubAPI.requestReviewers(
context,
prNumber,
reviewerToRequest
reviewerToRequest,
teamsToRequest
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/github/api.js
Expand Up @@ -425,13 +425,13 @@ class GithubAPI {
}
}

static async requestReviewers (context, pullNumber, reviewers) {
static async requestReviewers (context, pullNumber, reviewers, teamReviewers) {
const callFn = 'pulls.requestReview'

debugLog(context, callFn)
try {
return await context.octokit.pulls.requestReviewers(
context.repo({ pull_number: pullNumber, reviewers })
context.repo({ pull_number: pullNumber, reviewers, team_reviewers: teamReviewers })
)
} catch (err) {
const errorLog = createLog(context, { callFn: callFn, errors: err.toString(), logType: logger.logTypes.REQUEST_REVIEW_FAIL_ERROR })
Expand Down