From 18594ef3479f3b5f6be7e25c30bf4a1e332269e5 Mon Sep 17 00:00:00 2001
From: urec56 <yur.afonin2017@yandex.ru>
Date: Sun, 10 Mar 2024 14:16:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=81=D1=80=D0=B5=D0=B4=D0=BD=D0=B8=D0=B9=20=D1=85=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=20=D0=B0=D0=B2=D0=B0=D1=82=D0=B0=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/users/chat/dao.py    | 4 ++--
 app/users/chat/shemas.py | 2 ++
 app/users/dao.py         | 4 +++-
 app/users/router.py      | 4 ++--
 app/users/schemas.py     | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/users/chat/dao.py b/app/users/chat/dao.py
index 0a1ae02..953cf5f 100644
--- a/app/users/chat/dao.py
+++ b/app/users/chat/dao.py
@@ -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_(
diff --git a/app/users/chat/shemas.py b/app/users/chat/shemas.py
index de207f8..eae4603 100644
--- a/app/users/chat/shemas.py
+++ b/app/users/chat/shemas.py
@@ -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
diff --git a/app/users/dao.py b/app/users/dao.py
index b01475b..d5097cc 100644
--- a/app/users/dao.py
+++ b/app/users/dao.py
@@ -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(
diff --git a/app/users/router.py b/app/users/router.py
index f865c61..a4b697b 100644
--- a/app/users/router.py
+++ b/app/users/router.py
@@ -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
 
 
diff --git a/app/users/schemas.py b/app/users/schemas.py
index af780e6..4003870 100644
--- a/app/users/schemas.py
+++ b/app/users/schemas.py
@@ -47,6 +47,7 @@ class SUser(BaseModel):
     black_phoenix: bool
     date_of_birth: date
     date_of_registration: date
+    avatar_hex: str
 
 
 class SUserRename(BaseModel):