From fe2ef537aa5e06155ea260e3fb7501d80dde96d6 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 20 Sep 2026 16:27:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(schema):=20/ontology/versions=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=B5=81=E6=B0=B4=E6=9F=A5=E8=AF=A2=20+=20=E6=8C=89?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AF=BB=E5=9B=9E=E6=97=A7=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 --- server/gb48000_absorb_test.go | 12 +++++- server/handlers_versions.go | 72 +++++++++++++++++++++++++++++++++++ server/main.go | 4 ++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 server/handlers_versions.go diff --git a/server/gb48000_absorb_test.go b/server/gb48000_absorb_test.go index 91a5b11..30d4b8c 100644 --- a/server/gb48000_absorb_test.go +++ b/server/gb48000_absorb_test.go @@ -184,7 +184,7 @@ func TestIntegration_ExportTurtle(t *testing.T) { } // 类型编辑(经 schemaAudit)应同步产生版本行,且 before/after 完整可查。 -// 依赖 /versions 端点(Task 7 实现);Task 6 期间预期 FAIL(404)。 +// 走只读端点 GET /ontology/versions(列表) + GET /ontology/versions/:version(详情)。 func TestIntegration_SchemaVersions(t *testing.T) { env, _ := setupTestEnv(t) h := map[string]string{"X-Principal": "manager"} @@ -199,7 +199,7 @@ func TestIntegration_SchemaVersions(t *testing.T) { if code != 200 { t.Fatalf("versions 应 200, got %d", code) } - versions := body["versions"].([]any) // 键名以 Task 7 实现为准(先建 list 再补端点时同步) + versions := body["versions"].([]any) if len(versions) < 2 { t.Fatalf("至少应有 create+update 两条版本, got %d: %v", len(versions), body) } @@ -209,6 +209,14 @@ func TestIntegration_SchemaVersions(t *testing.T) { t.Errorf("最新 action=%v want object_type_update", first["action"]) } vno, _ := first["version"].(float64) + // 单调断言:version 来自序列,首条编号必须严格大于次条。 + // 排除按 action 字母序的巧合排序(object_type_create < object_type_update + // 恰好与写入先后一致,若 ORDER BY 误写会"假绿"通过最新在前断言)。 + second := versions[1].(map[string]any) + vno2, _ := second["version"].(float64) + if vno <= vno2 { + t.Errorf("versions 应按 version 严格倒序(最新在前),got versions[0].version=%v <= versions[1].version=%v", vno, vno2) + } code, detail := env.httpDo(t, "GET", fmt.Sprintf("/api/v1/ontology/versions/%d", int64(vno)), nil, h) if code != 200 { diff --git a/server/handlers_versions.go b/server/handlers_versions.go new file mode 100644 index 0000000..e6e70c2 --- /dev/null +++ b/server/handlers_versions.go @@ -0,0 +1,72 @@ +package main + +import ( + "net/http" + "strconv" + + "github.com/gin-gonic/gin" +) + +// listSchemaVersions 版本流水(最新在前),支持按 kind/name 过滤。 +func (a *app) listSchemaVersions(c *gin.Context) { + where, args := `WHERE 1=1`, []any{} + if k := c.Query("kind"); k != "" { + where += ` AND target_kind=$` + strconv.Itoa(len(args)+1) + args = append(args, k) + } + if n := c.Query("name"); n != "" { + where += ` AND target_name=$` + strconv.Itoa(len(args)+1) + args = append(args, n) + } + var total int64 + if err := a.pool.QueryRow(c, `SELECT count(*) FROM schema_versions `+where, args...).Scan(&total); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + limit := 50 + if v, err := strconv.Atoi(c.Query("limit")); err == nil && v > 0 && v <= 500 { + limit = v + } + offset := 0 + if v, err := strconv.Atoi(c.Query("offset")); err == nil && v >= 0 { + offset = v + } + args = append(args, limit, offset) + rows, err := a.pool.Query(c, + `SELECT id, version, action, target_kind, target_name, actor, created_at + FROM schema_versions `+where+` ORDER BY version DESC LIMIT $`+ + strconv.Itoa(len(args)-1)+` OFFSET $`+strconv.Itoa(len(args)), args...) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + defer rows.Close() + items := []gin.H{} + for rows.Next() { + var (id, ver int64; action, kind, name, actor string; createdAt interface{}) + if err := rows.Scan(&id, &ver, &action, &kind, &name, &actor, &createdAt); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + items = append(items, gin.H{"id": id, "version": ver, "action": action, + "target_kind": kind, "target_name": name, "actor": actor, "created_at": createdAt}) + } + c.JSON(200, gin.H{"versions": items, "total": total}) +} + +// getSchemaVersion 按版本号取该次变更完整 details(含 before 快照)——按版本读回旧定义。 +func (a *app) getSchemaVersion(c *gin.Context) { + ver, err := strconv.ParseInt(c.Param("version"), 10, 64) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "version 需为整数"}) + return + } + var (got int64; details []byte) + rowErr := a.pool.QueryRow(c, + `SELECT version, details FROM schema_versions WHERE version=$1`, ver).Scan(&got, &details) + if rowErr != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "版本不存在", "version": ver}) + return + } + c.JSON(200, gin.H{"version": got, "details": jsonRaw(details)}) +} diff --git a/server/main.go b/server/main.go index 5bc6fb2..2d7a73f 100644 --- a/server/main.go +++ b/server/main.go @@ -247,6 +247,10 @@ func registerRoutes(r *gin.Engine, a *app) { // schema 标准序列化导出(GB/T 48000.3-2026 §5.3):当前仅 format=turtle ot.GET("/export", a.ontologyExport) + // schema 版本流水查询(GB/T 48000.3-2026 通用建模方法·schema 版本):只读 + ot.GET("/versions", a.listSchemaVersions) + ot.GET("/versions/:version", a.getSchemaVersion) + obj := mgmt.Group("/objects") obj.GET("", a.listObjects) obj.POST("", a.createObject)