refactor reviewers to preserve state

Author: Thomas Stromberg

README.md

@@ -110,9 +110,9 @@ type PullRequest struct {
     Additions         int          `json:"additions"`
     Deletions         int          `json:"deletions"`
     ChangedFiles      int          `json:"changed_files"`
-    Assignees         []string     `json:"assignees,omitempty"`
-    RequestedReviewers []string    `json:"requested_reviewers,omitempty"`
-    Labels            []string     `json:"labels,omitempty"`
+    Assignees         []string                `json:"assignees,omitempty"`
+    Reviewers         map[string]ReviewState `json:"reviewers,omitempty"`
+    Labels            []string                `json:"labels,omitempty"`
     TestSummary       *TestSummary   `json:"test_summary,omitempty"`
     CheckSummary      *CheckSummary  `json:"check_summary,omitempty"`
 }

pkg/prx/graphql_complete.go

@@ -1028,18 +1028,54 @@ func (c *Client) convertGraphQLToPullRequest(ctx context.Context, data *graphQLP
 		pr.Labels = append(pr.Labels, label.Name)
 	}
 
-	// Requested reviewers
+	// Build reviewers map from review requests and actual reviews
+	pr.Reviewers = buildReviewersMap(data)
+
+	return pr
+}
+
+// buildReviewersMap constructs a map of reviewer login to their review state.
+// It combines data from review requests (pending) and actual reviews (approved/changes_requested/commented).
+func buildReviewersMap(data *graphQLPullRequestComplete) map[string]ReviewState {
+	reviewers := make(map[string]ReviewState)
+
+	// First, add all requested reviewers as pending
 	for _, request := range data.ReviewRequests.Nodes {
 		reviewer := request.RequestedReviewer
 		// Teams have "name", users have "login"
 		if reviewer.Login != "" {
-			pr.RequestedReviewers = append(pr.RequestedReviewers, reviewer.Login)
+			reviewers[reviewer.Login] = ReviewStatePending
 		} else if reviewer.Name != "" {
-			pr.RequestedReviewers = append(pr.RequestedReviewers, reviewer.Name)
+			reviewers[reviewer.Name] = ReviewStatePending
 		}
 	}
 
-	return pr
+	// Then, update with actual review states (latest review wins)
+	for i := range data.Reviews.Nodes {
+		review := &data.Reviews.Nodes[i]
+		if review.Author.Login == "" {
+			continue
+		}
+
+		// Map GraphQL review state to our ReviewState
+		var state ReviewState
+		switch strings.ToUpper(review.State) {
+		case "APPROVED":
+			state = ReviewStateApproved
+		case "CHANGES_REQUESTED":
+			state = ReviewStateChangesRequested
+		case "COMMENTED":
+			state = ReviewStateCommented
+		default:
+			// Skip unknown states
+			continue
+		}
+
+		// Update the reviewer's state (latest review wins)
+		reviewers[review.Author.Login] = state
+	}
+
+	return reviewers
 }
 
 // convertGraphQLToEvents converts GraphQL data to Events.

pkg/prx/pullrequest.go

@@ -14,6 +14,17 @@ const (
 	TestStatePending = "pending" // Some tests are pending
 )
 
+// ReviewState represents the current state of a reviewer's review.
+type ReviewState string
+
+// Review state constants.
+const (
+	ReviewStatePending          ReviewState = "pending"           // Review requested but not yet submitted
+	ReviewStateApproved         ReviewState = "approved"          // Approved
+	ReviewStateChangesRequested ReviewState = "changes_requested" // Changes requested
+	ReviewStateCommented        ReviewState = "commented"         // Reviewed with comments only
+)
+
 // PullRequest represents a GitHub pull request with its essential metadata.
 //
 //nolint:govet // fieldalignment: Struct fields ordered for JSON clarity and API compatibility
@@ -27,10 +38,10 @@ type PullRequest struct {
 	ApprovalSummary *ApprovalSummary `json:"approval_summary,omitempty"`
 	CheckSummary    *CheckSummary    `json:"check_summary,omitempty"`
 	Mergeable       *bool            `json:"mergeable"`
-	// 24-byte slice fields
-	Assignees          []string `json:"assignees,omitempty"`
-	Labels             []string `json:"labels,omitempty"`
-	RequestedReviewers []string `json:"requested_reviewers,omitempty"`
+	// 24-byte slice/map fields
+	Assignees []string               `json:"assignees,omitempty"`
+	Labels    []string               `json:"labels,omitempty"`
+	Reviewers map[string]ReviewState `json:"reviewers,omitempty"`
 	// 16-byte string fields
 	MergeableState            string `json:"mergeable_state"`
 	MergeableStateDescription string `json:"mergeable_state_description,omitempty"`