AskaEth
6bd7bd1627
口径（用户确认）： - 个人分按个人成绩排名给，**不计入单位总分**（下沉到通道级开关，不再动全局系数） - 团体成绩 = 每队成员成绩的**平均值** → 排名（并列顺延）→ 团体模板给分 → 计入单位总分 - 平均值口径是**小项级单选项**：默认「只算有效成绩」；「全部报名人员计入」= 分母为报名条数、 没成绩按 0 加入分子；在**成绩录入页**就地切换并立即保存 服务端： - 迁移 0017：score_ledger 加 count_to_team（重建，无子表）；event_score_channels 加 count_to_team； events 加 avg_mode（默认 valid） - 规则包 Channel 加 countToTeam（缺省 true）；channelTemplates 支持 individual_team → 默认 athlete(result, 不计入单位) + team(aggregate 队内平均) - 计分引擎：SumByTeam 跳过 count_to_team=0 的流水；实现 basis=aggregate 的队内平均团体排名 （valid 分母=有有效成绩人数；all 分母=报名人数；某队 0 有效成绩不参与） 前端： - 计分通道页：每行通道「计入单位总分」勾选 + basis 下拉「按队内平均」 - 成绩录入页：仅有队内平均通道的小项显示「平均值口径」单选（默认只算有效成绩），改动即存 - 录入页「实时积分预览」按新口径对齐（原先按主体求和且双通道重复计入，与发布后不一致） - 大屏/管理端团体成绩只显示数值，不出现「平均」字样 自检：服务端 12 包全绿；前端 vue-tsc + build、node --test 134/134；console 16 文件通过。
385 lines
13 KiB
Go
385 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,
|
||
}
|
||
}
|
||
|
||
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}},
|
||
}},
|
||
})
|
||
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}},
|
||
}
|
||
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}},
|
||
}
|
||
}
|
||
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}},
|
||
}
|
||
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)
|
||
}
|
||
}
|