feat(distribution): 公告中心支持分站自定义
公告中心(前台公告列表/详情)此前完全没有站点概念,分站访客只能看到主站公告。 本次按「默认继承主站、站长可切仅本站」的口径支持分站自定义。 数据与口径: - 新增 announcements.distribution_site_id(0=主站),前台按站点隔离 - 新增 distribution_sites.announcement_mode:inherit(默认,主站+本站)/ own_only(仅本站) 后端: - 公告模块新增 ResolvePublicSiteScope:主站 [0]、inherit [0, siteID]、own_only [siteID], 站点编码无效/已停用回落主站;列表与详情都按该范围过滤,详情不再允许跨站按 ID 读取 - 管理端公告列表支持按站点筛选(site_id:不传=全部,0=主站,>0=分站)并带出站点名 - 分销模块新增本站公告 CRUD(distribution/announcement.go):强制 distribution_site_id=本站, 先过 ensureSiteAccess,跨站更新/删除/上下架一律 ErrAnnouncementNotFound - UpdateSiteBranding 支持 announcement_mode 切换(非法值报错,读侧非法历史值回落 inherit) - 新增权限 distribution:announcement_view|manage 并授予 super_admin/ops/finance, 站长开通时继承 ops 角色即自动获得 - 路由:站长侧 /api/distribution/announcements*,平台侧 /api/admin/distribution/announcements* 前端: - 分销后台新增「公告中心」页:来源开关(继承主站+本站 / 仅本站)、本站公告列表与 新建/编辑/发布/下架/归档/恢复/删除,空态按来源模式给出引导 - 平台后台公告页新增「站点」列与筛选,新建公告可选择归属站点(主站或指定分站代发) - 前台 PC/移动无需改动:请求已带 X-Distribution-Site-Code,后端按站点隔离,页面已有空态 测试: - 公告模块:主站/继承/仅本站三种可见范围、跨站详情拦截、无效站点回落、管理端站点筛选 - 分销模块:本站公告 CRUD 与跨站防护、公告来源开关校验与非法值容错
This commit is contained in:
@@ -0,0 +1,142 @@
|
||||
package distribution
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
)
|
||||
|
||||
// TestSiteAnnouncementCRUDIsSiteScoped 验证站长自助公告只能读写本站数据:
|
||||
// 列表/更新/删除/上下架都强制 distribution_site_id = 本站,跨站 ID 视为不存在。
|
||||
func TestSiteAnnouncementCRUDIsSiteScoped(t *testing.T) {
|
||||
db := distributionTestDB(t)
|
||||
repo := NewRepository(db)
|
||||
ctx := context.Background()
|
||||
|
||||
siteA, err := repo.CreateSite(ctx, CreateSiteRequest{
|
||||
SiteCode: "ann_site_a", SiteName: "公告站A", Domain: "ann-a.hfb.local",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
siteB, err := repo.CreateSite(ctx, CreateSiteRequest{
|
||||
SiteCode: "ann_site_b", SiteName: "公告站B", Domain: "ann-b.hfb.local",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
created, err := repo.CreateSiteAnnouncement(ctx, 0, siteA.ID, CreateSiteAnnouncementRequest{
|
||||
Title: "本站公告", Content: "内容", Category: "notice",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("CreateSiteAnnouncement failed: %v", err)
|
||||
}
|
||||
if created.DistributionSiteID != siteA.ID || created.Status != "draft" {
|
||||
t.Fatalf("unexpected created announcement: %+v", created)
|
||||
}
|
||||
|
||||
// 列表按站点隔离
|
||||
pageA, err := repo.ListSiteAnnouncements(ctx, 0, siteA.ID, "", 1, 20)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if pageA.Total != 1 {
|
||||
t.Fatalf("A 站应有 1 条公告, got %d", pageA.Total)
|
||||
}
|
||||
pageB, err := repo.ListSiteAnnouncements(ctx, 0, siteB.ID, "", 1, 20)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if pageB.Total != 0 {
|
||||
t.Fatalf("B 站不应看到 A 站公告, got %d", pageB.Total)
|
||||
}
|
||||
|
||||
// 跨站更新/删除/上下架一律拒绝
|
||||
if _, err := repo.UpdateSiteAnnouncement(ctx, 0, siteB.ID, created.ID, UpdateSiteAnnouncementRequest{Title: "改"}); !errors.Is(err, ErrAnnouncementNotFound) {
|
||||
t.Fatalf("跨站更新应返回 ErrAnnouncementNotFound, got %v", err)
|
||||
}
|
||||
if err := repo.DeleteSiteAnnouncement(ctx, 0, siteB.ID, created.ID); !errors.Is(err, ErrAnnouncementNotFound) {
|
||||
t.Fatalf("跨站删除应返回 ErrAnnouncementNotFound, got %v", err)
|
||||
}
|
||||
if _, err := repo.UpdateSiteAnnouncementStatus(ctx, 0, siteB.ID, created.ID, "publish"); !errors.Is(err, ErrAnnouncementNotFound) {
|
||||
t.Fatalf("跨站发布应返回 ErrAnnouncementNotFound, got %v", err)
|
||||
}
|
||||
|
||||
// 本站更新与发布
|
||||
updated, err := repo.UpdateSiteAnnouncement(ctx, 0, siteA.ID, created.ID, UpdateSiteAnnouncementRequest{
|
||||
Title: "本站公告(改)", Content: "新内容", Category: "rule", Priority: 5, IsPinned: true,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("UpdateSiteAnnouncement failed: %v", err)
|
||||
}
|
||||
if updated.Title != "本站公告(改)" || updated.Category != "rule" || !updated.IsPinned || updated.Priority != 5 {
|
||||
t.Fatalf("unexpected updated announcement: %+v", updated)
|
||||
}
|
||||
published, err := repo.UpdateSiteAnnouncementStatus(ctx, 0, siteA.ID, created.ID, "publish")
|
||||
if err != nil {
|
||||
t.Fatalf("publish failed: %v", err)
|
||||
}
|
||||
if published.Status != "published" || published.PublishedAt == nil {
|
||||
t.Fatalf("发布后状态/时间不正确: %+v", published)
|
||||
}
|
||||
archived, err := repo.UpdateSiteAnnouncementStatus(ctx, 0, siteA.ID, created.ID, "archive")
|
||||
if err != nil {
|
||||
t.Fatalf("archive failed: %v", err)
|
||||
}
|
||||
if archived.Status != "archived" {
|
||||
t.Fatalf("归档后状态不正确: %+v", archived)
|
||||
}
|
||||
if _, err := repo.ListSiteAnnouncements(ctx, 0, siteA.ID, "archived", 1, 20); err != nil {
|
||||
t.Fatalf("按状态查询失败: %v", err)
|
||||
}
|
||||
if err := repo.DeleteSiteAnnouncement(ctx, 0, siteA.ID, created.ID); err != nil {
|
||||
t.Fatalf("本站删除失败: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestUpdateSiteBrandingAnnouncementMode 验证公告来源开关可保存并校验非法值。
|
||||
func TestUpdateSiteBrandingAnnouncementMode(t *testing.T) {
|
||||
db := distributionTestDB(t)
|
||||
repo := NewRepository(db)
|
||||
ctx := context.Background()
|
||||
|
||||
site, err := repo.CreateSite(ctx, CreateSiteRequest{
|
||||
SiteCode: "ann_mode_site", SiteName: "模式站", Domain: "ann-mode.hfb.local",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if site.AnnouncementMode != model.AnnouncementModeInherit {
|
||||
t.Fatalf("默认公告来源应为 inherit, got %q", site.AnnouncementMode)
|
||||
}
|
||||
|
||||
ownOnly := model.AnnouncementModeOwnOnly
|
||||
updated, err := repo.UpdateSiteBranding(ctx, 0, site.ID, UpdateSiteBrandingRequest{AnnouncementMode: &ownOnly})
|
||||
if err != nil {
|
||||
t.Fatalf("切换公告来源失败: %v", err)
|
||||
}
|
||||
if updated.AnnouncementMode != model.AnnouncementModeOwnOnly {
|
||||
t.Fatalf("announcement_mode = %q, want own_only", updated.AnnouncementMode)
|
||||
}
|
||||
|
||||
invalid := "whatever"
|
||||
if _, err := repo.UpdateSiteBranding(ctx, 0, site.ID, UpdateSiteBrandingRequest{AnnouncementMode: &invalid}); !errors.Is(err, ErrInvalidAnnouncementMode) {
|
||||
t.Fatalf("非法来源应返回 ErrInvalidAnnouncementMode, got %v", err)
|
||||
}
|
||||
|
||||
// 读侧容错:库里历史非法值按 inherit 返回
|
||||
if err := db.Model(&model.DistributionSite{}).Where("id = ?", site.ID).
|
||||
Update("announcement_mode", "legacy_value").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
reloaded, err := repo.FindSite(ctx, 0, site.ID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if reloaded.AnnouncementMode != model.AnnouncementModeInherit {
|
||||
t.Fatalf("非法历史值应回落 inherit, got %q", reloaded.AnnouncementMode)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user