From f6729210db9650daff8b909b788d00bc09b10dfd Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Thu, 21 May 2026 21:50:07 +0500
Subject: [PATCH] feat: public admin avatar endpoint, real admin avatar in user
 chat

---
 client/src/entities/user/api/user-api.ts      |  11 +++++++++++
 .../src/features/order-chat/ui/OrderChat.tsx  |  17 ++++++++++++++++-
 server/prisma/prisma/dev.db                   | Bin 364544 -> 364544 bytes
 server/src/routes/api/admin-profile.js        |  15 +++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/client/src/entities/user/api/user-api.ts b/client/src/entities/user/api/user-api.ts
index 20fdf20..d65bbce 100644
--- a/client/src/entities/user/api/user-api.ts
+++ b/client/src/entities/user/api/user-api.ts
@@ -30,6 +30,17 @@ export async function updateAdminUser(
   return data
 }
 
+export type AdminAvatarResponse = {
+  avatar: string | null
+  avatarType: string | null
+  avatarStyle: string | null
+}
+
+export async function fetchAdminAvatar(): Promise<AdminAvatarResponse> {
+  const { data } = await apiClient.get<AdminAvatarResponse>('admin/avatar')
+  return data
+}
+
 export async function deleteAdminUser(id: string): Promise<void> {
   await apiClient.delete(`admin/users/${id}`)
 }
diff --git a/client/src/features/order-chat/ui/OrderChat.tsx b/client/src/features/order-chat/ui/OrderChat.tsx
index 978c28f..27d1c8a 100644
--- a/client/src/features/order-chat/ui/OrderChat.tsx
+++ b/client/src/features/order-chat/ui/OrderChat.tsx
@@ -3,7 +3,9 @@ import Box from '@mui/material/Box'
 import Button from '@mui/material/Button'
 import Stack from '@mui/material/Stack'
 import Typography from '@mui/material/Typography'
+import { useQuery } from '@tanstack/react-query'
 import { useUnit } from 'effector-react'
+import { fetchAdminAvatar } from '@/entities/user/api/user-api'
 import { $user } from '@/shared/model/auth'
 import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
 import { OrderMessageBody } from '@/shared/ui/OrderMessageBody'
