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-03-10 14:16:43 +03:00
parent e2cd40e553
commit 18594ef347
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class ChatDAO(BaseDAO):
@staticmethod
async def get_message_by_id(message_id: int):
query = (select(Messages.message, Messages.image_url, Messages.chat_id, Messages.user_id,
Messages.created_at, Users.avatar_image, Users.username).select_from(Messages)
Messages.created_at, Users.avatar_image, Users.username, Users.avatar_hex).select_from(Messages)
.join(Users, Users.id == Messages.user_id)
.where(
and_(
@ -89,7 +89,7 @@ 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.username
messages_with_users.c.username, messages_with_users.c.avatar_hex
)
.where(
and_(

2
app/users/chat/shemas.py
View file

@ -11,6 +11,7 @@ class SMessage(BaseModel):
username: str
created_at: str
avatar_image: str
avatar_hex: str
class SLastMessages:
@ -47,3 +48,4 @@ class SChat(BaseModel):
chat_for: int
chat_name: str
avatar_image: str
avatar_hex: str

4
app/users/dao.py
View file

@ -57,6 +57,7 @@ class UserDAO(BaseDAO):
chats_with_descriptions.c.visibility,
Users.id,
Users.avatar_image,
Users.avatar_hex
)
.select_from(chats_with_descriptions)
.join(Users, Users.id == chats_with_descriptions.c.user_id)
@ -65,7 +66,8 @@ class UserDAO(BaseDAO):
chats_with_avatars.c.chat_id,
chats_with_avatars.c.chat_for,
chats_with_avatars.c.chat_name,
chats_with_avatars.c.avatar_image
chats_with_avatars.c.avatar_image,
chats_with_avatars.c.avatar_hex
)
.select_from(chats_with_avatars)
.where(

4
app/users/router.py
View file

@ -105,9 +105,9 @@ async def change_avatar(user_data: SUserAvatar, current_user: Users = Depends(ge
if not verify_password(user_data.password, current_user.hashed_password):
raise IncorrectPasswordException
if await UserDAO.change_data(
current_user.id, avatar_image=user_data.new_avatar_image, avatar_hex=SUserAvatar.avatar_hex
current_user.id, avatar_image=user_data.new_avatar_image, avatar_hex=user_data.avatar_hex
):
return {'new_avatar_image': user_data.new_avatar_image, 'avatar_hex': SUserAvatar.avatar_hex}
return {'new_avatar_image': user_data.new_avatar_image, 'avatar_hex': user_data.avatar_hex}
raise SomethingWentWrongException

1
app/users/schemas.py
View file

@ -47,6 +47,7 @@ class SUser(BaseModel):
black_phoenix: bool
date_of_birth: date
date_of_registration: date
avatar_hex: str
class SUserRename(BaseModel):