AskaEth
45edfbeb71
## P0：双通道项目重复发布跳分（45→85→收敛） results.rank 一列同时充当「个人名次输出」「手工名次输入」「榜单数据源」， 团体手工通道把个人名次当团体名次又按团体表发一遍分。 - 新增 channel_ranks（每个计分通道各自持久化名次，发布时全量重建） 与 channel_manual_ranks（按单位录入的团体手工名次，故意不挂通道外键， 避免规则包重导时级联删掉录入数据） - results.rank 语义收窄为「只表示个人名次」，只由 scope=athlete 通道写回； 团体手工名次的来源改为 TeamRanks 优先、团体报名项兜底， 个人报名项的名次绝不进团体通道 - writeLedgerTx 内重建 channel_ranks；buildRanked / export.loadRanked / realtime.loadRanked 三份同源 SQL 一起改读新表 - 回归：发布两次流水与名次逐字节一致（domain + httpapi 各一条，含变异验证） ## 奖牌结算开关与奖牌通道（P1(5)，新功能） - events.award_medals + 通道 count_to_medals / count_to_team_medals （迁移默认 1，升级不改变既有榜单） - 单位榜入选 = 小项结算奖牌 && 通道发奖牌 && 前三名 &&（团体项目 || 个人奖牌并入单位） - 个人榜只取个人通道；金牌榜与积分榜同源同数据、按通道过滤独立计算 - 前端：小项「该项启用奖牌结算」、通道「发奖牌/个人奖牌并入单位金牌榜」、 录入页新增「团体名次」区块（含新接口 GET/PUT .../team-ranks） ## 身份口径改回证件号（P1(15)，推翻第三十六轮） - 匹配顺序恢复 证件号 → 号码布 → 姓名+单位；新增 athleteByIDCard - 同表重复证件号 = 同一人报多个组别（notices 提示，不报错）； 只有「同证件号 + 同小项同组别」才是真重复（conflicts[].duplicate） - 补齐后端缺失但前端/文档已在依赖的三处契约 ## 其余 P1 - 安全：会话撤销断开 ws、实时层按角色裁剪、整库快照限流（含 hello 路径， 被限流的请求挂起并由心跳兜底补发，不丢刷新） - 错误分级：手填名次非正数 / gender / 组别年龄 / 导出不存在的小项与单位 / 积分模板 awardRanks → 400 或 404，不再 500 - 算分一致性：破纪录加分看得失状态；批量退赛·恢复·移出、作废成绩、 报名导入改状态一律无条件重算推榜（不受延迟结算约束，与实时模式逐字节等价） - 配置改动触发重算：通道 / 小项参数 / 积分模板 - 升级自愈：channel_ranks 空而已有已发布成绩时，启动时一次性全量重算 （服务对外监听之前完成，避免升级后奖牌榜全 0） - 示例数据模式下破坏性操作被阻断，不再假成功 - Console：修复「只剩一块屏」后屏幕监听器被永久摘掉 - 大屏模板引擎：嵌套深度与体积安全阀，任何输入都不抛异常 ## 文档 - docs/：使用手册（奖牌开关、奖牌通道、团体名次、枚举列留空口径）、 常见问题（奖牌排查、升级后奖牌榜为 0、历史重放已知限制）、 部署指南、上线检查清单 - 版本 dev_0.1.7 → dev_0.1.8（console/package.json 同步） 自检：服务端 13 包 ×2 全绿；前端 vue-tsc + 449 例 ×2 + pnpm build； Console 35 例 + 语法检查。
398 lines
13 KiB
Go
398 lines
13 KiB
Go
package domain
|
||
|
||
import "testing"
|
||
|
||
func mkRanked(teamID int64, scope Scope, rank int) RankedResult {
|
||
return RankedResult{
|
||
TeamID: teamID,
|
||
Shares: []TeamShare{{TeamID: teamID, Weight: 1}},
|
||
Scope: scope,
|
||
Rank: rank,
|
||
AwardMedals: true,
|
||
CountToMedals: true,
|
||
CountToTeamMedals: true,
|
||
}
|
||
}
|
||
|
||
func mkAthleteRanked(athleteID, teamID int64, rank int) RankedResult {
|
||
r := mkRanked(teamID, ScopeAthlete, rank)
|
||
r.AthleteID = athleteID
|
||
return r
|
||
}
|
||
|
||
func TestTeamStandingsWeight(t *testing.T) {
|
||
ledger := []LedgerEntry{
|
||
ledgerFor(1, 10), // 仅记单位
|
||
ledgerForAthlete(1, 9, 10), // 记到个人
|
||
}
|
||
cases := []struct {
|
||
name string
|
||
weight float64
|
||
want float64
|
||
}{
|
||
{"系数 1", 1, 20},
|
||
{"系数 0.5", 0.5, 15},
|
||
{"系数 2", 2, 30},
|
||
{"系数 0 按 1 处理", 0, 20},
|
||
{"系数负数按 1 处理", -1, 20},
|
||
}
|
||
for _, tc := range cases {
|
||
t.Run(tc.name, func(t *testing.T) {
|
||
rows := BuildTeamStandings(StandingsInput{
|
||
Teams: testTeams(1), Ledger: ledger, IndividualToTeamWeight: tc.weight,
|
||
})
|
||
if !nearlyEqual(rows[0].Points, tc.want) {
|
||
t.Fatalf("总分 = %v，期望 %v", rows[0].Points, tc.want)
|
||
}
|
||
if !nearlyEqual(rows[0].TeamOnlyPoints, 10) || !nearlyEqual(rows[0].IndividualPoints, 10) {
|
||
t.Fatalf("分项 = %v/%v，期望 10/10", rows[0].TeamOnlyPoints, rows[0].IndividualPoints)
|
||
}
|
||
})
|
||
}
|
||
}
|
||
|
||
func TestTeamStandingsSortOrder(t *testing.T) {
|
||
cases := []struct {
|
||
name string
|
||
ranked []RankedResult
|
||
want int64
|
||
}{
|
||
{"总分优先", nil, 1},
|
||
{"金牌优先", []RankedResult{mkRanked(2, ScopeAthlete, 1)}, 2},
|
||
{
|
||
"银牌优先",
|
||
[]RankedResult{
|
||
mkRanked(1, ScopeAthlete, 1),
|
||
mkRanked(2, ScopeAthlete, 1),
|
||
mkRanked(2, ScopeAthlete, 2),
|
||
},
|
||
2,
|
||
},
|
||
{
|
||
"铜牌优先",
|
||
[]RankedResult{
|
||
mkRanked(1, ScopeAthlete, 1),
|
||
mkRanked(2, ScopeAthlete, 1),
|
||
mkRanked(1, ScopeAthlete, 2),
|
||
mkRanked(2, ScopeAthlete, 2),
|
||
mkRanked(2, ScopeAthlete, 3),
|
||
},
|
||
2,
|
||
},
|
||
}
|
||
for _, tc := range cases {
|
||
t.Run(tc.name, func(t *testing.T) {
|
||
ledger := []LedgerEntry{ledgerFor(1, 10), ledgerFor(2, 10)}
|
||
if tc.name == "总分优先" {
|
||
ledger[0].Points = 20
|
||
}
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ledger: ledger, Ranked: tc.ranked})
|
||
if rows[0].TeamID != tc.want {
|
||
t.Fatalf("榜首 = 单位 %d，期望 %d", rows[0].TeamID, tc.want)
|
||
}
|
||
if rows[0].Rank != 1 || rows[1].Rank != 2 {
|
||
t.Fatalf("名次 = %d/%d，期望 1/2", rows[0].Rank, rows[1].Rank)
|
||
}
|
||
})
|
||
}
|
||
}
|
||
|
||
func TestTeamStandingsIncludesAllTeams(t *testing.T) {
|
||
t.Run("没有得分的单位也占一行", func(t *testing.T) {
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ledger: []LedgerEntry{ledgerFor(1, 10)}})
|
||
if len(rows) != 2 {
|
||
t.Fatalf("行数 = %d，期望 2", len(rows))
|
||
}
|
||
if rows[1].TeamID != 2 || rows[1].Points != 0 {
|
||
t.Fatalf("第二行 = %+v，期望单位2零分", rows[1])
|
||
}
|
||
})
|
||
t.Run("流水里出现的未知单位也上榜", func(t *testing.T) {
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1), Ledger: []LedgerEntry{ledgerFor(9, 5)}})
|
||
if len(rows) != 2 || rows[0].TeamID != 9 {
|
||
t.Fatalf("行 = %+v，期望未知单位9以5分居首", rows)
|
||
}
|
||
})
|
||
}
|
||
|
||
func TestMedalStandings(t *testing.T) {
|
||
ranked := []RankedResult{
|
||
mkRanked(1, ScopeTeam, 1), // 团体项目金牌
|
||
mkRanked(2, ScopeAthlete, 1), // 个人项目金牌
|
||
mkRanked(2, ScopeAthlete, 3),
|
||
}
|
||
in := StandingsInput{Teams: testTeams(1, 2), Ranked: ranked}
|
||
|
||
rows := BuildMedalStandings(in)
|
||
if len(rows) != 2 {
|
||
t.Fatalf("行数 = %d，期望 2", len(rows))
|
||
}
|
||
var gold, silver, bronze, total int
|
||
for _, r := range rows {
|
||
gold += r.Gold
|
||
silver += r.Silver
|
||
bronze += r.Bronze
|
||
total += r.Total
|
||
}
|
||
if gold != 2 || silver != 0 || bronze != 1 || total != 3 {
|
||
t.Fatalf("奖牌合计 = %d/%d/%d（共%d），期望 2/0/1（共3）", gold, silver, bronze, total)
|
||
}
|
||
|
||
in.ExcludeTeamEventMedals = true
|
||
rows = BuildMedalStandings(in)
|
||
for _, r := range rows {
|
||
if r.TeamID == 1 && r.Gold != 0 {
|
||
t.Fatalf("排除团体奖牌后单位1金牌 = %d，期望 0", r.Gold)
|
||
}
|
||
}
|
||
}
|
||
|
||
func TestAthleteStandings(t *testing.T) {
|
||
ledger := []LedgerEntry{
|
||
ledgerForAthlete(1001, 1, 10),
|
||
ledgerForAthlete(1002, 2, 10),
|
||
}
|
||
athletes := []Athlete{
|
||
{ID: 1, Name: "张三", TeamID: 1001},
|
||
{ID: 2, Name: "李四", TeamID: 1002},
|
||
}
|
||
teams := []Team{
|
||
{ID: 1001, Code: "A", Name: "一单位"},
|
||
{ID: 1002, Code: "B", Name: "二单位"},
|
||
}
|
||
|
||
t.Run("金牌优先", func(t *testing.T) {
|
||
rows := BuildAthleteStandings(StandingsInput{
|
||
Teams: teams, Athletes: athletes, Ledger: ledger,
|
||
Ranked: []RankedResult{mkAthleteRanked(2, 1002, 1)},
|
||
})
|
||
if rows[0].AthleteID != 2 {
|
||
t.Fatalf("榜首 = %+v，期望运动员2（金牌优先）", rows)
|
||
}
|
||
})
|
||
|
||
t.Run("同分按姓名", func(t *testing.T) {
|
||
rows := BuildAthleteStandings(StandingsInput{Teams: teams, Athletes: athletes, Ledger: ledger})
|
||
if rows[0].AthleteID != 1 {
|
||
t.Fatalf("榜首 = %+v，期望运动员1（张三 < 李四）", rows)
|
||
}
|
||
})
|
||
|
||
t.Run("姓名与单位信息齐全", func(t *testing.T) {
|
||
rows := BuildAthleteStandings(StandingsInput{Teams: teams, Athletes: athletes, Ledger: ledger})
|
||
if rows[0].Name != "张三" || rows[0].TeamCode != "A" || rows[0].TeamName != "一单位" {
|
||
t.Fatalf("行 = %+v，期望姓名/单位信息齐全", rows[0])
|
||
}
|
||
})
|
||
|
||
t.Run("团体项目奖牌不计入个人榜", func(t *testing.T) {
|
||
rows := BuildAthleteStandings(StandingsInput{
|
||
Teams: teams, Athletes: athletes, Ledger: ledger,
|
||
Ranked: []RankedResult{{
|
||
TeamID: 1001, AthleteID: 1, Scope: ScopeTeam, Rank: 1,
|
||
Shares: []TeamShare{{TeamID: 1001, Weight: 1}},
|
||
AwardMedals: true,
|
||
CountToMedals: true,
|
||
CountToTeamMedals: true,
|
||
}},
|
||
})
|
||
for _, r := range rows {
|
||
if r.AthleteID == 1 && r.Gold != 0 {
|
||
t.Fatalf("个人榜不应统计团体项目奖牌: %+v", r)
|
||
}
|
||
}
|
||
})
|
||
}
|
||
|
||
func TestUnionMedals(t *testing.T) {
|
||
rr := RankedResult{
|
||
TeamID: 1, Rank: 1, Scope: ScopeAthlete,
|
||
Shares: []TeamShare{{TeamID: 1, Weight: 0.6}, {TeamID: 2, Weight: 0.4}},
|
||
AwardMedals: true,
|
||
CountToMedals: true,
|
||
CountToTeamMedals: true,
|
||
}
|
||
t.Run("拆分时两单位各记一金", func(t *testing.T) {
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ranked: []RankedResult{rr}})
|
||
for _, r := range rows {
|
||
if r.Gold != 1 {
|
||
t.Fatalf("单位 %d 金牌 = %d，期望 1", r.TeamID, r.Gold)
|
||
}
|
||
}
|
||
})
|
||
t.Run("整体归属只记主单位", func(t *testing.T) {
|
||
rr := rr
|
||
rr.Shares = []TeamShare{{TeamID: 1, Weight: 1}}
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ranked: []RankedResult{rr}})
|
||
if rows[0].TeamID != 1 || rows[0].Gold != 1 {
|
||
t.Fatalf("整体归属榜首 = %+v，期望单位1记1金", rows[0])
|
||
}
|
||
if rows[1].Gold != 0 {
|
||
t.Fatalf("单位2金牌 = %d，期望 0", rows[1].Gold)
|
||
}
|
||
})
|
||
}
|
||
|
||
func TestStandingsEmptyInput(t *testing.T) {
|
||
t.Run("无单位无流水", func(t *testing.T) {
|
||
if rows := BuildTeamStandings(StandingsInput{}); len(rows) != 0 {
|
||
t.Fatalf("行数 = %d，期望 0", len(rows))
|
||
}
|
||
})
|
||
t.Run("个人榜无数据", func(t *testing.T) {
|
||
if rows := BuildAthleteStandings(StandingsInput{}); len(rows) != 0 {
|
||
t.Fatalf("行数 = %d，期望 0", len(rows))
|
||
}
|
||
})
|
||
}
|
||
|
||
func TestSumByTeamIgnoresVoided(t *testing.T) {
|
||
ledger := []LedgerEntry{ledgerFor(1, 10), ledgerFor(1, 5)}
|
||
ledger[1].Voided = true
|
||
got := SumByTeam(ledger, 1)
|
||
if !nearlyEqual(got[1].Total, 10) {
|
||
t.Fatalf("总分 = %v，期望只算未作废的 10", got[1].Total)
|
||
}
|
||
}
|
||
|
||
// TestTeamStandingsTieBreakConfig 验证 StandingsInput.TieBreak 真正参与排序：
|
||
// 配置 [teamCode] 时即使总分落后也按单位编码在前；未配置时仍是总分优先。
|
||
func TestTeamStandingsTieBreakConfig(t *testing.T) {
|
||
ledger := []LedgerEntry{ledgerFor(1, 10), ledgerFor(2, 20)}
|
||
|
||
def := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ledger: ledger})
|
||
if def[0].TeamID != 2 {
|
||
t.Fatalf("默认口径榜首 = 单位 %d，期望 2（总分 20 优先）", def[0].TeamID)
|
||
}
|
||
|
||
cfg := BuildTeamStandings(StandingsInput{
|
||
Teams: testTeams(1, 2), Ledger: ledger, TieBreak: []string{TieBreakTeamCode},
|
||
})
|
||
if cfg[0].TeamID != 1 {
|
||
t.Fatalf("配置 [teamCode] 榜首 = 单位 %d，期望 1（编码 A < B）", cfg[0].TeamID)
|
||
}
|
||
if cfg[0].Rank != 1 || cfg[1].Rank != 2 {
|
||
t.Fatalf("名次 = %d/%d，期望 1/2", cfg[0].Rank, cfg[1].Rank)
|
||
}
|
||
}
|
||
|
||
// TestMedalDedupAcrossChannels 验证多通道项目一条成绩只记一枚奖牌（P0-2）：
|
||
// buildRanked 会按通道把一条成绩展开成多条名次明细，去重后只保留优先级最高的通道名次。
|
||
func TestMedalDedupAcrossChannels(t *testing.T) {
|
||
ranked := func(scope Scope, channelID int64, rank int) RankedResult {
|
||
return RankedResult{
|
||
EventID: 1, CategoryID: 1, EntryID: 7, ChannelID: channelID, Scope: scope,
|
||
TeamID: 1, AthleteID: 101, Rank: rank,
|
||
Shares: []TeamShare{{TeamID: 1, Weight: 1}},
|
||
AwardMedals: true,
|
||
CountToMedals: true,
|
||
CountToTeamMedals: true,
|
||
}
|
||
}
|
||
teams := testTeams(1)
|
||
athletes := []Athlete{{ID: 101, Name: "甲", TeamID: 1}}
|
||
|
||
t.Run("双通道一条成绩只记一枚", func(t *testing.T) {
|
||
in := StandingsInput{Teams: teams, Athletes: athletes, Ranked: []RankedResult{
|
||
ranked(ScopeTeam, 2, 1), ranked(ScopeAthlete, 1, 1),
|
||
}}
|
||
rows := BuildTeamStandings(in)
|
||
if rows[0].Gold != 1 || rows[0].Medals != 1 {
|
||
t.Fatalf("单位奖牌 = %+v，期望只记 1 金", rows[0])
|
||
}
|
||
arows := BuildAthleteStandings(in)
|
||
if len(arows) != 1 || arows[0].Gold != 1 {
|
||
t.Fatalf("个人奖牌 = %+v，期望只记 1 金", arows)
|
||
}
|
||
})
|
||
|
||
t.Run("个人通道优先于团体通道", func(t *testing.T) {
|
||
in := StandingsInput{Teams: teams, Ranked: []RankedResult{
|
||
ranked(ScopeTeam, 1, 1), // 团体通道名次更靠前，但优先级更低
|
||
ranked(ScopeAthlete, 9, 2), // 个人通道优先，取银牌
|
||
}}
|
||
rows := BuildTeamStandings(in)
|
||
if rows[0].Gold != 0 || rows[0].Silver != 1 {
|
||
t.Fatalf("单位奖牌 = %+v，期望取个人通道的 1 银", rows[0])
|
||
}
|
||
})
|
||
|
||
t.Run("同 scope 取通道 id 小者", func(t *testing.T) {
|
||
in := StandingsInput{Teams: teams, Ranked: []RankedResult{
|
||
ranked(ScopeAthlete, 5, 3),
|
||
ranked(ScopeAthlete, 2, 1),
|
||
}}
|
||
rows := BuildTeamStandings(in)
|
||
if rows[0].Gold != 1 || rows[0].Bronze != 0 {
|
||
t.Fatalf("单位奖牌 = %+v，期望取通道 id=2 的 1 金", rows[0])
|
||
}
|
||
})
|
||
|
||
t.Run("不同报名项各记一枚", func(t *testing.T) {
|
||
other := ranked(ScopeAthlete, 1, 1)
|
||
other.EntryID = 8
|
||
other.AthleteID = 102
|
||
rows := BuildTeamStandings(StandingsInput{Teams: teams, Ranked: []RankedResult{
|
||
ranked(ScopeAthlete, 1, 1), other,
|
||
}})
|
||
if rows[0].Gold != 2 {
|
||
t.Fatalf("单位金牌 = %d，期望 2（两条成绩各一枚）", rows[0].Gold)
|
||
}
|
||
})
|
||
|
||
t.Run("聚合通道按主体去重", func(t *testing.T) {
|
||
a := RankedResult{
|
||
EventID: 1, CategoryID: 1, ChannelID: 1, Scope: ScopeAthlete, AthleteID: 101,
|
||
TeamID: 1, Rank: 1, Shares: []TeamShare{{TeamID: 1, Weight: 1}},
|
||
AwardMedals: true, CountToMedals: true, CountToTeamMedals: true,
|
||
}
|
||
b := a
|
||
b.ChannelID = 2
|
||
rows := BuildTeamStandings(StandingsInput{Teams: teams, Ranked: []RankedResult{a, b}})
|
||
if rows[0].Gold != 1 {
|
||
t.Fatalf("单位金牌 = %d，期望 1（同一主体只记一枚）", rows[0].Gold)
|
||
}
|
||
})
|
||
}
|
||
|
||
// TestAthleteStandingsTieBreakConfig 验证个人榜同样按配置排序。
|
||
func TestAthleteStandingsTieBreakConfig(t *testing.T) {
|
||
ledger := []LedgerEntry{ledgerForAthlete(1001, 1, 10), ledgerForAthlete(1002, 2, 10)}
|
||
athletes := []Athlete{{ID: 1, Name: "张三", TeamID: 1001}, {ID: 2, Name: "李四", TeamID: 1002}}
|
||
teams := []Team{{ID: 1001, Code: "B", Name: "二单位"}, {ID: 1002, Code: "A", Name: "一单位"}}
|
||
|
||
def := BuildAthleteStandings(StandingsInput{Teams: teams, Athletes: athletes, Ledger: ledger})
|
||
if def[0].AthleteID != 1 {
|
||
t.Fatalf("默认口径榜首 = 运动员 %d，期望 1（姓名 张三 < 李四）", def[0].AthleteID)
|
||
}
|
||
|
||
cfg := BuildAthleteStandings(StandingsInput{
|
||
Teams: teams, Athletes: athletes, Ledger: ledger, TieBreak: []string{TieBreakTeamCode},
|
||
})
|
||
if cfg[0].AthleteID != 2 {
|
||
t.Fatalf("配置 [teamCode] 榜首 = 运动员 %d，期望 2（单位编码 A < B）", cfg[0].AthleteID)
|
||
}
|
||
}
|
||
|
||
// 「个人+团体」项目的双计：个人通道的分不进单位总分，只有团体通道的分参与单位排名。
|
||
func TestTeamStandingsIgnoresPersonalOnlyLedger(t *testing.T) {
|
||
ledger := []LedgerEntry{
|
||
ledgerForPersonal(1, 101, 10), // 个人通道：单位1 不进分
|
||
ledgerFor(2, 8), // 团体通道
|
||
}
|
||
rows := BuildTeamStandings(StandingsInput{Teams: testTeams(1, 2), Ledger: ledger})
|
||
if rows[0].TeamID != 2 {
|
||
t.Fatalf("榜首 = 单位 %d，期望 2（个人通道不计入单位总分）", rows[0].TeamID)
|
||
}
|
||
if !nearlyEqual(rows[1].Points, 0) || !nearlyEqual(rows[1].IndividualPoints, 0) {
|
||
t.Fatalf("单位1 = %+v，期望 0 分", rows[1])
|
||
}
|
||
|
||
athlete := BuildAthleteStandings(StandingsInput{
|
||
Teams: testTeams(1, 2), Athletes: []Athlete{{ID: 101, Name: "张三", TeamID: 1}}, Ledger: ledger,
|
||
})
|
||
if len(athlete) != 1 || !nearlyEqual(athlete[0].Points, 10) {
|
||
t.Fatalf("个人榜 = %+v，期望仍保留个人通道的 10 分", athlete)
|
||
}
|
||
}
|