Skip to content

feat: add reviewers parameter to UpdatePullRequest #285

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Jul 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3234755
feat: add reviewers parameter to UpdatePullRequest and update tests
MayorFaj Apr 15, 2025
9db748b
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 17, 2025
a84ede9
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 17, 2025
276ac8d
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 18, 2025
53d0833
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 22, 2025
c4de80b
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 22, 2025
0e51a09
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 23, 2025
b9d2e28
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Apr 30, 2025
9ac7250
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj May 5, 2025
71dcedf
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jun 25, 2025
5c85a09
Update pullrequests.go
MayorFaj Jun 25, 2025
b09f589
feat: enhance update pull request functionality with reviewers support
MayorFaj Jun 25, 2025
53e2708
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jun 26, 2025
7676eae
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jun 28, 2025
9209f5c
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jun 30, 2025
6f21c3f
update README to clarify optional reviewers parameter in API document…
MayorFaj Jun 30, 2025
8a6cabf
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 1, 2025
4e28ee7
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 2, 2025
432907e
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 3, 2025
0474365
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 9, 2025
20bfead
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 16, 2025
5650e1d
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 19, 2025
0674183
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 25, 2025
046f994
feat: enhance UpdatePullRequest to return early if no updates or revi…
MayorFaj Jul 25, 2025
90eb11a
Add updating draft state to `update_pull_request` tool (#774)
mattdholloway Jul 29, 2025
033f613
Add support for org-level discussions in list_discussions tool (#775)
tommaso-moro Jul 29, 2025
94cef70
refactor: streamline UpdatePullRequest logic and enhance test cases f…
MayorFaj Jul 29, 2025
d89e522
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 29, 2025
5ea322b
refactor: remove redundant draft update tests and streamline UpdatePu…
MayorFaj Jul 29, 2025
be359ea
test: add unit tests for updating pull request draft state
MayorFaj Jul 29, 2025
1934e2a
Merge branch 'main' into feat/259/assign-reviewers
MayorFaj Jul 30, 2025
c1b9a46
refactor: simplify UpdatePullRequest tests by removing unused mock data
MayorFaj Jul 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ The following sets of tools are available (all are on by default):
- `owner`: Repository owner (string, required)
- `pullNumber`: Pull request number to update (number, required)
- `repo`: Repository name (string, required)
- `reviewers`: GitHub usernames to request reviews from (string[], optional)
- `state`: New state (string, optional)
- `title`: New title (string, optional)

Expand Down
7 changes: 7 additions & 0 deletions pkg/github/__toolsnaps__/update_pull_request.snap
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
"description": "Repository name",
"type": "string"
},
"reviewers": {
"description": "GitHub usernames to request reviews from",
"items": {
"type": "string"
},
"type": "array"
},
"state": {
"description": "New state",
"enum": [
Expand Down
3 changes: 1 addition & 2 deletions pkg/github/discussions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ var (
"url": "https://github.com/owner/.github/discussions/4",
"category": map[string]any{"name": "General"},
},

}

// Ordered mock responses
Expand Down Expand Up @@ -190,7 +189,7 @@ var (
"startCursor": "",
"endCursor": "",
},
"totalCount": 4,
"totalCount": 4,
},
},
})
Expand Down
56 changes: 54 additions & 2 deletions pkg/github/pullrequests.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ func UpdatePullRequest(getClient GetClientFn, getGQLClient GetGQLClientFn, t tra
mcp.WithBoolean("maintainer_can_modify",
mcp.Description("Allow maintainer edits"),
),
mcp.WithArray("reviewers",
mcp.Description("GitHub usernames to request reviews from"),
mcp.Items(map[string]interface{}{
"type": "string",
}),
),
),
func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
owner, err := RequiredParam[string](request, "owner")
Expand All @@ -256,15 +262,17 @@ func UpdatePullRequest(getClient GetClientFn, getGQLClient GetGQLClientFn, t tra
return mcp.NewToolResultError(err.Error()), nil
}

// Check if draft parameter is provided
draftProvided := request.GetArguments()["draft"] != nil
var draftValue bool
if draftProvided {
draftValue, err = OptionalParam[bool](request, "draft")
if err != nil {
return nil, err
return mcp.NewToolResultError(err.Error()), nil
}
}

// Build the update struct only with provided fields
update := &github.PullRequest{}
restUpdateNeeded := false

Expand Down Expand Up @@ -303,10 +311,18 @@ func UpdatePullRequest(getClient GetClientFn, getGQLClient GetGQLClientFn, t tra
restUpdateNeeded = true
}

if !restUpdateNeeded && !draftProvided {
// Handle reviewers separately
reviewers, err := OptionalStringArrayParam(request, "reviewers")
if err != nil {
return mcp.NewToolResultError(err.Error()), nil
}

// If no updates, no draft change, and no reviewers, return error early
if !restUpdateNeeded && !draftProvided && len(reviewers) == 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could simplify it to
!(restUpdateNeeded || draftProvided || len(reviewers) != 0)

return mcp.NewToolResultError("No update parameters provided."), nil
}

