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.

refactor(repo): 合并 rooms.go 中重复的聊天消息解码与 ID/RoomID 回填逻辑 (#323)

fx-kurumi08f67c21c8c1
diff --git a/internal/repo/rooms.go b/internal/repo/rooms.go
index dcedac35..3557840a 100644
--- a/internal/repo/rooms.go
+++ b/internal/repo/rooms.go
@@ -81,22 +81,7 @@ func (r *RoomsRepo) Messages(roomID string, limit int) []domain.ChatMessage {
if err := r.DB.Table("chat_messages").Where("room_id = ?", roomID).Order("created_at desc").Order("id desc").Limit(limit).Find(&rows).Error; err != nil {
return []domain.ChatMessage{}
}
- out := make([]domain.ChatMessage, 0, len(rows))
- for i := len(rows) - 1; i >= 0; i-- {
- row := rows[i]
- var item domain.ChatMessage
- if json.Unmarshal(row.Payload, &item) != nil {
- continue
- }
- if item.ID == "" {
- item.ID = row.ID
- }
- if item.RoomID == "" {
- item.RoomID = row.RoomID
- }
- out = append(out, item)
- }
- return out
+ return decodeChatMessagesReversed(rows)
}
// DispatchMessage finds the dispatch card in roomID that started runID, even
@@ -111,17 +96,9 @@ func (r *RoomsRepo) DispatchMessage(roomID, runID string) (domain.ChatMessage, b
return domain.ChatMessage{}, false
}
for _, row := range rows {
- var item domain.ChatMessage
- if json.Unmarshal(row.Payload, &item) != nil || item.RunID != runID {
- continue
+ if item, ok := decodeChatMessage(row); ok && item.RunID == runID {
+ return item, true
}
- if item.ID == "" {
- item.ID = row.ID
- }
- if item.RoomID == "" {
- item.RoomID = row.RoomID
- }
- return item, true
}
return domain.ChatMessage{}, false
}
@@ -169,21 +146,7 @@ func (r *RoomsRepo) TimelineMessages(roomID, threadID string, limit int) []domai
if err := q.Order("created_at desc").Order("id desc").Limit(limit).Find(&rows).Error; err != nil {
return []domain.ChatMessage{}
}
- out := make([]domain.ChatMessage, 0, len(rows))
- for i := len(rows) - 1; i >= 0; i-- {
- var item domain.ChatMessage
- if json.Unmarshal(rows[i].Payload, &item) != nil {
- continue
- }
- if item.ID == "" {
- item.ID = rows[i].ID
- }
- if item.RoomID == "" {
- item.RoomID = rows[i].RoomID
- }
- out = append(out, item)
- }
- return out
+ return decodeChatMessagesReversed(rows)
}
// ThreadMessageCounts returns how many messages each thread of roomID holds.
@@ -267,6 +230,12 @@ func (r *RoomsRepo) Message(roomID, id string) (domain.ChatMessage, bool) {
if err := r.DB.Table("chat_messages").Where("id = ? AND room_id = ?", strings.TrimSpace(id), strings.TrimSpace(roomID)).Take(&row).Error; err != nil {
return domain.ChatMessage{}, false
}
+ return decodeChatMessage(row)
+}
+
+// decodeChatMessage unmarshals a stored message, backfilling ID and RoomID
+// from the row when the payload omits them.
+func decodeChatMessage(row chatMessageRow) (domain.ChatMessage, bool) {
var item domain.ChatMessage
if json.Unmarshal(row.Payload, &item) != nil {
return domain.ChatMessage{}, false
@@ -280,6 +249,18 @@ func (r *RoomsRepo) Message(roomID, id string) (domain.ChatMessage, bool) {
return item, true
}
+// decodeChatMessagesReversed decodes a newest-first page into oldest-first
+// order, skipping rows whose payload does not decode.
+func decodeChatMessagesReversed(rows []chatMessageRow) []domain.ChatMessage {
+ out := make([]domain.ChatMessage, 0, len(rows))
+ for i := len(rows) - 1; i >= 0; i-- {
+ if item, ok := decodeChatMessage(rows[i]); ok {
+ out = append(out, item)
+ }
+ }
+ return out
+}
+
func (r *RoomsRepo) PutMessage(v domain.ChatMessage) error {
if v.CreatedAt.IsZero() {
v.CreatedAt = time.Now().UTC()
diff --git a/internal/repo/rooms_decode_test.go b/internal/repo/rooms_decode_test.go
new file mode 100644
index 00000000..e9a145a1
--- /dev/null
+++ b/internal/repo/rooms_decode_test.go
@@ -0,0 +1,44 @@
+package repo
+
+import (
+ "testing"
+
+ "agentflow/internal/domain"
+)
+
+func TestDecodeChatMessageBackfillsIDAndRoomID(t *testing.T) {
+ item, ok := decodeChatMessage(chatMessageRow{ID: "m1", RoomID: "r1", Payload: []byte(`{"text":"hi"}`)})
+ if !ok || item.ID != "m1" || item.RoomID != "r1" {
+ t.Fatalf("decodeChatMessage() = %+v, %v; want ID/RoomID backfilled", item, ok)
+ }
+
+ item, ok = decodeChatMessage(chatMessageRow{ID: "m1", RoomID: "r1", Payload: []byte(`{"id":"keep","roomId":"room"}`)})
+ if !ok || item.ID != "keep" || item.RoomID != "room" {
+ t.Fatalf("decodeChatMessage() = %+v, %v; want payload IDs kept", item, ok)
+ }
+
+ if item, ok := decodeChatMessage(chatMessageRow{ID: "m1", Payload: []byte(`{`)}); ok || item.ID != "" {
+ t.Fatalf("decodeChatMessage(bad payload) = %+v, %v; want zero, false", item, ok)
+ }
+}
+
+func TestDecodeChatMessagesReversedFlipsOrderAndSkipsBadRows(t *testing.T) {
+ rows := []chatMessageRow{
+ {ID: "new", RoomID: "r", Payload: []byte(`{}`)},
+ {ID: "bad", RoomID: "r", Payload: []byte(`not json`)},
+ {ID: "old", RoomID: "r", Payload: []byte(`{}`)},
+ }
+ got := decodeChatMessagesReversed(rows)
+ want := []domain.ChatMessage{{ID: "old", RoomID: "r"}, {ID: "new", RoomID: "r"}}
+ if len(got) != len(want) {
+ t.Fatalf("decodeChatMessagesReversed() len = %d, want %d", len(got), len(want))
+ }
+ for i := range want {
+ if got[i].ID != want[i].ID || got[i].RoomID != want[i].RoomID {
+ t.Fatalf("decodeChatMessagesReversed()[%d] = %+v, want %+v", i, got[i], want[i])
+ }
+ }
+ if got := decodeChatMessagesReversed(nil); got == nil || len(got) != 0 {
+ t.Fatalf("decodeChatMessagesReversed(nil) = %#v, want empty non-nil", got)
+ }
+}