lewen/X25020501_card_book
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(chat): 新增未读消息返回消息id

Browse Source
This commit is contained in:
xingc
2025-05-15 20:15:05 +08:00
parent 329a50bc43
commit 7b86e482fb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/routers/chat/schema.py
View File

@@ -27,6 +27,7 @@ class ChatCreateIn(BaseModel):
class PreviewMessage(BaseModel): class PreviewMessage(BaseModel):
id: int
message_type: MessageType message_type: MessageType
content: str content: str

11
core/routers/chat/services.py
View File

@@ -50,7 +50,7 @@ async def get_unread_messages_per_chat(
# 查询消息情况 # 查询消息情况
read_status_alias = aliased(ReadStatus) read_status_alias = aliased(ReadStatus)
query = ( query = (
select(Message.chat_id, Message.content, Message.message_type, func.count().label("message_count")) select(Message.id, Message.chat_id, Message.content, Message.message_type, func.count().label("message_count"))
.join( .join(
read_status_alias, read_status_alias,
and_(read_status_alias.user_id == login_user.user_id, read_status_alias.chat_id == Message.chat_id), and_(read_status_alias.user_id == login_user.user_id, read_status_alias.chat_id == Message.chat_id),
@@ -69,12 +69,13 @@ async def get_unread_messages_per_chat(
unread_messages_info = result.fetchall() unread_messages_info = result.fetchall()
for messages_info in unread_messages_info: for messages_info in unread_messages_info:
unread_messages_info_per_chat[messages_info[0]] = { unread_messages_info_per_chat[messages_info[1]] = {
'message': { 'message': {
'message_type': messages_info[2], 'id': messages_info[0],
'content': messages_info[1], 'message_type': messages_info[3],
'content': messages_info[2],
}, },
'message_count': messages_info[3], 'message_count': messages_info[4],
} }
results = [] results = []