From b0b2872cf81967f63c4b4c7be51e91ef5947b24d Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Wed, 27 May 2026 21:54:53 +0500
Subject: [PATCH] refactor: remove duplicate order status labels, use
 ORDER_STATUS_DATA as single source

---
 .../order-detail/ui/OrderDetailContent.tsx    |   6 +++---
 .../order-payment/ui/OrderPaymentSection.tsx  |   4 ++--
 .../pages/admin-orders/ui/AdminOrdersPage.tsx |   6 +++---
 .../src/pages/me/ui/sections/MessagesPage.tsx |   6 +++---
 .../src/pages/me/ui/sections/OrdersPage.tsx   |   4 ++--
 client/src/shared/lib/order-status-data.ts    |   4 ++++
 client/src/shared/lib/order-status-labels.ts  |  14 --------------
 server/prisma/prisma/dev.db                   | Bin 352256 -> 352256 bytes
 8 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 client/src/shared/lib/order-status-labels.ts

diff --git a/client/src/features/order-detail/ui/OrderDetailContent.tsx b/client/src/features/order-detail/ui/OrderDetailContent.tsx
index 34cd886..50dbe65 100644
--- a/client/src/features/order-detail/ui/OrderDetailContent.tsx
+++ b/client/src/features/order-detail/ui/OrderDetailContent.tsx
@@ -19,7 +19,7 @@ import { getAdminNextOrderStatuses } from '@/shared/constants/order'
 import { formatPriceRub } from '@/shared/lib/format-price'
 import { invalidateQueryKeys } from '@/shared/lib/invalidate-query-keys'
 import { parseOrderAddressSnapshot } from '@/shared/lib/order-address-snapshot'
-import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ORDER_STATUS_MAP } from '@/shared/lib/order-status-data'
 import { $user } from '@/shared/model/auth'
 import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
 import { OrderMessageBody } from '@/shared/ui/OrderMessageBody'
@@ -66,7 +66,7 @@ export function OrderDetailContent({ detail, orderId }: { detail: AdminOrderDeta
   return (
     <Stack spacing={2} sx={{ mt: 1 }}>
       <Typography sx={{ fontWeight: 700 }}>
-        #{detail.id.slice(-8)} · {detail.user.email} · {orderStatusLabelRu(detail.status)} ·{' '}
+        #{detail.id.slice(-8)} · {detail.user.email} · {ORDER_STATUS_MAP[detail.status] ?? detail.status} ·{' '}
         {formatPriceRub(detail.totalCents)}
       </Typography>
       <Typography variant="body2" color="text.secondary">
@@ -184,7 +184,7 @@ export function OrderDetailContent({ detail, orderId }: { detail: AdminOrderDeta
             </MenuItem>
             {nextStatuses.map((s) => (
               <MenuItem key={s} value={s}>
-                {orderStatusLabelRu(s)}
+                {ORDER_STATUS_MAP[s] ?? s}
               </MenuItem>
             ))}
           </Select>
diff --git a/client/src/features/order-payment/ui/OrderPaymentSection.tsx b/client/src/features/order-payment/ui/OrderPaymentSection.tsx
index cfacf9b..72b0adb 100644
--- a/client/src/features/order-payment/ui/OrderPaymentSection.tsx
+++ b/client/src/features/order-payment/ui/OrderPaymentSection.tsx
@@ -1,7 +1,7 @@
 import Box from '@mui/material/Box'
 import Button from '@mui/material/Button'
 import Typography from '@mui/material/Typography'
-import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ORDER_STATUS_MAP } from '@/shared/lib/order-status-data'
 
 type Props = {
   status: string
@@ -43,7 +43,7 @@ export function OrderPaymentSection({ status, deliveryFeeLocked, paymentMethod,
         <>
           <Typography color="text.secondary" variant="body2" sx={{ mb: 1 }}>
             Вы будете перенаправлены на защищённую платёжную страницу ЮKassa. После оплаты заказ получит статус «
-            {orderStatusLabelRu('PAID')}».
+            {ORDER_STATUS_MAP['PAID'] ?? 'PAID'}».
           </Typography>
           <Button variant="contained" onClick={onPay} disabled={isPayPending}>
             {isPayPending ? 'Создание платежа…' : 'Оплатить'}
diff --git a/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx b/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx
index e6c3c35..9904905 100644
--- a/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx
+++ b/client/src/pages/admin-orders/ui/AdminOrdersPage.tsx
@@ -20,7 +20,7 @@ import { OrderDetailContent } from '@/features/order-detail/ui/OrderDetailConten
 import { ORDER_STATUSES } from '@/shared/constants/order'
 import { formatPriceRub } from '@/shared/lib/format-price'
 import { groupOrdersByStatus } from '@/shared/lib/group-orders-by-status'
-import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ORDER_STATUS_MAP } from '@/shared/lib/order-status-data'
 import { AdminDialog } from '@/shared/ui/AdminDialog/AdminDialog'
 
 export function AdminOrdersPage() {
@@ -87,7 +87,7 @@ export function AdminOrdersPage() {
             </MenuItem>
             {ORDER_STATUSES.map((s) => (
               <MenuItem key={s} value={s}>
-                {orderStatusLabelRu(s)}
+                {ORDER_STATUS_MAP[s] ?? s}
               </MenuItem>
             ))}
           </Select>
@@ -130,7 +130,7 @@ export function AdminOrdersPage() {
             <Fragment key={`group:${group.statusCode}`}>
               <TableRow>
                 <TableCell colSpan={6} sx={{ fontWeight: 700, bgcolor: 'action.hover' }}>
-                  {orderStatusLabelRu(group.statusCode)} ({group.items.length})
+                  {ORDER_STATUS_MAP[group.statusCode] ?? group.statusCode} ({group.items.length})
                 </TableCell>
               </TableRow>
               {group.items.map((o) => (
diff --git a/client/src/pages/me/ui/sections/MessagesPage.tsx b/client/src/pages/me/ui/sections/MessagesPage.tsx
index e28df4c..ce61743 100644
--- a/client/src/pages/me/ui/sections/MessagesPage.tsx
+++ b/client/src/pages/me/ui/sections/MessagesPage.tsx
@@ -15,7 +15,7 @@ import { Link as RouterLink } from 'react-router-dom'
 import { fetchMyOrder, postOrderMessage } from '@/entities/order/api/order-api'
 import { fetchMyConversations, markOrderMessagesRead } from '@/entities/user/api/messages-api'
 import { fetchAdminAvatar } from '@/entities/user/api/user-api'
-import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ORDER_STATUS_MAP } from '@/shared/lib/order-status-data'
 import { usePageTitle } from '@/shared/lib/use-page-title'
 import { $user } from '@/shared/model/auth'
 import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
@@ -125,7 +125,7 @@ export function MessagesPage() {
                             №{c.orderId.slice(-6)}
                           </Typography>
                           <Typography component="span" variant="caption" color="text.secondary">
-                            · {orderStatusLabelRu(c.status)}
+                            · {ORDER_STATUS_MAP[c.status] ?? c.status}
                           </Typography>
                         </Stack>
                       }
@@ -168,7 +168,7 @@ export function MessagesPage() {
                   <Typography variant="h6">
                     Чат заказа №{order.id.slice(-6)}{' '}
                     <Typography component="span" variant="body2" color="text.secondary">
-                      ({orderStatusLabelRu(order.status)})
+                      ({ORDER_STATUS_MAP[order.status] ?? order.status})
                     </Typography>
                   </Typography>
                   <Button component={RouterLink} to={`/me/orders/${order.id}`} size="small" variant="outlined">
diff --git a/client/src/pages/me/ui/sections/OrdersPage.tsx b/client/src/pages/me/ui/sections/OrdersPage.tsx
index c6f8351..55bbe32 100644
--- a/client/src/pages/me/ui/sections/OrdersPage.tsx
+++ b/client/src/pages/me/ui/sections/OrdersPage.tsx
@@ -11,7 +11,7 @@ import { fetchMyOrders } from '@/entities/order/api/order-api'
 import { ORDER_STATUSES } from '@/shared/constants/order'
 import { formatPriceRub } from '@/shared/lib/format-price'
 import { groupOrdersByStatus } from '@/shared/lib/group-orders-by-status'
-import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ORDER_STATUS_MAP } from '@/shared/lib/order-status-data'
 import { usePageTitle } from '@/shared/lib/use-page-title'
 
 export function OrdersPage() {
@@ -40,7 +40,7 @@ export function OrdersPage() {
         {groups.map((group) => (
           <Box key={group.status}>
             <Typography variant="h6" sx={{ mb: 1 }}>
-              {orderStatusLabelRu(group.status)} ({group.items.length})
+              {ORDER_STATUS_MAP[group.status] ?? group.status} ({group.items.length})
             </Typography>
             <Stack spacing={2}>
               {group.items.map((o) => (
diff --git a/client/src/shared/lib/order-status-data.ts b/client/src/shared/lib/order-status-data.ts
index 18c5c39..05453e4 100644
--- a/client/src/shared/lib/order-status-data.ts
+++ b/client/src/shared/lib/order-status-data.ts
@@ -73,3 +73,7 @@ export const ORDER_STATUS_DATA: ReadonlyArray<OrderStatusData> = [
 export function getOrderStatusData(code: string): OrderStatusData | undefined {
   return ORDER_STATUS_DATA.find((s) => s.code === code)
 }
+
+export const ORDER_STATUS_MAP: Record<string, string> = Object.fromEntries(
+  ORDER_STATUS_DATA.map((s) => [s.code, s.label]),
+)
diff --git a/client/src/shared/lib/order-status-labels.ts b/client/src/shared/lib/order-status-labels.ts
deleted file mode 100644
index 9543f9e..0000000
--- a/client/src/shared/lib/order-status-labels.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/** Человекочитаемые подписи к кодам статуса заказа */
-export function orderStatusLabelRu(code: string): string {
-  const map: Record<string, string> = {
-    DRAFT: 'Черновик',
-    PENDING_PAYMENT: 'Ожидает оплаты',
-    PAID: 'Оплачен',
-    IN_PROGRESS: 'Подготовка к отправке',
-    SHIPPED: 'Отправлен',
-    READY_FOR_PICKUP: 'Готово к получению',
-    DONE: 'Завершён',
-    CANCELLED: 'Отменён',
-  }
-  return map[code] ?? code
-}
diff --git a/server/prisma/prisma/dev.db b/server/prisma/prisma/dev.db
index 3540a33cdefa0e9f3389a0b4dd3923fda703f3c3..08700b180610abc2ec5fbbff7cb49a1c5aa5e07f 100644
GIT binary patch
delta 2174
zcmc&#Pi)&%7`J1G#wp_^OkGvfC>1av7)7>YH?=sp8%!vIrA4X+6-?AgZ0C=iywuLW
za!AJsF05P@B&3y1h{M`RKv=?Mq7vGH0|E)baT4W#ggAkOhJ+N}i=8%|QzmhtmA)L_
z@BO~t_xbyMZ)102V|QZn5g(O$Z~6?1pRRs%=|Lhy5a37f1K0tdw8LxyG@qs}khW^s
zv+1l-)YVy7o8{thNn%-%=fxPmpw<-=8tOCYl1ZPW79Fsu9-st45{FR~K@iJ*N>jD7
zrHpkX^r<JQ$5)v9L)(9EeYJJEq}UljWmz`1me1*Wsh(%qvO!+SpTBy`_ZThvnY0Np
zD9$6$90nN`C>r_oH4M5o-B}=i0?|HviazCMmd+-hPb6P>W9jtDxwFY-7qmpuFxc<Y
z&tMO{(+)4Z37Qc~CLMN7$su;BA}OL+P(_W00zGsp*yxl^L$RvG^eQx<gxm3~dsmF%
z(^x8I<qJG3*41=mnvz}JnqEYQ624nDtA<gxYRAxBETtQO<XyS5Ns=>N5|Tl-JHG1s
z>(T>#nV%tv8fd|u?@aO~l99v53BvD}os{V7VLhB6ag~CU5(?{c)dI)IaIx3Fb)t)`
zl@M|sBU3pJ)(ef;=l);83DnUMBp*X^=5mM(+zj~lzzoKCuLoWA;LmpWyFJkQZIKEF
z89IEN=}YJ=QFO?e$QEclR0pf=muFrjn+1xIrDy^d(O0IgTWd%en~Cd1J*L)mK7kO=
zVe)-M1tI{45p09gvIQFnLNi@bDt30ZSTT&@0Yz1x`~EE_zI(zKl)1<UlM#o^Om}}#
zsIf7cAjTf<{+^{?^fxa?$e{en1QEUHcN5wgFJMV{3g*kzvXwWSgqCVM4$9Mvd|`q}
zJ3rBZQhUVs+|PZ@f&G?INlI0*6-8OI@Tc3k?!?zoKNgX`gDl=LbX|6&7flcQ_8rW=
zeW!^UeS75)y?2gX`hWNPh#Wc^Sj;`O-&v0f&e#3}c~-HqY6cf@<L!QYe}5YLwg$J6
zYa0KXu?J$hfeq@3CiYlHu+Tt>cxwp?OwZSKwe>}hI+?`#3RiITmgCbAJFrZK<Wo$9
zm<j}_Ve=zDAkKNrsaTM&HKbCX^HIDFG3T{um(#N{yS*Ou4G=~P^BpX$5h*$$nhrUu
z>FahFehK0tIW9BIB!m72pE<2#PiwJkE-r9IwZ!F8Xe$XKR(0hyC*t)pi4=^$9>Z&}
z7wxQ~RL-)#3D7@!(!!vbpvGmCZ#bPchc_>ecWY5xhYibYIF)N&r{Lr}<4#1QfB9Z2
zQNvVtiK{SPjc02`muldOq4kbgw*PQq0(IeDF1?1hQdpKXr$aSvWL++g3u>6;#-<ZH
wu>TT#NK<b0M?6&!v*RVjStT<g+2-(5<!#BKr^-|1p{L5D`{1eCrSES21I3n~bpQYW

delta 1301
zcma)5O>7fa5Z<?MmwKJTbA$qNMTixIDiol*S=+l&rEZcYpeV2yi3&IrvbHz2W3Rn-
z91>eam|l88B&{M@0*N2Ba746L>{MxKqzZ8=-3aB-8<ZQ0D%2aIk~_~%_)8G@Fj{%O
z`R1E9-;@^HN{ekXAF=4OZ+G-V{Bh)mX%|Z#Fysk&P-(TVlOucamwWJWlsCsa@eoR9
zOv^~5_DPD;qbRDZs)2yNH*apk60&R~sRl%;w_v2B=G6Y&1lxus;l<xET3Pw;>hD+k
zEJIFNMNt%GDRU;CEo6Jr6NNE!B|_Mf>@H5@g@|QSP$mbUAO(rpSaLEO&ow}^)n4?7
zbTr^zu8S8!gZjXbe(-dt@8sb@{n#ofgg6_<xyz8p<SvZ!GwE!{8lv2hlxfPq-JOWq
zqLN4?tY{(6?!cN*ejdkOw7G_CRM)CA2>IxzTdcK=u+OG9A!0McuC(@!lCoWA`%m;A
z428cqoER89J*wyjf`@YA!07PjJ;!w;kST^!M<=Jk#qpHBF9M?Uryb4sRtau~VGwx?
ziYu+oUxaHY`l`-)Z`#QB-9rxgzes*elkZ?!VaN(F{Y}a%N3h#HC3mZ$U-GNLY6x>4
z7mJn|*FR{va?}?_TP~huTQn(qd3*bLp6AOq{^Yv$JC~gKrIIu6EI123XU6%}xxMtY
zbH`a&y5P(?KSA;vA7Jh{zd)i?TQ;!w1MVV0?%Ka`Jj|E(#_%aV8dc>$Z90aB(Qf06
zkv9w@Hx4i1d2*{6>DX(Ff=@RrYwo?5RW0F9&TXT1Nk?F%0cw{XH8Gw{+Ddu8j(6+S
zD9{Mvs;}0YFN-`{m(b35T`s(pVR&9!g=VNvRmz!4c1!7k*yQX4w%G>f>>BV*uh!~y
z{0H%GEUe+RwaRrZsveH>z^?Bz<UYK`Z=^4PS~NkV!NmxI;Ntm4anSGwK%XRK;-(ar
z!)8&5HlB2@8Q<{J&Na&z8x=N9-%%Zb=5RM-44ETiVD(ev+z>cJgTC-<cBTguhR#8H
zKn1%Pu`D}JC2e?FAVz<>s~Lx2h}WpV4U^rJDz3<5u?b5|#w~MoI=KJ|Q7Q`w-0~sR
kZ@u?@Ggj@!WnSYjmHNtwfBNc)uT%K)**9u>bCJ9DKer*ETmS$7