jack/digital-psychology
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ECR-035): ExploreConfig StarConfig 只读并 Closed

Browse Source 
StarConfig catalog (000036) · Loop continuous.
This commit is contained in:
jackyu66git
2026-08-08 03:16:12 +08:00
parent 09b9c4daab
commit ebc93b6c7e
26 changed files with 464 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin-h5/src/api/client.ts
+4
View File
@@ -469,6 +469,10 @@ export const adminApi = {
request<{ items: Array<Record<string, unknown>> }>('GET', '/privacy/requests'),
request: (id: string) =>
request<Record<string, unknown>>('GET', `/privacy/requests/${id}`),
starConfigs: () =>
request<{ items: Array<Record<string, unknown>> }>('GET', '/explore/star-configs'),
starConfig: (id: string) =>
request<Record<string, unknown>>('GET', `/explore/star-configs/${id}`),
orders: () =>
request<{
items: Array<{
apps/api/internal/handler/admin.go
+1
View File
@@ -63,6 +63,7 @@ func (h *AdminHandler) Register(api *gin.RouterGroup) {
h.registerInterventionOutcomes(authed)
h.registerHandoffCases(authed)
h.registerPrivacyRequests(authed)
h.registerStarConfigs(authed)
}
func (h *AdminHandler) Login(c *gin.Context) {
apps/api/internal/handler/admin_star_config.go
+46
View File
@@ -0,0 +1,46 @@
package handler
import (
"errors"
"net/http"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/yuxingu/digital-psychology/apps/api/internal/middleware"
"github.com/yuxingu/digital-psychology/apps/api/internal/service/admin"
"github.com/yuxingu/digital-psychology/apps/api/pkg/response"
)
func (h *AdminHandler) registerStarConfigs(authed *gin.RouterGroup) {
g := authed.Group("/explore")
g.GET("/star-configs", middleware.RequireAdminPermission(h.Svc, admin.PermExploreRead), h.ListStarConfigs)
g.GET("/star-configs/:id", middleware.RequireAdminPermission(h.Svc, admin.PermExploreRead), h.GetStarConfig)
}
func (h *AdminHandler) ListStarConfigs(c *gin.Context) {
items, err := h.Svc.ListStarConfigs(c.Request.Context())
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50050, "list star-config failed")
return
}
response.OK(c, gin.H{"items": items})
}
func (h *AdminHandler) GetStarConfig(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.GetStarConfig(c.Request.Context(), id)
if errors.Is(err, admin.ErrStarConfigNotFound) {
response.Fail(c, http.StatusNotFound, 40420, "star-config not found")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50051, "get star-config failed")
return
}
response.OK(c, row)
}
apps/api/internal/integration/star_config_test.go
+88
View File
@@ -0,0 +1,88 @@
package integration_test
import (
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
)
func TestExploreStarConfigs(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/explore/star-configs", 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, "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("lim_%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/explore/star-configs", 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/explore/star-configs", 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 == "default_star" {
id = it.ID
break
}
}
if id == "" {
t.Fatalf("missing default_star: %#v", list.Items)
}
env, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/explore/star-configs/"+id, nil, tok)
if code != 200 {
t.Fatalf("get %d", code)
}
_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/explore/star-configs/"+fakeUUID(), nil, tok)
if code != http.StatusNotFound {
t.Fatalf("expected 404, got %d", code)
}
}
apps/api/internal/repository/star_config_repo.go
+57
View File
@@ -0,0 +1,57 @@
package repository
import (
"context"
"errors"
"time"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
)
// StarConfigRow is StarConfig catalog row.
type StarConfigRow struct {
ID uuid.UUID `json:"id"`
Code string `json:"code"`
Title string `json:"title"`
Active bool `json:"active"`
System bool `json:"system"`
UpdatedAt time.Time `json:"updated_at"`
}
// ListStarConfigs returns StarConfig catalog.
func (r *AdminRepo) ListStarConfigs(ctx context.Context) ([]StarConfigRow, error) {
rows, err := r.Pool.Query(ctx, `
SELECT id, code, title, active, system, updated_at
FROM star_configs
ORDER BY active DESC, code ASC`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []StarConfigRow
for rows.Next() {
var row StarConfigRow
if err := rows.Scan(&row.ID, &row.Code, &row.Title, &row.Active, &row.System, &row.UpdatedAt); err != nil {
return nil, err
}
out = append(out, row)
}
return out, rows.Err()
}
// GetStarConfig loads one by id.
func (r *AdminRepo) GetStarConfig(ctx context.Context, id uuid.UUID) (*StarConfigRow, error) {
var row StarConfigRow
err := r.Pool.QueryRow(ctx, `
SELECT id, code, title, active, system, updated_at
FROM star_configs WHERE id=$1`, id,
).Scan(&row.ID, &row.Code, &row.Title, &row.Active, &row.System, &row.UpdatedAt)
if errors.Is(err, pgx.ErrNoRows) {
return nil, err
}
if err != nil {
return nil, err
}
return &row, nil
}
apps/api/internal/service/admin/rbac.go
+2 -1
View File
@@ -31,6 +31,7 @@ const (
PermCrisisRead = "admin.crisis.read"
PermCMSRead = "admin.cms.read"
PermPrivacyRead = "admin.privacy.read"
PermExploreRead = "admin.explore.read"
)
var knownPermissions = map[string]struct{}{
@@ -40,7 +41,7 @@ var knownPermissions = map[string]struct{}{
PermUsersStatusWrite: {}, PermMembershipPlansRead: {}, PermMembershipPlansWrite: {},
PermMembershipCodesRead: {}, PermMembershipCodesWrite: {},
PermAskRead: {}, PermAskFeedbackWrite: {}, PermContentSafetyRead: {},
PermAIConfigRead: {}, PermCrisisRead: {}, PermCMSRead: {}, PermPrivacyRead: {},
PermAIConfigRead: {}, PermCrisisRead: {}, PermCMSRead: {}, PermExploreRead: {}, PermPrivacyRead: {},
}
var (
apps/api/internal/service/admin/star_config.go
+34
View File
@@ -0,0 +1,34 @@
package admin
import (
"context"
"errors"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/yuxingu/digital-psychology/apps/api/internal/repository"
)
var ErrStarConfigNotFound = errString("star config not found")
// ListStarConfigs returns catalog.
func (s *Service) ListStarConfigs(ctx context.Context) ([]repository.StarConfigRow, error) {
items, err := s.Repo.ListStarConfigs(ctx)
if err != nil {
return nil, err
}
if items == nil {
items = []repository.StarConfigRow{}
}
return items, nil
}
// GetStarConfig loads one.
func (s *Service) GetStarConfig(ctx context.Context, id uuid.UUID) (*repository.StarConfigRow, error) {
row, err := s.Repo.GetStarConfig(ctx, id)
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrStarConfigNotFound
}
return row, err
}
apps/api/migrations/000036_star_configs.down.sql
+2
View File
@@ -0,0 +1,2 @@
DELETE FROM admin_role_permissions WHERE code = 'admin.explore.read';
DROP TABLE IF EXISTS star_configs;
apps/api/migrations/000036_star_configs.up.sql
+23
View File
@@ -0,0 +1,23 @@
-- ECR-035 StarConfig (read catalog)
CREATE TABLE IF NOT EXISTS star_configs (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code varchar(64) NOT NULL UNIQUE,
title varchar(128) NOT NULL,
active boolean NOT NULL DEFAULT true,
system boolean NOT NULL DEFAULT false,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX IF NOT EXISTS idx_star_configs_active ON star_configs(active);
INSERT INTO star_configs(code, title, active, system)
VALUES ('default_star', '默认星座配置', true, true)
ON CONFLICT (code) DO NOTHING;
INSERT INTO admin_role_permissions(role_id, code)
SELECT r.id, 'admin.explore.read'
FROM admin_roles r
WHERE r.name = 'super_admin'
ON CONFLICT DO NOTHING;