fix: 上线前快修（大屏自愈 / 奖牌口径 / 聚合作废 / 密码可发现性）
- P0 慢客户端关闭码 1008 → 4000：前端把所有 1008 当「登录失效」并永久停止重连， 大屏被踢后再也不自愈（服务端 markSlow 改用自定义码，前端逻辑不动） - P1 REST 与 WS 的奖牌榜补 events.scored = 1 过滤，与导出成绩册口径一致 （否则「只排名不计分」项目只要挂着通道就会在大屏凭空出奖牌） - P1 聚合流水作废去掉 source_id 子查询：改通道会重建通道 id，旧聚合流水 永远匹配不上 → 再插一份 → 分数翻倍 - P1 审核页/历史页的折算系数兜底由 ?? 1 改为 >0 ? : 1：/ws 快照对非 admin 会把 individualToTeamWeight 置 0，recorder 看到的个人折算分全是 0 - P2 删掉 signature.local.txt 后清理残留的 signature.build.txt，避免继续注入旧署名 - 初始管理员密码：banner 加纯 ASCII 锚 INITIAL ADMIN CREATED，文档改为搜它 （原来教的 findstr "password=" 已经失效，且中文 findstr 本身不可靠） 自检：服务端 12 包全绿；前端 vue-tsc + build 通过、node --test 24/24；console 语法通过。
This commit is contained in:
AskaEth committed
1 parent
045b0f5d95
commit
27bddefaad
15 files changed
+199
-31
No files matched your search
@@ -364,13 +364,15 @@ func (s *server) domainAthletes(ctx context.Context, q queryer) ([]domain.Athlet
|
||||
}
|
||||
|
||||
// buildRanked 从已发布成绩重建名次明细（用于奖牌统计与个人榜）。
|
||||
// 一条成绩在每个通道下各产出一条明细，与计分引擎的口径一致。
|
||||
// 一条成绩在每个通道下各产出一条明细，与计分引擎的口径一致；
|
||||
// 只排名不计分（scored=0）的项目不产出奖牌，必须与导出侧同口径。
|
||||
func (s *server) buildRanked(ctx context.Context, q queryer) ([]domain.RankedResult, error) {
|
||||
rows, err := q.QueryContext(ctx,
|
||||
`SELECT r.id, r.event_id, e.category_id, r.rank, r.result_value, r.status,
|
||||
e.id, e.team_id, e.athlete_id, COALESCE(a.name, ''), c.scope, c.id
|
||||
FROM results r
|
||||
JOIN entries e ON e.id = r.entry_id
|
||||
JOIN events ev ON ev.id = r.event_id AND ev.scored = 1
|
||||
JOIN event_score_channels c ON c.event_id = r.event_id
|
||||
LEFT JOIN athletes a ON a.id = e.athlete_id
|
||||
WHERE r.state = 'published' AND r.rank IS NOT NULL AND r.rank > 0 AND r.status = 'ok'
|
||||
|
||||
@@ -162,6 +162,41 @@ func TestTeamBreakdownAppliesIndividualWeight(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// 只排名不计分（scored=0）的项目即使配了计分通道，也不得在大屏奖牌榜产出奖牌；
|
||||
// 导出侧已按 ev.scored = 1 过滤，两边口径必须一致，否则奖牌榜与成绩册对不上。
|
||||
func TestStandingsExcludesUnscoredEventMedals(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
ids := env.seed(t)
|
||||
env.createUser("recorder", "recorder-pass", "recorder")
|
||||
client, _ := env.client()
|
||||
env.login(client, "recorder", "recorder-pass")
|
||||
|
||||
unscored := env.insert(t,
|
||||
`INSERT INTO events (sport_id, code, name, event_type, result_mode, result_type, compare, scored, multiplier, status)
|
||||
VALUES (?, 'M200', '200米跑', 'individual', 'auto', 'time', 'asc', 0, 1, 'ongoing')`, ids.sport)
|
||||
cat := env.insert(t, `INSERT INTO event_categories (event_id, name, multiplier, sort_order) VALUES (?, '男子', 1, 0)`, unscored)
|
||||
var profileID int64
|
||||
if err := env.ev.QueryRow(`SELECT id FROM scoring_profiles WHERE code = 'individual_top6'`).Scan(&profileID); err != nil {
|
||||
t.Fatalf("读取积分模板: %v", err)
|
||||
}
|
||||
env.exec(t, `INSERT INTO event_score_channels (event_id, scope, basis, profile_id, sort_order)
|
||||
VALUES (?, 'athlete', 'result', ?, 0)`, unscored, profileID)
|
||||
entry := env.insert(t, `INSERT INTO entries (event_id, category_id, team_id, athlete_id, status)
|
||||
VALUES (?, ?, ?, ?, 'registered')`, unscored, cat, ids.teamB, ids.athB)
|
||||
env.exec(t, `INSERT INTO results (event_id, entry_id, rank, result_value, status, state)
|
||||
VALUES (?, ?, 1, 22.10, 'ok', 'published')`, unscored, entry)
|
||||
|
||||
_, env2 := env.do(client, http.MethodGet, "/api/standings", nil, false)
|
||||
standings := decodeData[[]map[string]any](t, env2)
|
||||
for _, row := range standings {
|
||||
if row["teamCode"] == "B" {
|
||||
if row["gold"].(float64) != 0 || row["medalTotal"].(float64) != 0 {
|
||||
t.Fatalf("scored=0 的项目不应计入奖牌榜: %+v", row)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// standings.tie_break 必须真正参与排序，否则换规则包后名次仍走硬编码默认序。
|
||||
func TestStandingsTieBreakFromSettings(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
|
||||
@@ -330,15 +330,15 @@ func computeEventScore(ctx context.Context, q queryer, eventID, categoryID int64
|
||||
// 作废范围是引擎产出的成绩分与破纪录加分；人工调整由 point_adjustments 管理，绝不在此作废。
|
||||
// 聚合通道的流水 entry_id/result_id 都为空（名次主体是单位/运动员，不对应单条报名项），
|
||||
// 所以按组别重算时不能只靠 entry_id IN (...) 定位，否则 NULL 永不命中、旧流水存活，
|
||||
// 重算再插一份导致该通道分数翻倍。这类流水改按「本小项的聚合通道」定位。
|
||||
// 重算再插一份导致该通道分数翻倍。聚合流水本身不归属组别，且重建通道会换掉通道 id
|
||||
// （source_id 随之失效），故按 event_id 全量作废；下方补算整项聚合流水时会重新插入全量。
|
||||
func recomputeLedgerTx(ctx context.Context, tx *sql.Tx, eventID, categoryID, actorID int64, reason string) (domain.EventScore, error) {
|
||||
scope := `source_type IN ('result', 'record_bonus') AND event_id = ?`
|
||||
args := []any{eventID}
|
||||
if categoryID > 0 {
|
||||
scope += ` AND (entry_id IN (SELECT id FROM entries WHERE category_id = ?)
|
||||
OR (entry_id IS NULL AND result_id IS NULL AND source_type = 'result'
|
||||
AND source_id IN (SELECT id FROM event_score_channels WHERE event_id = ?)))`
|
||||
args = append(args, categoryID, eventID)
|
||||
OR (entry_id IS NULL AND result_id IS NULL AND source_type = 'result'))`
|
||||
args = append(args, categoryID)
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx,
|
||||
`UPDATE score_ledger SET voided = 1, voided_by = ?, voided_at = datetime('now'), void_reason = ?
|
||||
|
||||
@@ -68,6 +68,59 @@ func TestRecomputeAggregateLedgerIsIdempotent(t *testing.T) {
|
||||
publish("再次按组别发布", &catID)
|
||||
}
|
||||
|
||||
// 整体替换通道会 DELETE + INSERT 生成新的通道 id，旧聚合流水的 source_id 随之失效。
|
||||
// 若作废范围仍按 source_id IN (本小项通道) 定位，旧流水作废不掉、重算再插一份 → 分数翻倍。
|
||||
func TestRecomputeAggregateLedgerSurvivesChannelRebuild(t *testing.T) {
|
||||
env := newTestEnv(t)
|
||||
ids := env.seed(t)
|
||||
env.createUser("recorder", "recorder-pass", "recorder")
|
||||
client, _ := env.client()
|
||||
env.login(client, "recorder", "recorder-pass")
|
||||
|
||||
var teamProfile int64
|
||||
if err := env.ev.QueryRow(`SELECT id FROM scoring_profiles WHERE code = 'team_top6'`).Scan(&teamProfile); err != nil {
|
||||
t.Fatalf("读取团体积分模板: %v", err)
|
||||
}
|
||||
env.exec(t, `DELETE FROM event_score_channels WHERE event_id = ?`, ids.event)
|
||||
env.exec(t, `INSERT INTO event_score_channels (event_id, scope, basis, profile_id, sort_order)
|
||||
VALUES (?, 'team', 'aggregate', ?, 0)`, ids.event, teamProfile)
|
||||
|
||||
env.do(client, http.MethodPut, "/api/results/draft", map[string]any{
|
||||
"eventId": ids.event,
|
||||
"results": []map[string]any{
|
||||
{"entryId": ids.entryA, "resultValue": 11.58, "unit": "s", "status": "ok"},
|
||||
{"entryId": ids.entryB, "resultValue": 11.92, "unit": "s", "status": "ok"},
|
||||
},
|
||||
}, true)
|
||||
if status, env2 := env.do(client, http.MethodPost, "/api/results/publish",
|
||||
map[string]any{"eventId": ids.event}, true); status != http.StatusOK {
|
||||
t.Fatalf("整项发布应 200，得到 %d %+v", status, env2.Error)
|
||||
}
|
||||
// 聚合通道两单位各一条流水：15 + 10。
|
||||
if count, total := env.resultLedger(t); count != 2 || total != 25 {
|
||||
t.Fatalf("整项发布后成绩流水应为 2 条 25 分，得到 %d 条 %v 分", count, total)
|
||||
}
|
||||
|
||||
// 走真实接口整体替换通道，模拟运维改配置（通道 id 会被重建）。
|
||||
status, env2 := env.do(client, http.MethodPut, fmt.Sprintf("/api/events/%d/channels", ids.event),
|
||||
map[string]any{"channels": []map[string]any{
|
||||
{"scope": "team", "basis": "aggregate", "profileId": teamProfile, "sortOrder": 0},
|
||||
}}, true)
|
||||
if status != http.StatusOK || !env2.OK {
|
||||
t.Fatalf("替换通道应 200，得到 %d %+v", status, env2.Error)
|
||||
}
|
||||
|
||||
catID := ids.category
|
||||
status, env2 = env.do(client, http.MethodPost, "/api/results/publish",
|
||||
map[string]any{"eventId": ids.event, "categoryId": catID}, true)
|
||||
if status != http.StatusOK || !env2.OK {
|
||||
t.Fatalf("按组别重算应 200，得到 %d %+v", status, env2.Error)
|
||||
}
|
||||
if count, total := env.resultLedger(t); count != 2 || total != 25 {
|
||||
t.Fatalf("改通道后按组别重算不得翻倍，应仍为 2 条 25 分，得到 %d 条 %v 分", count, total)
|
||||
}
|
||||
}
|
||||
|
||||
// 作废一条成绩会改变同组别名次，重算结果必须回写 results.rank，
|
||||
// 否则奖牌榜（读 rank）与积分榜（读流水）互相矛盾。
|
||||
func TestVoidResultRewritesRemainingRanks(t *testing.T) {
|
||||
|
||||
Reference in new issue
Block a user