fix: P0 计分根因 + 奖牌结算/奖牌通道 + 身份口径改回证件号 + 19 条 P1（dev_0.1.8）
## 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 例 + 语法检查。
This commit is contained in:
AskaEth committed
1 parent
53a0cb225c
commit
45edfbeb71
115 files changed
+10104
-755
No files matched your search
@@ -0,0 +1,363 @@
|
||||
package domain
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"strconv"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// 本文件守住 devdocs/17 的两条底线：
|
||||
// 1. P0：同一份数据连续发布两次，流水与名次必须完全一致——团体通道绝不读
|
||||
// 「athlete_id != 0 的报名项」的 results.rank（那是个人名次，读了会让同一份成绩发两次团体分）；
|
||||
// 2. 团体名次的来源只有 in.TeamRanks 与团体报名项（athlete_id == 0）的 results.rank 两处，
|
||||
// 同一单位两边都有时以 TeamRanks 为准。
|
||||
|
||||
// teamPullupInput 构造 TEAM_PULLUP 场景：1 个小项、1 个组别、6 名运动员同属 A 队（1001），
|
||||
// 成绩 30/29/28/27/26/25（引体向上，次数多者名次靠前），两条通道 =
|
||||
// 个人通道（athlete + result + 个人表）+ 团体通道（team + manual + 团体表）。
|
||||
// teamRanks 是录入员填的团体名次（可为空）。
|
||||
func teamPullupInput(teamRanks []TeamManualRank) EventScoreInput {
|
||||
values := []float64{30, 29, 28, 27, 26, 25}
|
||||
ps := make([]participant, 0, len(values))
|
||||
for i, v := range values {
|
||||
ps = append(ps, participant{
|
||||
entryID: int64(i + 1), athleteID: int64(101 + i), teamID: 1001,
|
||||
name: "选手" + string(rune('A'+i)), value: v,
|
||||
})
|
||||
}
|
||||
entries, results := fixture(ps)
|
||||
ev := individualEvent(1)
|
||||
ev.EventType = EventTypeIndividualTeam
|
||||
ev.Compare = CompareDesc
|
||||
|
||||
return EventScoreInput{
|
||||
Event: ev, Category: testCategory(),
|
||||
Channels: []ScoreChannel{
|
||||
{ID: 1, EventID: 1, Scope: ScopeAthlete, Basis: BasisResult, ProfileID: 1},
|
||||
{ID: 2, EventID: 1, Scope: ScopeTeam, Basis: BasisManual, ProfileID: 2},
|
||||
},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6(), 2: teamTop6()},
|
||||
Entries: entries,
|
||||
Results: results,
|
||||
TeamRanks: teamRanks,
|
||||
}
|
||||
}
|
||||
|
||||
// writeBackComputedRanks 模拟 httpapi 的 applyComputedRanks：
|
||||
// 只把个人通道（scope=athlete）算出的名次写回对应成绩的 results.rank。
|
||||
func writeBackComputedRanks(in EventScoreInput, ranked []RankedResult) {
|
||||
for _, rr := range ranked {
|
||||
if rr.Scope != ScopeAthlete || rr.ResultID == 0 || rr.Rank <= 0 {
|
||||
continue
|
||||
}
|
||||
for i := range in.Results {
|
||||
if in.Results[i].ID == rr.ResultID {
|
||||
in.Results[i].Rank = rr.Rank
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TestTeamPullupPublishTwiceIsIdempotent 是 P0 回归：
|
||||
// 「发布 → 把个人名次写回 results.rank → 再发布一次」两次的 Ledger 与 Ranked 必须逐字段一致。
|
||||
func TestTeamPullupPublishTwiceIsIdempotent(t *testing.T) {
|
||||
t.Run("团体名次已录：两次发布一致，A 队总分不跳变", func(t *testing.T) {
|
||||
in := teamPullupInput([]TeamManualRank{{TeamID: 1001, Rank: 1}})
|
||||
|
||||
first := mustScore(t, in)
|
||||
writeBackComputedRanks(in, first.Ranked)
|
||||
second := mustScore(t, in)
|
||||
|
||||
if !reflect.DeepEqual(first.Ledger, second.Ledger) {
|
||||
t.Fatalf("两次发布的流水不一致：\n第一次 %+v\n第二次 %+v", first.Ledger, second.Ledger)
|
||||
}
|
||||
if !reflect.DeepEqual(first.Ranked, second.Ranked) {
|
||||
t.Fatalf("两次发布的名次不一致：\n第一次 %+v\n第二次 %+v", first.Ranked, second.Ranked)
|
||||
}
|
||||
|
||||
// 团体通道的分数只来自团体名次：唯一一条单位流水，没有报名项 / 成绩（EntryID=0、ResultID=0）。
|
||||
var teamLedger []LedgerEntry
|
||||
for _, l := range second.Ledger {
|
||||
if l.AthleteID == 0 {
|
||||
teamLedger = append(teamLedger, l)
|
||||
}
|
||||
}
|
||||
if len(teamLedger) != 1 {
|
||||
t.Fatalf("团体流水 = %d 条，期望 1 条：%+v", len(teamLedger), teamLedger)
|
||||
}
|
||||
l := teamLedger[0]
|
||||
if l.TeamID != 1001 || l.EntryID != 0 || l.ResultID != 0 {
|
||||
t.Fatalf("团体流水 = %+v，期望只记单位 1001 且无报名项 / 成绩", l)
|
||||
}
|
||||
if !nearlyEqual(l.Points, 15) {
|
||||
t.Fatalf("团体名次第 1 名的分 = %v，期望 15（团体表）", l.Points)
|
||||
}
|
||||
if l.SourceID != 2 {
|
||||
t.Fatalf("sourceID 兜底应取通道 id=2，得到 %d", l.SourceID)
|
||||
}
|
||||
if l.SourceType != SourceResult {
|
||||
t.Fatalf("SourceType = %q，期望 %q", l.SourceType, SourceResult)
|
||||
}
|
||||
|
||||
// 团体通道只有一条名次明细，主体是单位，绝不消费那 6 条个人名次。
|
||||
var teamRanked []RankedResult
|
||||
for _, rr := range second.Ranked {
|
||||
if rr.ChannelID == 2 {
|
||||
teamRanked = append(teamRanked, rr)
|
||||
}
|
||||
}
|
||||
if len(teamRanked) != 1 {
|
||||
t.Fatalf("团体通道名次 = %d 条，期望 1 条（只认团体名次）：%+v", len(teamRanked), teamRanked)
|
||||
}
|
||||
if teamRanked[0].EntryID != 0 || teamRanked[0].AthleteID != 0 || teamRanked[0].SubjectKey != "t:1001" {
|
||||
t.Fatalf("团体名次 = %+v，期望合成主体 t:1001", teamRanked[0])
|
||||
}
|
||||
if teamRanked[0].Rank != 1 {
|
||||
t.Fatalf("团体名次 Rank = %d，期望 1", teamRanked[0].Rank)
|
||||
}
|
||||
|
||||
// 个人通道照旧按成绩排名 1..6。
|
||||
ranks := rankByEntry(second.Ranked)
|
||||
for i := 1; i <= 6; i++ {
|
||||
if ranks[int64(i)] != i {
|
||||
t.Fatalf("个人名次 = %v，期望 entry%d → %d", ranks, i, i)
|
||||
}
|
||||
}
|
||||
|
||||
// A 队总分 = 个人表 10+8+6+3+2+1 = 30，加团体名次第 1 名的 15，共 45；
|
||||
// 第二次发布如果团体通道又读了一遍个人名次，这里会变成 85（P0 的真机表现）。
|
||||
for _, es := range []EventScore{first, second} {
|
||||
if got := SumByTeam(es.Ledger, 1)[1001].Total; !nearlyEqual(got, 45) {
|
||||
t.Fatalf("A 队总分 = %v，期望 45（30 个人 + 15 团体）", got)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("团体名次未录：个人名次绝不进团体通道", func(t *testing.T) {
|
||||
in := teamPullupInput(nil)
|
||||
|
||||
first := mustScore(t, in)
|
||||
writeBackComputedRanks(in, first.Ranked)
|
||||
second := mustScore(t, in)
|
||||
|
||||
if !reflect.DeepEqual(first, second) {
|
||||
t.Fatalf("两次发布的计分结果不一致：\n第一次 %+v\n第二次 %+v", first, second)
|
||||
}
|
||||
for _, rr := range second.Ranked {
|
||||
if rr.ChannelID == 2 {
|
||||
t.Fatalf("没录团体名次时团体通道不应产出名次：%+v", rr)
|
||||
}
|
||||
}
|
||||
if got := SumByTeam(second.Ledger, 1)[1001].Total; !nearlyEqual(got, 30) {
|
||||
t.Fatalf("A 队总分 = %v，期望只算个人通道的 30（不跳变）", got)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestTeamManualChannelCandidateSources 守住团体手工通道的候选来源。
|
||||
func TestTeamManualChannelCandidateSources(t *testing.T) {
|
||||
score := func(t *testing.T, in EventScoreInput) EventScore {
|
||||
t.Helper()
|
||||
return mustScore(t, in)
|
||||
}
|
||||
|
||||
t.Run("只认团体报名项兜底，个人报名项的名次不进团体通道", func(t *testing.T) {
|
||||
entries, results := fixture([]participant{
|
||||
// 个人报名项：录入名次第 1，是个人名次，团体通道不许读。
|
||||
{entryID: 1, athleteID: 101, teamID: 1001, name: "甲", rank: 1, noValue: true},
|
||||
// 团体报名项（athlete_id = 0）：团体名次第 2。
|
||||
{entryID: 2, teamID: 1002, rank: 2, noValue: true},
|
||||
})
|
||||
es := score(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
Entries: entries, Results: results,
|
||||
})
|
||||
|
||||
got := pointsByTeam(es.Ledger)
|
||||
if !nearlyEqual(got[1002], 10) {
|
||||
t.Fatalf("单位 1002 = %v，期望团体名次第 2 名的 10 分：%v", got[1002], got)
|
||||
}
|
||||
if _, ok := got[1001]; ok {
|
||||
t.Fatalf("个人报名项的名次进了团体通道：%v", got)
|
||||
}
|
||||
if len(es.Ranked) != 1 || es.Ranked[0].TeamID != 1002 || es.Ranked[0].EntryID != 2 {
|
||||
t.Fatalf("团体名次明细 = %+v，期望只有单位 1002 的团体报名项", es.Ranked)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("TeamRanks 覆盖团体报名项的兜底名次", func(t *testing.T) {
|
||||
entries, results := fixture([]participant{
|
||||
{entryID: 1, teamID: 1001, rank: 3, noValue: true},
|
||||
})
|
||||
es := score(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
Entries: entries, Results: results,
|
||||
TeamRanks: []TeamManualRank{{TeamID: 1001, Rank: 1}},
|
||||
})
|
||||
|
||||
if got := pointsByTeam(es.Ledger); !nearlyEqual(got[1001], 15) {
|
||||
t.Fatalf("单位 1001 = %v，期望以 TeamRanks 的第 1 名计 15 分：%v", got[1001], got)
|
||||
}
|
||||
if len(es.Ranked) != 1 {
|
||||
t.Fatalf("同一单位应只产出一条名次，得到 %d 条：%+v", len(es.Ranked), es.Ranked)
|
||||
}
|
||||
if es.Ranked[0].Rank != 1 || es.Ranked[0].EntryID != 1 || es.Ranked[0].SubjectKey != "e:1" {
|
||||
t.Fatalf("覆盖后的名次 = %+v，期望报名项 1 记为第 1 名", es.Ranked[0])
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("rank<=0 的团体名次视为未填，退回团体报名项", func(t *testing.T) {
|
||||
entries, results := fixture([]participant{
|
||||
{entryID: 1, teamID: 1001, rank: 2, noValue: true},
|
||||
})
|
||||
es := score(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
Entries: entries, Results: results,
|
||||
TeamRanks: []TeamManualRank{{TeamID: 1001, Rank: 0}, {TeamID: 1002, Rank: -1}},
|
||||
})
|
||||
|
||||
got := pointsByTeam(es.Ledger)
|
||||
if !nearlyEqual(got[1001], 10) {
|
||||
t.Fatalf("单位 1001 = %v，期望退回团体报名项的第 2 名（10 分）：%v", got[1001], got)
|
||||
}
|
||||
if _, ok := got[1002]; ok {
|
||||
t.Fatalf("rank<=0 的团体名次不应产出名次：%v", got)
|
||||
}
|
||||
if len(es.Ranked) != 1 {
|
||||
t.Fatalf("名次明细 = %d 条，期望 1 条：%+v", len(es.Ranked), es.Ranked)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("并列团体名次走模板的 tieMode", func(t *testing.T) {
|
||||
ranks := []TeamManualRank{{TeamID: 1001, Rank: 1}, {TeamID: 1002, Rank: 1}}
|
||||
cases := []struct {
|
||||
name string
|
||||
tie TieMode
|
||||
points float64
|
||||
}{
|
||||
{"顺延（默认）", TieSkip, 15},
|
||||
{"平均", TieAverage, 12.5},
|
||||
{"就高", TieHigher, 15},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
profile := teamTop6()
|
||||
profile.TieMode = tc.tie
|
||||
es := score(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: profile},
|
||||
TeamRanks: ranks,
|
||||
})
|
||||
|
||||
if len(es.Ranked) != 2 {
|
||||
t.Fatalf("并列名次 = %d 条，期望 2 条：%+v", len(es.Ranked), es.Ranked)
|
||||
}
|
||||
got := pointsByTeam(es.Ledger)
|
||||
for _, rr := range es.Ranked {
|
||||
if rr.Rank != 1 {
|
||||
t.Fatalf("并列名次 = %+v，期望同为第 1 名", rr)
|
||||
}
|
||||
}
|
||||
if !nearlyEqual(got[1001], tc.points) || !nearlyEqual(got[1002], tc.points) {
|
||||
t.Fatalf("并列得分 = %v，期望各 %v", got, tc.points)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestRankedSubjectKeys 覆盖计分引擎各条产出路径的 SubjectKey 口径。
|
||||
func TestRankedSubjectKeys(t *testing.T) {
|
||||
t.Run("result 通道按报名项", func(t *testing.T) {
|
||||
entries, results := fixture(lineupValues(11, 12))
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: individualEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{athleteResultChannel(1)},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6()},
|
||||
Entries: entries, Results: results,
|
||||
})
|
||||
for _, rr := range es.Ranked {
|
||||
if want := "e:" + strconv.FormatInt(rr.EntryID, 10); rr.SubjectKey != want {
|
||||
t.Fatalf("SubjectKey = %q，期望 %q（%+v）", rr.SubjectKey, want, rr)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("团体手工名次按单位", func(t *testing.T) {
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
TeamRanks: []TeamManualRank{{TeamID: 1001, Rank: 1}, {TeamID: 1002, Rank: 2}},
|
||||
})
|
||||
want := []string{"t:1001", "t:1002"}
|
||||
if len(es.Ranked) != len(want) {
|
||||
t.Fatalf("名次条数 = %d，期望 %d", len(es.Ranked), len(want))
|
||||
}
|
||||
for i, key := range want {
|
||||
if es.Ranked[i].SubjectKey != key {
|
||||
t.Fatalf("第 %d 条 SubjectKey = %q，期望 %q", i, es.Ranked[i].SubjectKey, key)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("聚合通道按主体", func(t *testing.T) {
|
||||
entries, results := fixture([]participant{
|
||||
{entryID: 1, athleteID: 1, teamID: 1001, value: 11},
|
||||
{entryID: 2, athleteID: 2, teamID: 1001, value: 12},
|
||||
{entryID: 3, athleteID: 3, teamID: 1002, value: 13},
|
||||
})
|
||||
ev := teamEvent(1)
|
||||
ev.Compare = CompareAsc
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: ev, Category: testCategory(),
|
||||
Channels: []ScoreChannel{
|
||||
{ID: 1, EventID: 1, Scope: ScopeAthlete, Basis: BasisAggregate, ProfileID: 1},
|
||||
{ID: 2, EventID: 1, Scope: ScopeTeam, Basis: BasisAggregate, ProfileID: 2},
|
||||
},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6(), 2: teamTop6()},
|
||||
Entries: entries, Results: results,
|
||||
})
|
||||
for _, rr := range es.Ranked {
|
||||
var want string
|
||||
if rr.Scope == ScopeAthlete {
|
||||
want = "a:" + strconv.FormatInt(rr.AthleteID, 10)
|
||||
} else {
|
||||
want = "t:" + strconv.FormatInt(rr.TeamID, 10)
|
||||
}
|
||||
if rr.SubjectKey != want || rr.EntryID != 0 {
|
||||
t.Fatalf("聚合名次 = %+v，期望 SubjectKey %q 且 EntryID=0", rr, want)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestSubjectKeyOfFallback 直接覆盖 subjectKeyOf 的四层口径（含退化兜底）。
|
||||
func TestSubjectKeyOfFallback(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
rr RankedResult
|
||||
want string
|
||||
}{
|
||||
{"有报名项按报名项", RankedResult{EntryID: 7, AthleteID: 101, TeamID: 1001, ChannelID: 3, Scope: ScopeAthlete}, "e:7"},
|
||||
{"个人主体", RankedResult{AthleteID: 101, TeamID: 1001, ChannelID: 3, Scope: ScopeAthlete}, "a:101"},
|
||||
{"单位主体", RankedResult{TeamID: 1001, ChannelID: 3, Scope: ScopeTeam}, "t:1001"},
|
||||
{"团体名次但没有单位", RankedResult{AthleteID: 101, ChannelID: 3, Scope: ScopeTeam}, "ch:3"},
|
||||
{"全空退化通道", RankedResult{ChannelID: 5}, "ch:5"},
|
||||
{"连通道都没有", RankedResult{}, "ch:0"},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
if got := subjectKeyOf(tc.rr); got != tc.want {
|
||||
t.Fatalf("subjectKeyOf = %q，期望 %q", got, tc.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,8 @@ import "testing"
|
||||
|
||||
func ptr(f float64) *float64 { return &f }
|
||||
|
||||
func boolPtr(b bool) *bool { return &b }
|
||||
|
||||
// individualTop6 是规则包里的个人项目前六名：10/8/6/3/2/1。
|
||||
func individualTop6() ScoringProfile {
|
||||
return ScoringProfile{
|
||||
@@ -40,7 +42,8 @@ func testCategory() EventCategory {
|
||||
func individualEvent(multiplier float64) Event {
|
||||
return Event{
|
||||
ID: 1, Code: "E1", Name: "100米跑", EventType: EventTypeIndividual,
|
||||
Compare: CompareAsc, RecordEligible: true, Scored: true, Multiplier: multiplier, Status: EventStatusPublished,
|
||||
Compare: CompareAsc, RecordEligible: true, Scored: true, AwardMedals: true,
|
||||
Multiplier: multiplier, Status: EventStatusPublished,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,8 @@ func TestMatrix04_ThreeWayTieAtThird(t *testing.T) {
|
||||
func TestMatrix05_TeamEventDoubled(t *testing.T) {
|
||||
ps := lineup(8)
|
||||
for i := range ps {
|
||||
// 纯团体项目的报名项是团体报名项（无运动员）：团体名次由 results.rank 兜底。
|
||||
ps[i].athleteID = 0
|
||||
ps[i].rank = i + 1
|
||||
}
|
||||
entries, results := fixture(ps)
|
||||
@@ -193,24 +195,24 @@ func TestMatrix13_TieBreakOrder(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
name: "金牌优先",
|
||||
ranked: []RankedResult{{TeamID: 2, Shares: []TeamShare{{TeamID: 2, Weight: 1}}, Rank: 1, Scope: ScopeAthlete}},
|
||||
ranked: []RankedResult{mkRanked(2, ScopeAthlete, 1)},
|
||||
want: 2,
|
||||
},
|
||||
{
|
||||
name: "银牌优先",
|
||||
ranked: []RankedResult{
|
||||
{TeamID: 1, Shares: []TeamShare{{TeamID: 1, Weight: 1}}, Rank: 1, Scope: ScopeAthlete},
|
||||
{TeamID: 2, Shares: []TeamShare{{TeamID: 2, Weight: 1}}, Rank: 1, Scope: ScopeAthlete},
|
||||
{TeamID: 2, Shares: []TeamShare{{TeamID: 2, Weight: 1}}, Rank: 2, Scope: ScopeAthlete},
|
||||
mkRanked(1, ScopeAthlete, 1),
|
||||
mkRanked(2, ScopeAthlete, 1),
|
||||
mkRanked(2, ScopeAthlete, 2),
|
||||
},
|
||||
want: 2,
|
||||
},
|
||||
{
|
||||
name: "铜牌优先",
|
||||
ranked: []RankedResult{
|
||||
{TeamID: 1, Shares: []TeamShare{{TeamID: 1, Weight: 1}}, Rank: 3, Scope: ScopeAthlete},
|
||||
{TeamID: 2, Shares: []TeamShare{{TeamID: 2, Weight: 1}}, Rank: 3, Scope: ScopeAthlete},
|
||||
{TeamID: 1, Shares: []TeamShare{{TeamID: 1, Weight: 1}}, Rank: 3, Scope: ScopeAthlete},
|
||||
mkRanked(1, ScopeAthlete, 3),
|
||||
mkRanked(2, ScopeAthlete, 3),
|
||||
mkRanked(1, ScopeAthlete, 3),
|
||||
},
|
||||
want: 1,
|
||||
},
|
||||
|
||||
@@ -0,0 +1,223 @@
|
||||
package domain
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// 本文件守住 devdocs/17 §4.5 的奖牌口径：
|
||||
// 入选 = 小项结算奖牌 && 通道是奖牌通道 && 名次前三；
|
||||
// 单位榜再加 scope == team || count_to_team_medals；
|
||||
// 个人榜只取 scope == athlete && AthleteID != 0。
|
||||
// 奖牌开关只影响奖牌，不影响积分流水。
|
||||
|
||||
// medalInput 是奖牌开关的测试底座：3 名运动员各代表一个单位，个人通道按成绩排出 1/2/3 名。
|
||||
func medalInput(ch ScoreChannel) EventScoreInput {
|
||||
entries, results := fixture(lineupValues(11, 12, 13))
|
||||
return EventScoreInput{
|
||||
Event: individualEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{ch},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6()},
|
||||
Entries: entries, Results: results,
|
||||
}
|
||||
}
|
||||
|
||||
// medalTotals 汇总单位榜 / 个人榜的金银铜。
|
||||
func medalTotals(t *testing.T, in StandingsInput) (team, athlete [3]int) {
|
||||
t.Helper()
|
||||
for _, r := range BuildMedalStandings(in) {
|
||||
team[0] += r.Gold
|
||||
team[1] += r.Silver
|
||||
team[2] += r.Bronze
|
||||
}
|
||||
for _, r := range BuildAthleteStandings(in) {
|
||||
athlete[0] += r.Gold
|
||||
athlete[1] += r.Silver
|
||||
athlete[2] += r.Bronze
|
||||
}
|
||||
return team, athlete
|
||||
}
|
||||
|
||||
func TestAwardMedalsSwitch(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
award bool
|
||||
wantTeam [3]int
|
||||
wantAthlet [3]int
|
||||
}{
|
||||
{"开启奖牌结算", true, [3]int{1, 1, 1}, [3]int{1, 1, 1}},
|
||||
{"关闭奖牌结算", false, [3]int{0, 0, 0}, [3]int{0, 0, 0}},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
in := medalInput(athleteResultChannel(1))
|
||||
in.Event.AwardMedals = tc.award
|
||||
es := mustScore(t, in)
|
||||
|
||||
if len(es.Ledger) != 3 {
|
||||
t.Fatalf("流水条数 = %d，期望 3（奖牌开关不影响积分）", len(es.Ledger))
|
||||
}
|
||||
if got := pointsByEntry(es.Ledger); !nearlyEqual(got[1], 10) || !nearlyEqual(got[3], 6) {
|
||||
t.Fatalf("积分 = %v，期望 10/8/6（奖牌开关不影响积分）", got)
|
||||
}
|
||||
|
||||
team, athlete := medalTotals(t, StandingsInput{
|
||||
Teams: testTeams(1001, 1002, 1003), Ranked: es.Ranked,
|
||||
})
|
||||
if team != tc.wantTeam || athlete != tc.wantAthlet {
|
||||
t.Fatalf("奖牌 = 单位 %v / 个人 %v，期望 %v / %v", team, athlete, tc.wantTeam, tc.wantAthlet)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestChannelCountToMedalsSwitch(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
countTo *bool
|
||||
want [3]int
|
||||
}{
|
||||
{"未配置按发牌", nil, [3]int{1, 1, 1}},
|
||||
{"显式开启", boolPtr(true), [3]int{1, 1, 1}},
|
||||
{"显式关闭", boolPtr(false), [3]int{0, 0, 0}},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
ch := athleteResultChannel(1)
|
||||
ch.CountToMedals = tc.countTo
|
||||
in := medalInput(ch)
|
||||
es := mustScore(t, in)
|
||||
|
||||
if len(es.Ledger) != 3 {
|
||||
t.Fatalf("流水条数 = %d，期望 3（奖牌通道开关不影响积分）", len(es.Ledger))
|
||||
}
|
||||
team, athlete := medalTotals(t, StandingsInput{
|
||||
Teams: testTeams(1001, 1002, 1003), Ranked: es.Ranked,
|
||||
})
|
||||
if team != tc.want || athlete != tc.want {
|
||||
t.Fatalf("奖牌 = 单位 %v / 个人 %v，期望 %v", team, athlete, tc.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 个人奖牌不并入单位榜：个人榜照常记牌，单位榜一枚都没有。
|
||||
func TestCountToTeamMedalsSwitch(t *testing.T) {
|
||||
ch := athleteResultChannel(1)
|
||||
ch.CountToTeamMedals = boolPtr(false)
|
||||
in := medalInput(ch)
|
||||
es := mustScore(t, in)
|
||||
|
||||
team, athlete := medalTotals(t, StandingsInput{
|
||||
Teams: testTeams(1001, 1002, 1003), Ranked: es.Ranked,
|
||||
})
|
||||
if team != [3]int{0, 0, 0} {
|
||||
t.Fatalf("单位奖牌榜 = %v，期望 0（个人奖牌不并入单位榜）", team)
|
||||
}
|
||||
if athlete != [3]int{1, 1, 1} {
|
||||
t.Fatalf("个人奖牌榜 = %v，期望 1/1/1", athlete)
|
||||
}
|
||||
|
||||
// 单位总分不受奖牌通道开关影响。
|
||||
if got := SumByTeam(es.Ledger, 1); !nearlyEqual(got[1001].Total, 10) || !nearlyEqual(got[1003].Total, 6) {
|
||||
t.Fatalf("单位总分 = %v，期望 10/8/6（奖牌通道开关不影响积分）", got)
|
||||
}
|
||||
}
|
||||
|
||||
// scope=team 的奖牌不受 count_to_team_medals 影响：它本来就记在单位头上。
|
||||
func TestTeamScopeMedalIgnoresCountToTeamMedals(t *testing.T) {
|
||||
ch := teamManualChannel(2)
|
||||
ch.CountToTeamMedals = boolPtr(false)
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{ch},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
TeamRanks: []TeamManualRank{{TeamID: 1001, Rank: 1}, {TeamID: 1002, Rank: 2}},
|
||||
})
|
||||
|
||||
team, athlete := medalTotals(t, StandingsInput{Teams: testTeams(1001, 1002), Ranked: es.Ranked})
|
||||
if team != [3]int{1, 1, 0} {
|
||||
t.Fatalf("单位奖牌榜 = %v，期望 1 金 1 银", team)
|
||||
}
|
||||
if athlete != [3]int{0, 0, 0} {
|
||||
t.Fatalf("个人奖牌榜 = %v，期望 0（团体名次不发个人牌）", athlete)
|
||||
}
|
||||
}
|
||||
|
||||
// 旧全局开关与 per-通道开关是「与」的关系：总闸关掉时团体项目的奖牌一律不进单位榜。
|
||||
func TestExcludeTeamEventMedalsStillApplies(t *testing.T) {
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
Profiles: map[int64]ScoringProfile{2: teamTop6()},
|
||||
TeamRanks: []TeamManualRank{{TeamID: 1001, Rank: 1}},
|
||||
})
|
||||
teams := testTeams(1001)
|
||||
|
||||
team, _ := medalTotals(t, StandingsInput{Teams: teams, Ranked: es.Ranked})
|
||||
if team != [3]int{1, 0, 0} {
|
||||
t.Fatalf("默认口径单位榜 = %v，期望 1 金", team)
|
||||
}
|
||||
|
||||
team, _ = medalTotals(t, StandingsInput{Teams: teams, Ranked: es.Ranked, ExcludeTeamEventMedals: true})
|
||||
if team != [3]int{0, 0, 0} {
|
||||
t.Fatalf("全局排除团体奖牌后单位榜 = %v，期望 0", team)
|
||||
}
|
||||
}
|
||||
|
||||
// P1(5) 回归：individual_team 项目的团体聚合名次现在能进 Ranked 并产出单位金牌。
|
||||
func TestAggregateTeamRankProducesTeamMedal(t *testing.T) {
|
||||
entries, results := fixture([]participant{
|
||||
{entryID: 1, athleteID: 1, teamID: 1001, value: 11},
|
||||
{entryID: 2, athleteID: 2, teamID: 1001, value: 12},
|
||||
{entryID: 3, athleteID: 3, teamID: 1002, value: 13},
|
||||
})
|
||||
ev := individualEvent(1)
|
||||
ev.EventType = EventTypeIndividualTeam
|
||||
ev.Compare = CompareAsc // 团体平均成绩越小越好
|
||||
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: ev, Category: testCategory(),
|
||||
Channels: []ScoreChannel{
|
||||
athleteResultChannel(1),
|
||||
{ID: 2, EventID: 1, Scope: ScopeTeam, Basis: BasisAggregate, ProfileID: 2},
|
||||
},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6(), 2: teamTop6()},
|
||||
Entries: entries, Results: results,
|
||||
})
|
||||
|
||||
var teamRanked []RankedResult
|
||||
for _, rr := range es.Ranked {
|
||||
if rr.ChannelID != 2 {
|
||||
continue
|
||||
}
|
||||
teamRanked = append(teamRanked, rr)
|
||||
if rr.EntryID != 0 || rr.ResultID != 0 || rr.AthleteID != 0 {
|
||||
t.Fatalf("团体聚合名次 = %+v，期望不对应单条报名项 / 成绩", rr)
|
||||
}
|
||||
if rr.SubjectKey != "t:"+strconv.FormatInt(rr.TeamID, 10) {
|
||||
t.Fatalf("团体聚合名次 SubjectKey = %q，期望 t:%d", rr.SubjectKey, rr.TeamID)
|
||||
}
|
||||
}
|
||||
if len(teamRanked) != 2 {
|
||||
t.Fatalf("团体聚合名次 = %d 条，期望 2 条：%+v", len(teamRanked), teamRanked)
|
||||
}
|
||||
|
||||
// 只拿团体通道的名次也能看出：1001 第 1 名（金），1002 第 2 名（银）。
|
||||
aggOnly := BuildTeamStandings(StandingsInput{Teams: testTeams(1001, 1002), Ranked: teamRanked})
|
||||
if aggOnly[0].TeamID != 1001 || aggOnly[0].Gold != 1 {
|
||||
t.Fatalf("团体名次单独统计 = %+v，期望单位 1001 记 1 金", aggOnly)
|
||||
}
|
||||
if aggOnly[1].TeamID != 1002 || aggOnly[1].Silver != 1 {
|
||||
t.Fatalf("团体名次单独统计 = %+v，期望单位 1002 记 1 银", aggOnly)
|
||||
}
|
||||
|
||||
// 全量榜单：个人通道（1 金 1 银 1 铜）与团体通道（1 金 1 银）各记一枚，互不去重。
|
||||
team, athlete := medalTotals(t, StandingsInput{Teams: testTeams(1001, 1002), Ranked: es.Ranked})
|
||||
if team != [3]int{2, 2, 1} {
|
||||
t.Fatalf("单位奖牌合计 = %v，期望 2 金 2 银 1 铜", team)
|
||||
}
|
||||
if athlete != [3]int{1, 1, 1} {
|
||||
t.Fatalf("个人奖牌合计 = %v，期望 1/1/1（团体名次不进个人榜）", athlete)
|
||||
}
|
||||
}
|
||||
@@ -111,11 +111,18 @@ func recordBonusLedger(in EventScoreInput) ([]LedgerEntry, error) {
|
||||
}
|
||||
breaks = append(breaks, b)
|
||||
}
|
||||
byEntry := make(map[int64]Result, len(in.Results))
|
||||
for _, r := range in.Results {
|
||||
byEntry[r.EntryID] = r
|
||||
}
|
||||
modes := make(map[int64]RecordBonusMode, len(in.Entries))
|
||||
byID := make(map[int64]Entry, len(in.Entries))
|
||||
for _, e := range in.Entries {
|
||||
if in.Category.ID != 0 && e.CategoryID != in.Category.ID {
|
||||
// 状态不正常的报名项 / 成绩不给加分：与名次分同一口径，理由见 recordBonusEntryRankable。
|
||||
if !recordBonusEntryRankable(in, e, byEntry) {
|
||||
continue
|
||||
}
|
||||
byID[e.ID] = e
|
||||
if m, ok := recordBonusModeFor(in, e); ok {
|
||||
modes[e.ID] = m
|
||||
}
|
||||
@@ -125,14 +132,6 @@ func recordBonusLedger(in EventScoreInput) ([]LedgerEntry, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
byID := make(map[int64]Entry, len(in.Entries))
|
||||
for _, e := range in.Entries {
|
||||
if in.Category.ID != 0 && e.CategoryID != in.Category.ID {
|
||||
continue
|
||||
}
|
||||
byID[e.ID] = e
|
||||
}
|
||||
|
||||
var out []LedgerEntry
|
||||
for _, b := range bonuses {
|
||||
if b.Points == 0 {
|
||||
@@ -165,6 +164,29 @@ func recordBonusLedger(in EventScoreInput) ([]LedgerEntry, error) {
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// recordBonusEntryRankable 判断一条报名项现在还够不够拿破纪录加分。
|
||||
//
|
||||
// 判据与 collectCandidates 的可排名判据同源（报名项与成绩都走 rankable()，草稿不算），
|
||||
// 不另写一套：名次分与破纪录加分是同一条成绩的两种产出，一边认「这条成绩还算数」、
|
||||
// 另一边不认，就会出现退赛 / 弃权 / 失格的人拿不到名次分、却继续在个人榜与单位榜上拿加分，
|
||||
// 已作废成绩重算时也会把加分再写一遍（P1-6）。
|
||||
//
|
||||
// 这里只判「还算不算数」，不动 record_breaks 本身：登记是现场发生过的事实，
|
||||
// 状态改回来（批量恢复 / 成绩改回 ok）时同一个登记还要能把加分重新算出来。
|
||||
func recordBonusEntryRankable(in EventScoreInput, e Entry, byEntry map[int64]Result) bool {
|
||||
if !entryMatches(in, e) || !e.Status.rankable() {
|
||||
return false
|
||||
}
|
||||
r, ok := byEntry[e.ID]
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
if r.State == ResultStateDraft && !in.Options.IncludeDrafts {
|
||||
return false
|
||||
}
|
||||
return r.Status.rankable()
|
||||
}
|
||||
|
||||
// recordBonusModeFor 取报名项「命中通道」所属模板的破纪录口径。
|
||||
// 命中通道按 channelBefore 的优先级挑选（athlete → team → 通道 id 升序），
|
||||
// 与奖牌去重同一口径；没有可命中通道或模板缺失时返回 false，由调用方退回全局口径。
|
||||
|
||||
@@ -318,3 +318,112 @@ func TestRecordBonusLedgerFiltersByCategory(t *testing.T) {
|
||||
t.Fatalf("别的组别的加分不应记入本组别，实际 %d 条", otherCategory)
|
||||
}
|
||||
}
|
||||
|
||||
// bonusLedgerOfEntry 取某报名项名下两种流水的分值：成绩分与破纪录加分。
|
||||
func bonusLedgerOfEntry(es EventScore, entryID int64) (rankPoints, bonusPoints float64) {
|
||||
for _, l := range es.Ledger {
|
||||
if l.EntryID != entryID {
|
||||
continue
|
||||
}
|
||||
switch l.SourceType {
|
||||
case SourceResult:
|
||||
rankPoints += l.Points
|
||||
case SourceRecordBonus:
|
||||
bonusPoints += l.Points
|
||||
}
|
||||
}
|
||||
return rankPoints, bonusPoints
|
||||
}
|
||||
|
||||
// TestRecordBonusFollowsRankableStatus 验证破纪录加分与名次分同一口径（P1-6）：
|
||||
// 报名项退赛 / 弃权 / 失格，或成绩被作废 / 未发布时都不该再有加分流水。
|
||||
//
|
||||
// 除了逐条钉期望值，还断言「名次分有没有，破纪录加分就有没有」——两条通道是同一条成绩的
|
||||
// 两种产出，判据必须同源（EntryStatus.rankable / ResultStatus.rankable），
|
||||
// 各写一套就会出现「退赛的人拿不到名次分、却继续拿加分」。
|
||||
func TestRecordBonusFollowsRankableStatus(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
mutate func(entries *[]Entry, results *[]Result)
|
||||
want bool
|
||||
}{
|
||||
{"正常参赛且成绩有效", func(*[]Entry, *[]Result) {}, true},
|
||||
{"报名项退赛", func(entries *[]Entry, _ *[]Result) { (*entries)[0].Status = EntryStatusScratched }, false},
|
||||
{"报名项失格", func(entries *[]Entry, _ *[]Result) { (*entries)[0].Status = EntryStatusDQ }, false},
|
||||
{"报名项未出场", func(entries *[]Entry, _ *[]Result) { (*entries)[0].Status = EntryStatusDNS }, false},
|
||||
{"成绩作废", func(_ *[]Entry, results *[]Result) { (*results)[0].Status = ResultStatusWithdrawn }, false},
|
||||
{"成绩失格", func(_ *[]Entry, results *[]Result) { (*results)[0].Status = ResultStatusDQ }, false},
|
||||
{"成绩未出场", func(_ *[]Entry, results *[]Result) { (*results)[0].Status = ResultStatusDNS }, false},
|
||||
{"成绩未完赛", func(_ *[]Entry, results *[]Result) { (*results)[0].Status = ResultStatusDNF }, false},
|
||||
{"成绩仍是草稿", func(_ *[]Entry, results *[]Result) { (*results)[0].State = ResultStateDraft }, false},
|
||||
{"没有成绩行", func(_ *[]Entry, results *[]Result) { *results = nil }, false},
|
||||
{"状态留空按正常处理", func(entries *[]Entry, results *[]Result) {
|
||||
(*entries)[0].Status = ""
|
||||
(*results)[0].Status = ""
|
||||
}, true},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
entries, results := fixture(lineup(1))
|
||||
tc.mutate(&entries, &results)
|
||||
cfg := bonusConfig(RecordBonusMax)
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: individualEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{athleteResultChannel(1)},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6()},
|
||||
Entries: entries, Results: results,
|
||||
RecordBonus: &cfg,
|
||||
RecordBreaks: []RecordBreak{{
|
||||
ID: 1, EventID: 1, EntryID: 1, AthleteID: 101, TeamID: 1001,
|
||||
Level: "meet", State: RecordBreakApproved,
|
||||
}},
|
||||
})
|
||||
rankPoints, bonusPoints := bonusLedgerOfEntry(es, 1)
|
||||
if tc.want && !nearlyEqual(bonusPoints, 2) {
|
||||
t.Fatalf("加分 = %v，期望 2", bonusPoints)
|
||||
}
|
||||
if !tc.want && bonusPoints != 0 {
|
||||
t.Fatalf("不该产生破纪录加分，得到 %v", bonusPoints)
|
||||
}
|
||||
if got := rankPoints > 0; got != (bonusPoints > 0) {
|
||||
t.Fatalf("成绩分与破纪录加分必须同生同灭，得到 成绩分=%v 加分=%v", rankPoints, bonusPoints)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestRecordBonusComesBackAfterRestore 验证状态判据是「看当前状态」而不是「一次性作废」：
|
||||
// 退赛 / 作废后再改回正常，同一个登记还要能把加分还回来（现场纠正误判就靠这条）。
|
||||
func TestRecordBonusComesBackAfterRestore(t *testing.T) {
|
||||
entries, results := fixture(lineup(1))
|
||||
cfg := bonusConfig(RecordBonusMax)
|
||||
in := EventScoreInput{
|
||||
Event: individualEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{athleteResultChannel(1)},
|
||||
Profiles: map[int64]ScoringProfile{1: individualTop6()},
|
||||
Entries: entries, Results: results,
|
||||
RecordBonus: &cfg,
|
||||
RecordBreaks: []RecordBreak{{
|
||||
ID: 1, EventID: 1, EntryID: 1, AthleteID: 101, TeamID: 1001,
|
||||
Level: "meet", State: RecordBreakApproved,
|
||||
}},
|
||||
}
|
||||
|
||||
entries[0].Status = EntryStatusScratched
|
||||
if got := recordBonusPointsOf(t, in); got != 0 {
|
||||
t.Fatalf("退赛后的加分 = %v，期望 0", got)
|
||||
}
|
||||
entries[0].Status = EntryStatusRegistered
|
||||
if got := recordBonusPointsOf(t, in); !nearlyEqual(got, 2) {
|
||||
t.Fatalf("恢复参赛后的加分 = %v，期望 2", got)
|
||||
}
|
||||
|
||||
results[0].Status = ResultStatusWithdrawn
|
||||
if got := recordBonusPointsOf(t, in); got != 0 {
|
||||
t.Fatalf("成绩作废后的加分 = %v，期望 0", got)
|
||||
}
|
||||
results[0].Status = ResultStatusOK
|
||||
if got := recordBonusPointsOf(t, in); !nearlyEqual(got, 2) {
|
||||
t.Fatalf("成绩改回有效后的加分 = %v，期望 2", got)
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,10 @@ type EventScoreInput struct {
|
||||
Results []Result
|
||||
RecordBonus *RecordBonusConfig
|
||||
RecordBreaks []RecordBreak
|
||||
Options ScoreOptions
|
||||
// TeamRanks 是按单位录入的团体名次，只有 scope=team + basis=manual 的通道读它。
|
||||
// 与「团体报名项（athlete_id=0）的 results.rank」共同构成团体名次的全部来源。
|
||||
TeamRanks []TeamManualRank
|
||||
Options ScoreOptions
|
||||
}
|
||||
|
||||
// EventScore 是一次小项计分的结果。
|
||||
@@ -54,6 +57,15 @@ type RankedResult struct {
|
||||
Points float64
|
||||
ResultValue *float64
|
||||
Status ResultStatus
|
||||
// SubjectKey 是这条名次的主体标识：名次按 (通道, 组别, 主体) 唯一，
|
||||
// 取值 'e:<entryId>' / 'a:<athleteId>' / 't:<teamId>'，三者都是 0 时退化为 'ch:<channelId>'。
|
||||
// 聚合与团体手工名次没有单条报名项，靠它才能唯一落库。
|
||||
SubjectKey string
|
||||
// 下面三个开关随名次一起携带，榜单侧（standings.go）不必回查库就能算出奖牌：
|
||||
// 小项是否结算奖牌、通道是否发牌、个人奖牌是否并入单位奖牌榜。
|
||||
AwardMedals bool
|
||||
CountToMedals bool
|
||||
CountToTeamMedals bool
|
||||
}
|
||||
|
||||
// ScoreEvent 按项目的计分通道逐条计算名次与积分，输出流水与名次明细。
|
||||
@@ -175,10 +187,14 @@ func entryMatches(in EventScoreInput, e Entry) bool {
|
||||
|
||||
// collectCandidates 过滤出本通道真正参与排名的报名项：
|
||||
// 只取已发布、状态正常、且带有本通道所需数据的成绩。聚合通道不用本函数，见 scoreByAggregate。
|
||||
// scope=team + basis=manual 的候选来源与其它通道不同（P0 的修法），转给 collectTeamManualCandidates。
|
||||
func collectCandidates(in EventScoreInput, ch ScoreChannel) ([]candidate, error) {
|
||||
if ch.Basis == BasisResult && in.Event.Compare == CompareNone {
|
||||
return nil, ErrCompareRequired
|
||||
}
|
||||
if ch.Basis == BasisManual && ch.Scope == ScopeTeam {
|
||||
return collectTeamManualCandidates(in, ch), nil
|
||||
}
|
||||
|
||||
byEntry := make(map[int64]Result, len(in.Results))
|
||||
for _, r := range in.Results {
|
||||
@@ -222,6 +238,72 @@ func collectCandidates(in EventScoreInput, ch ScoreChannel) ([]candidate, error)
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// collectTeamManualCandidates 是 scope=team + basis=manual 的候选来源，只有两处：
|
||||
// 1. in.TeamRanks（按单位录入的团体名次）：没有对应的报名项，用合成 Entry{TeamID: id} 承载；
|
||||
// 2. 兜底：团体报名项（athlete_id == 0）的 results.rank，纯团体项目（篮球等）沿用原录入流程。
|
||||
//
|
||||
// 同一单位两个来源都有时以 TeamRanks 为准；rank <= 0 的团体名次视为未填 / 清空，直接忽略。
|
||||
// 个人报名项（athlete_id != 0）的名次是个人名次，绝不进团体通道——否则双通道项目
|
||||
// 第 2 次发布时会把刚写回 results.rank 的个人名次当成团体名次再发一次分（P0）。
|
||||
func collectTeamManualCandidates(in EventScoreInput, ch ScoreChannel) []candidate {
|
||||
type manualRank struct {
|
||||
teamID int64
|
||||
rank int
|
||||
}
|
||||
overrides := make([]manualRank, 0, len(in.TeamRanks))
|
||||
overrideOf := make(map[int64]int, len(in.TeamRanks))
|
||||
for _, tr := range in.TeamRanks {
|
||||
if tr.TeamID == 0 || tr.Rank <= 0 {
|
||||
continue
|
||||
}
|
||||
if _, dup := overrideOf[tr.TeamID]; dup {
|
||||
continue
|
||||
}
|
||||
overrideOf[tr.TeamID] = tr.Rank
|
||||
overrides = append(overrides, manualRank{teamID: tr.TeamID, rank: tr.Rank})
|
||||
}
|
||||
|
||||
byEntry := make(map[int64]Result, len(in.Results))
|
||||
for _, r := range in.Results {
|
||||
byEntry[r.EntryID] = r
|
||||
}
|
||||
|
||||
out := make([]candidate, 0, len(in.Entries)+len(overrides))
|
||||
taken := make(map[int64]bool, len(overrides))
|
||||
for _, e := range in.Entries {
|
||||
if !entryMatches(in, e) || e.AthleteID != 0 || !e.Status.rankable() {
|
||||
continue
|
||||
}
|
||||
r, ok := byEntry[e.ID]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if r.State == ResultStateDraft && !in.Options.IncludeDrafts {
|
||||
continue
|
||||
}
|
||||
if !r.Status.rankable() || r.Rank <= 0 {
|
||||
continue
|
||||
}
|
||||
rankIn := r.Rank
|
||||
if rank, ok := overrideOf[e.TeamID]; ok {
|
||||
rankIn = rank
|
||||
}
|
||||
taken[e.TeamID] = true
|
||||
out = append(out, candidate{entry: e, result: r, rankIn: rankIn})
|
||||
}
|
||||
for _, or := range overrides {
|
||||
if taken[or.teamID] {
|
||||
continue
|
||||
}
|
||||
// 合成报名项：ID=0 表示「不对应任何一条报名项」，团体名次的主体是单位。
|
||||
out = append(out, candidate{
|
||||
entry: Entry{TeamID: or.teamID},
|
||||
rankIn: or.rank,
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func scoreByResult(in EventScoreInput, ch ScoreChannel, profile ScoringProfile) ([]RankedResult, error) {
|
||||
cands, err := collectCandidates(in, ch)
|
||||
if err != nil {
|
||||
@@ -366,6 +448,10 @@ func rankedResult(in EventScoreInput, ch ScoreChannel, c candidate, rank int, po
|
||||
Points: points,
|
||||
Status: c.result.Status,
|
||||
}
|
||||
rr.SubjectKey = subjectKeyOf(rr)
|
||||
rr.AwardMedals = in.Event.AwardMedals
|
||||
rr.CountToMedals = ch.CountsToMedals()
|
||||
rr.CountToTeamMedals = ch.CountsToTeamMedals()
|
||||
if c.result.ResultValue != nil {
|
||||
v := *c.result.ResultValue
|
||||
rr.ResultValue = &v
|
||||
@@ -474,6 +560,10 @@ func scoreByAggregate(in EventScoreInput, ch ScoreChannel, profile ScoringProfil
|
||||
rr.AthleteName = c.entry.AthleteName
|
||||
rr.Shares = wholeShare(c.entry.primaryTeamID())
|
||||
}
|
||||
rr.SubjectKey = subjectKeyOf(rr)
|
||||
rr.AwardMedals = in.Event.AwardMedals
|
||||
rr.CountToMedals = ch.CountsToMedals()
|
||||
rr.CountToTeamMedals = ch.CountsToTeamMedals()
|
||||
v := c.value
|
||||
rr.ResultValue = &v
|
||||
out = append(out, rr)
|
||||
@@ -516,6 +606,11 @@ func validResultValue(r Result, found bool, opts ScoreOptions) (float64, bool) {
|
||||
// ledgerFromRanked 把名次明细转成积分流水：按通道 scope 决定记给个人还是单位；
|
||||
// 0 分不产生流水，避免流水表被零分噪声撑大。
|
||||
// 流水是否计入单位总分由通道的 countToTeam 决定（个人通道可以只记个人）。
|
||||
//
|
||||
// 团体手工名次与聚合名次没有对应的报名项与成绩（EntryID=0、ResultID=0），
|
||||
// 仍要能落库：SourceType 与聚合流水一样是 result，sourceID 退化为通道 id，
|
||||
// 由真实来源（通道 + 主体）唯一确定。写入侧按「EntryID=0 && ResultID=0 && source_type=result」
|
||||
// 识别这类流水（httpapi 的 isAggregateLedger），按组别重算时会整项重算回填，条数不增不减。
|
||||
func ledgerFromRanked(in EventScoreInput, ch ScoreChannel, ranked []RankedResult) []LedgerEntry {
|
||||
var out []LedgerEntry
|
||||
for _, rr := range ranked {
|
||||
@@ -556,6 +651,22 @@ func ledgerFromRanked(in EventScoreInput, ch ScoreChannel, ranked []RankedResult
|
||||
return out
|
||||
}
|
||||
|
||||
// subjectKeyOf 计算一条名次明细的主体标识（channel_ranks.subject_key 同口径）：
|
||||
// 有报名项就用报名项（个人名次按报名项去重才不会被并列拆开），否则按主体（个人 / 单位），
|
||||
// 全为空时退化为通道 id，保证 (通道, 组别, 主体) 的唯一索引不会撞键。
|
||||
func subjectKeyOf(rr RankedResult) string {
|
||||
switch {
|
||||
case rr.EntryID != 0:
|
||||
return fmt.Sprintf("e:%d", rr.EntryID)
|
||||
case rr.Scope == ScopeAthlete && rr.AthleteID != 0:
|
||||
return fmt.Sprintf("a:%d", rr.AthleteID)
|
||||
case rr.TeamID != 0:
|
||||
return fmt.Sprintf("t:%d", rr.TeamID)
|
||||
default:
|
||||
return fmt.Sprintf("ch:%d", rr.ChannelID)
|
||||
}
|
||||
}
|
||||
|
||||
// wholeShare 构造「主单位独占 100%」的归属份额。联队拆分未实现，这里只产出这一种口径。
|
||||
func wholeShare(teamID int64) []TeamShare {
|
||||
if teamID == 0 {
|
||||
|
||||
@@ -160,9 +160,8 @@ func TestScopeAndLedgerAttribution(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("team 通道仅记单位", func(t *testing.T) {
|
||||
ps := lineup(1)
|
||||
ps[0].rank = 1
|
||||
entries, results := fixture(ps)
|
||||
// 团体手工通道的候选只能来自 TeamRanks 或团体报名项（athlete_id = 0）。
|
||||
entries, results := fixture([]participant{{entryID: 1, teamID: 1001, rank: 1, noValue: true}})
|
||||
es := mustScore(t, EventScoreInput{
|
||||
Event: teamEvent(1), Category: testCategory(),
|
||||
Channels: []ScoreChannel{teamManualChannel(2)},
|
||||
|
||||
@@ -52,6 +52,12 @@ func rankMedal(rank int) int {
|
||||
}
|
||||
}
|
||||
|
||||
// medalEligible 是奖牌入选判据（devdocs 17 §4.5）：小项结算奖牌、通道是奖牌通道、
|
||||
// 名次在前三，三者同时成立才计入。三个开关随 RankedResult 携带，榜单不必回查库。
|
||||
func medalEligible(rr RankedResult) bool {
|
||||
return rr.AwardMedals && rr.CountToMedals && rankMedal(rr.Rank) != 0
|
||||
}
|
||||
|
||||
// BuildTeamStandings 生成总积分榜。
|
||||
// 总分 = Σ(仅记单位的流水) + 系数 × Σ(记到个人的流水)；排序按 in.TieBreak，缺省为总分 → 金 → 银 → 铜 → 单位编码。
|
||||
func BuildTeamStandings(in StandingsInput) []StandingsRow {
|
||||
@@ -243,12 +249,15 @@ func medalKeyOf(rr RankedResult, index int) medalKey {
|
||||
return k
|
||||
}
|
||||
|
||||
// pickMedalChannels 把按通道展开的名次明细去重成「每个报名项一条」：
|
||||
// 只保留优先级最高的通道名次，否则双通道项目一条成绩会拿两枚奖牌。
|
||||
// pickMedalChannels 先按奖牌入选判据过滤，再把按通道展开的名次明细去重成「每个主体一条」：
|
||||
// 只保留优先级最高的通道名次（个人通道优先），否则双通道项目一条成绩会拿两枚奖牌。
|
||||
func pickMedalChannels(ranked []RankedResult, excludeTeam bool) []RankedResult {
|
||||
best := make(map[medalKey]RankedResult, len(ranked))
|
||||
order := make([]medalKey, 0, len(ranked))
|
||||
for i, rr := range ranked {
|
||||
if !medalEligible(rr) {
|
||||
continue
|
||||
}
|
||||
if excludeTeam && rr.Scope == ScopeTeam {
|
||||
continue
|
||||
}
|
||||
@@ -270,11 +279,20 @@ func pickMedalChannels(ranked []RankedResult, excludeTeam bool) []RankedResult {
|
||||
return out
|
||||
}
|
||||
|
||||
// teamMedals 统计团体奖牌榜。按 Shares 逐份额记牌：当前只有「主单位独占 100%」一种口径，
|
||||
// teamMedals 统计单位奖牌榜。按 Shares 逐份额记牌：当前只有「主单位独占 100%」一种口径，
|
||||
// 将来若支持联队拆分，每个成员单位都会各记一枚。
|
||||
//
|
||||
// 两层开关（devdocs 17 §4.5）：
|
||||
// - 粗粒度总闸 StandingsInput.ExcludeTeamEventMedals：为 true 时团体项目的奖牌一律不进单位榜；
|
||||
// - 通道开关 count_to_team_medals：scope=athlete 的通道置 false 时，它的个人奖牌不进单位榜。
|
||||
//
|
||||
// 两者是「与」的关系；scope=team 的奖牌本来就记在单位头上，不受通道开关影响。
|
||||
func teamMedals(in StandingsInput) map[int64]medalTally {
|
||||
out := make(map[int64]medalTally)
|
||||
for _, rr := range pickMedalChannels(in.Ranked, in.ExcludeTeamEventMedals) {
|
||||
if rr.Scope != ScopeTeam && !rr.CountToTeamMedals {
|
||||
continue
|
||||
}
|
||||
medal := rankMedal(rr.Rank)
|
||||
if medal == 0 {
|
||||
continue
|
||||
@@ -295,7 +313,8 @@ func teamMedals(in StandingsInput) map[int64]medalTally {
|
||||
return out
|
||||
}
|
||||
|
||||
// athleteMedals 只统计个人项目（scope=athlete）的奖牌。
|
||||
// athleteMedals 只统计个人项目（scope=athlete）的奖牌；
|
||||
// 通道的 count_to_team_medals 与个人榜无关，只决定这枚奖牌算不算进单位榜。
|
||||
func athleteMedals(in StandingsInput) map[int64]medalTally {
|
||||
out := make(map[int64]medalTally)
|
||||
for _, rr := range pickMedalChannels(in.Ranked, false) {
|
||||
|
||||
@@ -4,10 +4,13 @@ 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,
|
||||
TeamID: teamID,
|
||||
Shares: []TeamShare{{TeamID: teamID, Weight: 1}},
|
||||
Scope: scope,
|
||||
Rank: rank,
|
||||
AwardMedals: true,
|
||||
CountToMedals: true,
|
||||
CountToTeamMedals: true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,7 +190,10 @@ func TestAthleteStandings(t *testing.T) {
|
||||
Teams: teams, Athletes: athletes, Ledger: ledger,
|
||||
Ranked: []RankedResult{{
|
||||
TeamID: 1001, AthleteID: 1, Scope: ScopeTeam, Rank: 1,
|
||||
Shares: []TeamShare{{TeamID: 1001, Weight: 1}},
|
||||
Shares: []TeamShare{{TeamID: 1001, Weight: 1}},
|
||||
AwardMedals: true,
|
||||
CountToMedals: true,
|
||||
CountToTeamMedals: true,
|
||||
}},
|
||||
})
|
||||
for _, r := range rows {
|
||||
@@ -201,7 +207,10 @@ func TestAthleteStandings(t *testing.T) {
|
||||
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}},
|
||||
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}})
|
||||
@@ -274,7 +283,10 @@ func TestMedalDedupAcrossChannels(t *testing.T) {
|
||||
return RankedResult{
|
||||
EventID: 1, CategoryID: 1, EntryID: 7, ChannelID: channelID, Scope: scope,
|
||||
TeamID: 1, AthleteID: 101, Rank: rank,
|
||||
Shares: []TeamShare{{TeamID: 1, Weight: 1}},
|
||||
Shares: []TeamShare{{TeamID: 1, Weight: 1}},
|
||||
AwardMedals: true,
|
||||
CountToMedals: true,
|
||||
CountToTeamMedals: true,
|
||||
}
|
||||
}
|
||||
teams := testTeams(1)
|
||||
@@ -332,6 +344,7 @@ func TestMedalDedupAcrossChannels(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
|
||||
|
||||
@@ -208,6 +208,9 @@ type Event struct {
|
||||
Venue string `json:"venue,omitempty"`
|
||||
SortOrder int `json:"sortOrder,omitempty"`
|
||||
Remark string `json:"remark,omitempty"`
|
||||
// AwardMedals 决定该小项是否结算奖牌；库中默认 1（开启），关闭后它的名次不产生任何奖牌。
|
||||
// 积分不受影响：奖牌与积分是两套口径。
|
||||
AwardMedals bool `json:"awardMedals"`
|
||||
// AvgMode 团体成绩（basis=aggregate 通道）取平均时的分母口径；空值按 valid 处理。
|
||||
AvgMode AvgMode `json:"avgMode"`
|
||||
}
|
||||
@@ -237,6 +240,19 @@ type ScoreChannel struct {
|
||||
// CountToTeam 决定该通道产出的流水是否计入单位总分；nil 表示按缺省（计入）处理。
|
||||
// 「个人+团体」项目的个人通道置 false：分只记在个人头上，不进单位总分。
|
||||
CountToTeam *bool `json:"countToTeam,omitempty"`
|
||||
// CountToMedals 决定该通道产出的名次是否发奖牌；nil 表示按缺省（发牌）处理。
|
||||
CountToMedals *bool `json:"countToMedals,omitempty"`
|
||||
// CountToTeamMedals 决定该通道的个人奖牌是否并入单位奖牌榜；nil 表示按缺省（并入）处理。
|
||||
// 只对 scope=athlete 的通道有意义：scope=team 的名次本来就记在单位头上。
|
||||
CountToTeamMedals *bool `json:"countToTeamMedals,omitempty"`
|
||||
}
|
||||
|
||||
// TeamManualRank 是「按单位录入的团体名次」，只被 scope=team + basis=manual 的通道读取。
|
||||
// 团体名次的来源只有两个：这里，以及团体报名项（athlete_id=0）的 results.rank；
|
||||
// 同一单位两边都有时以这里为准。个人报名项的名次属于个人名次，绝不进团体通道。
|
||||
type TeamManualRank struct {
|
||||
TeamID int64 `json:"teamId"`
|
||||
Rank int `json:"rank"`
|
||||
}
|
||||
|
||||
// ScoringRule 积分模板的一条明细：名次 → 分值。分值一律来自配置。
|
||||
@@ -446,6 +462,16 @@ func (c ScoreChannel) countToTeam() bool {
|
||||
return c.CountToTeam == nil || *c.CountToTeam
|
||||
}
|
||||
|
||||
// CountsToMedals 未配置时按 true 处理：只有显式关闭的通道才不发奖牌。
|
||||
func (c ScoreChannel) CountsToMedals() bool {
|
||||
return c.CountToMedals == nil || *c.CountToMedals
|
||||
}
|
||||
|
||||
// CountsToTeamMedals 未配置时按 true 处理：个人通道的奖牌默认也计入单位奖牌榜。
|
||||
func (c ScoreChannel) CountsToTeamMedals() bool {
|
||||
return c.CountToTeamMedals == nil || *c.CountToTeamMedals
|
||||
}
|
||||
|
||||
func (c EventCategory) multiplier() float64 {
|
||||
if c.Multiplier <= 0 {
|
||||
return 1
|
||||
|
||||
Reference in new issue
Block a user