From 540b50e176e1a7f0138f6dde271df2db56f62a93 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Mon, 25 Dec 2023 21:55:29 -0800 Subject: [PATCH] feat: wip chat route --- backend/apps/web/models/chats.py | 5 ++++- backend/apps/web/routers/chats.py | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/backend/apps/web/models/chats.py b/backend/apps/web/models/chats.py index 1105452f4..30a21a807 100644 --- a/backend/apps/web/models/chats.py +++ b/backend/apps/web/models/chats.py @@ -88,7 +88,10 @@ class ChatTable: ) -> List[ChatModel]: return [ ChatModel(**model_to_dict(chat)) - for chat in Chat.select(Chat.user_id == user_id).limit(limit).offset(skip) + for chat in Chat.select(Chat.id, Chat.title) + .where(Chat.user_id == user_id) + .limit(limit) + .offset(skip) ] def get_chat_by_id_and_user_id(self, id: str, user_id: str) -> Optional[ChatModel]: diff --git a/backend/apps/web/routers/chats.py b/backend/apps/web/routers/chats.py index a29f2da5c..64cee04e2 100644 --- a/backend/apps/web/routers/chats.py +++ b/backend/apps/web/routers/chats.py @@ -33,7 +33,7 @@ async def get_user_chats(skip: int = 0, limit: int = 50, cred=Depends(bearer_sch user = Users.get_user_by_token(token) if user: - return Chats.get_chat_titles_and_ids_by_user_id(user.id, skip, limit) + return Chats.get_chat_lists_by_user_id(user.id, skip, limit) else: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, @@ -92,7 +92,14 @@ async def update_chat_by_id( user = Users.get_user_by_token(token) if user: - return Chats.update_chat_by_id_and_user_id(id, user.id, form_data.chat) + chat = Chats.get_chat_by_id_and_user_id(id, user.id) + if chat: + return Chats.update_chat_by_id(id, form_data.chat) + else: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail=ERROR_MESSAGES.ACCESS_PROHIBITED, + ) else: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED,