Skip to content

fix(session): allow claiming open draft PRs #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nic-kahuna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(session): allow claiming open draft PRs #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backend/internal/service/session/claim_pr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var (
ErrInvalidPRRef = errors.New("session: invalid pr ref")
// ErrPRNotFound is returned when the SCM provider has no matching pull request.
ErrPRNotFound = errors.New("session: pr not found")
// ErrPRNotOpen is returned when a PR is draft, merged, or closed and therefore cannot be claimed.
// ErrPRNotOpen is returned when a PR is merged or closed and therefore cannot be claimed.
ErrPRNotOpen = errors.New("session: pr not open")
// ErrSCMUnavailable is returned when live SCM facts cannot be fetched.
ErrSCMUnavailable = errors.New("session: scm unavailable")
Expand Down Expand Up @@ -105,7 +105,7 @@ func (s *Service) ClaimPR(ctx context.Context, id domain.SessionID, ref string,
if obs.PR.URL == "" {
obs.PR.URL = prURL
}
if obs.PR.Draft || obs.PR.Merged || obs.PR.Closed {
if obs.PR.Merged || obs.PR.Closed {
return ClaimPRResult{}, ErrPRNotOpen
}
reviewMode, err := s.enrichClaimReviews(ctx, refSpec, &obs)
Expand Down
37 changes: 34 additions & 3 deletions backend/internal/service/session/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,15 +559,19 @@ func TestSpawnOrchestratorNoCleanSkipsKills(t *testing.T) {
}

type fakePRClaimer struct {
out errorFreeClaimOutcome
err error
out errorFreeClaimOutcome
err error
claimed *domain.PullRequest
}

type errorFreeClaimOutcome struct {
ports.ClaimOutcome
}

func (f fakePRClaimer) ClaimPR(context.Context, domain.PullRequest, []domain.PullRequestCheck, []domain.PullRequestReviewThread, []domain.PullRequestComment, ports.ReviewWriteMode, bool) (ports.ClaimOutcome, error) {
func (f fakePRClaimer) ClaimPR(_ context.Context, pr domain.PullRequest, _ []domain.PullRequestCheck, _ []domain.PullRequestReviewThread, _ []domain.PullRequestComment, _ ports.ReviewWriteMode, _ bool) (ports.ClaimOutcome, error) {
if f.claimed != nil {
*f.claimed = pr
}
return f.out.ClaimOutcome, f.err
}

Expand Down Expand Up @@ -614,6 +618,7 @@ func TestClaimPRMapsObserverAndStoreErrors(t *testing.T) {
{"missing scm", NewWithDeps(Deps{Store: st}), ErrSCMUnavailable},
{"not found", NewWithDeps(Deps{Store: st, PRClaimer: fakePRClaimer{}, SCM: fakeSCM{fetchErr: ports.ErrSCMNotFound}}), ErrPRNotFound},
{"closed", NewWithDeps(Deps{Store: st, PRClaimer: fakePRClaimer{}, SCM: fakeSCM{obs: ports.SCMObservation{Fetched: true, Provider: "github", Host: "github.com", Repo: "acme/repo", PR: ports.SCMPRObservation{URL: "https://github.com/acme/repo/pull/7", Number: 7, Closed: true}}}}), ErrPRNotOpen},
{"merged", NewWithDeps(Deps{Store: st, PRClaimer: fakePRClaimer{}, SCM: fakeSCM{obs: ports.SCMObservation{Fetched: true, Provider: "github", Host: "github.com", Repo: "acme/repo", PR: ports.SCMPRObservation{URL: "https://github.com/acme/repo/pull/7", Number: 7, Merged: true}}}}), ErrPRNotOpen},
{"active owner", NewWithDeps(Deps{Store: st, PRClaimer: fakePRClaimer{err: ports.PRClaimedByActiveSessionError{Owner: "mer-2"}}, SCM: fakeSCM{obs: ports.SCMObservation{Fetched: true, Provider: "github", Host: "github.com", Repo: "acme/repo", PR: ports.SCMPRObservation{URL: "https://github.com/acme/repo/pull/7", Number: 7}}}}), ports.ErrPRClaimedByActiveSession},
}
for _, tc := range cases {
Expand All @@ -634,6 +639,32 @@ func TestClaimPRMapsObserverAndStoreErrors(t *testing.T) {
if len(res.TakenOverFrom) != 1 || res.TakenOverFrom[0] != "mer-2" || len(res.PRs) != 1 || res.PRs[0].URL == "" {
t.Fatalf("claim result = %+v", res)
}

t.Run("open draft", func(t *testing.T) {
var claimed domain.PullRequest
svc := NewWithDeps(Deps{
Store: st,
PRClaimer: fakePRClaimer{claimed: &claimed},
SCM: fakeSCM{obs: ports.SCMObservation{
Fetched: true,
Provider: "github",
Host: "github.com",
Repo: "acme/repo",
PR: ports.SCMPRObservation{
URL: "https://github.com/acme/repo/pull/7",
Number: 7,
Draft: true,
},
}},
})

if _, err := svc.ClaimPR(context.Background(), "mer-1", "7", ClaimPROptions{}); err != nil {
t.Fatalf("ClaimPR(open draft): %v", err)
}
if !claimed.Draft {
t.Fatalf("claimed PR draft = false, want true")
}
})
}

func TestListPRsOrdersActiveBeforeClosedThenUpdatedDesc(t *testing.T) {
Expand Down