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
@@ -0,0 +1,193 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"git.yeij.top/AskaEth/Scoreboard/server/internal/realtime"
|
||||
)
|
||||
|
||||
// 导出与 WS 快照必须同源：同一赛事库上，总积分榜的总分、奖牌与名次不能对不上。
|
||||
func TestExportStandingsMatchesSnapshot(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
|
||||
wb, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("导出总表: %v", err)
|
||||
}
|
||||
hub := realtime.NewHub(db, testLogger())
|
||||
defer func() { _ = hub.Close() }()
|
||||
snap, err := hub.Snapshot(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("读取 WS 快照: %v", err)
|
||||
}
|
||||
|
||||
if len(wb.Team) != len(snap.Standings) {
|
||||
t.Fatalf("单位数不一致：导出 %d，快照 %d", len(wb.Team), len(snap.Standings))
|
||||
}
|
||||
for _, s := range snap.Standings {
|
||||
idx := -1
|
||||
for i := range wb.Team {
|
||||
if wb.Team[i].TeamID == s.TeamID {
|
||||
idx = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if idx < 0 {
|
||||
t.Fatalf("快照中的单位 %d 不在导出结果里", s.TeamID)
|
||||
}
|
||||
row := wb.Team[idx]
|
||||
if row.Points != s.TotalPoints || row.Gold != s.Gold || row.Silver != s.Silver ||
|
||||
row.Bronze != s.Bronze || row.Medals != s.MedalTotal || row.Rank != s.Rank {
|
||||
t.Errorf("单位 %d 口径不一致：导出 %+v，快照 %+v", s.TeamID, row, s)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 只排名不计分（scored=0）的项目不进奖牌榜，即使它配了计分通道。
|
||||
func TestLoadRankedExcludesRankOnlyEvents(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
|
||||
stmts := []string{
|
||||
`INSERT INTO events(sport_id, code, name, event_type, result_mode, result_type, compare, scored, status)
|
||||
VALUES (1, 'E2', '飞行人员战斗体能', 'individual', 'auto', 'score', 'desc', 0, 'published')`,
|
||||
`INSERT INTO event_categories(event_id, name, sort_order) VALUES (2, '男子', 1)`,
|
||||
`INSERT INTO event_score_channels(event_id, scope, basis, profile_id)
|
||||
SELECT 2, 'athlete', 'result', id FROM scoring_profiles WHERE code = 'individual_top6'`,
|
||||
`INSERT INTO entries(event_id, category_id, team_id, athlete_id, bib) VALUES (2, 2, 1, 1, '201')`,
|
||||
`INSERT INTO results(event_id, entry_id, rank, result_text, result_value, state)
|
||||
VALUES (2, 3, 1, '100', 100, 'published')`,
|
||||
}
|
||||
for _, s := range stmts {
|
||||
if _, err := db.Exec(s); err != nil {
|
||||
t.Fatalf("造数据 %q: %v", s, err)
|
||||
}
|
||||
}
|
||||
|
||||
ranked, err := loadRanked(db)
|
||||
if err != nil {
|
||||
t.Fatalf("读取名次: %v", err)
|
||||
}
|
||||
for _, rr := range ranked {
|
||||
if rr.EventID == 2 {
|
||||
t.Fatalf("scored=0 的项目不应产出奖牌名次: %+v", rr)
|
||||
}
|
||||
}
|
||||
|
||||
wb, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("导出总表: %v", err)
|
||||
}
|
||||
for _, row := range wb.Team {
|
||||
if row.TeamID == 1 && row.Gold != 1 {
|
||||
t.Errorf("T1 金牌 = %d，期望 1（只排名项目不得计牌）", row.Gold)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 排序口径取自 settings.standings.tie_break，不再是硬编码默认序。
|
||||
func TestLoadStandingsHonoursTieBreak(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
// T1 金牌 1 但总分 5，T2 无牌但总分 10。
|
||||
for _, s := range []string{
|
||||
`UPDATE score_ledger SET points = 5 WHERE team_id = 1`,
|
||||
`UPDATE score_ledger SET points = 10 WHERE team_id = 2`,
|
||||
} {
|
||||
if _, err := db.Exec(s); err != nil {
|
||||
t.Fatalf("造数据 %q: %v", s, err)
|
||||
}
|
||||
}
|
||||
|
||||
wb, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("默认口径导出: %v", err)
|
||||
}
|
||||
if wb.Team[0].Code != "T2" {
|
||||
t.Fatalf("默认按总分排序，第一名 = %q，期望 T2", wb.Team[0].Code)
|
||||
}
|
||||
|
||||
if _, err := db.Exec(`INSERT INTO settings(key, value) VALUES ('standings.tie_break', 'gold,points')
|
||||
ON CONFLICT(key) DO UPDATE SET value = excluded.value`); err != nil {
|
||||
t.Fatalf("写入 tie_break: %v", err)
|
||||
}
|
||||
wb, err = LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("金牌优先导出: %v", err)
|
||||
}
|
||||
if wb.Team[0].Code != "T1" {
|
||||
t.Errorf("tie_break=gold,points 时第一名 = %q，期望 T1", wb.Team[0].Code)
|
||||
}
|
||||
}
|
||||
|
||||
// 停用但仍有积分的单位要显示编码/名称，不能是空行。
|
||||
func TestLoadStandingsShowsInactiveTeam(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
for _, s := range []string{
|
||||
`INSERT INTO teams(code, name, short_name, sort_order, active)
|
||||
VALUES ('T3', '第三分公司', '三公司', 3, 0)`,
|
||||
`INSERT INTO score_ledger(team_id, source_type, source_id, points)
|
||||
VALUES (3, 'adjustment', 99, 7)`,
|
||||
} {
|
||||
if _, err := db.Exec(s); err != nil {
|
||||
t.Fatalf("造数据 %q: %v", s, err)
|
||||
}
|
||||
}
|
||||
|
||||
wb, err := LoadStandingsWorkbook(db, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("导出总表: %v", err)
|
||||
}
|
||||
idx := -1
|
||||
for i := range wb.Team {
|
||||
if wb.Team[i].TeamID == 3 {
|
||||
idx = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if idx < 0 {
|
||||
t.Fatalf("停用单位未出现在榜单：%+v", wb.Team)
|
||||
}
|
||||
row := wb.Team[idx]
|
||||
if row.Code != "T3" || row.Name != "第三分公司" || row.ShortName != "三公司" {
|
||||
t.Errorf("停用单位展示字段不完整: %+v", row)
|
||||
}
|
||||
if row.Points != 7 {
|
||||
t.Errorf("停用单位总分 = %v，期望 7", row.Points)
|
||||
}
|
||||
}
|
||||
|
||||
// 单位积分明细的「合计」与总积分榜同口径：个人分要乘 individual_to_team_weight。
|
||||
func TestTeamDetailTotalAppliesWeight(t *testing.T) {
|
||||
db := openEventDB(t)
|
||||
seedEvent(t, db)
|
||||
if _, err := db.Exec(`UPDATE settings SET value = '2' WHERE key = 'standings.individual_to_team_weight'`); err != nil {
|
||||
t.Fatalf("修改折算系数: %v", err)
|
||||
}
|
||||
|
||||
wb, err := LoadTeamDetailWorkbook(db, 1, Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("读取积分明细: %v", err)
|
||||
}
|
||||
if wb.IndividualToTeamWeight != 2 {
|
||||
t.Fatalf("折算系数 = %v，期望 2", wb.IndividualToTeamWeight)
|
||||
}
|
||||
rows := teamDetailRows(wb.Rows, wb.IndividualToTeamWeight)
|
||||
if len(rows) < 2 {
|
||||
t.Fatalf("明细行数 = %d，期望含合计行", len(rows))
|
||||
}
|
||||
// 与 REST 一致：个人分逐行折算，合计等于各行之和。
|
||||
if got, ok := rows[0][8].(float64); !ok || got != 20 {
|
||||
t.Errorf("明细行积分 = %v，期望 20（10 × 系数 2）", rows[0][8])
|
||||
}
|
||||
total, ok := rows[len(rows)-1][8].(float64)
|
||||
if !ok {
|
||||
t.Fatalf("合计列类型异常: %T", rows[len(rows)-1][8])
|
||||
}
|
||||
if total != 20 {
|
||||
t.Errorf("合计 = %v，期望 20（10 × 系数 2）", total)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user