only make the graphql call once

Author: GrantBirki

internal/cmd/match_criteria.go

@@ -210,114 +210,73 @@ func GetPRStatusInfo(ctx context.Context, graphQlClient *api.GraphQLClient, owne
 	return response, nil
 }
 
-// HasPassingCI checks if a pull request has passing CI
-func HasPassingCI(ctx context.Context, graphQlClient *api.GraphQLClient, owner, repo string, prNumber int) (bool, error) {
-	// Check for context cancellation
-	select {
-	case <-ctx.Done():
-		return false, ctx.Err()
-	default:
-		// Continue processing
+// PrMeetsRequirements checks if a PR meets additional requirements beyond basic criteria
+func PrMeetsRequirements(ctx context.Context, graphQlClient *api.GraphQLClient, owner, repo string, prNumber int) (bool, error) {
+	// If no additional requirements are specified, the PR meets requirements
+	if !requireCI && !mustBeApproved {
+		return true, nil
 	}
 
-	// Get PR status info using GraphQL
+	// Fetch PR status info once
 	response, err := GetPRStatusInfo(ctx, graphQlClient, owner, repo, prNumber)
 	if err != nil {
 		return false, err
 	}
 
-	// Get the commit status check info
+	// Check CI status if required
+	if requireCI {
+		passing := isCIPassing(response)
+		if !passing {
+			return false, nil
+		}
+	}
+
+	// Check approval status if required
+	if mustBeApproved {
+		approved := isPRApproved(response)
+		if !approved {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}
+
+// isCIPassing checks if the CI status is passing based on the response
+func isCIPassing(response *prStatusResponse) bool {
 	commits := response.Data.Repository.PullRequest.Commits.Nodes
 	if len(commits) == 0 {
-		Logger.Debug("No commits found for PR", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber)
-		return false, nil
+		Logger.Debug("No commits found for PR")
+		return false
 	}
 
-	// Get status check info
 	statusCheckRollup := commits[0].Commit.StatusCheckRollup
 	if statusCheckRollup == nil {
-		Logger.Debug("No status checks found for PR", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber)
-		return true, nil // If no checks defined, consider it passing
+		Logger.Debug("No status checks found for PR")
+		return true // If no checks defined, consider it passing
 	}
 
-	// Check if status is SUCCESS
 	if statusCheckRollup.State != "SUCCESS" {
-		Logger.Debug("PR failed CI check", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber, "status", statusCheckRollup.State)
-		return false, nil
+		Logger.Debug("PR failed CI check", "status", statusCheckRollup.State)
+		return false
 	}
 
-	return true, nil
+	return true
 }
 
-// HasApproval checks if a pull request has been approved
-func HasApproval(ctx context.Context, graphQlClient *api.GraphQLClient, owner, repo string, prNumber int) (bool, error) {
-	// Check for context cancellation
-	select {
-	case <-ctx.Done():
-		return false, ctx.Err()
-	default:
-		// Continue processing
-	}
-
-	// Get PR status info using GraphQL
-	response, err := GetPRStatusInfo(ctx, graphQlClient, owner, repo, prNumber)
-	if err != nil {
-		return false, err
-	}
-
+// isPRApproved checks if the PR is approved based on the response
+func isPRApproved(response *prStatusResponse) bool {
 	reviewDecision := response.Data.Repository.PullRequest.ReviewDecision
-	Logger.Debug("PR review decision", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber, "decision", reviewDecision)
+	Logger.Debug("PR review decision", "decision", reviewDecision)
 
-	// Check the review decision
 	switch reviewDecision {
 	case "APPROVED":
-		return true, nil
+		return true
 	case "": // When no reviews are required
-		Logger.Debug("PR has no required reviewers", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber)
-		return true, nil // If no reviews required, consider it approved
-	default:
-		// Any other decision (REVIEW_REQUIRED, CHANGES_REQUESTED, etc.)
-		Logger.Debug("PR not approved", "repo", fmt.Sprintf("%s/%s", owner, repo), "pr", prNumber, "decision", reviewDecision)
-		return false, nil
-	}
-}
-
-// PrMeetsRequirements checks if a PR meets additional requirements beyond basic criteria
-func PrMeetsRequirements(ctx context.Context, graphQlClient *api.GraphQLClient, owner, repo string, prNumber int) (bool, error) {
-	// If no additional requirements are specified, the PR meets requirements
-	if !requireCI && !mustBeApproved {
-		return true, nil
-	}
-
-	// Check for context cancellation
-	select {
-	case <-ctx.Done():
-		return false, ctx.Err()
+		Logger.Debug("PR has no required reviewers")
+		return true // If no reviews required, consider it approved
 	default:
-		// Continue processing
-	}
-
-	// Check CI status if required
-	if requireCI {
-		passing, err := HasPassingCI(ctx, graphQlClient, owner, repo, prNumber)
-		if err != nil {
-			return false, err
-		}
-		if !passing {
-			return false, nil
-		}
-	}
-
-	// Check approval status if required
-	if mustBeApproved {
-		approved, err := HasApproval(ctx, graphQlClient, owner, repo, prNumber)
-		if err != nil {
-			return false, err
-		}
-		if !approved {
-			return false, nil
-		}
+		Logger.Debug("PR not approved", "decision", reviewDecision)
+		return false
 	}
-
-	return true, nil
 }