用户点名的三件事(模板功能、删死代码、剩余缺口)这一批全部落地,另修掉两个刚暴露的导入缺陷:
**新增能力**
- 备份恢复:`POST /api/backup/restore`(admin)。先把校验做在拍快照之前(只读打开 + integrity_check +
关键表校验 + 异类库标志表互斥),再用 VACUUM INTO 拍「恢复前安全副本」,然后关连接、整文件替换、
触发优雅重启;`-wal` 还在时直接拒绝(宁可失败也不让旧库 WAL 套到新库上);恢复后审计直写"恢复之后
还在的那份库"(不走通用 Auditor,否则记录只会落在被替换掉的旧文件上)。顺带修掉:裸服务端连续恢复
第二次会在拍副本处崩出一句看不懂的 500,现在回 503「上次恢复后尚未重启,请先重启服务端」。
- 安全副本保留策略:每类库保留最近 5 份,独立于 .db 的 20 份滚动清理。
- 图片管理:`DELETE /api/uploads/{name}`(被引用 409 并列出引用点)、`GET /api/uploads/orphans`、
`POST /api/uploads/orphans/delete`(只删列出的孤儿,宁漏勿误),全部 admin(与字体删除同档);
`deploy/backup.bat` 补上 uploads/ 归档(logs 不归档:可再生的诊断且会无上限增长)。
- 已彻底删除单位的恢复:`POST /api/teams/{id}/restore`(与 hideTeam 同档)。幂等;恢复不会把「停用」
变成「启用」;真机确认恢复前后榜单逐字节一致、change_log 最大值不变(数据一行没动,不需要重算)。
界面加「显示已彻底删除的单位」(仅 admin)与恢复按钮;非 admin 的删除确认框里写明"本账号无法自行恢复"。
- 审计日志按 `action` 过滤(子串模糊,输入里的 %/_/\ 转义成字面量)。
- 删除死表 recent_projects(新增 system 迁移 0006,未动已应用的迁移)。
- points_override 不再"设了没效果":写入侧 400 + 引擎侧守卫,提示改用「积分调整」。
- 联队份额空壳清理(UnionAttribution/UnionSplit/Entry.TeamShares/resolvedShares 等;TeamShare 类型保留,
因为 export/realtime/奖牌流水三处在生产路径上构造它)。
- 自定义大屏模板 M1:插值引擎(parseTemplate/renderTemplate),任何情况都不抛异常、未定义→空串+警告、
警告按 (code,path) 合并计数、无 eval/innerHTML,57 个新用例。
**两个真缺陷(前两个已随 0.1.6 出包)**
- 基础数据包导入「排序」列口径不一致:小项/组别留空保持原值,单位/大项留空被写成 0(plan 没从库里
现值起手)→ 四张表统一为「留空保持原值」。
- 同类第二处:布尔列「整列被删掉」被当成"取默认值",会把库里所有停用的单位/大项静默改回启用 →
改为「缺列 = 不动」(写侧与解析侧都收口,补了"缺列保持/空格子=是/显式否=停用"三组对照用例)。
**删死代码**
- createEntry / updateEntry / deleteEntry / entryEventID / checkCategoryInEvent / getEntry /
normalizeEntryStatus / ExportBaseDataXLSX(全仓 grep 零引用)。⚠️ 随之记入文档:「组别必须属于该小项」
这道校验现在只由导入路径"按小项+组别名解析"天然保证,将来若新增从请求体接收 categoryId 的接口,
必须自己补校验(库层没有复合外键)。
**文档**
- devdocs 全面同步(01/02/03/04/05/06/07/09/11/12/13/README;含身份口径、延迟结算、大屏单栏新版式、
新增路由与设置键、R18/R19 风险);docs 复核 + 第二轮(身份口径三个易写反的分支、图片删除、备份覆盖、
审计过滤、单位恢复、去掉硬编码版本号、上线检查清单 +5 项);debug/使用说明 6 份逐份 diff 一致。
测试:服务端 13 包(连跑两遍)、前端 406 例、Console 28 例 + 18 文件语法检查 —— 全绿。
版本号 dev_0.1.6 → dev_0.1.7。
207 lines
6.0 KiB
Go
207 lines
6.0 KiB
Go
package domain
|
||
|
||
import "testing"
|
||
|
||
// ---------- 通用构造 ----------
|
||
|
||
func ptr(f float64) *float64 { return &f }
|
||
|
||
// 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, 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
|
||
}
|