coderd/database: only generate ID at database side, order messages by created_at instead of id

johnstcn · johnstcn · commit 8fec93621b6f · 2025-04-30T15:32:56.000+01:00
diff --git a/coderd/chat.go b/coderd/chat.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/kylecarbs/aisdk-go"
 
 	"github.com/coder/coder/v2/coderd/ai"
@@ -33,7 +32,6 @@ func (api *API) postChats(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	chat, err := api.Database.InsertChat(ctx, database.InsertChatParams{
-		ID:        uuid.New(),
 		OwnerID:   apiKey.UserID,
 		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -5344,7 +5344,7 @@ func (s *MethodTestSuite) TestChat() {
 			OwnerID: u1.ID,
 		})
 		_, _, _ = createChat(s.T(), db) // other user's chat
-		check.Args(u1.ID).Asserts(u1c2, policy.ActionRead, u1c1, policy.ActionRead).Returns([]database.Chat{u1c1, u1c2})
+		check.Args(u1.ID).Asserts(u1c2, policy.ActionRead, u1c1, policy.ActionRead).Returns([]database.Chat{u1c2, u1c1})
 	}))
 
 	s.Run("InsertChat", s.Subtest(func(db database.Store, check *expects) {
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -144,7 +144,6 @@ func APIKey(t testing.TB, db database.Store, seed database.APIKey) (key database
 
 func Chat(t testing.TB, db database.Store, seed database.Chat) database.Chat {
 	chat, err := db.InsertChat(genCtx, database.InsertChatParams{
-		ID:        takeFirst(seed.ID, uuid.New()),
 		OwnerID:   takeFirst(seed.OwnerID, uuid.New()),
 		CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
 		UpdatedAt: takeFirst(seed.UpdatedAt, dbtime.Now()),
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -2916,6 +2916,9 @@ func (q *FakeQuerier) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID)
 			chats = append(chats, chat)
 		}
 	}
+	sort.Slice(chats, func(i, j int) bool {
+		return chats[i].CreatedAt.After(chats[j].CreatedAt)
+	})
 	return chats, nil
 }
 
@@ -8447,7 +8450,13 @@ func (q *FakeQuerier) InsertChat(ctx context.Context, arg database.InsertChatPar
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	chat := database.Chat(arg)
+	chat := database.Chat{
+		ID:        uuid.New(),
+		CreatedAt: arg.CreatedAt,
+		UpdatedAt: arg.UpdatedAt,
+		OwnerID:   arg.OwnerID,
+		Title:     arg.Title,
+	}
 	q.chats = append(q.chats, chat)
 
 	return chat, nil
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/chat.sql b/coderd/database/queries/chat.sql
@@ -1,6 +1,6 @@
 -- name: InsertChat :one
-INSERT INTO chats (id, owner_id, created_at, updated_at, title)
-VALUES ($1, $2, $3, $4, $5)
+INSERT INTO chats (owner_id, created_at, updated_at, title)
+VALUES ($1, $2, $3, $4)
 RETURNING *;
 
 -- name: UpdateChatByID :exec
@@ -30,7 +30,7 @@ RETURNING chat_messages.*;
 -- name: GetChatMessagesByChatID :many
 SELECT * FROM chat_messages
 WHERE chat_id = $1
-ORDER BY id ASC;
+ORDER BY created_at ASC;
 
 -- name: DeleteChat :exec
 DELETE FROM chats WHERE id = $1;
