feat(chat): 聊天列表新增未读消息总数
This commit is contained in:
@@ -24,7 +24,8 @@ from core.base.exceptions import WebsocketTooManyRequests
|
||||
|
||||
from . import schema
|
||||
from .handlers import socket_manager
|
||||
from .services import websocket_callback, get_user_active_direct_chats, get_unread_messages_per_chat, get_chat
|
||||
from .services import websocket_callback, get_user_active_direct_chats, get_unread_messages_per_chat, get_chat, \
|
||||
get_total_unread_messages_count
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -34,7 +35,7 @@ chat_router = APIRouter(prefix='/chat', tags=['聊天模块'])
|
||||
@chat_router.get(
|
||||
'/all/', summary='获取所有聊天',
|
||||
response_model=base_schema.BaseResponse[
|
||||
base_schema.Paginated[
|
||||
schema.ChatPaginated[
|
||||
List[schema.ChatUnreadOut]
|
||||
]
|
||||
]
|
||||
@@ -67,11 +68,13 @@ async def get_all_chats(
|
||||
result = await db_session.execute(query)
|
||||
chats = result.scalars().all()
|
||||
|
||||
unread_messages_chats_count = await get_unread_messages_per_chat(db_session, chats, login_user)
|
||||
unread_messages_chats = await get_unread_messages_per_chat(db_session, chats, login_user)
|
||||
unread_messages_total = await get_total_unread_messages_count(db_session, login_user)
|
||||
|
||||
return {
|
||||
'data': {
|
||||
'list': unread_messages_chats_count,
|
||||
'list': unread_messages_chats,
|
||||
'unread_messages_total': unread_messages_total,
|
||||
'next_page': (page * page_size) < total,
|
||||
'total': total,
|
||||
'page': page,
|
||||
|
||||
Reference in New Issue
Block a user