Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions backend/internal/review/planner.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ type PRReviewState struct {
// review runs. It is pure so the trigger path and API list path share exactly
// the same eligibility/status rules.
func Plan(prs []domain.PullRequest, runs []domain.ReviewRun) []PRReviewState {
latest := latestRunsByPRAndSHA(runs)
latestForHead := latestRunsByPRAndSHA(runs)
latestForPR := latestRunsByPR(runs)
reviews := make([]PRReviewState, 0, len(prs))
for _, pr := range prs {
review := PRReviewState{
Expand All @@ -48,13 +49,13 @@ func Plan(prs []domain.PullRequest, runs []domain.ReviewRun) []PRReviewState {
}
if pr.URL == "" || pr.HeadSHA == "" || pr.Draft || pr.Merged || pr.Closed {
review.Status = ReviewStateIneligible
if run, ok := latest[review.PRURL+"\x00"+review.TargetSHA]; ok {
if run, ok := latestForPR[review.PRURL]; ok {
review.LatestRun = &run
}
reviews = append(reviews, review)
continue
}
if run, ok := latest[review.PRURL+"\x00"+review.TargetSHA]; ok {
if run, ok := latestForHead[review.PRURL+"\x00"+review.TargetSHA]; ok {
review.LatestRun = &run
switch {
case run.Status == domain.ReviewRunRunning:
Expand All @@ -68,6 +69,8 @@ func Plan(prs []domain.PullRequest, runs []domain.ReviewRun) []PRReviewState {
default:
review.Status = ReviewStateNeedsReview
}
} else if run, ok := latestForPR[review.PRURL]; ok {
review.LatestRun = &run
}
reviews = append(reviews, review)
}
Expand All @@ -80,6 +83,19 @@ func Plan(prs []domain.PullRequest, runs []domain.ReviewRun) []PRReviewState {
return reviews
}

func latestRunsByPR(runs []domain.ReviewRun) map[string]domain.ReviewRun {
latest := make(map[string]domain.ReviewRun)
for _, run := range runs {
if run.PRURL == "" {
continue
}
if existing, ok := latest[run.PRURL]; !ok || run.CreatedAt.After(existing.CreatedAt) {
latest[run.PRURL] = run
}
}
return latest
}

func latestRunsByPRAndSHA(runs []domain.ReviewRun) map[string]domain.ReviewRun {
latest := make(map[string]domain.ReviewRun)
for _, run := range runs {
Expand Down
17 changes: 17 additions & 0 deletions backend/internal/review/planner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,23 @@ func TestPlanStatuses(t *testing.T) {
}
}

func TestPlanKeepsLatestRunForPRWhenHeadChanges(t *testing.T) {
runs := []domain.ReviewRun{
{ID: "older", PRURL: "pr1", TargetSHA: "sha0", Status: domain.ReviewRunComplete, Verdict: domain.VerdictApproved, CreatedAt: time.Unix(1, 0).UTC()},
{ID: "latest", PRURL: "pr1", TargetSHA: "sha1", Status: domain.ReviewRunDelivered, Verdict: domain.VerdictChangesRequested, CreatedAt: time.Unix(2, 0).UTC()},
}
got := Plan([]domain.PullRequest{planPR("pr1", 1, "sha2")}, runs)
if len(got) != 1 {
t.Fatalf("review states = %d, want 1", len(got))
}
if got[0].Status != ReviewStateNeedsReview {
t.Fatalf("status = %s, want %s", got[0].Status, ReviewStateNeedsReview)
}
if got[0].LatestRun == nil || got[0].LatestRun.ID != "latest" {
t.Fatalf("latest run = %+v, want latest", got[0].LatestRun)
}
}

func planPR(url string, n int, sha string) domain.PullRequest {
return domain.PullRequest{URL: url, Number: n, HeadSHA: sha}
}
Expand Down
18 changes: 18 additions & 0 deletions frontend/src/renderer/components/SessionInspector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,18 @@ function sessionReviewVerdict(reviewStates: PRReviewState[]): {
if (reviewStates.some((reviewState) => reviewState.latestRun?.status === "failed")) {
return { label: "Failed", tone: "danger" };
}
if (reviewStates.some((reviewState) => reviewState.latestRun?.verdict === "changes_requested")) {
return { label: "Changes requested", tone: "danger" };
}
const reviewsWithVerdicts = reviewStates.filter(
(reviewState) => reviewState.status !== "ineligible" && reviewState.latestRun?.verdict,
);
if (
reviewsWithVerdicts.length > 0 &&
reviewsWithVerdicts.every((reviewState) => reviewState.latestRun?.verdict === "approved")
) {
return { label: "Approved", tone: "success" };
}
if (reviewStates.some((reviewState) => reviewState.status === "changes_requested")) {
return { label: "Changes requested", tone: "danger" };
}
Expand All @@ -596,6 +608,12 @@ function reviewVerdict(reviewState: PRReviewState): {
if (reviewState.latestRun?.status === "failed") {
return { label: "Failed", tone: "danger" };
}
if (reviewState.latestRun?.verdict === "changes_requested") {
return { label: "Changes requested", tone: "danger" };
}
if (reviewState.latestRun?.verdict === "approved") {
return { label: "Approved", tone: "success" };
}
switch (reviewState.status) {
case "running":
return { label: "Reviewing...", tone: "running" };
Expand Down