@@ -29,6 +31,12 @@ export function OrderChat({ messages, isPending, onSend }: Props) {
   const canSend = text.replace(/<[^>]*>/g, ' ').trim().length > 0
   const currentUser = useUnit($user)
 
+  const adminAvatarQuery = useQuery({
+    queryKey: ['admin', 'avatar'],
+    queryFn: fetchAdminAvatar,
+    staleTime: 5 * 60 * 1000,
+  })
+
   const handleSend = () => {
     if (!canSend || isPending) return
     onSend(text.trim())
@@ -43,8 +51,15 @@ export function OrderChat({ messages, isPending, onSend }: Props) {
       <Stack spacing={1} sx={{ mb: 2 }}>
         {messages.map((m) => {
           const isAdminMsg = m.authorType === 'admin'
+          const adminAv = adminAvatarQuery.data
           const avatarNode = isAdminMsg ? (
-            <UserAvatar userId="admin" avatarUrl={null} avatarType={null} avatarStyle={null} size={24} />
+            <UserAvatar
+              userId="admin"
+              avatarUrl={adminAv?.avatar}
+              avatarType={adminAv?.avatarType}
+              avatarStyle={adminAv?.avatarStyle}
+              size={24}
+            />
           ) : currentUser ? (
             <UserAvatar
               userId={currentUser.id}
diff --git a/server/prisma/prisma/dev.db b/server/prisma/prisma/dev.db
index 80a0e79dae519d88c744faffb4a58f1f673eb560..53dd97bacd3388780f328cfc0585c677a068f734 100644
GIT binary patch
delta 1232
zcmaJ=OHUI~6rSmwLW?1{jVW5>6)=Q^l+1LdFI`LpiD?vQBO4PUw8KnW+R~ZQ@+gaT
z<;ny_lO`rg7e*H@)Kpr<#7BZlB71j|=mHY{fC=6^Q?xqhP3Gk0%(>rreBUXS+luA3
zJMD&+=-rNCWM9raUTYyN1OdOmLwH!R`X9i_ZZJY-#f7XR9nNKAj$RNT=hI>;98WqJ
zkH^RMgOK)L4zFk)?|Cp`j*3~wZ;z8<eO}h%7nj2+IVo0tY;14%6}RXVXqsjjr?ir$
z*@z%B%jBc0^7@vckK&DHAtg(SJLPucAX)Nevhl2#S0Wx9^me=IC%?ij9BrotjppF!
z_~pR(mFeK68)Kv6ll7P&Ny#R)r#-k=u?FA3()1K%D(!qGyKD%Ykr8-!aoL+r<wY@(
zU>9%glGR-U)zhTDk}FnPf+hLLaKA>C$?veX4}rZ$yO;KPVAtXfHm#_d+Q9@kYtd%-
z48~#my-?3U%{>ENG!LwTR^Hcbv)KZK(MS+#bDWe?P<}d-OU`C;3D3e(Rwz9ez_r%&
zP#@|5S%PSOSc=BLDur%cwQn)NH5JAX)(D}V1}p^+iosZ(%*v81Nv>7H2|05?<P9{w
zo<xpNqeGoL%i_}T+|yCtoZw|MstypVg*wrgR=3lOX}wOi@)J4;J$3)p#gLFrsl2_@
zYzqd&dfbDb;8P79+sZlrn#N;D;gCfBZX0w0o~)}!--V$A@c-6UwFu|}QikY^Ay^mI
zW`Y(LB_%&!dVK`?$B^J~b?aMNf)g~XkQRQ>+)3C?CUBZSZ1cxTj$lYUQFcC>QKHF+
z3fYUqtTw!T9H&$KD{2R_Cl>WbH#+>Pg`zAq%5V4xFZ#$+ybFD1^BFTbMq@o2mqArY
zcm?A5S&5UG2;*cqms-(n%~s3gKE&&ykFEMCiq<x46V9P+xd}^i1#0R7igsdg3mDm#
k<7f}VvGtVttyA+1Yqnba1&N4nT-x`Py0m)SCm*QYpHnkzp#T5?

delta 1152
zcmZvb-)qxQ6vva?TTLf=JJjlQn^UPjkjhQduC0Qt&M9Nsb?A#AYHZUsZGPD#uC0iB
z(kGqbAo!v__~TWXYbQSV1NW#71jRRTqTu!?2=k`dROlXZN$&lg?>Ra5b4Ks`NALS@
zZerL^w>l4z_360>V{HujNTFZoBbu6MPd-EgTR<PZ4Ghq#CMtp?2f1i8&PU_1csv&3
zlcwkg9Ifa=DHg$8vMQ)qv9h;pG3x>6{kxraA}4;|dwVabS#r6EG3GB8Ee=~XBU_7c
z^xeVK_2<lXnDBTrik>4PLn5MHN5rW$A#4=RH$|W8N%|Y=cGMkkkH?$tPaPge9X*>q
zc<Ok6>g1v(O+%ff(JX~#(d<Nf`Z==Co`$Ub?gQPuUK=T7En<%OoDkzOs?4d?($yKd
zKEuGC6*ST*q))Wt9J2KVX1oD?@F!}_A<)s|zT0yN&_Q(b6q=uGC)G6OhrmW(8^dNO
z_8Xf4*KQB@>}vF$15Z}k`(zNXyFwoS%41qtltszbWw6=q%!3|ynOU8%^967T-q=j9
zY5XXF@QM>=FefOITn+Gt1EJ8tvLwiXP+uT~4M8=6hFF$zWS@NJG}R0mQcZM~5&Ylw
zh$!U?rh5>^_Er^au*cp&_5e1;iWwBtOhGHV$BLBA%Ay;aUChcw_r`G3kMHkG1$dJF
zh!beP{s7n7U&lP`?!lq&3~BbTEapX3EDNTXl~l<j)f#OSMKNgF>HRc%Odz`Bc7Isy
z<#p9*yj;cktY+Z|R}n!MNYKum>o|AOB!|&rHLOH))eF_I8fQ8|!X;w4ORJ9pd}W<O
zltBU`4lGI$XXLPDHx|Io<Af5ItVO0;!Mi~F5_`N|R0qp~wG`#?B$n_~h-1ugl&w;=
zC>z+GS^zt?rLKQ=8C%k|VEPQcL;P|zo&WbU1n(CAx(`Ah!RkGQ-V<bBp#5=rRU$$j
zFLoA|@_N0j$J0zqx=|wqat^{uMVIqf5=mV{-&uDhW^<@XdW)={gb<VAn557oDiYAo
zAiH=4p5CWb%#koL?R7375-oC?Rl-ZzS_X#XNq-r4*ZQby*_^lO|L5%`B=feM@1s|6
F<`0SUZF2ws

diff --git a/server/src/routes/api/admin-profile.js b/server/src/routes/api/admin-profile.js
index 64aaeff..d69f0c5 100644
--- a/server/src/routes/api/admin-profile.js
+++ b/server/src/routes/api/admin-profile.js
@@ -1,3 +1,4 @@
+import { normalizeEmail } from '../../lib/auth.js'
 import { prisma } from '../../lib/prisma.js'
 
 export async function registerAdminProfileRoutes(fastify) {
@@ -15,6 +16,20 @@ export async function registerAdminProfileRoutes(fastify) {
     }
   })
 
+  fastify.get('/api/admin/avatar', async (request, reply) => {
+    const adminEmail = normalizeEmail(process.env.ADMIN_EMAIL)
+    if (!adminEmail || !adminEmail.includes('@')) return reply.code(404).send({ error: 'Администратор не найден' })
+
+    const user = await prisma.user.findUnique({ where: { email: adminEmail } })
+    if (!user) return reply.code(404).send({ error: 'Администратор не найден' })
+
+    return {
+      avatar: user.avatar,
+      avatarType: user.avatarType,
+      avatarStyle: user.avatarStyle,
+    }
+  })
+
   fastify.patch('/api/admin/profile', { preHandler: [fastify.verifyAdmin] }, async (request, reply) => {
     const userId = request.user.sub
     const nameRaw = request.body?.displayName