Support GitHub Team in requested reviewers

doi-t · doi-t · commit d70358ea3445 · 2020-04-22T21:58:01.000+09:00
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -66,6 +66,7 @@ type PullRequest struct {
 			RequestedReviewer struct {
 				TypeName string `json:"__typename"`
 				Login    string
+				Name     string
 			}
 		}
 		TotalCount int
@@ -373,6 +374,9 @@ func PullRequestByNumber(client *Client, repo ghrepo.Interface, number int) (*Pu
 							...on User {
 								login
 							}
+							...on Team {
+								name
+							}
 						}
 					}
 					totalCount
@@ -470,6 +474,9 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
 								...on User {
 									login
 								}
+								...on Team {
+									name
+								}
 							}
 						}
 						totalCount
diff --git a/command/pr.go b/command/pr.go
@@ -431,6 +431,9 @@ func prReviewerList(pr api.PullRequest) string {
 	return reviewerList
 }
 
+// Ref. https://developer.github.com/v4/union/requestedreviewer/
+const teamTypeName = "Team"
+
 // parseReviewers parses given Reviews and ReviewRequests
 func parseReviewers(pr api.PullRequest) []*reviewerState {
 	reviewerStates := make(map[string]*reviewerState)
@@ -446,8 +449,12 @@ func parseReviewers(pr api.PullRequest) []*reviewerState {
 
 	// Overwrite reviewer's state if a review request for the same reviewer exists.
 	for _, reviewRequest := range pr.ReviewRequests.Nodes {
-		reviewerStates[reviewRequest.RequestedReviewer.Login] = &reviewerState{
-			Name:  reviewRequest.RequestedReviewer.Login,
+		name := reviewRequest.RequestedReviewer.Login
+		if reviewRequest.RequestedReviewer.TypeName == teamTypeName {
+			name = reviewRequest.RequestedReviewer.Name
+		}
+		reviewerStates[name] = &reviewerState{
+			Name:  name,
 			State: requestedReviewState,
 		}
 	}
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -442,7 +442,7 @@ func TestPRView_Preview(t *testing.T) {
 			fixture:   "../test/fixtures/prViewPreviewWithReviewersByNumber.json",
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Reviewers: DEF \(Commented\), def \(Changes requested\), xyz \(Approved\), 123 \(Requested\), abc \(Requested\)\n`,
+				`Reviewers: DEF \(Commented\), def \(Changes requested\), xyz \(Approved\), 123 \(Requested\), Team 1 \(Requested\), abc \(Requested\)\n`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12\n`,
 			},
diff --git a/test/fixtures/prViewPreviewWithMetadataByNumber.json b/test/fixtures/prViewPreviewWithMetadataByNumber.json
@@ -14,7 +14,7 @@
             "nodes": [
                 {
                     "requestedReviewer": {
-                        "__typename": "user",
+                        "__typename": "User",
                         "login": "1"
                     }
                 }
diff --git a/test/fixtures/prViewPreviewWithReviewersByNumber.json b/test/fixtures/prViewPreviewWithReviewersByNumber.json
@@ -18,6 +18,12 @@
                 "login": "123"
               }
             },
+            {
+                "requestedReviewer": {
+                    "__typename": "Team",
+                    "name": "Team 1"
+                }
+            },
             {
               "requestedReviewer": {
                 "__typename": "user",

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ type PullRequest struct {`
`66`	`66`	`RequestedReviewer struct {`
`67`	`67`	TypeName string `json:"__typename"`
`68`	`68`	`Login string`
	`69`	`+ Name string`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`TotalCount int`
`@@ -373,6 +374,9 @@ func PullRequestByNumber(client Client, repo ghrepo.Interface, number int) (Pu`
`373`	`374`	`...on User {`
`374`	`375`	`login`
`375`	`376`	`}`
	`377`	`+ ...on Team {`
	`378`	`+ name`
	`379`	`+ }`
`376`	`380`	`}`
`377`	`381`	`}`
`378`	`382`	`totalCount`
`@@ -470,6 +474,9 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea`
`470`	`474`	`...on User {`
`471`	`475`	`login`
`472`	`476`	`}`
	`477`	`+ ...on Team {`
	`478`	`+ name`
	`479`	`+ }`
`473`	`480`	`}`
`474`	`481`	`}`
`475`	`482`	`totalCount`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"nodes": [`
`15`	`15`	`{`
`16`	`16`	`"requestedReviewer": {`
`17`		`- "__typename": "user",`
	`17`	`+ "__typename": "User",`
`18`	`18`	`"login": "1"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,12 @@`
`18`	`18`	`"login": "123"`
`19`	`19`	`}`
`20`	`20`	`},`
	`21`	`+ {`
	`22`	`+ "requestedReviewer": {`
	`23`	`+ "__typename": "Team",`
	`24`	`+ "name": "Team 1"`
	`25`	`+ }`
	`26`	`+ },`
`21`	`27`	`{`
`22`	`28`	`"requestedReviewer": {`
`23`	`29`	`"__typename": "user",`