diff --git a/chat_test/app/users/chat/dao.py b/chat_test/app/users/chat/dao.py index 3dc9923..b713dd1 100644 --- a/chat_test/app/users/chat/dao.py +++ b/chat_test/app/users/chat/dao.py @@ -83,7 +83,9 @@ class ChatDAO(BaseDAO): messages = (select(messages_with_users.c.message, messages_with_users.c.image_url, messages_with_users.c.chat_id, messages_with_users.c.user_id, - messages_with_users.c.created_at, messages_with_users.c.avatar_image) + messages_with_users.c.created_at, messages_with_users.c.avatar_image, + messages_with_users.c.username + ) .where( and_( messages_with_users.c.chat_id == chat_id, diff --git a/chat_test/app/users/chat/router.py b/chat_test/app/users/chat/router.py index 2325b3e..f47b61b 100644 --- a/chat_test/app/users/chat/router.py +++ b/chat_test/app/users/chat/router.py @@ -15,7 +15,7 @@ router = APIRouter( ) -@router.get("") +@router.get('') async def get_all_chats(user: Users = Depends(get_current_user)): return await UserDAO.get_user_allowed_chats(user.id) diff --git a/chat_test/app/users/chat/shemas.py b/chat_test/app/users/chat/shemas.py index d381b96..0c834d3 100644 --- a/chat_test/app/users/chat/shemas.py +++ b/chat_test/app/users/chat/shemas.py @@ -5,10 +5,11 @@ from pydantic import BaseModel class SMessage(BaseModel): - message: str + message: Optional[str] = None image_url: Optional[str] = None chat_id: int user_id: int + username: str created_at: datetime avatar_image: str diff --git a/front/src/chat/components/AppContent.jsx b/front/src/chat/components/AppContent.jsx deleted file mode 100644 index c8ba012..0000000 --- a/front/src/chat/components/AppContent.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import {Layout} from "antd"; -import {users} from "../../api.js"; - - - -const contentStyle = { - textAlign: 'center', - minHeight: 120, - lineHeight: 'calc(100vh - 64px)', - color: '#fff', - backgroundColor: '#001529', - padding: '1rem', -}; - -export default function () { - return (users) -}