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-05-06 21:32:50 +05:00
parent e64431f925
commit 4133fed00a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/users/chat/dao.py
View file

@ -45,7 +45,7 @@ class ChatDAO(BaseDAO):
Users.avatar_image, Users.username, Users.avatar_hex, Answers.self_id, Answers.answer_id)
.select_from(inserted_image)
.join(Users, Users.id == inserted_image.c.user_id)
.join(Answers, Answers.answer_id == inserted_image.c.id, isouter=True))
.join(Answers, Answers.self_id == inserted_image.c.id, isouter=True))
async with async_session_maker() as session:
result = await session.execute(query)
@ -99,7 +99,7 @@ class ChatDAO(BaseDAO):
select(Messages.__table__.columns, Users.__table__.columns, Answers.__table__.columns)
.select_from(Messages)
.join(Users, Messages.user_id == Users.id)
.join(Answers, Answers.answer_id == Messages.id, isouter=True)).cte('messages_with_users')
.join(Answers, Answers.self_id == Messages.id, isouter=True)).cte('messages_with_users')
messages = (select(messages_with_users.c.id, messages_with_users.c.message, messages_with_users.c.image_url,
messages_with_users.c.chat_id, messages_with_users.c.user_id,
@ -138,8 +138,8 @@ class ChatDAO(BaseDAO):
Users.avatar_image, Users.username, Users.avatar_hex, answer.c.self_id, answer.c.answer_id)
.select_from(Messages)
.join(Users, Users.id == Messages.user_id)
.join(answer, answer.c.answer_id == Messages.id, isouter=True)
.where(Messages.id == answer_id))
.join(answer, answer.c.self_id == Messages.id, isouter=True)
.where(Messages.id == self_id))
async with async_session_maker() as session:
result = await session.execute(query)