## 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 例 + 语法检查。
210 lines
6.0 KiB
Go
210 lines
6.0 KiB
Go
package domain
|
||
|
||
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{
|
||
ID: 1, Code: "individual_top6", Name: "个人项目前六名",
|
||
AwardRanks: 6, LastPlaceZero: false, TieMode: TieSkip,
|
||
Rules: []ScoringRule{{1, 10}, {2, 8}, {3, 6}, {4, 3}, {5, 2}, {6, 1}},
|
||
}
|
||
}
|
||
|
||
// teamTop6 是规则包里的团体项目前六名:15/10/8/4/2/1。
|
||
func teamTop6() ScoringProfile {
|
||
return ScoringProfile{
|
||
ID: 2, Code: "team_top6", Name: "团体项目前六名",
|
||
AwardRanks: 6, LastPlaceZero: false, TieMode: TieSkip,
|
||
Rules: []ScoringRule{{1, 15}, {2, 10}, {3, 8}, {4, 4}, {5, 2}, {6, 1}},
|
||
}
|
||
}
|
||
|
||
// nineProfile 是测试矩阵 case 1..6 使用的八名表:9/7/6/5/4/3/2/1。
|
||
func nineProfile(tie TieMode) ScoringProfile {
|
||
return ScoringProfile{
|
||
ID: 3, Code: "nine", Name: "八名表",
|
||
AwardRanks: 8, LastPlaceZero: false, TieMode: tie,
|
||
Rules: []ScoringRule{{1, 9}, {2, 7}, {3, 6}, {4, 5}, {5, 4}, {6, 3}, {7, 2}, {8, 1}},
|
||
}
|
||
}
|
||
|
||
func testCategory() EventCategory {
|
||
return EventCategory{ID: 1, EventID: 1, Name: "男子组", Multiplier: 1}
|
||
}
|
||
|
||
func individualEvent(multiplier float64) Event {
|
||
return Event{
|
||
ID: 1, Code: "E1", Name: "100米跑", EventType: EventTypeIndividual,
|
||
Compare: CompareAsc, RecordEligible: true, Scored: true, AwardMedals: true,
|
||
Multiplier: multiplier, Status: EventStatusPublished,
|
||
}
|
||
}
|
||
|
||
func teamEvent(multiplier float64) Event {
|
||
e := individualEvent(multiplier)
|
||
e.EventType = EventTypeTeam
|
||
e.Code = "E2"
|
||
return e
|
||
}
|
||
|
||
func athleteResultChannel(profileID int64) ScoreChannel {
|
||
return ScoreChannel{ID: 1, EventID: 1, Scope: ScopeAthlete, Basis: BasisResult, ProfileID: profileID}
|
||
}
|
||
|
||
func athleteManualChannel(profileID int64) ScoreChannel {
|
||
return ScoreChannel{ID: 1, EventID: 1, Scope: ScopeAthlete, Basis: BasisManual, ProfileID: profileID}
|
||
}
|
||
|
||
func teamManualChannel(profileID int64) ScoreChannel {
|
||
return ScoreChannel{ID: 2, EventID: 1, Scope: ScopeTeam, Basis: BasisManual, ProfileID: profileID}
|
||
}
|
||
|
||
func teamAggregateChannel(profileID int64) ScoreChannel {
|
||
return ScoreChannel{ID: 3, EventID: 1, Scope: ScopeTeam, Basis: BasisAggregate, ProfileID: profileID}
|
||
}
|
||
|
||
// participant 是构造「报名项 + 成绩」的最小描述。
|
||
type participant struct {
|
||
entryID int64
|
||
athleteID int64
|
||
teamID int64
|
||
name string
|
||
value float64
|
||
noValue bool // true 表示这条成绩没有可比数值(如直接录名次的项目)
|
||
rank int
|
||
status ResultStatus
|
||
entryStatus EntryStatus
|
||
state ResultState
|
||
}
|
||
|
||
func fixture(ps []participant) ([]Entry, []Result) {
|
||
entries := make([]Entry, 0, len(ps))
|
||
results := make([]Result, 0, len(ps))
|
||
for _, p := range ps {
|
||
entries = append(entries, Entry{
|
||
ID: p.entryID, EventID: 1, CategoryID: 1, TeamID: p.teamID,
|
||
AthleteID: p.athleteID, AthleteName: p.name,
|
||
Status: p.entryStatus,
|
||
})
|
||
state := p.state
|
||
if state == "" {
|
||
state = ResultStatePublished
|
||
}
|
||
var value *float64
|
||
if !p.noValue {
|
||
value = ptr(p.value)
|
||
}
|
||
results = append(results, Result{
|
||
ID: p.entryID * 100, EventID: 1, EntryID: p.entryID,
|
||
Rank: p.rank, ResultValue: value, Status: p.status, State: state,
|
||
})
|
||
}
|
||
return entries, results
|
||
}
|
||
|
||
// lineup 生成 n 个参赛者:成绩 1..n,entryID 1..n。
|
||
func lineup(n int) []participant {
|
||
ps := make([]participant, 0, n)
|
||
for i := 1; i <= n; i++ {
|
||
ps = append(ps, participant{
|
||
entryID: int64(i), athleteID: int64(100 + i), teamID: int64(1000 + i),
|
||
name: "选手" + string(rune('A'+i-1)), value: float64(i),
|
||
})
|
||
}
|
||
return ps
|
||
}
|
||
|
||
// lineupValues 生成 n 个参赛者并指定成绩值,用于构造并列。
|
||
func lineupValues(values ...float64) []participant {
|
||
ps := make([]participant, 0, len(values))
|
||
for i, v := range values {
|
||
ps = append(ps, participant{
|
||
entryID: int64(i + 1), athleteID: int64(100 + i + 1), teamID: int64(1000 + i + 1),
|
||
name: "选手" + string(rune('A'+i)), value: v,
|
||
})
|
||
}
|
||
return ps
|
||
}
|
||
|
||
func mustScore(t *testing.T, in EventScoreInput) EventScore {
|
||
t.Helper()
|
||
es, err := ScoreEvent(in)
|
||
if err != nil {
|
||
t.Fatalf("ScoreEvent 返回错误: %v", err)
|
||
}
|
||
return es
|
||
}
|
||
|
||
func pointsByEntry(ledger []LedgerEntry) map[int64]float64 {
|
||
out := make(map[int64]float64)
|
||
for _, e := range ledger {
|
||
if e.Voided {
|
||
continue
|
||
}
|
||
out[e.EntryID] += e.Points
|
||
}
|
||
return out
|
||
}
|
||
|
||
func rankByEntry(ranked []RankedResult) map[int64]int {
|
||
out := make(map[int64]int, len(ranked))
|
||
for _, r := range ranked {
|
||
out[r.EntryID] = r.Rank
|
||
}
|
||
return out
|
||
}
|
||
|
||
func pointsByTeam(ledger []LedgerEntry) map[int64]float64 {
|
||
out := make(map[int64]float64)
|
||
for _, e := range ledger {
|
||
if e.Voided {
|
||
continue
|
||
}
|
||
out[e.TeamID] += e.Points
|
||
}
|
||
return out
|
||
}
|
||
|
||
// assertEntryPoints 断言 entryID 1..len(want) 的积分依次等于 want;缺键按 0 处理。
|
||
func assertEntryPoints(t *testing.T, got map[int64]float64, want []float64) {
|
||
t.Helper()
|
||
for i, w := range want {
|
||
id := int64(i + 1)
|
||
if !nearlyEqual(got[id], w) {
|
||
t.Errorf("entry %d 积分 = %v,期望 %v", id, got[id], w)
|
||
}
|
||
}
|
||
}
|
||
|
||
func testTeams(ids ...int64) []Team {
|
||
out := make([]Team, 0, len(ids))
|
||
for i, id := range ids {
|
||
out = append(out, Team{
|
||
ID: id, Code: string(rune('A' + i)), Name: "单位" + string(rune('A'+i)), Active: true,
|
||
})
|
||
}
|
||
return out
|
||
}
|
||
|
||
func ledgerFor(teamID int64, points float64) LedgerEntry {
|
||
return LedgerEntry{TeamID: teamID, SourceType: SourceResult, SourceID: teamID, Points: points, CountToTeam: true}
|
||
}
|
||
|
||
func ledgerForAthlete(teamID, athleteID int64, points float64) LedgerEntry {
|
||
return LedgerEntry{TeamID: teamID, AthleteID: athleteID, SourceType: SourceResult, SourceID: athleteID, Points: points, CountToTeam: true}
|
||
}
|
||
|
||
// ledgerForPersonal 是「不计入单位总分」的流水:只记在个人头上(如「个人+团体」项目的个人通道)。
|
||
func ledgerForPersonal(teamID, athleteID int64, points float64) LedgerEntry {
|
||
e := ledgerForAthlete(teamID, athleteID, points)
|
||
e.CountToTeam = false
|
||
return e
|
||
}
|