fix: 修掉十路审查发现的 9 个 P0 与一批 P1（数据正确性 / 越权 / 现场可用性）
P0（9 条全修）： - 多通道项目奖牌重复计数：domain 层按 (EventID,CategoryID,EntryID/Subject) 去重， 通道优先级 athlete→team→id - 「只排名不计分」项目（scored:false）不再进奖牌榜，REST/WS/导出口径统一 - aggregate 流水 entry_id 恒 NULL 导致重算后分数翻倍：作废范围改按 event+category 定位 - 已发布成绩仍可被「存草稿」覆盖并清空 rank：服务端 409 STATE_INVALID + 前端禁编辑 - voidResult / 规则导入重算后名次不回写：接住 Ranked 调 applyComputedRanks - 赛事包覆盖导入可能「旧项目已删、新项目没成」：先改名成功再清理，失败回滚 - 导入赛事包可覆盖正在运行的赛事目录：name==当前项目直接 400 - Console spawn 失败后守护器永久卡死：清 child/pid + 调度重启 + stop 超时兜底 - /ws 快照向非 admin 下发 admin-only 配置：按角色裁剪 settings P1（计分口径 / 契约 / 现场）： - standings.tieBreak 三处接线；profiles[].recordBonusMode 生效；破纪录校验 RecordEligible 与 entry 归属；破纪录登记校验已发布成绩 - export.loadRanked 与主路径对齐；ListBackups reason 解析；CLI backup 前缀修正 （原来只增不减会撑爆磁盘）；单位积分明细/导出统一权重折算；停用单位展示 - 规则导入原子化（重算并入同一事务）+ 返回 compatible/affectedEventCount/ recalculatedLedgerRows；登录审计 user_id 修正 - WS 策略性断开用 Close(code,reason)；HelloMessage 补 page/instanceId； 实例注册表清理；settings/单位/项目写操作补 change_log 触发大屏刷新 - 大屏：全量快照不再被版本守卫丢弃；个人积分榜刷新；公告返回页/轮播；行数截断； REST 竞态；1008 停止重连；握手超时；时区补 Z；401 仅 AUTH_REQUIRED 才登出 - 管理端：published 行禁编辑；saveDraft 补 unit（1:06.33 显示）；前端预览改用服务端 points；空成绩行不再恒「已修改」；修订详情按 id 拉取；切项目请求序号与 dirty 保护； 发布后刷新项目状态；NAV/路由按角色过滤；recorder 不再打 admin-only 接口 - Console：大屏窗口销毁后重建；大屏 URL 复用 host 归一化；backup.bat 改纯 ASCII （已在 Meowhome 实跑验证） 自检：服务端 gofmt/build/vet 通过、12 包测试全绿；前端 vue-tsc + build 通过、 node --test 24/24；console check-syntax 12 文件通过。
This commit is contained in:
AskaEth committed
1 parent
96cf181ae3
commit
13f1f03cd0
124 files changed
+5658
-1820
No files matched your search
@@ -471,3 +471,165 @@ func lastID(t *testing.T, res sql.Result) int64 {
|
||||
}
|
||||
return id
|
||||
}
|
||||
|
||||
// 快照榜单排序必须读规则包落库的 standings.tie_break，不能只走硬编码默认序。
|
||||
func TestSnapshotTieBreakFromSettings(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
db := env.db
|
||||
|
||||
team1 := insertTeam(t, db, "T1", "第一单位", "")
|
||||
team2 := insertTeam(t, db, "T2", "第二单位", "")
|
||||
event1 := insertEvent(t, db, "E1", "100米")
|
||||
event2 := insertEvent(t, db, "E2", "200米")
|
||||
cat1 := insertCategory(t, db, event1, "男子")
|
||||
cat2 := insertCategory(t, db, event2, "男子")
|
||||
athlete1 := insertAthlete(t, db, "张三", team1)
|
||||
athlete2 := insertAthlete(t, db, "李四", team2)
|
||||
|
||||
// T1：银牌 + 10 分；T2：金牌 + 0 分。默认「总分优先」T1 在前，按金牌优先则 T2 在前。
|
||||
entry1 := insertEntry(t, db, event1, cat1, team1, athlete1)
|
||||
insertChannel(t, db, event1, "athlete")
|
||||
result1 := insertResult(t, db, event1, entry1, 2, "11.58", 11.58, "2026-09-09T10:00:00Z")
|
||||
insertLedger(t, db, team1, athlete1, event1, entry1, result1, 10)
|
||||
|
||||
entry2 := insertEntry(t, db, event2, cat2, team2, athlete2)
|
||||
insertChannel(t, db, event2, "athlete")
|
||||
insertResult(t, db, event2, entry2, 1, "22.10", 22.10, "2026-09-09T10:00:01Z")
|
||||
|
||||
snap, err := env.hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("构建快照: %v", err)
|
||||
}
|
||||
if len(snap.Standings) != 2 || snap.Standings[0].TeamCode != "T1" {
|
||||
t.Fatalf("未配置 tieBreak 时应按总分排序，T1 在前: %+v", snap.Standings)
|
||||
}
|
||||
|
||||
mustExec(t, db, `INSERT INTO settings(key, value) VALUES('standings.tie_break', 'gold')
|
||||
ON CONFLICT(key) DO UPDATE SET value = 'gold'`)
|
||||
snap, err = env.hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("构建快照: %v", err)
|
||||
}
|
||||
if len(snap.Standings) != 2 || snap.Standings[0].TeamCode != "T2" {
|
||||
t.Fatalf("tieBreak=gold 时应按金牌排序，T2 在前: %+v", snap.Standings)
|
||||
}
|
||||
}
|
||||
|
||||
// 停用但有积分的单位必须像 REST 一样补出编码/名称；排名输入仍只含启用单位。
|
||||
func TestSnapshotStandingsIncludesInactiveTeamDisplayFields(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
db := env.db
|
||||
|
||||
insertTeam(t, db, "T1", "第一单位", "")
|
||||
inactive := insertTeam(t, db, "T2", "第二单位", "")
|
||||
mustExec(t, db, `UPDATE teams SET active = 0 WHERE id = ?`, inactive)
|
||||
// 停用且无流水的单位不应出现在榜单里。
|
||||
idle := insertTeam(t, db, "T3", "第三单位", "")
|
||||
mustExec(t, db, `UPDATE teams SET active = 0 WHERE id = ?`, idle)
|
||||
|
||||
event1 := insertEvent(t, db, "E1", "100米")
|
||||
cat1 := insertCategory(t, db, event1, "男子")
|
||||
athlete2 := insertAthlete(t, db, "李四", inactive)
|
||||
entry2 := insertEntry(t, db, event1, cat1, inactive, athlete2)
|
||||
insertChannel(t, db, event1, "athlete")
|
||||
result2 := insertResult(t, db, event1, entry2, 1, "11.58", 11.58, "2026-09-09T10:00:00Z")
|
||||
insertLedger(t, db, inactive, athlete2, event1, entry2, result2, 5)
|
||||
|
||||
snap, err := env.hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("构建快照: %v", err)
|
||||
}
|
||||
|
||||
// teams 是公开单位表，与 GET /api/teams 一样含停用单位。
|
||||
if len(snap.Teams) != 3 {
|
||||
t.Fatalf("快照单位表应含停用单位，得到 %+v", snap.Teams)
|
||||
}
|
||||
|
||||
byCode := make(map[string]dto.StandingRow, len(snap.Standings))
|
||||
for _, row := range snap.Standings {
|
||||
byCode[row.TeamCode] = row
|
||||
}
|
||||
row, ok := byCode["T2"]
|
||||
if !ok {
|
||||
t.Fatalf("停用但有积分的单位应上榜: %+v", snap.Standings)
|
||||
}
|
||||
if row.TeamName != "第二单位" || row.TotalPoints != 5 {
|
||||
t.Fatalf("停用单位应补出名称与积分: %+v", row)
|
||||
}
|
||||
if _, ok := byCode["T3"]; ok {
|
||||
t.Fatalf("停用且无流水的单位不应上榜: %+v", snap.Standings)
|
||||
}
|
||||
if _, ok := byCode["T1"]; !ok {
|
||||
t.Fatalf("启用单位应上榜: %+v", snap.Standings)
|
||||
}
|
||||
}
|
||||
|
||||
// 已作废（status=withdrawn）的成绩不得出现在大屏「最新成绩」。
|
||||
func TestSnapshotLatestResultsExcludesVoided(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
db := env.db
|
||||
|
||||
team1 := insertTeam(t, db, "T1", "第一单位", "")
|
||||
event1 := insertEvent(t, db, "E1", "100米")
|
||||
cat1 := insertCategory(t, db, event1, "男子")
|
||||
athlete1 := insertAthlete(t, db, "张三", team1)
|
||||
athlete2 := insertAthlete(t, db, "李四", team1)
|
||||
|
||||
keep := insertEntry(t, db, event1, cat1, team1, athlete1)
|
||||
insertResult(t, db, event1, keep, 1, "11.58", 11.58, "2026-09-09T10:00:01Z")
|
||||
// 同一报名项只能有一条成绩，作废行用另一个报名项。
|
||||
voided := insertEntry(t, db, event1, cat1, team1, athlete2)
|
||||
voidedResult := insertResult(t, db, event1, voided, 2, "11.72", 11.72, "2026-09-09T10:00:02Z")
|
||||
mustExec(t, db, `UPDATE results SET status = 'withdrawn' WHERE id = ?`, voidedResult)
|
||||
|
||||
snap, err := env.hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("构建快照: %v", err)
|
||||
}
|
||||
for _, group := range snap.LatestResults {
|
||||
for _, row := range group.Rows {
|
||||
if row.EntryID == voided {
|
||||
t.Fatalf("已作废成绩不应出现在最新成绩: %+v", row)
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(snap.LatestResults) != 1 || len(snap.LatestResults[0].Rows) != 1 ||
|
||||
snap.LatestResults[0].Rows[0].EntryID != keep {
|
||||
t.Fatalf("最新成绩应只保留未作废的一条: %+v", snap.LatestResults)
|
||||
}
|
||||
}
|
||||
|
||||
// 快照的 teams/events 必须用 DTO 序列化：可空字段显式 null、必填字段不因零值消失。
|
||||
func TestSnapshotTeamsEventsWireFieldsPresent(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
db := env.db
|
||||
insertTeam(t, db, "T1", "第一单位", "")
|
||||
insertEvent(t, db, "E1", "100米")
|
||||
|
||||
snap, err := env.hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("构建快照: %v", err)
|
||||
}
|
||||
raw, err := json.Marshal(snap)
|
||||
if err != nil {
|
||||
t.Fatalf("序列化快照: %v", err)
|
||||
}
|
||||
var top struct {
|
||||
Teams []map[string]json.RawMessage `json:"teams"`
|
||||
Events []map[string]json.RawMessage `json:"events"`
|
||||
}
|
||||
if err := json.Unmarshal(raw, &top); err != nil {
|
||||
t.Fatalf("解析快照: %v", err)
|
||||
}
|
||||
for _, key := range []string{"id", "code", "name", "shortName", "logoPath", "color", "sortOrder", "active"} {
|
||||
if _, ok := top.Teams[0][key]; !ok {
|
||||
t.Fatalf("teams 缺少契约字段 %s: %s", key, top.Teams[0])
|
||||
}
|
||||
}
|
||||
for _, key := range []string{"id", "sportId", "code", "name", "eventType", "resultMode", "resultType",
|
||||
"compare", "recordEligible", "scored", "multiplier", "status", "scheduledAt", "venue", "sortOrder", "remark"} {
|
||||
if _, ok := top.Events[0][key]; !ok {
|
||||
t.Fatalf("events 缺少契约字段 %s: %s", key, top.Events[0])
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user