## 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 例 + 语法检查。
236 lines
7.9 KiB
TypeScript
236 lines
7.9 KiB
TypeScript
/**
|
|
* 规则包归一化。
|
|
*
|
|
* `GET /api/rules/export` 返回裸 YAML(服务端 rules.Marshal),这里把解析出的
|
|
* unknown 收敛成 shared 的 RulePack 契约:补齐缺省值、丢弃未知字段。
|
|
* 校验口径与服务端 rules.Canonical 对齐,避免前端拿到的规则包和实际生效规则不一致。
|
|
*/
|
|
|
|
import { normalizeCountToTeam } from './channels'
|
|
import {
|
|
asRecord,
|
|
emptyToNull,
|
|
firstBool,
|
|
firstNumber,
|
|
firstNumberOrNull,
|
|
firstString,
|
|
isRecord,
|
|
} from './internal'
|
|
import type {
|
|
ChannelBasis,
|
|
ChannelScope,
|
|
ChannelTemplate,
|
|
EventOverride,
|
|
EventType,
|
|
RecordBonusLevel,
|
|
RecordBonusMode,
|
|
ResultType,
|
|
RuleChannel,
|
|
RulePack,
|
|
RulePackManualAdjustment,
|
|
RulePackMeta,
|
|
RulePackRecordBonus,
|
|
RulePackStandings,
|
|
RuleProfile,
|
|
ScoringProfileRule,
|
|
TieBreakKey,
|
|
TieMode,
|
|
} from './types'
|
|
|
|
const TIE_BREAK_KEYS: readonly TieBreakKey[] = [
|
|
'points',
|
|
'gold',
|
|
'silver',
|
|
'bronze',
|
|
'teamCode',
|
|
'name',
|
|
]
|
|
const DEFAULT_TIE_BREAK: TieBreakKey[] = ['points', 'gold', 'silver', 'bronze', 'teamCode']
|
|
const TIE_MODES: readonly TieMode[] = ['skip', 'average', 'higher']
|
|
const RECORD_BONUS_MODES: readonly RecordBonusMode[] = ['max', 'sum']
|
|
const SCOPES: readonly ChannelScope[] = ['athlete', 'team']
|
|
const BASES: readonly ChannelBasis[] = ['result', 'manual', 'aggregate']
|
|
const EVENT_TYPES: readonly EventType[] = ['individual', 'team', 'match', 'individual_team']
|
|
const RESULT_TYPES: readonly ResultType[] = ['time', 'distance', 'count', 'score', 'none']
|
|
|
|
export function normalizeRulePack(raw: unknown): RulePack | null {
|
|
if (!isRecord(raw)) return null
|
|
if (firstString(raw.format) !== 'scoreboard-rules') return null
|
|
if (firstNumber(0, raw.formatVersion) !== 1) return null
|
|
return {
|
|
format: 'scoreboard-rules',
|
|
formatVersion: 1,
|
|
meta: normalizeMeta(raw.meta),
|
|
standings: normalizeStandings(raw.standings),
|
|
profiles: normalizeProfiles(raw.profiles),
|
|
recordBonus: normalizeRecordBonus(raw.recordBonus),
|
|
manualAdjustment: normalizeManualAdjustment(raw.manualAdjustment),
|
|
channelTemplates: normalizeTemplates(raw.channelTemplates),
|
|
eventOverrides: normalizeOverrides(raw.eventOverrides),
|
|
}
|
|
}
|
|
|
|
function oneOf<T extends string>(value: unknown, allowed: readonly T[], fallback: T): T {
|
|
return typeof value === 'string' && (allowed as readonly string[]).includes(value)
|
|
? (value as T)
|
|
: fallback
|
|
}
|
|
|
|
function optionalOneOf<T extends string>(value: unknown, allowed: readonly T[]): T | undefined {
|
|
return typeof value === 'string' && (allowed as readonly string[]).includes(value)
|
|
? (value as T)
|
|
: undefined
|
|
}
|
|
|
|
function normalizeMeta(raw: unknown): RulePackMeta {
|
|
const rec = asRecord(raw)
|
|
return {
|
|
code: firstString(rec.code) ?? '',
|
|
name: firstString(rec.name) ?? '',
|
|
version: firstString(rec.version) ?? '',
|
|
updatedAt: firstString(rec.updatedAt) ?? '',
|
|
author: emptyToNull(firstString(rec.author)),
|
|
note: emptyToNull(firstString(rec.note)),
|
|
}
|
|
}
|
|
|
|
function normalizeStandings(raw: unknown): RulePackStandings {
|
|
const rec = asRecord(raw)
|
|
const tieBreakRaw = rec.tieBreak
|
|
const tieBreak = Array.isArray(tieBreakRaw)
|
|
? tieBreakRaw.filter(
|
|
(item): item is TieBreakKey =>
|
|
typeof item === 'string' && (TIE_BREAK_KEYS as readonly string[]).includes(item),
|
|
)
|
|
: []
|
|
return {
|
|
individualToTeamWeight: firstNumber(1, rec.individualToTeamWeight),
|
|
tieBreak: tieBreak.length > 0 ? tieBreak : [...DEFAULT_TIE_BREAK],
|
|
medalCountsTeamEvents: firstBool(true, rec.medalCountsTeamEvents),
|
|
showIndividualBoard: firstBool(true, rec.showIndividualBoard),
|
|
showIndividualMedals: firstBool(true, rec.showIndividualMedals),
|
|
}
|
|
}
|
|
|
|
function normalizeProfiles(raw: unknown): RuleProfile[] {
|
|
if (!Array.isArray(raw)) return []
|
|
const out: RuleProfile[] = []
|
|
for (const item of raw) {
|
|
const rec = asRecord(item)
|
|
const code = firstString(rec.code)
|
|
if (code === null || code === '') continue
|
|
out.push({
|
|
code,
|
|
name: firstString(rec.name) ?? code,
|
|
awardRanks: firstNumber(0, rec.awardRanks),
|
|
lastPlaceZero: firstBool(false, rec.lastPlaceZero),
|
|
tieMode: oneOf(rec.tieMode, TIE_MODES, 'skip'),
|
|
recordBonusMode: optionalOneOf(rec.recordBonusMode, RECORD_BONUS_MODES),
|
|
rules: normalizeScoringRules(rec.rules),
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
function normalizeScoringRules(raw: unknown): ScoringProfileRule[] {
|
|
if (!Array.isArray(raw)) return []
|
|
const out: ScoringProfileRule[] = []
|
|
for (const item of raw) {
|
|
const rec = asRecord(item)
|
|
const rank = firstNumberOrNull(rec.rank)
|
|
const points = firstNumberOrNull(rec.points)
|
|
if (rank === null || points === null) continue
|
|
out.push({ rank, points })
|
|
}
|
|
return out
|
|
}
|
|
|
|
function normalizeRecordBonus(raw: unknown): RulePackRecordBonus {
|
|
const rec = asRecord(raw)
|
|
return {
|
|
enabled: firstBool(false, rec.enabled),
|
|
mode: oneOf(rec.mode, RECORD_BONUS_MODES, 'max'),
|
|
levels: normalizeLevels(rec.levels),
|
|
}
|
|
}
|
|
|
|
function normalizeLevels(raw: unknown): RecordBonusLevel[] {
|
|
if (!Array.isArray(raw)) return []
|
|
const out: RecordBonusLevel[] = []
|
|
for (const item of raw) {
|
|
const rec = asRecord(item)
|
|
const code = firstString(rec.code)
|
|
if (code === null || code === '') continue
|
|
out.push({ code, name: firstString(rec.name) ?? code, points: firstNumber(0, rec.points) })
|
|
}
|
|
return out
|
|
}
|
|
|
|
function normalizeManualAdjustment(raw: unknown): RulePackManualAdjustment {
|
|
const rec = asRecord(raw)
|
|
return {
|
|
enabled: firstBool(false, rec.enabled),
|
|
reasonRequired: firstBool(true, rec.reasonRequired),
|
|
}
|
|
}
|
|
|
|
function normalizeTemplates(raw: unknown): ChannelTemplate[] {
|
|
if (!Array.isArray(raw)) return []
|
|
return raw.map((item) => {
|
|
const rec = asRecord(item)
|
|
const match = asRecord(rec.match)
|
|
return {
|
|
match: {
|
|
eventType: optionalOneOf(match.eventType, EVENT_TYPES),
|
|
resultType: optionalOneOf(match.resultType, RESULT_TYPES),
|
|
sportCode: firstString(match.sportCode) ?? undefined,
|
|
},
|
|
channels: normalizeChannels(rec.channels),
|
|
}
|
|
})
|
|
}
|
|
|
|
function normalizeOverrides(raw: unknown): EventOverride[] {
|
|
if (!Array.isArray(raw)) return []
|
|
const out: EventOverride[] = []
|
|
for (const item of raw) {
|
|
const rec = asRecord(item)
|
|
const eventCode = firstString(rec.eventCode)
|
|
if (eventCode === null || eventCode === '') continue
|
|
const override: EventOverride = { eventCode }
|
|
const name = firstString(rec.name)
|
|
if (name !== null) override.name = name
|
|
if (typeof rec.scored === 'boolean') override.scored = rec.scored
|
|
const multiplier = firstNumberOrNull(rec.multiplier)
|
|
if (multiplier !== null) override.multiplier = multiplier
|
|
// 三态:缺省表示不动该小项已有的奖牌开关,只有显式写了才落到覆盖对象上。
|
|
if (typeof rec.awardMedals === 'boolean') override.awardMedals = rec.awardMedals
|
|
if (Array.isArray(rec.channels)) override.channels = normalizeChannels(rec.channels)
|
|
out.push(override)
|
|
}
|
|
return out
|
|
}
|
|
|
|
function normalizeChannels(raw: unknown): RuleChannel[] {
|
|
if (!Array.isArray(raw)) return []
|
|
const out: RuleChannel[] = []
|
|
for (const item of raw) {
|
|
const rec = asRecord(item)
|
|
const profile = firstString(rec.profile)
|
|
if (profile === null || profile === '') continue
|
|
const channel: RuleChannel = {
|
|
scope: oneOf(rec.scope, SCOPES, 'athlete'),
|
|
basis: oneOf(rec.basis, BASES, 'result'),
|
|
profile,
|
|
// 旧规则包不写这个字段,缺省按「计入单位总分」处理。
|
|
countToTeam: normalizeCountToTeam(rec.countToTeam),
|
|
}
|
|
// 两个奖牌开关同样是「缺省即开」;只有规则包显式写了才落到对象上,
|
|
// 保留「未配置」与「显式开启」的区别,导出页才能如实显示规则包原文口径。
|
|
if (typeof rec.countToMedals === 'boolean') channel.countToMedals = rec.countToMedals
|
|
if (typeof rec.countToTeamMedals === 'boolean') channel.countToTeamMedals = rec.countToTeamMedals
|
|
out.push(channel)
|
|
}
|
|
return out
|
|
}
|