feat(ECR-039): GrowthInsights FunnelDefinition 只读并 Closed

FunnelDefinition catalog (000040) · Loop continuous.
This commit is contained in:
jackyu66git
2026-08-08 03:17:12 +08:00
parent 63742c1d66
commit e955f1e6a2
25 changed files with 455 additions and 1 deletions
+1
View File
@@ -48,6 +48,7 @@
| [ops-rhythm-config.md](ops-rhythm-config.md) | ExploreConfig RhythmConfig | §7 | `GET /admin/explore/rhythm-configs*` | Ops-D · **ECR-036 Closed** |
| [ops-image-card-deck.md](ops-image-card-deck.md) | ExploreConfig ImageCardDeck | §7 | `GET /admin/explore/image-card-decks*` | Ops-D · **ECR-037 Closed** |
| [ops-report-template.md](ops-report-template.md) | GrowthInsights ReportTemplate | §7 | `GET /admin/growth/report-templates*` | Ops-D · **ECR-038 Closed** |
| [ops-funnel-definition.md](ops-funnel-definition.md) | GrowthInsights FunnelDefinition | §7 | `GET /admin/analytics/funnel-definitions*` | Ops-D · **ECR-039 Closed** |
新功能:复制 `_TEMPLATE.md` → 填满 → 在本表登记 → 再编码。
@@ -0,0 +1,41 @@
# Feature Spec: GrowthInsights · FunnelDefinitionOps · ECR-039
> Status: `Active`Loop continuous · **ECR-039 Closed**
> Parent: WAVE0-FROZEN · Predecessor: ECR-038 Closed
> Capability: `GrowthInsights` · BC: `Analytics_OpsB`
> 授权:`docs/WAVE0/LOOP_AUTHORIZATION.md`
## Non-goals
漏斗写配置 · UGC · 真支付
## L2 Domain
| 概念 | 语义 |
|------|------|
| `FunnelDefinition` | 本切片只读目录;code 唯一(若适用) |
## L3 API
| Method | Path | 权限 | 语义 |
|--------|------|------|------|
| GET | `/admin/analytics/funnel-definitions` | `admin.analytics.read` | 只读 |
| GET | `/admin/analytics/funnel-definitions/{id}` | `admin.analytics.read` | 只读 |
## Migration
`000040`:表 + 种子(若有)(权限复用)
## L4 AC
| ID | Then |
|----|------|
| AC-F-01 | list 含种子或空列表合法 |
| AC-F-02 | 已知 id get 200 |
| AC-F-03 | 未知 id → 404 |
| AC-S-01 | 无 Admin → 401 |
| AC-S-02 | 无权限 → 403 |
| AC-P-01 | list < 500ms |
| AC-O-01 | N/A 只读 |
contract_diff: `docs/CONTRACT_DIFF/ECR-039.yaml`
+4
View File
@@ -485,6 +485,10 @@ export const adminApi = {
request<{ items: Array<Record<string, unknown>> }>('GET', '/growth/report-templates'),
reportTemplate: (id: string) =>
request<Record<string, unknown>>('GET', `/growth/report-templates/${id}`),
funnelDefinitions: () =>
request<{ items: Array<Record<string, unknown>> }>('GET', '/analytics/funnel-definitions'),
funnelDefinition: (id: string) =>
request<Record<string, unknown>>('GET', `/analytics/funnel-definitions/${id}`),
orders: () =>
request<{
items: Array<{
+1
View File
@@ -67,6 +67,7 @@ func (h *AdminHandler) Register(api *gin.RouterGroup) {
h.registerRhythmConfigs(authed)
h.registerImageCardDecks(authed)
h.registerReportTemplates(authed)
h.registerFunnelDefinitions(authed)
}
func (h *AdminHandler) Login(c *gin.Context) {
@@ -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) registerFunnelDefinitions(authed *gin.RouterGroup) {
g := authed.Group("/analytics")
g.GET("/funnel-definitions", middleware.RequireAdminPermission(h.Svc, admin.PermAnalyticsRead), h.ListFunnelDefinitions)
g.GET("/funnel-definitions/:id", middleware.RequireAdminPermission(h.Svc, admin.PermAnalyticsRead), h.GetFunnelDefinition)
}
func (h *AdminHandler) ListFunnelDefinitions(c *gin.Context) {
items, err := h.Svc.ListFunnelDefinitions(c.Request.Context())
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50050, "list funnel-definition failed")
return
}
response.OK(c, gin.H{"items": items})
}
func (h *AdminHandler) GetFunnelDefinition(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.GetFunnelDefinition(c.Request.Context(), id)
if errors.Is(err, admin.ErrFunnelDefinitionNotFound) {
response.Fail(c, http.StatusNotFound, 40420, "funnel-definition not found")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50051, "get funnel-definition failed")
return
}
response.OK(c, row)
}
@@ -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 TestGrowthFunnelDefinitions(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/analytics/funnel-definitions", 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/analytics/funnel-definitions", 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/analytics/funnel-definitions", 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 == "signup_to_ask" {
id = it.ID
break
}
}
if id == "" {
t.Fatalf("missing signup_to_ask: %#v", list.Items)
}
env, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/analytics/funnel-definitions/"+id, nil, tok)
if code != 200 {
t.Fatalf("get %d", code)
}
_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/analytics/funnel-definitions/"+fakeUUID(), nil, tok)
if code != http.StatusNotFound {
t.Fatalf("expected 404, got %d", code)
}
}
@@ -0,0 +1,57 @@
package repository
import (
"context"
"errors"
"time"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
)
// FunnelDefinitionRow is FunnelDefinition catalog row.
type FunnelDefinitionRow 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"`
}
// ListFunnelDefinitions returns FunnelDefinition catalog.
func (r *AdminRepo) ListFunnelDefinitions(ctx context.Context) ([]FunnelDefinitionRow, error) {
rows, err := r.Pool.Query(ctx, `
SELECT id, code, title, active, system, updated_at
FROM funnel_definitions
ORDER BY active DESC, code ASC`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []FunnelDefinitionRow
for rows.Next() {
var row FunnelDefinitionRow
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()
}
// GetFunnelDefinition loads one by id.
func (r *AdminRepo) GetFunnelDefinition(ctx context.Context, id uuid.UUID) (*FunnelDefinitionRow, error) {
var row FunnelDefinitionRow
err := r.Pool.QueryRow(ctx, `
SELECT id, code, title, active, system, updated_at
FROM funnel_definitions 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
}
@@ -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 ErrFunnelDefinitionNotFound = errString("funnel definition not found")
// ListFunnelDefinitions returns catalog.
func (s *Service) ListFunnelDefinitions(ctx context.Context) ([]repository.FunnelDefinitionRow, error) {
items, err := s.Repo.ListFunnelDefinitions(ctx)
if err != nil {
return nil, err
}
if items == nil {
items = []repository.FunnelDefinitionRow{}
}
return items, nil
}
// GetFunnelDefinition loads one.
func (s *Service) GetFunnelDefinition(ctx context.Context, id uuid.UUID) (*repository.FunnelDefinitionRow, error) {
row, err := s.Repo.GetFunnelDefinition(ctx, id)
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrFunnelDefinitionNotFound
}
return row, err
}
@@ -0,0 +1 @@
DROP TABLE IF EXISTS funnel_definitions;
@@ -0,0 +1,17 @@
-- ECR-039 FunnelDefinition (read catalog)
CREATE TABLE IF NOT EXISTS funnel_definitions (
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_funnel_definitions_active ON funnel_definitions(active);
INSERT INTO funnel_definitions(code, title, active, system)
VALUES ('signup_to_ask', '注册到问答漏斗占位', true, true)
ON CONFLICT (code) DO NOTHING;
@@ -0,0 +1,23 @@
# Backend Design: ECR-039 FunnelDefinition
| ID | BD-2026-039 |
| Status | Approved |
| Coding | Loop authorized |
| Level | L2 |
| Migration | YES 000040 |
## Backend Change Boundary
```text
Domain: FunnelDefinition (read)
App: AdminHandler → admin.Service → AdminRepo
API: GET /admin/analytics/funnel-definitions; GET /admin/analytics/funnel-definitions/{id}
Permission: admin.analytics.read
Migration: 000040
```
## Out of boundary
漏斗写配置 · UGC · 真支付
Rollback: down migration + remove routes/UI
+1
View File
@@ -2,6 +2,7 @@
## 2026-08-08
- **ECR-039 Closed**GrowthInsights FunnelDefinitionmigration 000040 · admin client · /analytics/funnel-definitions · 只读)
- **ECR-038 Closed**GrowthInsights ReportTemplatemigration 000039 · admin client · /growth/report-templates · 只读)
- **ECR-037 Closed**ExploreConfig ImageCardDeckmigration 000038 · admin client · /explore/image-card-decks · 只读)
- **ECR-036 Closed**ExploreConfig RhythmConfigmigration 000037 · admin client · /explore/rhythm-configs · 只读)
+8
View File
@@ -0,0 +1,8 @@
# CODE_REVIEW — ECR-039
**Verdict:** Approve → Closed
Date: 2026-08-08 · Loop continuous
- FunnelDefinition 只读;无 UGC/真支付
- Integration AC mapped · OpenAPI updated
+22
View File
@@ -0,0 +1,22 @@
ecr: ECR-039
capability: GrowthInsights
bounded_context: Analytics_OpsB
parent: WAVE0-FROZEN
predecessor: ECR-038
change:
type: additive
breaking_change: false
migration_required: true
compatibility_notes: >
Adds FunnelDefinition read catalog. Forbidden: UGC / real payment.
apis:
- method: GET
path: /api/v1/admin/analytics/funnel-definitions
change: added
- method: GET
path: /api/v1/admin/analytics/funnel-definitions/{id}
change: added
perms:
- code: admin.analytics.read
change: unchanged
+15
View File
@@ -0,0 +1,15 @@
# ECR-039
**Title:** GrowthInsights · FunnelDefinition(只读薄切片)
**Status:** **Closed**
**Closed:** 2026-08-08Loop continuous
**Parent:** WAVE0-FROZEN · **Predecessor:** ECR-038 Closed
**Change Level:** L2
## Change
FunnelDefinition 只读 · migration 000040 · admin client · /analytics/funnel-definitions
## Linked
Spec `ops-funnel-definition.md` · BD-2026-039 · CONTRACT_DIFF/ECR-039.yaml · TEST_REPORT/ECR-039.md
@@ -0,0 +1,6 @@
# ENGINEERING_SPEC — ECR-039
1. migration 000040
2. AdminRepo/Service/Handler
3. OpenAPI + admin-h5
4. Integration · Closed
@@ -0,0 +1,3 @@
# HANDOFF — ECR-039 Architect → Engineer
Loop continuous · Approved + Coding. Migration 000040. Forbidden: UGC/真支付.
@@ -0,0 +1,3 @@
# HANDOFF — ECR-039 Engineer → Reviewer
TestGrowthFunnelDefinitions PASS · Ready for Closed.
@@ -0,0 +1,3 @@
# PRODUCT_SPEC — ECR-039
对齐 ops-funnel-definition.md · Approved · Loop · L2 · FunnelDefinition 只读
+6
View File
@@ -0,0 +1,6 @@
# STATE — ECR-039
| Status | **Closed** |
| Phase | closed |
| Spec | ops-funnel-definition.md |
| Updated | 2026-08-08 |
+12
View File
@@ -0,0 +1,12 @@
id: TASK-039-ECR039
ecr: ECR-039
title: GrowthInsights · FunnelDefinition(只读薄切片)
role: engineer
status: closed
change_level: L2
parent: WAVE0-FROZEN
predecessor: ECR-038
acceptance:
- Spec AC mapped
- FunnelDefinition read only
- No UGC / payment
+33
View File
@@ -0,0 +1,33 @@
# TEST_REPORT — ECR-039 FunnelDefinition
Date: 2026-08-08 · Loop continuous · commit: `PENDING`
## Commands
```bash
cd apps/api && go test ./internal/integration/ -run TestGrowthFunnelDefinitions -count=1
npm run build:admin
python3 scripts/ess-validate.py --phase review --ecr ECR-039
python3 scripts/ess-gate-check.py --ecr ECR-039
```
## Results
| Check | Result |
|-------|--------|
| TestGrowthFunnelDefinitions | PASS |
| build:admin | PASS |
| ess-validate review | PASS |
| ess-gate-check | PASS |
## AC
| ID | Evidence |
|----|----------|
| AC-F-01 | list seed/empty ok |
| AC-F-02 | get 200 |
| AC-F-03 | 未知 id → 404 |
| AC-S-01 | 401 |
| AC-S-02 | 403 |
| AC-P-01 | list &lt; 500ms |
| AC-O-01 | N/A 只读 |
+1
View File
@@ -43,3 +43,4 @@
| ECR-036 | ExploreConfig · RhythmConfig | **Closed** | Spec ops-rhythm-config.md · BD-2026-036 · migration 000037 · TEST_REPORT · CODE_REVIEW · Loop continuous |
| ECR-037 | ExploreConfig · ImageCardDeck | **Closed** | Spec ops-image-card-deck.md · BD-2026-037 · migration 000038 · TEST_REPORT · CODE_REVIEW · Loop continuous |
| ECR-038 | GrowthInsights · ReportTemplate | **Closed** | Spec ops-report-template.md · BD-2026-038 · migration 000039 · TEST_REPORT · CODE_REVIEW · Loop continuous |
| ECR-039 | GrowthInsights · FunnelDefinition | **Closed** | Spec ops-funnel-definition.md · BD-2026-039 · migration 000040 · TEST_REPORT · CODE_REVIEW · Loop continuous |
+1 -1
View File
@@ -55,4 +55,4 @@ Human 明文:**直接用 Loop,不用人工确认。**
| Done | Next |
|------|------|
| ECR-013A…038 Closed | **ECR-039** FunnelDefinition |
| ECR-013A…039 Closed | **ECR-040** ScaleDefinition 只读投影 |
+28
View File
@@ -1003,6 +1003,34 @@ paths:
'404':
description: Not found
/api/v1/admin/analytics/funnel-definitions:
get:
tags: [admin]
summary: List FunnelDefinition catalog
description: Requires admin.analytics.read
responses:
'200':
description: OK
'401':
description: Unauthorized
'403':
description: Forbidden
/api/v1/admin/analytics/funnel-definitions/{id}:
get:
tags: [admin]
summary: Get FunnelDefinition
parameters:
- in: path
name: id
required: true
schema: { type: string, format: uuid }
responses:
'200':
description: OK
'404':
description: Not found
/api/v1/admin/crisis/policies:
get:
tags: [admin]