公告: - 服务端把当前公告落库到 settings(display.announce_text / announce_seconds), 作为 display.announce 随 snapshot 与 /api/settings 下发(非 admin 快照也保留) - announce 指令除转发外写库;新增 announce_clear 清空并广播;两者写审计 - realtime 协议登记 announce_clear(补上,使清除能即时推到大屏) - 大屏把「全屏推送」与「底栏常驻」拆开:推送 seconds 秒后只退出全屏态,公告留在底栏, 直到被替换或清除;新增公告状态机(可测)与底栏取值优先级 推送中 > 服务端持久值 > 「暂无公告」;管理端加「清除公告」与当前公告状态 团体报名: - EntryPicker 团体/对抗模式允许不勾队员直接报名该单位(此前必须勾人,导致 「只想给单位报个团体项目」做不到、单位下没有运动员时完全报不了) - 核实录入页团体行:显示/填名次/保存/发布/算分闭环无缺陷(用真实服务端跑过), 抽出共享的 entryRowLabel 供两处复用 榜单口径: - 基础数据 → 积分模板页新增「榜单口径(全局)」卡片:individualToTeamWeight 数字输入(默认 1、0–100),说明「个人项目得分按该系数折算计入单位总分」, 保存走 PUT /api/settings;因该值在服务端是全局键、模板表里没有此字段, 故做成独立卡片并标注全局,不塞进模板表单 自检:服务端 11 包全绿;前端 vue-tsc + build、node --test 99/99。
209 lines
8.6 KiB
Go
209 lines
8.6 KiB
Go
package httpapi_test
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/httpapi"
|
|
"git.yeij.top/AskaEth/Scoreboard/server/internal/realtime"
|
|
)
|
|
|
|
// strictDisplaySender 与 main.go 的 displaySender 同口径:经实时层校验 action,未知 action 直接报错。
|
|
type strictDisplaySender struct{ sent []string }
|
|
|
|
func (d *strictDisplaySender) SendDisplayCommand(action string, payload any) error {
|
|
if _, err := realtime.NewDisplayCommand(action, payload); err != nil {
|
|
return err
|
|
}
|
|
d.sent = append(d.sent, action)
|
|
return nil
|
|
}
|
|
|
|
// settingValue 读取 settings 表里的点号键。
|
|
func settingValue(t *testing.T, env *testEnv, key string) string {
|
|
t.Helper()
|
|
var v string
|
|
if err := env.ev.QueryRow(`SELECT value FROM settings WHERE key = ?`, key).Scan(&v); err != nil {
|
|
t.Fatalf("读取配置 %s: %v", key, err)
|
|
}
|
|
return v
|
|
}
|
|
|
|
// 个人榜的单位展示字段必须取全量单位表:停用但有积分的单位也要显示名称与简称。
|
|
func TestAthleteStandingsUsesFullTeamTable(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
ids := env.seed(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPut, "/api/results/draft", map[string]any{
|
|
"eventId": ids.event,
|
|
"results": []map[string]any{
|
|
{"entryId": ids.entryA, "resultValue": 11.58, "unit": "s", "status": "ok"},
|
|
{"entryId": ids.entryB, "resultValue": 11.92, "unit": "s", "status": "ok"},
|
|
},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/results/publish", map[string]any{
|
|
"eventId": ids.event,
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("发布应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
env.exec(t, `UPDATE teams SET active = 0 WHERE id = ?`, ids.teamB)
|
|
|
|
_, env2 := env.do(client, http.MethodGet, "/api/standings/athletes", nil, false)
|
|
rows := decodeData[[]map[string]any](t, env2)
|
|
seen := map[int64]map[string]any{}
|
|
for _, row := range rows {
|
|
seen[int64(row["athleteId"].(float64))] = row
|
|
}
|
|
|
|
active := seen[ids.athleteA]
|
|
if active == nil || active["teamName"] != "第一分公司" || active["shortName"] != "一司" {
|
|
t.Fatalf("在职单位的个人行应带单位名与简称: %+v", active)
|
|
}
|
|
stopped := seen[ids.athB]
|
|
if stopped == nil {
|
|
t.Fatalf("停用单位的运动员仍应在个人榜上: %+v", rows)
|
|
}
|
|
if stopped["teamName"] != "第二分公司" || stopped["shortName"] != "二司" {
|
|
t.Fatalf("停用单位的个人行应补齐单位名与简称,得到 %+v", stopped)
|
|
}
|
|
}
|
|
|
|
// 个人榜的 logoPath 取「运动员所属单位」的 logo:姓名前显示的是单位标识,不是运动员头像。
|
|
func TestAthleteStandingsIncludesTeamLogo(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
ids := env.seed(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPut, "/api/results/draft", map[string]any{
|
|
"eventId": ids.event,
|
|
"results": []map[string]any{
|
|
{"entryId": ids.entryA, "resultValue": 11.58, "unit": "s", "status": "ok"},
|
|
{"entryId": ids.entryB, "resultValue": 11.92, "unit": "s", "status": "ok"},
|
|
},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/results/publish", map[string]any{
|
|
"eventId": ids.event,
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("发布应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
env.exec(t, `UPDATE teams SET logo_path = ? WHERE id = ?`, "/uploads/teams/a.png", ids.teamA)
|
|
// 历史数据里 logo 可能是空串,同样按「无 logo」下发 null。
|
|
env.exec(t, `UPDATE teams SET logo_path = '' WHERE id = ?`, ids.teamB)
|
|
|
|
_, env2 := env.do(client, http.MethodGet, "/api/standings/athletes", nil, false)
|
|
rows := decodeData[[]map[string]any](t, env2)
|
|
seen := map[int64]map[string]any{}
|
|
for _, row := range rows {
|
|
seen[int64(row["athleteId"].(float64))] = row
|
|
}
|
|
|
|
withLogo := seen[ids.athleteA]
|
|
if withLogo == nil || withLogo["logoPath"] != "/uploads/teams/a.png" {
|
|
t.Fatalf("有 logo 的单位,个人行应带该单位的 logo: %+v", withLogo)
|
|
}
|
|
noLogo, ok := seen[ids.athB]["logoPath"]
|
|
if !ok || noLogo != nil {
|
|
t.Fatalf("无 logo 的单位,个人行 logoPath 应为 null,得到 %+v", seen[ids.athB])
|
|
}
|
|
}
|
|
|
|
// 公告必须落库:只转发的话全屏推送结束(seconds 秒)后底栏会回落到「暂无公告」,
|
|
// 新连上的大屏也拿不到当前公告。
|
|
func TestDisplayAnnouncePersistsAndClears(t *testing.T) {
|
|
sender := &strictDisplaySender{}
|
|
env := newTestEnvWith(t, func(o *httpapi.Options) { o.Display = sender })
|
|
env.createUser("admin", "admin-pass", "admin")
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
recorder, _ := env.client()
|
|
env.login(recorder, "recorder", "recorder-pass")
|
|
admin, _ := env.client()
|
|
env.login(admin, "admin", "admin-pass")
|
|
|
|
// 公告的推送权限在 recorder,配置接口是 admin-only,所以落库必须由指令这一侧完成。
|
|
announceLogs := changeLogCount(t, env, "settings", "upsert")
|
|
status, env2 := env.do(recorder, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "决赛推迟到 15:00", "seconds": 30},
|
|
}, true)
|
|
if status != http.StatusOK || !env2.OK {
|
|
t.Fatalf("推送公告应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if len(sender.sent) != 1 || sender.sent[0] != "announce" {
|
|
t.Fatalf("公告应照旧转发给大屏,得到 %v", sender.sent)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "决赛推迟到 15:00" {
|
|
t.Fatalf("公告正文应落库,得到 %q", got)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "30" {
|
|
t.Fatalf("全屏时长应落库,得到 %q", got)
|
|
}
|
|
// 已连接的大屏靠 settings 变更重拉快照,没有这条变更它们看不到公告变化。
|
|
if got := changeLogCount(t, env, "settings", "upsert"); got != announceLogs+1 {
|
|
t.Fatalf("公告落库应新增 1 条 settings 变更,得到 %d → %d", announceLogs, got)
|
|
}
|
|
|
|
_, env2 = env.do(admin, http.MethodGet, "/api/settings", nil, false)
|
|
display := decodeData[map[string]any](t, env2)["display"].(map[string]any)
|
|
if display["announce"] != "决赛推迟到 15:00" {
|
|
t.Fatalf("settings.display.announce 应带当前公告: %+v", display)
|
|
}
|
|
|
|
// payload 没带 seconds 时落默认 20。
|
|
env.do(recorder, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "第二条公告"},
|
|
}, true)
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "20" {
|
|
t.Fatalf("payload 未带 seconds 时应落默认 20,得到 %q", got)
|
|
}
|
|
|
|
// 清空公告:正文清空,重连的大屏拿到 null。
|
|
status, env2 = env.do(recorder, http.MethodPost, "/api/display/command",
|
|
map[string]any{"action": "announce_clear"}, true)
|
|
if status != http.StatusOK || !env2.OK {
|
|
t.Fatalf("清空公告应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "" {
|
|
t.Fatalf("清空后公告正文应为空串,得到 %q", got)
|
|
}
|
|
_, env2 = env.do(admin, http.MethodGet, "/api/settings", nil, false)
|
|
display = decodeData[map[string]any](t, env2)["display"].(map[string]any)
|
|
if v, ok := display["announce"]; !ok || v != nil {
|
|
t.Fatalf("清空后 settings.display.announce 应为 null: %+v", display)
|
|
}
|
|
}
|
|
|
|
// 公告归档只对 announce 系列生效,其它指令不能碰 settings;公告时长在清空后保留。
|
|
func TestDisplayAnnounceLeavesOtherCommandsAlone(t *testing.T) {
|
|
env := newTestEnv(t)
|
|
env.createUser("recorder", "recorder-pass", "recorder")
|
|
client, _ := env.client()
|
|
env.login(client, "recorder", "recorder-pass")
|
|
|
|
env.do(client, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "announce",
|
|
"payload": map[string]any{"text": "公告一", "seconds": 45},
|
|
}, true)
|
|
if status, env2 := env.do(client, http.MethodPost, "/api/display/command", map[string]any{
|
|
"action": "lock", "payload": map[string]any{},
|
|
}, true); status != http.StatusOK {
|
|
t.Fatalf("锁屏指令应 200,得到 %d %+v", status, env2.Error)
|
|
}
|
|
if got := settingValue(t, env, "display.announce_text"); got != "公告一" {
|
|
t.Fatalf("非公告指令不应改公告正文,得到 %q", got)
|
|
}
|
|
|
|
env.do(client, http.MethodPost, "/api/display/command", map[string]any{"action": "announce_clear"}, true)
|
|
if got := settingValue(t, env, "display.announce_seconds"); got != "45" {
|
|
t.Fatalf("清空公告应保留全屏时长,得到 %q", got)
|
|
}
|
|
if got := changeLogCount(t, env, "settings", "upsert"); got != 2 {
|
|
t.Fatalf("推送、清空各应写 1 条 settings 变更、锁屏不写,共 2 条,得到 %d", got)
|
|
}
|
|
}
|