From 4584b6683efd62521b7839539d361970e8c3d65c Mon Sep 17 00:00:00 2001 From: urec56 Date: Tue, 13 Feb 2024 14:05:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chat_test/app/users/chat/dao.py | 1 + chat_test/app/users/chat/router.py | 4 ++++ chat_test/app/users/chat/websocket.py | 1 + 3 files changed, 6 insertions(+) diff --git a/chat_test/app/users/chat/dao.py b/chat_test/app/users/chat/dao.py index f271f3b..c985b52 100644 --- a/chat_test/app/users/chat/dao.py +++ b/chat_test/app/users/chat/dao.py @@ -99,4 +99,5 @@ class ChatDAO(BaseDAO): result = await session.execute(messages) result = result.mappings().all() if result: + result = [dict(res) for res in result] return result diff --git a/chat_test/app/users/chat/router.py b/chat_test/app/users/chat/router.py index f47b61b..e7563bb 100644 --- a/chat_test/app/users/chat/router.py +++ b/chat_test/app/users/chat/router.py @@ -71,6 +71,8 @@ async def get_last_message(chat_id: int, user: Users = Depends(get_current_user) message = await ChatDAO.get_some_messages(chat_id=chat_id, message_number_from=0, messages_to_get=1) if message is None: raise MessageNotFoundException + for mes in message: + mes['created_at'] = mes['created_at'].isoformat() return message @@ -86,4 +88,6 @@ async def get_some_messages( ) if not messages: raise MessageNotFoundException + for mes in messages: + mes['created_at'] = mes['created_at'].isoformat() return messages diff --git a/chat_test/app/users/chat/websocket.py b/chat_test/app/users/chat/websocket.py index a487176..8ea0c72 100644 --- a/chat_test/app/users/chat/websocket.py +++ b/chat_test/app/users/chat/websocket.py @@ -28,6 +28,7 @@ class ConnectionManager(WebSocket): new_message = await self.add_message_to_database(user_id=user_id, chat_id=chat_id, message=message) new_message = dict(new_message) new_message['created_at'] = new_message['created_at'].isoformat() + print(new_message) for websocket in self.active_connections[chat_id]: await websocket.send_json(new_message)