X Tutup
Skip to content

Commit a7806a3

Browse files
committed
Add names to queries made over our homegrown GraphQL adapter
1 parent b81122c commit a7806a3

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

api/queries_issue.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func IssueStatus(client *Client, repo ghrepo.Interface, currentUsername string)
140140
}
141141

142142
query := fragments + `
143-
query($owner: String!, $repo: String!, $viewer: String!, $per_page: Int = 10) {
143+
query IssueStatus($owner: String!, $repo: String!, $viewer: String!, $per_page: Int = 10) {
144144
repository(owner: $owner, name: $repo) {
145145
hasIssuesEnabled
146146
assigned: issues(filterBy: {assignee: $viewer, states: OPEN}, first: $per_page, orderBy: {field: UPDATED_AT, direction: DESC}) {
@@ -212,7 +212,7 @@ func IssueList(client *Client, repo ghrepo.Interface, state string, labels []str
212212
}
213213

214214
query := fragments + `
215-
query($owner: String!, $repo: String!, $limit: Int, $endCursor: String, $states: [IssueState!] = OPEN, $labels: [String!], $assignee: String, $author: String, $mention: String, $milestone: String) {
215+
query IssueList($owner: String!, $repo: String!, $limit: Int, $endCursor: String, $states: [IssueState!] = OPEN, $labels: [String!], $assignee: String, $author: String, $mention: String, $milestone: String) {
216216
repository(owner: $owner, name: $repo) {
217217
hasIssuesEnabled
218218
issues(first: $limit, after: $endCursor, orderBy: {field: CREATED_AT, direction: DESC}, states: $states, labels: $labels, filterBy: {assignee: $assignee, createdBy: $author, mentioned: $mention, milestone: $milestone}) {
@@ -306,7 +306,7 @@ func IssueByNumber(client *Client, repo ghrepo.Interface, number int) (*Issue, e
306306
}
307307

308308
query := `
309-
query($owner: String!, $repo: String!, $issue_number: Int!) {
309+
query IssueByNumber($owner: String!, $repo: String!, $issue_number: Int!) {
310310
repository(owner: $owner, name: $repo) {
311311
hasIssuesEnabled
312312
issue(number: $issue_number) {

api/queries_pr.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
296296
`
297297

298298
queryPrefix := `
299-
query($owner: String!, $repo: String!, $headRefName: String!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
299+
query PullRequestStatus($owner: String!, $repo: String!, $headRefName: String!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
300300
repository(owner: $owner, name: $repo) {
301301
defaultBranchRef { name }
302302
pullRequests(headRefName: $headRefName, first: $per_page, orderBy: { field: CREATED_AT, direction: DESC }) {
@@ -311,7 +311,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
311311
`
312312
if currentPRNumber > 0 {
313313
queryPrefix = `
314-
query($owner: String!, $repo: String!, $number: Int!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
314+
query PullRequestStatus($owner: String!, $repo: String!, $number: Int!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {
315315
repository(owner: $owner, name: $repo) {
316316
defaultBranchRef { name }
317317
pullRequest(number: $number) {
@@ -408,7 +408,7 @@ func PullRequestByNumber(client *Client, repo ghrepo.Interface, number int) (*Pu
408408
}
409409

410410
query := `
411-
query($owner: String!, $repo: String!, $pr_number: Int!) {
411+
query PullRequestByNumber($owner: String!, $repo: String!, $pr_number: Int!) {
412412
repository(owner: $owner, name: $repo) {
413413
pullRequest(number: $pr_number) {
414414
id
@@ -518,7 +518,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
518518
}
519519

520520
query := `
521-
query($owner: String!, $repo: String!, $headRefName: String!) {
521+
query PullRequestForBranch($owner: String!, $repo: String!, $headRefName: String!) {
522522
repository(owner: $owner, name: $repo) {
523523
pullRequests(headRefName: $headRefName, states: OPEN, first: 30) {
524524
nodes {
@@ -634,7 +634,7 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
634634
// CreatePullRequest creates a pull request in a GitHub repository
635635
func CreatePullRequest(client *Client, repo *Repository, params map[string]interface{}) (*PullRequest, error) {
636636
query := `
637-
mutation CreatePullRequest($input: CreatePullRequestInput!) {
637+
mutation PullRequestCreate($input: CreatePullRequestInput!) {
638638
createPullRequest(input: $input) {
639639
pullRequest {
640640
id
@@ -681,7 +681,7 @@ func CreatePullRequest(client *Client, repo *Repository, params map[string]inter
681681
}
682682
if len(updateParams) > 0 {
683683
updateQuery := `
684-
mutation UpdatePullRequest($input: UpdatePullRequestInput!) {
684+
mutation PullRequestCreateMetadata($input: UpdatePullRequestInput!) {
685685
updatePullRequest(input: $input) { clientMutationId }
686686
}`
687687
updateParams["pullRequestId"] = pr.ID
@@ -705,7 +705,7 @@ func CreatePullRequest(client *Client, repo *Repository, params map[string]inter
705705

706706
if len(reviewParams) > 0 {
707707
reviewQuery := `
708-
mutation RequestReviews($input: RequestReviewsInput!) {
708+
mutation PullRequestCreateRequestReviews($input: RequestReviewsInput!) {
709709
requestReviews(input: $input) { clientMutationId }
710710
}`
711711
reviewParams["pullRequestId"] = pr.ID
@@ -798,7 +798,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) (*P
798798
// If assignee wasn't specified, use `Repository.pullRequest` for ability to
799799
// query by multiple labels
800800
query := fragment + `
801-
query(
801+
query PullRequestList(
802802
$owner: String!,
803803
$repo: String!,
804804
$limit: Int!,
@@ -840,7 +840,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) (*P
840840
// `Repository.pullRequests`, but this mode doesn't support multiple labels
841841
if assignee, ok := vars["assignee"].(string); ok {
842842
query = fragment + `
843-
query(
843+
query PullRequestList(
844844
$q: String!,
845845
$limit: Int!,
846846
$endCursor: String,

api/queries_repo.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r Repository) ViewerCanTriage() bool {
7878

7979
func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
8080
query := `
81-
query($owner: String!, $name: String!) {
81+
query RepositoryInfo($owner: String!, $name: String!) {
8282
repository(owner: $owner, name: $name) {
8383
id
8484
hasIssuesEnabled
@@ -174,7 +174,7 @@ func RepoNetwork(client *Client, repos []ghrepo.Interface) (RepoNetworkResult, e
174174
}
175175
isPrivate
176176
}
177-
query {
177+
query RepositoryNetwork {
178178
viewer { login }
179179
%s
180180
}
@@ -284,7 +284,7 @@ func RepoFindFork(client *Client, repo ghrepo.Interface) (*Repository, error) {
284284
}
285285

286286
if err := client.GraphQL(`
287-
query($owner: String!, $repo: String!) {
287+
query RepositoryFindFork($owner: String!, $repo: String!) {
288288
repository(owner: $owner, name: $repo) {
289289
forks(first: 1, affiliations: [OWNER, COLLABORATOR]) {
290290
nodes {
@@ -353,7 +353,7 @@ func RepoCreate(client *Client, input RepoCreateInput) (*Repository, error) {
353353
}
354354

355355
err := client.GraphQL(`
356-
mutation($input: CreateRepositoryInput!) {
356+
mutation RepositoryCreate($input: CreateRepositoryInput!) {
357357
createRepository(input: $input) {
358358
repository {
359359
id
@@ -626,7 +626,7 @@ func RepoResolveMetadataIDs(client *Client, repo ghrepo.Interface, input RepoRes
626626
}
627627

628628
query := &bytes.Buffer{}
629-
fmt.Fprint(query, "{\n")
629+
fmt.Fprint(query, "query RepositoryResolveMetadataIDs {\n")
630630
for i, u := range users {
631631
fmt.Fprintf(query, "u%03d: user(login:%q){id,login}\n", i, u)
632632
}

api/queries_repo_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func Test_RepoResolveMetadataIDs(t *testing.T) {
188188
Labels: []string{"bug", "help wanted"},
189189
}
190190

191-
expectedQuery := `{
191+
expectedQuery := `query RepositoryResolveMetadataIDs {
192192
u000: user(login:"monalisa"){id,login}
193193
u001: user(login:"hubot"){id,login}
194194
u002: user(login:"octocat"){id,login}

0 commit comments

Comments
 (0)
X Tutup