feat(ECR-025): OpsCMS FeedSlot 只读并 Closed

栏目位目录（ops_feed_slots + /cms），复用 admin.cms.read。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-08 03:08:40 +08:00
parent f51b2524c5
commit e32466357d
26 changed files with 661 additions and 4 deletions
@@ -16,6 +16,8 @@ func (h *AdminHandler) registerCMS(authed *gin.RouterGroup) {
 	g := authed.Group("/cms")
 	g.GET("/banners", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.ListBanners)
 	g.GET("/banners/:id", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.GetBanner)
+	g.GET("/feed-slots", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.ListFeedSlots)
+	g.GET("/feed-slots/:id", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.GetFeedSlot)
 }

 func (h *AdminHandler) ListBanners(c *gin.Context) {
@@ -44,3 +46,30 @@ func (h *AdminHandler) GetBanner(c *gin.Context) {
 	}
 	response.OK(c, row)
 }
+
+func (h *AdminHandler) ListFeedSlots(c *gin.Context) {
+	items, err := h.Svc.ListFeedSlots(c.Request.Context())
+	if err != nil {
+		response.Fail(c, http.StatusInternalServerError, 50042, "list feed slots failed")
+		return
+	}
+	response.OK(c, gin.H{"items": items})
+}
+
+func (h *AdminHandler) GetFeedSlot(c *gin.Context) {
+	id, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		response.Fail(c, http.StatusBadRequest, 40002, "invalid id")
+		return
+	}
+	row, err := h.Svc.GetFeedSlot(c.Request.Context(), id)
+	if errors.Is(err, admin.ErrFeedSlotNotFound) {
+		response.Fail(c, http.StatusNotFound, 40411, "feed slot not found")
+		return
+	}
+	if err != nil {
+		response.Fail(c, http.StatusInternalServerError, 50043, "get feed slot failed")
+		return
+	}
+	response.OK(c, row)
+}
@@ -0,0 +1,95 @@
+package integration_test
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"golang.org/x/crypto/bcrypt"
+)
+
+func TestOpsCMSFeedSlots(t *testing.T) {
+	r, pool := setupAPIPool(t)
+	ctx := context.Background()
+	tok := adminLogin(t, r, "admin", "change-me")
+
+	_, code := doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, "")
+	if code != http.StatusUnauthorized {
+		t.Fatalf("expected 401, got %d", code)
+	}
+
+	limitedRoleID := uuid.New()
+	_, err := pool.Exec(ctx, `INSERT INTO admin_roles(id, name, system) VALUES ($1,$2,false)`,
+		limitedRoleID, "fs_lim_"+limitedRoleID.String()[:8])
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = pool.Exec(ctx, `INSERT INTO admin_role_permissions(role_id, code) VALUES ($1,'admin.users.read')`, limitedRoleID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	hash, err := bcrypt.GenerateFromPassword([]byte("limited-pass"), bcrypt.DefaultCost)
+	if err != nil {
+		t.Fatal(err)
+	}
+	limUser := fmt.Sprintf("fslim_%d", time.Now().UnixNano())
+	_, err = pool.Exec(ctx, `INSERT INTO admin_accounts(username, password_hash, role_id) VALUES ($1,$2,$3)`,
+		limUser, string(hash), limitedRoleID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() {
+		_, _ = pool.Exec(ctx, `DELETE FROM admin_accounts WHERE username=$1`, limUser)
+		_, _ = pool.Exec(ctx, `DELETE FROM admin_roles WHERE id=$1`, limitedRoleID)
+	})
+	limTok := adminLogin(t, r, limUser, "limited-pass")
+	_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, limTok)
+	if code != http.StatusForbidden {
+		t.Fatalf("expected 403, got %d", code)
+	}
+
+	start := time.Now()
+	env, code := doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, tok)
+	if code != 200 || env.Code != 0 {
+		t.Fatalf("list http=%d msg=%s", code, env.Message)
+	}
+	if time.Since(start) > 500*time.Millisecond {
+		t.Fatalf("list too slow %v", time.Since(start))
+	}
+	var list struct {
+		Items []struct {
+			ID   string `json:"id"`
+			Code string `json:"code"`
+		} `json:"items"`
+	}
+	_ = json.Unmarshal(env.Data, &list)
+	var id string
+	for _, it := range list.Items {
+		if it.Code == "home_feed_main" {
+			id = it.ID
+			break
+		}
+	}
+	if id == "" {
+		t.Fatalf("missing home_feed_main: %#v", list.Items)
+	}
+	env, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots/"+id, nil, tok)
+	if code != 200 {
+		t.Fatalf("get %d", code)
+	}
+	var detail struct {
+		Code string `json:"code"`
+	}
+	_ = json.Unmarshal(env.Data, &detail)
+	if detail.Code != "home_feed_main" {
+		t.Fatalf("bad detail %#v", detail)
+	}
+	_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots/"+fakeUUID(), nil, tok)
+	if code != http.StatusNotFound {
+		t.Fatalf("expected 404, got %d", code)
+	}
+}
@@ -65,3 +65,54 @@ func (r *AdminRepo) GetBanner(ctx context.Context, id uuid.UUID) (*BannerRow, er
 	}
 	return &b, nil
 }
