Fix chat session endpoint and order by latest message time (#557)

* Fix chat session endpoint and order by latest message time * Update chat session query to use LEFT JOIN and order by latest message time and session ID.
swuecho · Nov 27, 2024 · 1d23e5a · 1d23e5a
1 parent ad9834c
commit 1d23e5a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/api/chat_session_handler.go b/api/chat_session_handler.go
@@ -27,7 +27,7 @@ func NewChatSessionHandler(sqlc_q *sqlc_queries.Queries) *ChatSessionHandler {
 }
 
 func (h *ChatSessionHandler) Register(router *mux.Router) {
-	router.HandleFunc("/chat_sessions/users", h.getSimpleChatSessionsByUserID).Methods(http.MethodGet)
+	router.HandleFunc("/chat_sessions/user", h.getSimpleChatSessionsByUserID).Methods(http.MethodGet)
 
 	router.HandleFunc("/uuid/chat_sessions/max_length/{uuid}", h.updateSessionMaxLength).Methods("PUT")
 	router.HandleFunc("/uuid/chat_sessions/topic/{uuid}", h.updateChatSessionTopicByUUID).Methods("PUT")

diff --git a/api/sqlc/queries/chat_session.sql b/api/sqlc/queries/chat_session.sql
@@ -74,8 +74,21 @@ returning *;
 -- name: GetChatSessionsByUserID :many
 SELECT cs.*
 FROM chat_session cs
-WHERE cs.user_id = $1 and cs.active = true
-ORDER BY cs.id DESC;
+LEFT JOIN (
+    SELECT chat_session_uuid, MAX(created_at) AS latest_message_time
+    FROM chat_message
+    GROUP BY chat_session_uuid
+) cm ON cs.uuid = cm.chat_session_uuid
+WHERE cs.user_id = $1 AND cs.active = true
+ORDER BY 
+    cm.latest_message_time DESC,
+    cs.id DESC;
+
+
+-- SELECT cs.*
+-- FROM chat_session cs
+-- WHERE cs.user_id = $1 and cs.active = true
+-- ORDER BY cs.updated_at DESC;
 
 -- name: HasChatSessionPermission :one
 SELECT COUNT(*) > 0 as has_permission

diff --git a/api/sqlc_queries/chat_session.sql.go b/api/sqlc_queries/chat_session.sql.go
diff --git a/web/src/api/chat_session.ts b/web/src/api/chat_session.ts
@@ -22,7 +22,7 @@ export const getChatSessionDefault = async (title: string): Promise<Chat.Session
 
 export const getChatSessionsByUser = async () => {
   try {
-    const response = await request.get('/chat_sessions/users')
+    const response = await request.get('/chat_sessions/user')
     return response.data
   }
   catch (error) {

diff --git a/web/src/api/use_chat_session.ts b/web/src/api/use_chat_session.ts
@@ -34,7 +34,7 @@ const renameChatSessionQuery = useMutation({
 })
 
 const updateChatSessionQuery = useMutation({
-        mutationFn: (variables: { sessionUuid: string, session_data: Chat.Session }) => updateChatSession(variables.sessionUuid, variables.session_data),
+        mutationFn: (variables: { sessionUuid: string, sessionData: Chat.Session }) => updateChatSession(variables.sessionUuid, variables.sessionData),
         onSuccess: () => {
                 queryClient.invalidateQueries({ queryKey: ['sessions'] })
         }