// Handle REST API updates (title, body, state, base, maintainer_can_modify)
if restUpdateNeeded {
client, err := getClient(ctx)
if err != nil {
Expand All @@ -332,6 +348,7 @@ func UpdatePullRequest(getClient GetClientFn, getGQLClient GetGQLClientFn, t tra
}
}

// Handle draft status changes using GraphQL
if draftProvided {
gqlClient, err := getGQLClient(ctx)
if err != nil {
Expand Down Expand Up @@ -397,6 +414,41 @@ func UpdatePullRequest(getClient GetClientFn, getGQLClient GetGQLClientFn, t tra
}
}

// Handle reviewer requests
if len(reviewers) > 0 {
client, err := getClient(ctx)
if err != nil {
return nil, fmt.Errorf("failed to get GitHub client: %w", err)
}

reviewersRequest := github.ReviewersRequest{
Reviewers: reviewers,
}

_, resp, err := client.PullRequests.RequestReviewers(ctx, owner, repo, pullNumber, reviewersRequest)
if err != nil {
return ghErrors.NewGitHubAPIErrorResponse(ctx,
"failed to request reviewers",
resp,
err,
), nil
}
defer func() {
if resp != nil && resp.Body != nil {
_ = resp.Body.Close()
}
}()

if resp.StatusCode != http.StatusCreated && resp.StatusCode != http.StatusOK {
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("failed to read response body: %w", err)
}
return mcp.NewToolResultError(fmt.Sprintf("failed to request reviewers: %s", string(body))), nil
}
}

// Get the final state of the PR to return
client, err := getClient(ctx)
if err != nil {
return nil, err
Expand Down
78 changes: 75 additions & 3 deletions pkg/github/pullrequests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ func Test_UpdatePullRequest(t *testing.T) {
assert.Contains(t, tool.InputSchema.Properties, "state")
assert.Contains(t, tool.InputSchema.Properties, "base")
assert.Contains(t, tool.InputSchema.Properties, "maintainer_can_modify")
assert.Contains(t, tool.InputSchema.Properties, "reviewers")
assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "pullNumber"})

// Setup mock PR for success case
Expand All @@ -173,6 +174,17 @@ func Test_UpdatePullRequest(t *testing.T) {
State: github.Ptr("closed"), // State updated
}

// Mock PR for when there are no updates but we still need a response
mockPRWithReviewers := &github.PullRequest{
Number: github.Ptr(42),
Title: github.Ptr("Test PR"),
State: github.Ptr("open"),
RequestedReviewers: []*github.User{
{Login: github.Ptr("reviewer1")},
{Login: github.Ptr("reviewer2")},
},
}

tests := []struct {
name string
mockedClient *http.Client
Expand Down Expand Up @@ -238,6 +250,28 @@ func Test_UpdatePullRequest(t *testing.T) {
expectError: false,
expectedPR: mockClosedPR,
},
{
name: "successful PR update with reviewers",
mockedClient: mock.NewMockedHTTPClient(
// Mock for RequestReviewers call, returning the PR with reviewers
mock.WithRequestMatch(
mock.PostReposPullsRequestedReviewersByOwnerByRepoByPullNumber,
mockPRWithReviewers,
),
mock.WithRequestMatch(
mock.GetReposPullsByOwnerByRepoByPullNumber,
mockPRWithReviewers,
),
),
requestArgs: map[string]interface{}{
"owner": "owner",
"repo": "repo",
"pullNumber": float64(42),
"reviewers": []interface{}{"reviewer1", "reviewer2"},
},
expectError: false,
expectedPR: mockPRWithReviewers,
},
{
name: "successful PR update (title only)",
mockedClient: mock.NewMockedHTTPClient(
Expand Down Expand Up @@ -295,6 +329,27 @@ func Test_UpdatePullRequest(t *testing.T) {
expectError: true,
expectedErrMsg: "failed to update pull request",
},
{
name: "request reviewers fails",
mockedClient: mock.NewMockedHTTPClient(
// Then reviewer request fails
mock.WithRequestMatchHandler(
mock.PostReposPullsRequestedReviewersByOwnerByRepoByPullNumber,
http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusUnprocessableEntity)
_, _ = w.Write([]byte(`{"message": "Invalid reviewers"}`))
}),
),
),
requestArgs: map[string]interface{}{
"owner": "owner",
"repo": "repo",
"pullNumber": float64(42),
"reviewers": []interface{}{"invalid-user"},
},
expectError: true,
expectedErrMsg: "failed to request reviewers",
},
}

for _, tc := range tests {
Expand Down Expand Up @@ -347,6 +402,26 @@ func Test_UpdatePullRequest(t *testing.T) {
if tc.expectedPR.MaintainerCanModify != nil {
assert.Equal(t, *tc.expectedPR.MaintainerCanModify, *returnedPR.MaintainerCanModify)
}

// Check reviewers if they exist in the expected PR
if len(tc.expectedPR.RequestedReviewers) > 0 {
assert.NotNil(t, returnedPR.RequestedReviewers)
assert.Equal(t, len(tc.expectedPR.RequestedReviewers), len(returnedPR.RequestedReviewers))

// Create maps of reviewer logins for easy comparison
expectedReviewers := make(map[string]bool)
for _, reviewer := range tc.expectedPR.RequestedReviewers {
expectedReviewers[*reviewer.Login] = true
}

actualReviewers := make(map[string]bool)
for _, reviewer := range returnedPR.RequestedReviewers {
actualReviewers[*reviewer.Login] = true
}

// Compare the maps
assert.Equal(t, expectedReviewers, actualReviewers)
}
})
}
}
Expand Down Expand Up @@ -529,9 +604,6 @@ func Test_UpdatePullRequest_Draft(t *testing.T) {
err = json.Unmarshal([]byte(textContent.Text), &returnedPR)
require.NoError(t, err)
assert.Equal(t, *tc.expectedPR.Number, *returnedPR.Number)
if tc.expectedPR.Draft != nil {
assert.Equal(t, *tc.expectedPR.Draft, *returnedPR.Draft)
}
})
}
}
Expand Down
Loading