Server: reject NEW task-scope problems on draft PUT (409 review_task_scope_deprecated, ID-matched against stored entries; existing entries round-trip unchanged, full-replace semantics kept); formal-rejection flattening no longer emits 整体任务 lines or expands ProblemSliceIDs; rework-baseline reads hide task problems (read-only narrowing); workforce stats stop counting task scope. Frontend: remove task from composer scope lists and card cycle; hide stored task opinions in rework banner/soft reminder/rail, QC panel groups and history, acceptance source projection, stats panel rows, frozen-comment displays (stripTaskOpinionLines); submit/approve gates count visible problems only; stats panel documents the 2026-10-14 scope switch. Data untouched: no migration, no deletion, audit trail intact.
110 lines
4.8 KiB
Go
110 lines
4.8 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"droboticflow/internal/domain"
|
|
"droboticflow/internal/store"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strconv"
|
|
"strings"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestReviewDraftReopenRecoversPersistedIntentAfterProcessCrash(t *testing.T) {
|
|
f := qualityReviewDraftFixture(t)
|
|
version, headers := openReviewDraftSession(t, f)
|
|
f.handler = NewHandler(&interruptedPreparationStore{Store: f.store}, nil)
|
|
base := "/api/human-items/" + f.item.ID
|
|
payload := map[string]any{"version": 0, "resultVersion": version, "operationId": "draft-crash", "problems": []map[string]any{{"id": "crash-note", "scope": "slice", "sliceId": "left", "text": "进程中断前保存的意见", "atSeconds": 1}}}
|
|
first := reviewSessionRequest(f, http.MethodPut, base+"/review-draft", f.reviewer, payload, headers)
|
|
if first.Code != 500 {
|
|
t.Fatalf("crash %d %s", first.Code, first.Body.String())
|
|
}
|
|
f.handler = NewHandler(f.store, nil)
|
|
opened := f.request(http.MethodPost, base+"/review-session", f.reviewer, map[string]any{"action": "takeover", "pageId": "reopened-page"})
|
|
if opened.Code != 200 || !strings.Contains(opened.Body.String(), `"writable":true`) || strings.Contains(opened.Body.String(), `"busy":true`) {
|
|
t.Fatalf("draft remained locked %d %s", opened.Code, opened.Body.String())
|
|
}
|
|
read := f.request(http.MethodGet, base+"/review-draft", f.reviewer, nil)
|
|
var saved struct {
|
|
Draft domain.ReviewDraft `json:"draft"`
|
|
}
|
|
json.Unmarshal(read.Body.Bytes(), &saved)
|
|
if read.Code != 200 || saved.Draft.Version != 1 || len(saved.Draft.Problems) != 1 || saved.Draft.Problems[0].Text != "进程中断前保存的意见" {
|
|
t.Fatalf("intent not recovered %s", read.Body.String())
|
|
}
|
|
}
|
|
|
|
type delayedDraftWriterStore struct {
|
|
store.Store
|
|
blocked atomic.Bool
|
|
arrived chan struct{}
|
|
resume chan struct{}
|
|
}
|
|
|
|
func (s *delayedDraftWriterStore) CompareAndSwapReviewDraft(ctx context.Context, next domain.ReviewDraft, expected int) (bool, error) {
|
|
if next.LastOperationID == "slow-original" && !s.blocked.Swap(true) {
|
|
close(s.arrived)
|
|
<-s.resume
|
|
}
|
|
return s.Store.CompareAndSwapReviewDraft(ctx, next, expected)
|
|
}
|
|
func TestReviewDraftTakeoverFencesDelayedOriginalWriter(t *testing.T) {
|
|
for _, changedResult := range []bool{false, true} {
|
|
t.Run(strconv.FormatBool(changedResult), func(t *testing.T) {
|
|
f := qualityReviewDraftFixture(t)
|
|
version, headers := openReviewDraftSession(t, f)
|
|
base := "/api/human-items/" + f.item.ID
|
|
delayed := &delayedDraftWriterStore{Store: f.store, arrived: make(chan struct{}), resume: make(chan struct{})}
|
|
f.handler = NewHandler(delayed, nil)
|
|
oldDone := make(chan *httptest.ResponseRecorder, 1)
|
|
go func() {
|
|
oldDone <- reviewSessionRequest(f, http.MethodPut, base+"/review-draft", f.reviewer, map[string]any{"version": 0, "resultVersion": version, "operationId": "slow-original", "problems": []map[string]any{{"id": "one", "scope": "slice", "sliceId": "left", "text": "旧页面文字", "atSeconds": 1}}}, headers)
|
|
}()
|
|
select {
|
|
case <-delayed.arrived:
|
|
case <-time.After(3 * time.Second):
|
|
t.Fatal("save did not reach CAS")
|
|
}
|
|
if changedResult {
|
|
f.item.Subject.Payload["evidenceVersion"] = "new-reviewed-result"
|
|
f.store.UpsertHumanItem(f.ctx, f.item)
|
|
}
|
|
takeover := f.request(http.MethodPost, base+"/review-session", f.reviewer, map[string]any{"action": "takeover", "pageId": "new-page"})
|
|
if takeover.Code != 200 {
|
|
close(delayed.resume)
|
|
t.Fatalf("takeover %d %s", takeover.Code, takeover.Body.String())
|
|
}
|
|
var lease struct {
|
|
Generation int `json:"generation"`
|
|
ResultVersion string `json:"resultVersion"`
|
|
}
|
|
json.Unmarshal(takeover.Body.Bytes(), &lease)
|
|
read := f.request(http.MethodGet, base+"/review-draft", f.reviewer, nil)
|
|
var before struct {
|
|
Draft domain.ReviewDraft `json:"draft"`
|
|
}
|
|
json.Unmarshal(read.Body.Bytes(), &before)
|
|
newHeaders := map[string]string{"X-Review-Page": "new-page", "X-Review-Generation": strconv.Itoa(lease.Generation)}
|
|
newer := reviewSessionRequest(f, http.MethodPut, base+"/review-draft", f.reviewer, map[string]any{"version": before.Draft.Version, "resultVersion": lease.ResultVersion, "operationId": "newer-save", "problems": []map[string]any{{"id": "one", "scope": "slice", "sliceId": "left", "text": "新页面确认后的文字", "atSeconds": 1}}}, newHeaders)
|
|
close(delayed.resume)
|
|
if newer.Code != 200 {
|
|
t.Fatalf("new save %d %s", newer.Code, newer.Body.String())
|
|
}
|
|
select {
|
|
case <-oldDone:
|
|
case <-time.After(3 * time.Second):
|
|
t.Fatal("old writer did not finish")
|
|
}
|
|
final := f.request(http.MethodGet, base+"/review-draft", f.reviewer, nil)
|
|
if final.Code != 200 || !strings.Contains(final.Body.String(), "新页面确认后的文字") || strings.Contains(final.Body.String(), "旧页面文字") {
|
|
t.Fatalf("late writer overwrote new draft %s", final.Body.String())
|
|
}
|
|
})
|
|
}
|
|
}
|