Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

【架构优化】合并 repo 包中 payload JSON 文本提取的方言分支为 sqlPayloadJSONText (#567)

fx-kurumi8c7c93c6a9f8
diff --git a/internal/repo/analytics_business_delivery.go b/internal/repo/analytics_business_delivery.go
index 5ad16457..c4b632e6 100644
--- a/internal/repo/analytics_business_delivery.go
+++ b/internal/repo/analytics_business_delivery.go
@@ -121,12 +121,6 @@ func (r *AnalyticsRepo) businessDeliveryIssues(projectIDs []string) ([]domain.Is
if len(projectIDs) == 0 {
return nil, nil
}
- extract := func(path string) string {
- if r.isMySQL() {
- return "JSON_UNQUOTE(JSON_EXTRACT(payload, '$." + path + "'))"
- }
- return "json_extract(payload, '$." + path + "')"
- }
type lifecycleRow struct {
ID string
ProjectID string
@@ -139,9 +133,9 @@ func (r *AnalyticsRepo) businessDeliveryIssues(projectIDs []string) ([]domain.Is
}
var rows []lifecycleRow
err := r.DB.Table("issues").Select("id", "project_id", "status", "kind", "source",
- extract("completedAt")+" AS completed_at",
- extract("clarification.startedAt")+" AS clarification_started_at",
- extract("operations")+" AS operations",
+ r.sqlPayloadJSONText("completedAt")+" AS completed_at",
+ r.sqlPayloadJSONText("clarification.startedAt")+" AS clarification_started_at",
+ r.sqlPayloadJSONText("operations")+" AS operations",
).Where("project_id IN ?", projectIDs).Find(&rows).Error
if err != nil {
return nil, err
diff --git a/internal/repo/issues.go b/internal/repo/issues.go
index db9f45c2..1ee8a1e0 100644
--- a/internal/repo/issues.go
+++ b/internal/repo/issues.go
@@ -17,18 +17,6 @@ import (
// IssueAnalyticsViews loads the columns analytics needs without hydrating the
// full issue payload (clarification, comments, and delivery lock blobs).
func (r *IssuesRepo) IssueAnalyticsViews() []domain.Issue {
- urlExpr := "json_extract(payload, '$.externalRef.externalUrl')"
- tapdIDExpr := "json_extract(payload, '$.tapdId')"
- clarificationStartExpr := "json_extract(payload, '$.clarification.startedAt')"
- deliveryExpr := "json_extract(payload, '$.deliveryState')"
- deliveryMRExpr := "json_extract(payload, '$.deliveryMrUrl')"
- if r.isMySQL() {
- urlExpr = "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.externalRef.externalUrl'))"
- tapdIDExpr = "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.tapdId'))"
- clarificationStartExpr = "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.clarification.startedAt'))"
- deliveryExpr = "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.deliveryState'))"
- deliveryMRExpr = "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.deliveryMrUrl'))"
- }
type liteRow struct {
ID string `gorm:"column:id"`
ProjectID string `gorm:"column:project_id"`
@@ -49,11 +37,11 @@ func (r *IssuesRepo) IssueAnalyticsViews() []domain.Issue {
var rows []liteRow
if err := r.DB.Table("issues").Select(
"id", "project_id", "title", "status", "kind", "source", "workflow_id", "assignee_user_id", "external_id", "created_at",
- urlExpr+" AS external_url",
- tapdIDExpr+" AS tapd_id",
- clarificationStartExpr+" AS clarification_started_at",
- deliveryExpr+" AS delivery_state",
- deliveryMRExpr+" AS delivery_mr_url",
+ r.sqlPayloadJSONText("externalRef.externalUrl")+" AS external_url",
+ r.sqlPayloadJSONText("tapdId")+" AS tapd_id",
+ r.sqlPayloadJSONText("clarification.startedAt")+" AS clarification_started_at",
+ r.sqlPayloadJSONText("deliveryState")+" AS delivery_state",
+ r.sqlPayloadJSONText("deliveryMrUrl")+" AS delivery_mr_url",
).Find(&rows).Error; err != nil {
return []domain.Issue{}
}
diff --git a/internal/repo/payload_json_text_projection_test.go b/internal/repo/payload_json_text_projection_test.go
new file mode 100644
index 00000000..fb15d65f
--- /dev/null
+++ b/internal/repo/payload_json_text_projection_test.go
@@ -0,0 +1,86 @@
+package repo
+
+import (
+ "testing"
+ "time"
+
+ "agentflow/internal/domain"
+)
+
+// The analytics projections read payload JSON through sqlPayloadJSONText; every
+// projected column must round-trip from the stored issue payload.
+func TestIssueAnalyticsViewsProjectsPayloadJSONColumns(t *testing.T) {
+ s, err := OpenTest()
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(s.Close)
+ started := time.Date(2026, 11, 13, 9, 30, 0, 0, time.UTC)
+ issue := domain.Issue{
+ ID: "iss-projection", ProjectID: "alpha", Title: "projection", Source: "tapd", Kind: "requirement",
+ TapdID: "1001", DeliveryState: "merged", DeliveryMRURL: "https://git.example.com/mr/7",
+ ExternalRef: &domain.ExternalRef{ExternalID: "2002", ExternalURL: "https://tapd.example.com/story/2002"},
+ Clarification: domain.ClarificationAssessment{StartedAt: started},
+ }
+ if err := s.PutIssue(issue); err != nil {
+ t.Fatal(err)
+ }
+ views := s.IssueAnalyticsViews()
+ if len(views) != 1 {
+ t.Fatalf("views = %+v", views)
+ }
+ got := views[0]
+ if got.ExternalRef == nil || got.ExternalRef.ExternalURL != "https://tapd.example.com/story/2002" || got.ExternalRef.ExternalID != "2002" {
+ t.Fatalf("external ref = %+v", got.ExternalRef)
+ }
+ if got.TapdID != "1001" || got.DeliveryState != "merged" || got.DeliveryMRURL != "https://git.example.com/mr/7" {
+ t.Fatalf("payload columns = %+v", got)
+ }
+ if !got.Clarification.StartedAt.Equal(started) {
+ t.Fatalf("clarification startedAt = %v, want %v", got.Clarification.StartedAt, started)
+ }
+}
+
+func TestBusinessDeliveryIssuesProjectsPayloadJSONColumns(t *testing.T) {
+ s, err := OpenTest()
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(s.Close)
+ started := time.Date(2026, 11, 13, 9, 30, 0, 0, time.UTC)
+ issue := domain.Issue{
+ ID: "iss-lifecycle", ProjectID: "alpha", Title: "lifecycle", Status: "open", Kind: "requirement", Source: "platform",
+ Clarification: domain.ClarificationAssessment{StartedAt: started},
+ Operations: []domain.IssueOperation{{At: started, Action: "create"}, {At: started.Add(time.Hour), Action: "close"}},
+ }
+ if err := s.PutIssue(issue); err != nil {
+ t.Fatal(err)
+ }
+ // CompletedAt is stamped by PutIssue on the transition to done.
+ issue.Status = "done"
+ if err := s.PutIssue(issue); err != nil {
+ t.Fatal(err)
+ }
+ stored, ok := s.Issue(issue.ID)
+ if !ok || stored.CompletedAt.IsZero() {
+ t.Fatalf("stored completion = %+v (found=%v)", stored.CompletedAt, ok)
+ }
+ completed := stored.CompletedAt
+ if err := s.PutIssue(domain.Issue{ID: "iss-other", ProjectID: "beta", Title: "other"}); err != nil {
+ t.Fatal(err)
+ }
+ issues, err := s.AnalyticsRepo.businessDeliveryIssues([]string{"alpha"})
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(issues) != 1 || issues[0].ID != "iss-lifecycle" {
+ t.Fatalf("issues = %+v", issues)
+ }
+ got := issues[0]
+ if !got.CompletedAt.Equal(completed) || !got.Clarification.StartedAt.Equal(started) {
+ t.Fatalf("lifecycle times completed=%v started=%v", got.CompletedAt, got.Clarification.StartedAt)
+ }
+ if len(got.Operations) < 2 || got.Operations[0].Action != "create" || got.Operations[len(got.Operations)-1].Action != "close" {
+ t.Fatalf("operations = %+v", got.Operations)
+ }
+}
diff --git a/internal/repo/payload_json_text_test.go b/internal/repo/payload_json_text_test.go
new file mode 100644
index 00000000..0c9124c9
--- /dev/null
+++ b/internal/repo/payload_json_text_test.go
@@ -0,0 +1,51 @@
+package repo
+
+import (
+ "testing"
+
+ "gorm.io/driver/mysql"
+ "gorm.io/gorm"
+)
+
+func TestSQLPayloadJSONTextSQLite(t *testing.T) {
+ s, err := OpenTest()
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(s.Close)
+ d := &deps{DB: s.DB}
+ cases := map[string]string{
+ "tapdId": "json_extract(payload, '$.tapdId')",
+ "externalRef.externalUrl": "json_extract(payload, '$.externalRef.externalUrl')",
+ "clarification.startedAt": "json_extract(payload, '$.clarification.startedAt')",
+ }
+ for path, want := range cases {
+ if got := d.sqlPayloadJSONText(path); got != want {
+ t.Fatalf("sqlPayloadJSONText(%q) = %q, want %q", path, got, want)
+ }
+ }
+}
+
+func TestSQLPayloadJSONTextMySQL(t *testing.T) {
+ db, err := gorm.Open(mysql.New(mysql.Config{
+ DSN: "user:pass@tcp(127.0.0.1:1)/agentflow",
+ SkipInitializeWithVersion: true,
+ }), &gorm.Config{DisableAutomaticPing: true})
+ if err != nil {
+ t.Fatal(err)
+ }
+ d := &deps{DB: db}
+ if !d.isMySQL() {
+ t.Fatal("expected mysql dialect")
+ }
+ cases := map[string]string{
+ "deliveryState": "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.deliveryState'))",
+ "externalRef.externalUrl": "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.externalRef.externalUrl'))",
+ "operations": "JSON_UNQUOTE(JSON_EXTRACT(payload, '$.operations'))",
+ }
+ for path, want := range cases {
+ if got := d.sqlPayloadJSONText(path); got != want {
+ t.Fatalf("sqlPayloadJSONText(%q) = %q, want %q", path, got, want)
+ }
+ }
+}
diff --git a/internal/repo/repo.go b/internal/repo/repo.go
index 3e400777..37892422 100644
--- a/internal/repo/repo.go
+++ b/internal/repo/repo.go
@@ -47,6 +47,16 @@ func (d *deps) sqlJSONText(path string) string {
return "json_extract(payload, ?)"
}
+// sqlPayloadJSONText is the literal-path variant of sqlJSONText for SELECT
+// projections that cannot bind the path as a parameter. path is the JSON path
+// below "$." and must be a code constant, never user input.
+func (d *deps) sqlPayloadJSONText(path string) string {
+ if d.isMySQL() {
+ return "JSON_UNQUOTE(JSON_EXTRACT(payload, '$." + path + "'))"
+ }
+ return "json_extract(payload, '$." + path + "')"
+}
+
// locking returns the query with a row-lock clause on MySQL. sqlite serializes
// writers already (single connection in tests), so no clause is needed there.
func (d *deps) locking(q *gorm.DB) *gorm.DB {