+
+// FeedSlotRow is OpsCMS FeedSlot catalog row.
+type FeedSlotRow struct {
+	ID        uuid.UUID `json:"id"`
+	Code      string    `json:"code"`
+	Title     string    `json:"title"`
+	SlotKey   string    `json:"slot_key"`
+	Placement string    `json:"placement"`
+	Active    bool      `json:"active"`
+	System    bool      `json:"system"`
+	UpdatedAt time.Time `json:"updated_at"`
+}
+
+// ListFeedSlots returns feed slot catalog.
+func (r *AdminRepo) ListFeedSlots(ctx context.Context) ([]FeedSlotRow, error) {
+	rows, err := r.Pool.Query(ctx, `
+		SELECT id, code, title, slot_key, placement, active, system, updated_at
+		FROM ops_feed_slots
+		ORDER BY active DESC, code ASC`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var out []FeedSlotRow
+	for rows.Next() {
+		var s FeedSlotRow
+		if err := rows.Scan(
+			&s.ID, &s.Code, &s.Title, &s.SlotKey, &s.Placement, &s.Active, &s.System, &s.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		out = append(out, s)
+	}
+	return out, rows.Err()
+}
+
+// GetFeedSlot loads one feed slot by id.
+func (r *AdminRepo) GetFeedSlot(ctx context.Context, id uuid.UUID) (*FeedSlotRow, error) {
+	var s FeedSlotRow
+	err := r.Pool.QueryRow(ctx, `
+		SELECT id, code, title, slot_key, placement, active, system, updated_at
+		FROM ops_feed_slots WHERE id=$1`, id,
+	).Scan(&s.ID, &s.Code, &s.Title, &s.SlotKey, &s.Placement, &s.Active, &s.System, &s.UpdatedAt)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &s, nil
+}
@@ -11,6 +11,7 @@ import (
 )

 var ErrBannerNotFound = errString("banner not found")
+var ErrFeedSlotNotFound = errString("feed slot not found")

 // ListBanners returns OpsCMS Banner catalog.
 func (s *Service) ListBanners(ctx context.Context) ([]repository.BannerRow, error) {
@@ -32,3 +33,24 @@ func (s *Service) GetBanner(ctx context.Context, id uuid.UUID) (*repository.Bann
 	}
 	return row, err
 }
+
+// ListFeedSlots returns OpsCMS FeedSlot catalog.
+func (s *Service) ListFeedSlots(ctx context.Context) ([]repository.FeedSlotRow, error) {
+	items, err := s.Repo.ListFeedSlots(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if items == nil {
+		items = []repository.FeedSlotRow{}
+	}
+	return items, nil
+}
+
+// GetFeedSlot loads one feed slot.
+func (s *Service) GetFeedSlot(ctx context.Context, id uuid.UUID) (*repository.FeedSlotRow, error) {
+	row, err := s.Repo.GetFeedSlot(ctx, id)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, ErrFeedSlotNotFound
+	}
+	return row, err
+}