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

feat(ECR-046): ScaleDefinition 元数据写面闭环并 Closed

Browse Source 
explore.write POST/PUT · create→draft · status 仍 ECR-008 · migration 000055 · Loop STOP

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jackyu66git
2026-08-13 21:56:11 +08:00
co-authored by Cursor
parent fa8b0ba963
commit b3fe4363fd
28 changed files with 868 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin-h5/src/api/client.ts
+35 -2
View File
@@ -726,9 +726,42 @@ export const adminApi = {
funnelDefinition: (id: string) =>
request<Record<string, unknown>>('GET', `/analytics/funnel-definitions/${id}`),
exploreScales: () =>
request<{ items: Array<Record<string, unknown>> }>('GET', '/explore/scales'),
request<{
items: Array<{
id: string
slug: string
title: string
description: string
status: string
}>
}>('GET', '/explore/scales'),
exploreScale: (id: string) =>
request<Record<string, unknown>>('GET', `/explore/scales/${id}`),
request<{
id: string
slug: string
title: string
description: string
status: string
}>('GET', `/explore/scales/${id}`),
createExploreScale: (body: { slug: string; title: string; description: string }) =>
request<{
id: string
slug: string
title: string
description: string
status: string
}>('POST', '/explore/scales', body),
updateExploreScale: (
id: string,
body: { slug: string; title: string; description: string },
) =>
request<{
id: string
slug: string
title: string
description: string
status: string
}>('PUT', `/explore/scales/${id}`, body),
orders: (params?: {
status?: string
kind?: string
apps/admin-h5/src/layouts/AdminShell.vue
+1
View File
@@ -38,6 +38,7 @@ async function onLogout() {
<RouterLink to="/star-configs">星座配置</RouterLink>
<RouterLink to="/rhythm-configs">节律配置</RouterLink>
<RouterLink to="/image-card-decks">意象牌组</RouterLink>
<RouterLink to="/scale-definitions">量表元数据</RouterLink>
<RouterLink to="/catalogs">目录仓</RouterLink>
<RouterLink to="/orders">订单</RouterLink>
<RouterLink v-if="auth.can('admin.membership.plans.read')" to="/pricing">定价</RouterLink>
apps/admin-h5/src/pages/ScaleDefinitionPage.vue
+156
View File
@@ -0,0 +1,156 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from 'vue'
import { adminApi } from '@/api/client'
import { useAuthStore } from '@/stores/auth'
type Row = Awaited<ReturnType<typeof adminApi.exploreScales>>['items'][number]
const auth = useAuthStore()
const canWrite = () => auth.can('admin.explore.write')
const loading = ref(false)
const error = ref('')
const items = ref<Row[]>([])
const selected = ref<Row | null>(null)
const saving = ref(false)
const formErr = ref('')
const form = reactive({
slug: '',
title: '',
description: '',
})
async function load() {
loading.value = true
error.value = ''
try {
const res = await adminApi.exploreScales()
items.value = res.items || []
} catch (e) {
error.value = e instanceof Error ? e.message : '加载失败'
} finally {
loading.value = false
}
}
function resetForm() {
form.slug = ''
form.title = ''
form.description = ''
selected.value = null
formErr.value = ''
}
async function openRow(id: string) {
formErr.value = ''
try {
const row = await adminApi.exploreScale(id)
selected.value = row
form.slug = row.slug
form.title = row.title
form.description = row.description || ''
} catch {
selected.value = null
}
}
function payload() {
return {
slug: form.slug.trim(),
title: form.title.trim(),
description: form.description.trim(),
}
}
async function createRow() {
if (!canWrite()) return
saving.value = true
formErr.value = ''
try {
const row = await adminApi.createExploreScale(payload())
await load()
await openRow(row.id)
} catch (e) {
formErr.value = e instanceof Error ? e.message : '创建失败'
} finally {
saving.value = false
}
}
async function saveRow() {
if (!selected.value || !canWrite()) return
saving.value = true
formErr.value = ''
try {
const row = await adminApi.updateExploreScale(selected.value.id, payload())
selected.value = row
await load()
} catch (e) {
formErr.value = e instanceof Error ? e.message : '保存失败'
} finally {
saving.value = false
}
}
onMounted(() => {
void load()
})
</script>
<template>
<section>
<h1>量表元数据</h1>
<p class="muted">
ScaleDefinition 写面 · 仅 slug/title/description · 创建为 draft · 上下架请用「内容」页（ECR-008）· ECR-046
</p>
<p v-if="!canWrite()" class="err">需要 admin.explore.write 才可写</p>
<p v-if="loading" class="muted">加载中…</p>
<p v-else-if="error" class="err">{{ error }}</p>
<div v-else class="layout">
<div class="card">
<h2>列表</h2>
<button v-if="canWrite()" class="btn" type="button" @click="resetForm">新建</button>
<p v-if="!items.length" class="muted">暂无</p>
<table v-else>
<thead>
<tr><th>slug</th><th>标题</th><th>状态</th><th></th></tr>
</thead>
<tbody>
<tr v-for="b in items" :key="b.id">
<td><code>{{ b.slug }}</code></td>
<td>{{ b.title }}</td>
<td>{{ b.status }}</td>
<td><button class="btn" type="button" @click="openRow(b.id)">编辑</button></td>
</tr>
</tbody>
</table>
</div>
<div class="card">
<h2>{{ selected ? '编辑元数据' : '新建（draft）' }}</h2>
<label>slug <input v-model="form.slug" :disabled="!canWrite()" /></label>
<label>标题 <input v-model="form.title" :disabled="!canWrite()" /></label>
<label>简介 <textarea v-model="form.description" rows="3" :disabled="!canWrite()" /></label>
<p v-if="selected" class="muted">当前 status={{ selected.status }}（本页不可改）</p>
<p v-if="formErr" class="err">{{ formErr }}</p>
<div v-if="canWrite()" class="actions">
<button v-if="!selected" class="btn primary" type="button" :disabled="saving" @click="createRow">
创建
</button>
<button v-else class="btn primary" type="button" :disabled="saving" @click="saveRow">保存</button>
</div>
</div>
</div>
</section>
</template>
<style scoped>
h1 { margin: 0 0 0.35rem; font-size: 1.35rem; }
h2 { margin: 0 0 0.6rem; font-size: 1.05rem; }
.layout { display: grid; grid-template-columns: 1.2fr 1fr; gap: 1rem; margin-top: 1rem; }
code { font-size: 0.8rem; }
.card label { display: block; margin: 0.4rem 0; font-size: 0.9rem; }
.card input, .card textarea { width: 100%; margin-top: 0.2rem; }
.actions { display: flex; gap: 0.5rem; margin-top: 0.75rem; }
.btn.primary { font-weight: 600; }
@media (max-width: 900px) { .layout { grid-template-columns: 1fr; } }
</style>
apps/admin-h5/src/router/index.ts
+6
View File
@@ -42,6 +42,12 @@ const router = createRouter({
component: () => import('@/pages/ImageCardDeckPage.vue'),
meta: { permission: 'admin.explore.read' },
},
{
path: 'scale-definitions',
name: 'scale-definitions',
component: () => import('@/pages/ScaleDefinitionPage.vue'),
meta: { permission: 'admin.explore.read' },
},
{ path: 'catalogs', name: 'catalogs', component: () => import('@/pages/CatalogHubPage.vue') },
{ path: 'push', name: 'push', component: () => import('@/pages/PushJobsPage.vue') },
{ path: 'admins', name: 'admins', component: () => import('@/pages/AdminsPage.vue'), meta: { superOnly: true } },
apps/api/internal/handler/admin_explore_scales.go
+65
View File
@@ -16,6 +16,8 @@ func (h *AdminHandler) registerExploreScales(authed *gin.RouterGroup) {
g := authed.Group("/explore")
g.GET("/scales", middleware.RequireAnyAdminPermission(h.Svc, admin.PermExploreRead, admin.PermContentWrite), h.ListExploreScales)
g.GET("/scales/:id", middleware.RequireAnyAdminPermission(h.Svc, admin.PermExploreRead, admin.PermContentWrite), h.GetExploreScale)
g.POST("/scales", middleware.RequireAdminPermission(h.Svc, admin.PermExploreWrite), h.CreateExploreScale)
g.PUT("/scales/:id", middleware.RequireAdminPermission(h.Svc, admin.PermExploreWrite), h.UpdateExploreScale)
}
func (h *AdminHandler) ListExploreScales(c *gin.Context) {
@@ -44,3 +46,66 @@ func (h *AdminHandler) GetExploreScale(c *gin.Context) {
}
response.OK(c, row)
}
func (h *AdminHandler) CreateExploreScale(c *gin.Context) {
adminID, ok := middleware.AdminIDFromContext(c)
if !ok {
response.Fail(c, http.StatusUnauthorized, 40101, "admin auth required")
return
}
var body admin.ScaleDefinitionWriteBody
if err := c.ShouldBindJSON(&body); err != nil {
response.Fail(c, http.StatusBadRequest, 40054, "invalid body")
return
}
row, err := h.Svc.CreateScaleDefinition(c.Request.Context(), adminID, body)
if errors.Is(err, admin.ErrInvalidScaleDefinition) {
response.Fail(c, http.StatusBadRequest, 40055, "invalid scale definition")
return
}
if errors.Is(err, admin.ErrScaleDefinitionConflict) {
response.Fail(c, http.StatusConflict, 40912, "scale slug conflict")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50062, "create scale definition failed")
return
}
response.OK(c, row)
}
func (h *AdminHandler) UpdateExploreScale(c *gin.Context) {
adminID, ok := middleware.AdminIDFromContext(c)
if !ok {
response.Fail(c, http.StatusUnauthorized, 40101, "admin auth required")
return
}
id, err := uuid.Parse(c.Param("id"))
if err != nil {
response.Fail(c, http.StatusBadRequest, 40002, "invalid id")
return
}
var body admin.ScaleDefinitionWriteBody
if err := c.ShouldBindJSON(&body); err != nil {
response.Fail(c, http.StatusBadRequest, 40054, "invalid body")
return
}
row, err := h.Svc.UpdateScaleDefinition(c.Request.Context(), adminID, id, body)
if errors.Is(err, admin.ErrScaleNotFound) {
response.Fail(c, http.StatusNotFound, 40430, "scale not found")
return
}
if errors.Is(err, admin.ErrInvalidScaleDefinition) {
response.Fail(c, http.StatusBadRequest, 40055, "invalid scale definition")
return
}
if errors.Is(err, admin.ErrScaleDefinitionConflict) {
response.Fail(c, http.StatusConflict, 40912, "scale slug conflict")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50063, "update scale definition failed")
return
}
response.OK(c, row)
}
apps/api/internal/integration/scale_definition_write_test.go
+116
View File
@@ -0,0 +1,116 @@
package integration_test
import (
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
)
func TestExploreScaleDefinitionWrite(t *testing.T) {
r, pool := setupAPIPool(t)
ctx := context.Background()
tok := adminLogin(t, r, "admin", "change-me")
slug := fmt.Sprintf("scale-w-%d", time.Now().UnixNano()%1_000_000)
body := map[string]any{"slug": slug, "title": "测试量表元数据", "description": "desc"}
env, httpCode := doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/scales", body, tok)
if httpCode != 200 || env.Code != 0 {
t.Fatalf("create http=%d code=%d msg=%s", httpCode, env.Code, env.Message)
}
var created struct {
ID string `json:"id"`
Slug string `json:"slug"`
Status string `json:"status"`
Title string `json:"title"`
}
_ = json.Unmarshal(env.Data, &created)
if created.ID == "" || created.Status != "draft" {
t.Fatalf("bad create %#v", created)
}
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `DELETE FROM scales WHERE id=$1`, created.ID)
})
_, httpCode = doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/scales", body, tok)
if httpCode != http.StatusConflict {
t.Fatalf("dup expected 409 got %d", httpCode)
}
// draft must not appear on C-end published list
key := mustRegister(t, r)
env, key = doJSON(t, r, http.MethodGet, "/api/v1/scales", nil, key)
var pub struct {
Items []struct {
Slug string `json:"slug"`
} `json:"items"`
}
_ = json.Unmarshal(env.Data, &pub)
for _, it := range pub.Items {
if it.Slug == slug {
t.Fatal("draft listed on C-end")
}
}
body["title"] = "改标题"
env, httpCode = doAdminJSON(t, r, http.MethodPut, "/api/v1/admin/explore/scales/"+created.ID, body, tok)
if httpCode != 200 {
t.Fatalf("update %d", httpCode)
}
_ = json.Unmarshal(env.Data, &created)
if created.Title != "改标题" || created.Status != "draft" {
t.Fatalf("put changed status or missed title %#v", created)
}
// publish via ECR-008 channel
_, httpCode = doAdminJSON(t, r, http.MethodPatch, "/api/v1/admin/scales/"+created.ID, map[string]any{"status": "published"}, tok)
if httpCode != 200 {
t.Fatalf("patch status %d", httpCode)
}
env, _ = doJSON(t, r, http.MethodGet, "/api/v1/scales", nil, key)
_ = json.Unmarshal(env.Data, &pub)
found := false
for _, it := range pub.Items {
if it.Slug == slug {
found = true
break
}
}
if !found {
t.Fatal("published missing on C-end")
}
var n int
_ = pool.QueryRow(ctx, `
SELECT COUNT(*) FROM admin_audit_logs
WHERE action IN ('explore.scale_definition.create','explore.scale_definition.update') AND target_id=$1`,
created.ID).Scan(&n)
if n < 2 {
t.Fatalf("audit %d", n)
}
limitedRoleID := uuid.New()
_, _ = pool.Exec(ctx, `INSERT INTO admin_roles(id, name, system) VALUES ($1,$2,false)`,
limitedRoleID, "sd_ro_"+limitedRoleID.String()[:8])
_, _ = pool.Exec(ctx, `INSERT INTO admin_role_permissions(role_id, code) VALUES ($1,'admin.explore.read')`, limitedRoleID)
hash, _ := bcrypt.GenerateFromPassword([]byte("ro-pass"), bcrypt.DefaultCost)
roUser := fmt.Sprintf("sdro_%d", time.Now().UnixNano())
_, _ = pool.Exec(ctx, `INSERT INTO admin_accounts(username, password_hash, role_id) VALUES ($1,$2,$3)`,
roUser, string(hash), limitedRoleID)
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `DELETE FROM admin_accounts WHERE username=$1`, roUser)
_, _ = pool.Exec(ctx, `DELETE FROM admin_roles WHERE id=$1`, limitedRoleID)
})
roTok := adminLogin(t, r, roUser, "ro-pass")
_, httpCode = doAdminJSON(t, r, http.MethodPost, "/api/v1/admin/explore/scales", map[string]any{
"slug": "x-ro", "title": "no", "description": "",
}, roTok)
if httpCode != http.StatusForbidden {
t.Fatalf("expected 403 got %d", httpCode)
}
}
apps/api/internal/repository/scale_definition_write.go
+106
View File
@@ -0,0 +1,106 @@
package repository
import (
"context"
"encoding/json"
"errors"
"strings"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
)
// ScaleDefinitionWriteInput is explore-side metadata payload (no status).
type ScaleDefinitionWriteInput struct {
Slug string
Title string
Description string
}
// CreateScaleDefinitionWithAudit inserts draft scale metadata + audit.
func (r *ScaleRepo) CreateScaleDefinitionWithAudit(
ctx context.Context, adminID uuid.UUID, in ScaleDefinitionWriteInput, meta json.RawMessage,
) (*ScaleAdminItem, error) {
tx, err := r.Pool.Begin(ctx)
if err != nil {
return nil, err
}
defer tx.Rollback(ctx)
var it ScaleAdminItem
err = tx.QueryRow(ctx, `
INSERT INTO scales(slug, title, description, status)
VALUES ($1,$2,$3,'draft')
RETURNING id, slug, title, description, status`,
in.Slug, in.Title, in.Description,
).Scan(&it.ID, &it.Slug, &it.Title, &it.Description, &it.Status)
if err != nil {
return nil, mapScaleDefinitionWriteErr(err)
}
if meta == nil {
meta = json.RawMessage(`{}`)
}
if _, err := tx.Exec(ctx, `
INSERT INTO admin_audit_logs(admin_id, action, target_type, target_id, meta)
VALUES ($1,'explore.scale_definition.create','scale',$2,$3)`,
adminID, it.ID.String(), meta,
); err != nil {
return nil, err
}
if err := tx.Commit(ctx); err != nil {
return nil, err
}
return &it, nil
}
// UpdateScaleDefinitionWithAudit updates metadata only (never status).
func (r *ScaleRepo) UpdateScaleDefinitionWithAudit(
ctx context.Context, adminID, id uuid.UUID, in ScaleDefinitionWriteInput, meta json.RawMessage,
) (*ScaleAdminItem, error) {
tx, err := r.Pool.Begin(ctx)
if err != nil {
return nil, err
}
defer tx.Rollback(ctx)
var it ScaleAdminItem
err = tx.QueryRow(ctx, `
UPDATE scales
SET slug=$2, title=$3, description=$4, updated_at=now()
WHERE id=$1 AND deleted_at IS NULL
RETURNING id, slug, title, description, status`,
id, in.Slug, in.Title, in.Description,
).Scan(&it.ID, &it.Slug, &it.Title, &it.Description, &it.Status)
if errors.Is(err, pgx.ErrNoRows) {
return nil, pgx.ErrNoRows
}
if err != nil {
return nil, mapScaleDefinitionWriteErr(err)
}
if meta == nil {
meta = json.RawMessage(`{}`)
}
if _, err := tx.Exec(ctx, `
INSERT INTO admin_audit_logs(admin_id, action, target_type, target_id, meta)
VALUES ($1,'explore.scale_definition.update','scale',$2,$3)`,
adminID, id.String(), meta,
); err != nil {
return nil, err
}
if err := tx.Commit(ctx); err != nil {
return nil, err
}
return &it, nil
}
func mapScaleDefinitionWriteErr(err error) error {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) && pgErr.Code == "23505" {
return errString("scale slug conflict")
}
return err
}
// ScaleSlugConflict reports unique violation.
func ScaleSlugConflict(err error) bool {
return err != nil && strings.Contains(err.Error(), "scale slug conflict")
}
apps/api/internal/service/admin/scale_definition_write.go
+81
View File
@@ -0,0 +1,81 @@
package admin
import (
"context"
"encoding/json"
"errors"
"regexp"
"strings"
"unicode/utf8"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/yuxingu/digital-psychology/apps/api/internal/repository"
)
var (
ErrInvalidScaleDefinition = errors.New("invalid scale definition")
ErrScaleDefinitionConflict = errors.New("scale slug conflict")
scaleSlugRe = regexp.MustCompile(`^[a-z][a-z0-9-]{1,62}$`)
)
// ScaleDefinitionWriteBody is explore-side JSON (no status).
type ScaleDefinitionWriteBody struct {
Slug string `json:"slug"`
Title string `json:"title"`
Description string `json:"description"`
}
// CreateScaleDefinition creates draft metadata.
func (s *Service) CreateScaleDefinition(ctx context.Context, adminID uuid.UUID, body ScaleDefinitionWriteBody) (*repository.ScaleAdminItem, error) {
if s.Scales == nil {
return nil, errors.New("scales unavailable")
}
in, err := normalizeScaleDefinitionWrite(body)
if err != nil {
return nil, err
}
meta, _ := json.Marshal(map[string]any{"slug": in.Slug})
row, err := s.Scales.CreateScaleDefinitionWithAudit(ctx, adminID, in, meta)
if repository.ScaleSlugConflict(err) {
return nil, ErrScaleDefinitionConflict
}
return row, err
}
// UpdateScaleDefinition updates metadata; preserves status.
func (s *Service) UpdateScaleDefinition(ctx context.Context, adminID, id uuid.UUID, body ScaleDefinitionWriteBody) (*repository.ScaleAdminItem, error) {
if s.Scales == nil {
return nil, errors.New("scales unavailable")
}
in, err := normalizeScaleDefinitionWrite(body)
if err != nil {
return nil, err
}
meta, _ := json.Marshal(map[string]any{"slug": in.Slug})
row, err := s.Scales.UpdateScaleDefinitionWithAudit(ctx, adminID, id, in, meta)
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrScaleNotFound
}
if repository.ScaleSlugConflict(err) {
return nil, ErrScaleDefinitionConflict
}
return row, err
}
func normalizeScaleDefinitionWrite(body ScaleDefinitionWriteBody) (repository.ScaleDefinitionWriteInput, error) {
slug := strings.TrimSpace(body.Slug)
title := strings.TrimSpace(body.Title)
desc := strings.TrimSpace(body.Description)
if !scaleSlugRe.MatchString(slug) {
return repository.ScaleDefinitionWriteInput{}, ErrInvalidScaleDefinition
}
if title == "" || utf8.RuneCountInString(title) > 128 {
return repository.ScaleDefinitionWriteInput{}, ErrInvalidScaleDefinition
}
if utf8.RuneCountInString(desc) > 512 {
return repository.ScaleDefinitionWriteInput{}, ErrInvalidScaleDefinition
}
return repository.ScaleDefinitionWriteInput{Slug: slug, Title: title, Description: desc}, nil
}
apps/api/migrations/000055_ops_scale_definition_write.down.sql
+2
View File
@@ -0,0 +1,2 @@
-- ECR-046 rollback marker (permission shared — do not revoke explore.write)
SELECT 1;
apps/api/migrations/000055_ops_scale_definition_write.up.sql
+7
View File
@@ -0,0 +1,7 @@
-- ECR-046 ScaleDefinition metadata write (reuse admin.explore.write)
INSERT INTO admin_role_permissions(role_id, code)
SELECT r.id, 'admin.explore.write'
FROM admin_roles r
WHERE r.name = 'super_admin'
ON CONFLICT DO NOTHING;