Skip to content

state: Preserve drafts changed during publication #1440

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

Merged
abhinav merged 2 commits into from
Sep 6, 2026
Merged

state: Preserve drafts changed during publication #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
322dcfb
state: Preserve drafts changed during publication
abhinav Aug 30, 2026
39fe738
review: Verify draft ID retention
abhinav Aug 30, 2026
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
2 changes: 1 addition & 1 deletion internal/handler/review/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ var _ Service = (*spice.Service)(nil)
type Store interface {
AddReviewDraft(context.Context, string, review.Draft) (review.Draft, error)
LoadReviewDrafts(context.Context, string) ([]review.Draft, error)
RemovePublishedReviewDrafts(context.Context, string, []review.Draft) error
UpdateReviewDraftBody(context.Context, string, review.DraftID, string) error
ClearReviewDrafts(context.Context, string) error
}

var _ Store = (*state.Store)(nil)
Expand Down
2 changes: 1 addition & 1 deletion internal/handler/review/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ func TestHandler_PublishDrafts(t *testing.T) {
Return(forge.SubmitReviewResult{}, nil)
store.
EXPECT().
ClearReviewDrafts(gomock.Any(), "feature").
RemovePublishedReviewDrafts(gomock.Any(), "feature", drafts).
Return(nil)

err := handler.PublishDrafts(t.Context(), &PublishDraftsRequest{
Expand Down
62 changes: 31 additions & 31 deletions internal/handler/review/mocks_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions internal/handler/review/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,12 @@ func (h *Handler) PublishDrafts(
); err != nil {
return fmt.Errorf("submit review: %w", err)
}
if err := h.Store.ClearReviewDrafts(ctx, req.Branch); err != nil {
return fmt.Errorf("clear draft comments: %w", err)
if err := h.Store.RemovePublishedReviewDrafts(
ctx,
req.Branch,
drafts,
); err != nil {
return fmt.Errorf("remove published draft comments: %w", err)
}

h.Log.Infof(
Expand Down
Loading
Loading