Merge pull request #80 from github/status-check-rollup

Strengthen PR Reviews+Checks GraphQL via `pe_mobile` feature flag

api/queries.go

@@ -30,29 +30,16 @@ type PullRequest struct {
 	IsCrossRepository   bool
 	MaintainerCanModify bool
 
-	Reviews struct {
-		Nodes []struct {
-			State  string
-			Author struct {
-				Login string
-			}
-		}
-	}
+	ReviewDecision string
 
 	Commits struct {
 		Nodes []struct {
 			Commit struct {
-				Status struct {
-					Contexts []struct {
-						State string
-					}
-				}
-				CheckSuites struct {
-					Nodes []struct {
-						CheckRuns struct {
-							Nodes []struct {
-								Conclusion string
-							}
+				StatusCheckRollup struct {
+					Contexts struct {
+						Nodes []struct {
+							State      string
+							Conclusion string
 						}
 					}
 				}
@@ -71,23 +58,18 @@ func (pr PullRequest) HeadLabel() string {
 type PullRequestReviewStatus struct {
 	ChangesRequested bool
 	Approved         bool
+	ReviewRequired   bool
 }
 
 func (pr *PullRequest) ReviewStatus() PullRequestReviewStatus {
 	status := PullRequestReviewStatus{}
-	reviewMap := map[string]string{}
-	// Reviews will include every review on record, including consecutive ones
-	// from the same actor. Consolidate them into latest state per reviewer.
-	for _, review := range pr.Reviews.Nodes {
-		reviewMap[review.Author.Login] = review.State
-	}
-	for _, state := range reviewMap {
-		switch state {
-		case "CHANGES_REQUESTED":
-			status.ChangesRequested = true
-		case "APPROVED":
-			status.Approved = true
-		}
+	switch pr.ReviewDecision {
+	case "CHANGES_REQUESTED":
+		status.ChangesRequested = true
+	case "APPROVED":
+		status.Approved = true
+	case "REVIEW_REQUIRED":
+		status.ReviewRequired = true
 	}
 	return status
 }
@@ -104,32 +86,23 @@ func (pr *PullRequest) ChecksStatus() (summary PullRequestChecksStatus) {
 		return
 	}
 	commit := pr.Commits.Nodes[0].Commit
-	for _, status := range commit.Status.Contexts {
-		switch status.State {
-		case "SUCCESS":
+	for _, c := range commit.StatusCheckRollup.Contexts.Nodes {
+		state := c.State
+		if state == "" {
+			state = c.Conclusion
+		}
+		switch state {
+		case "SUCCESS", "NEUTRAL", "SKIPPED":
 			summary.Passing++
-		case "EXPECTED", "ERROR", "FAILURE":
+		case "ERROR", "FAILURE", "CANCELLED", "TIMED_OUT", "ACTION_REQUIRED":
 			summary.Failing++
-		case "PENDING":
+		case "EXPECTED", "QUEUED", "PENDING", "IN_PROGRESS":
 			summary.Pending++
 		default:
-			panic(fmt.Errorf("unsupported status: %q", status.State))
+			panic(fmt.Errorf("unsupported status: %q", state))
 		}
 		summary.Total++
 	}
-	for _, checkSuite := range commit.CheckSuites.Nodes {
-		for _, checkRun := range checkSuite.CheckRuns.Nodes {
-			switch checkRun.Conclusion {
-			case "SUCCESS", "NEUTRAL":
-				summary.Passing++
-			case "FAILURE", "CANCELLED", "TIMED_OUT", "ACTION_REQUIRED":
-				summary.Failing++
-			default:
-				panic(fmt.Errorf("unsupported check conclusion: %q", checkRun.Conclusion))
-			}
-			summary.Total++
-		}
-	}
 	return
 }
 
@@ -274,15 +247,13 @@ func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername st
 		commits(last: 1) {
 			nodes {
 				commit {
-					status {
-						contexts {
-							state
-						}
-					}
-					checkSuites(first: 50) {
-						nodes {
-							checkRuns(first: 50) {
-								nodes {
+					statusCheckRollup {
+						contexts(last: 100) {
+							nodes {
+								...on StatusContext {
+									state
+								}
+								...on CheckRun {
 									conclusion
 								}
 							}
@@ -294,14 +265,7 @@ func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername st
 	}
 	fragment prWithReviews on PullRequest {
 		...pr
-		reviews(last: 20) {
-			nodes {
-				state
-				author {
-					login
-				}
-			}
-		}
+		reviewDecision
 	}
 
     query($owner: String!, $repo: String!, $headRefName: String!, $viewerQuery: String!, $reviewerQuery: String!, $per_page: Int = 10) {

command/pr.go

@@ -378,6 +378,8 @@ func printPrs(prs ...api.PullRequest) {
 
 		if reviews.ChangesRequested {
 			fmt.Printf(" - %s", utils.Red("changes requested"))
+		} else if reviews.ReviewRequired {
+			fmt.Printf(" - %s", utils.Yellow("review required"))
 		} else if reviews.Approved {
 			fmt.Printf(" - %s", utils.Green("approved"))
 		}

command/root.go

@@ -75,6 +75,7 @@ var apiClientForContext = func(ctx context.Context) (*api.Client, error) {
 		// antiope-preview: Checks
 		// shadow-cat-preview: Draft pull requests
 		api.AddHeader("Accept", "application/vnd.github.antiope-preview+json, application/vnd.github.shadow-cat-preview"),
+		api.AddHeader("GraphQL-Features", "pe_mobile"),
 	}
 	if verbose := os.Getenv("DEBUG"); verbose != "" {
 		opts = append(opts, api.VerboseLog(os.Stderr))