urec/chat_back
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Фикс преглоса в чат

Browse source
This commit is contained in:
urec56 2024-10-07 16:19:55 +03:00
parent c3d5ada5f3
commit a45989a057
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/chat/router.py
View file

@ -1,3 +1,5 @@
from uuid import UUID
from fastapi import APIRouter, Depends, status
from app.chat.shemas import (
@ -187,10 +189,10 @@ async def get_last_message(chat_id: int, user: SUser = Depends(get_verificated_u
},
)
async def get_some_messages(
chat_id: int,
last_messages: SLastMessages = Depends(),
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork)
chat_id: int,
last_messages: SLastMessages = Depends(),
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork),
):
await AuthService.validate_user_access_to_chat(uow=uow, chat_id=chat_id, user_id=user.id)
messages = await MessageService.get_some_messages(
@ -230,10 +232,10 @@ async def get_some_messages(
},
)
async def get_message_by_id(
chat_id: int,
message_id: int,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork)
chat_id: int,
message_id: UUID,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork),
):
await AuthService.validate_user_access_to_chat(uow=uow, chat_id=chat_id, user_id=user.id)
message = await MessageService.get_message_by_id(uow=uow, message_id=message_id)
@ -268,9 +270,9 @@ async def get_message_by_id(
},
)
async def create_invitation_link(
chat_id: int,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork)
chat_id: int,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork),
):
await AuthService.validate_user_access_to_chat(uow=uow, chat_id=chat_id, user_id=user.id)
invitation_link = ChatService.create_invitation_link(chat_id=chat_id)
@ -305,9 +307,9 @@ async def create_invitation_link(
},
)
async def invite_to_chat(
invitation_token: str,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork)
invitation_token: str,
user: SUser = Depends(get_verificated_user),
uow=Depends(UnitOfWork),
):
await ChatService.invite_to_chat(uow=uow, user_id=user.id, invitation_token=invitation_token)

2
app/dao/chat.py
View file

@ -33,7 +33,7 @@ class ChatDAO(BaseDAO):
)
.select_from(Chat)
.join(UserChat, Chat.id == UserChat.chat_id)
.where(UserChat.chat_id == chat_id, UserChat.user_id == user_id)
.where(UserChat.chat_id == chat_id)
)
result = await self.session.execute(query)