Изменения сообщений
This commit is contained in:
parent
9d8c5b9eaa
commit
4584b6683e
3 changed files with 6 additions and 0 deletions
|
@ -99,4 +99,5 @@ class ChatDAO(BaseDAO):
|
||||||
result = await session.execute(messages)
|
result = await session.execute(messages)
|
||||||
result = result.mappings().all()
|
result = result.mappings().all()
|
||||||
if result:
|
if result:
|
||||||
|
result = [dict(res) for res in result]
|
||||||
return result
|
return result
|
||||||
|
|
|
@ -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)
|
message = await ChatDAO.get_some_messages(chat_id=chat_id, message_number_from=0, messages_to_get=1)
|
||||||
if message is None:
|
if message is None:
|
||||||
raise MessageNotFoundException
|
raise MessageNotFoundException
|
||||||
|
for mes in message:
|
||||||
|
mes['created_at'] = mes['created_at'].isoformat()
|
||||||
return message
|
return message
|
||||||
|
|
||||||
|
|
||||||
|
@ -86,4 +88,6 @@ async def get_some_messages(
|
||||||
)
|
)
|
||||||
if not messages:
|
if not messages:
|
||||||
raise MessageNotFoundException
|
raise MessageNotFoundException
|
||||||
|
for mes in messages:
|
||||||
|
mes['created_at'] = mes['created_at'].isoformat()
|
||||||
return messages
|
return messages
|
||||||
|
|
|
@ -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 = await self.add_message_to_database(user_id=user_id, chat_id=chat_id, message=message)
|
||||||
new_message = dict(new_message)
|
new_message = dict(new_message)
|
||||||
new_message['created_at'] = new_message['created_at'].isoformat()
|
new_message['created_at'] = new_message['created_at'].isoformat()
|
||||||
|
print(new_message)
|
||||||
for websocket in self.active_connections[chat_id]:
|
for websocket in self.active_connections[chat_id]:
|
||||||
await websocket.send_json(new_message)
|
await websocket.send_json(new_message)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue