@open-mercato/core 0.6.6-develop.6256.1.9fc16aedc4 → 0.6.6-develop.6286.1.d985c5c374

package/src/modules/messages/commands/conversation.ts

@@ -228,6 +228,91 @@ const markConversationUnreadForActorCommand: CommandHandler<unknown, { ok: true;
   },
 }
 
+const unarchiveConversationForActorCommand: CommandHandler<unknown, { ok: true; affectedCount: number }> = {
+  id: 'messages.conversation.unarchive_for_actor',
+  async execute(rawInput, ctx) {
+    const input = conversationCommandSchema.parse(rawInput)
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const scope = await resolveConversationScope(em, input)
+    const messageIdsToUnarchive = scope.messageIds.filter((messageId) => scope.recipientMessageIds.has(messageId))
+
+    if (messageIdsToUnarchive.length === 0) {
+      return { ok: true, affectedCount: 0 }
+    }
+
+    const unarchivedIds: string[] = []
+    await em.transactional(async (trx) => {
+      const recipients = await trx.find(MessageRecipient, {
+        messageId: { $in: messageIdsToUnarchive },
+        recipientUserId: input.userId,
+        deletedAt: null,
+      })
+      for (const recipient of recipients) {
+        if (recipient.status === 'archived' || recipient.archivedAt !== null) {
+          recipient.archivedAt = null
+          recipient.status = recipient.readAt ? 'read' : 'unread'
+          unarchivedIds.push(recipient.messageId)
+        }
+      }
+    })
+
+    for (const messageId of unarchivedIds) {
+      await emitMessagesEvent('messages.message.unarchived', {
+        messageId,
+        recipientUserId: input.userId,
+        userId: input.userId,
+        tenantId: input.tenantId,
+        organizationId: input.organizationId,
+      }, { persistent: true })
+    }
+
+    return { ok: true, affectedCount: unarchivedIds.length }
+  },
+}
+
+const markConversationReadForActorCommand: CommandHandler<unknown, { ok: true; affectedCount: number }> = {
+  id: 'messages.conversation.mark_read_for_actor',
+  async execute(rawInput, ctx) {
+    const input = conversationCommandSchema.parse(rawInput)
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const scope = await resolveConversationScope(em, input)
+    const messageIdsToMarkRead = scope.messageIds.filter((messageId) => scope.recipientMessageIds.has(messageId))
+
+    if (messageIdsToMarkRead.length === 0) {
+      return { ok: true, affectedCount: 0 }
+    }
+
+    const readAt = new Date()
+    const markedIds: string[] = []
+    await em.transactional(async (trx) => {
+      const recipients = await trx.find(MessageRecipient, {
+        messageId: { $in: messageIdsToMarkRead },
+        recipientUserId: input.userId,
+        deletedAt: null,
+      })
+      for (const recipient of recipients) {
+        if (recipient.status === 'unread') {
+          recipient.status = 'read'
+          recipient.readAt = readAt
+          markedIds.push(recipient.messageId)
+        }
+      }
+    })
+
+    for (const messageId of markedIds) {
+      await emitMessagesEvent('messages.message.read', {
+        messageId,
+        recipientUserId: input.userId,
+        userId: input.userId,
+        tenantId: input.tenantId,
+        organizationId: input.organizationId,
+      }, { persistent: true })
+    }
+
+    return { ok: true, affectedCount: markedIds.length }
+  },
+}
+
 type DeletedTarget = { messageId: string; target: 'sender' | 'recipient' }
 
 const deleteConversationForActorCommand: CommandHandler<unknown, { ok: true; affectedCount: number }> = {
@@ -289,5 +374,7 @@ const deleteConversationForActorCommand: CommandHandler<unknown, { ok: true; aff
 }
 
 registerCommand(archiveConversationForActorCommand)
+registerCommand(unarchiveConversationForActorCommand)
 registerCommand(markConversationUnreadForActorCommand)
+registerCommand(markConversationReadForActorCommand)
 registerCommand(deleteConversationForActorCommand)

package/src/modules/messages/components/MessageDetailPageClient.tsx

@@ -220,6 +220,8 @@ export function MessageDetailPageClient({ id }: { id: string }) {
   const firstConversationMessageId = state.conversationItems[0]?.id ?? null
   const latestConversationMessageId = state.conversationItems[state.conversationItems.length - 1]?.id ?? null
   const canRunConversationActions = Boolean(firstConversationMessageId)
+  const conversationArchived = Boolean(detail.conversationArchived)
+  const conversationAllUnread = Boolean(detail.conversationAllUnread)
 
   return (
     <div className="space-y-3">
@@ -228,6 +230,8 @@ export function MessageDetailPageClient({ id }: { id: string }) {
         priority={(detail.priority as 'low' | 'normal' | 'high' | 'urgent') ?? 'normal'}
         canReply={!detail.isDraft && detail.typeDefinition.allowReply && Boolean(firstConversationMessageId)}
         canForwardAll={!detail.isDraft && detail.typeDefinition.allowForward && Boolean(latestConversationMessageId)}
+        conversationArchived={conversationArchived}
+        conversationAllUnread={conversationAllUnread}
         actionsDisabled={Boolean(state.activeConversationAction)}
         activeActionId={state.activeConversationAction}
         onReply={() => {
@@ -244,13 +248,21 @@ export function MessageDetailPageClient({ id }: { id: string }) {
             messageId: latestConversationMessageId,
           })
         }}
-        onArchiveConversation={() => {
+        onToggleArchiveConversation={() => {
           if (!canRunConversationActions) return
-          void state.archiveConversation(firstConversationMessageId ?? undefined)
+          if (conversationArchived) {
+            void state.unarchiveConversation(firstConversationMessageId ?? undefined)
+          } else {
+            void state.archiveConversation(firstConversationMessageId ?? undefined)
+          }
         }}
-        onMarkAllUnread={() => {
+        onToggleReadConversation={() => {
           if (!canRunConversationActions) return
-          void state.markConversationUnread(firstConversationMessageId ?? undefined)
+          if (conversationAllUnread) {
+            void state.markConversationRead(firstConversationMessageId ?? undefined)
+          } else {
+            void state.markConversationUnread(firstConversationMessageId ?? undefined)
+          }
         }}
         onDeleteConversation={() => {
           if (!canRunConversationActions || state.activeConversationAction) return

package/src/modules/messages/components/message-detail/hooks/useMessageDetails.ts

@@ -61,7 +61,9 @@ export function useMessageDetails(id: string) {
     attachments: queryState.attachments,
     isArchived,
     onDeleted: () => router.push('/backend/messages'),
+    onMarkedUnread: () => router.push('/backend/messages'),
     refreshDetailWithoutAutoMarkRead: queryState.refreshDetailWithoutAutoMarkRead,
+    suppressAutoMarkRead: queryState.suppressAutoMarkRead,
   })
 
   const conversationState = useMessageDetailsConversation({

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsActions.ts

@@ -18,9 +18,15 @@ import { isSafeNavigationHref, parseObjectActionId, toErrorMessage } from '../ut
 
 type RequestAndRefreshOptions = {
   skipDetailAutoMarkRead?: boolean
+  onSuccess?: () => void
 }
 
-type ConversationActionKind = 'archiveConversation' | 'deleteConversation' | 'markAllUnread'
+type ConversationActionKind =
+  | 'archiveConversation'
+  | 'unarchiveConversation'
+  | 'deleteConversation'
+  | 'markAllUnread'
+  | 'markAllRead'
 
 type MessageDetailMutationContext = {
   resourceKind: 'message' | 'conversation'
@@ -37,7 +43,9 @@ type UseMessageDetailsActionsInput = {
   attachments: MessageAttachment[] | undefined
   isArchived: boolean
   onDeleted: () => void
+  onMarkedUnread: () => void
   refreshDetailWithoutAutoMarkRead: () => Promise<MessageDetail | null>
+  suppressAutoMarkRead: () => void
 }
 
 export function useMessageDetailsActions({
@@ -48,7 +56,9 @@ export function useMessageDetailsActions({
   attachments,
   isArchived,
   onDeleted,
+  onMarkedUnread,
   refreshDetailWithoutAutoMarkRead,
+  suppressAutoMarkRead,
 }: UseMessageDetailsActionsInput) {
   const [replyOpen, setReplyOpen] = React.useState(false)
   const [forwardOpen, setForwardOpen] = React.useState(false)
@@ -88,6 +98,7 @@ export function useMessageDetailsActions({
         context: { resourceKind: 'message', messageId: id, action: 'state-change', retryLastMutation },
         mutationPayload: { messageId: id, action: 'state-change', url, method },
       })
+      options?.onSuccess?.()
     } catch (err) {
       flash(
         err instanceof Error
@@ -188,13 +199,32 @@ export function useMessageDetailsActions({
     })
   }, [id, runConversationAction, t])
 
+  const unarchiveConversation = React.useCallback(async (messageId?: string) => {
+    const targetMessageId = messageId ?? id
+    await runConversationAction('unarchiveConversation', {
+      url: `/api/messages/${encodeURIComponent(targetMessageId)}/conversation/archive`,
+      method: 'DELETE',
+      successMessage: t('messages.flash.conversationUnarchived', 'Conversation restored from archive.'),
+    })
+  }, [id, runConversationAction, t])
+
   const markConversationUnread = React.useCallback(async (messageId?: string) => {
+    suppressAutoMarkRead()
     const targetMessageId = messageId ?? id
     await runConversationAction('markAllUnread', {
       url: `/api/messages/${encodeURIComponent(targetMessageId)}/conversation/read`,
       method: 'DELETE',
       successMessage: t('messages.flash.conversationMarkedUnread', 'Conversation marked unread.'),
-      skipDetailAutoMarkRead: true,
+      onSuccess: onMarkedUnread,
+    })
+  }, [id, onMarkedUnread, runConversationAction, suppressAutoMarkRead, t])
+
+  const markConversationRead = React.useCallback(async (messageId?: string) => {
+    const targetMessageId = messageId ?? id
+    await runConversationAction('markAllRead', {
+      url: `/api/messages/${encodeURIComponent(targetMessageId)}/conversation/read`,
+      method: 'PUT',
+      successMessage: t('messages.flash.conversationMarkedRead', 'Conversation marked read.'),
     })
   }, [id, runConversationAction, t])
 
@@ -362,12 +392,15 @@ export function useMessageDetailsActions({
   }, [detail?.actionData?.actions])
 
   const toggleRead = React.useCallback(async () => {
+    if (detail?.isRead) {
+      suppressAutoMarkRead()
+    }
     await requestAndRefresh(
       `/api/messages/${encodeURIComponent(id)}/read`,
       detail?.isRead ? 'DELETE' : 'PUT',
-      detail?.isRead ? { skipDetailAutoMarkRead: true } : undefined,
+      detail?.isRead ? { skipDetailAutoMarkRead: true, onSuccess: onMarkedUnread } : undefined,
     )
-  }, [detail?.isRead, id, requestAndRefresh])
+  }, [detail?.isRead, id, onMarkedUnread, requestAndRefresh, suppressAutoMarkRead])
 
   const toggleArchive = React.useCallback(async () => {
     await requestAndRefresh(
@@ -393,8 +426,10 @@ export function useMessageDetailsActions({
     toggleRead,
     toggleArchive,
     archiveConversation,
+    unarchiveConversation,
     deleteConversation,
     markConversationUnread,
+    markConversationRead,
     requestAndRefresh,
     handleDelete,
     handleDeleteDialogKeyDown,

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsQueries.ts

@@ -26,10 +26,19 @@ export function useMessageDetailsQueries({
     [id, scopeVersion],
   )
 
+  const suppressAutoMarkReadRef = React.useRef(false)
+
+  React.useEffect(() => {
+    suppressAutoMarkReadRef.current = false
+  }, [id])
+
   const detailQuery = useQuery<MessageDetail | null>({
     queryKey: detailQueryKey,
     queryFn: async () => {
-      const call = await apiCall<MessageDetail>(`/api/messages/${encodeURIComponent(id)}`)
+      const detailUrl = suppressAutoMarkReadRef.current
+        ? `/api/messages/${encodeURIComponent(id)}?skipMarkRead=1`
+        : `/api/messages/${encodeURIComponent(id)}`
+      const call = await apiCall<MessageDetail>(detailUrl)
       if (call.status === 404) {
         return null
       }
@@ -97,6 +106,10 @@ export function useMessageDetailsQueries({
     return call.result
   }, [detailQueryKey, id, queryClient, t])
 
+  const suppressAutoMarkRead = React.useCallback(() => {
+    suppressAutoMarkReadRef.current = true
+  }, [])
+
   const listItemComponentKey = detail?.typeDefinition.ui?.listItemComponent ?? null
   const contentComponentKey = detail?.typeDefinition.ui?.contentComponent ?? null
   const actionsComponentKey = detail?.typeDefinition.ui?.actionsComponent ?? null
@@ -111,6 +124,7 @@ export function useMessageDetailsQueries({
     attachmentsQuery,
     attachments,
     refreshDetailWithoutAutoMarkRead,
+    suppressAutoMarkRead,
     listItemComponentKey,
     contentComponentKey,
     actionsComponentKey,

package/src/modules/messages/components/message-detail/panels/MainMessageHeader.tsx

@@ -4,7 +4,7 @@ import * as React from 'react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { FormHeader, type ActionItem } from '@open-mercato/ui/backend/forms'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
-import { Archive, Forward, MailMinus, Reply, Trash2 } from 'lucide-react'
+import { Archive, ArchiveRestore, Forward, MailMinus, MailOpen, Reply, Trash2 } from 'lucide-react'
 import { PriorityBadge } from '../../utils/PriorityBadge'
 
 type MainMessageHeaderProps = {
@@ -12,12 +12,21 @@ type MainMessageHeaderProps = {
   priority: 'low' | 'normal' | 'high' | 'urgent'
   canReply: boolean
   canForwardAll: boolean
+  conversationArchived: boolean
+  conversationAllUnread: boolean
   actionsDisabled?: boolean
-  activeActionId?: 'forwardAll' | 'archiveConversation' | 'markAllUnread' | 'deleteConversation' | null
+  activeActionId?:
+    | 'forwardAll'
+    | 'archiveConversation'
+    | 'unarchiveConversation'
+    | 'markAllUnread'
+    | 'markAllRead'
+    | 'deleteConversation'
+    | null
   onReply: () => void
   onForwardAll: () => void
-  onArchiveConversation: () => void
-  onMarkAllUnread: () => void
+  onToggleArchiveConversation: () => void
+  onToggleReadConversation: () => void
   onDeleteConversation: () => void
 }
 
@@ -42,19 +51,23 @@ export function MainMessageHeader(props: MainMessageHeaderProps) {
     },
     {
       id: 'archive-conversation',
-      label: t('messages.actions.archiveConversation', 'Archive conversation'),
-      icon: Archive,
-      onSelect: props.onArchiveConversation,
+      label: props.conversationArchived
+        ? t('messages.actions.unarchiveConversation', 'Unarchive conversation')
+        : t('messages.actions.archiveConversation', 'Archive conversation'),
+      icon: props.conversationArchived ? ArchiveRestore : Archive,
+      onSelect: props.onToggleArchiveConversation,
       disabled: props.actionsDisabled,
-      loading: props.activeActionId === 'archiveConversation',
+      loading: props.activeActionId === 'archiveConversation' || props.activeActionId === 'unarchiveConversation',
     },
     {
       id: 'mark-all-unread',
-      label: t('messages.actions.markAllUnread', 'Mark all unread'),
-      icon: MailMinus,
-      onSelect: props.onMarkAllUnread,
+      label: props.conversationAllUnread
+        ? t('messages.actions.markAllRead', 'Mark all read')
+        : t('messages.actions.markAllUnread', 'Mark all unread'),
+      icon: props.conversationAllUnread ? MailOpen : MailMinus,
+      onSelect: props.onToggleReadConversation,
       disabled: props.actionsDisabled,
-      loading: props.activeActionId === 'markAllUnread',
+      loading: props.activeActionId === 'markAllUnread' || props.activeActionId === 'markAllRead',
     },
     {
       id: 'delete-conversation',
@@ -68,10 +81,12 @@ export function MainMessageHeader(props: MainMessageHeaderProps) {
     props.actionsDisabled,
     props.canForwardAll,
     props.canReply,
-    props.onArchiveConversation,
+    props.conversationArchived,
+    props.conversationAllUnread,
+    props.onToggleArchiveConversation,
     props.onDeleteConversation,
     props.onForwardAll,
-    props.onMarkAllUnread,
+    props.onToggleReadConversation,
     props.onReply,
     props.activeActionId,
     t,

package/src/modules/messages/components/message-detail/types.ts

@@ -97,6 +97,8 @@ export type MessageDetail = {
     objects?: MessageDetailObject[]
   }>
   isRead: boolean
+  conversationArchived?: boolean
+  conversationAllUnread?: boolean
 }
 
 export type ActionResult = {

package/src/modules/messages/i18n/de.json

@@ -9,6 +9,7 @@
   "messages.actions.edit": "Bearbeiten",
   "messages.actions.executing": "Wird ausgeführt...",
   "messages.actions.forwardAll": "Alle weiterleiten",
+  "messages.actions.markAllRead": "Alle als gelesen markieren",
   "messages.actions.markAllUnread": "Alle als ungelesen markieren",
   "messages.actions.markRead": "Als gelesen markieren",
   "messages.actions.markUnread": "Als ungelesen markieren",
@@ -16,6 +17,7 @@
   "messages.actions.taken": "Aktion ausgeführt",
   "messages.actions.title": "Aktionen",
   "messages.actions.unarchive": "Wiederherstellen",
+  "messages.actions.unarchiveConversation": "Konversation wiederherstellen",
   "messages.attachFiles": "Dateien anhängen",
   "messages.attachObject": "Objekt anhängen",
   "messages.attachedFiles": "Anhänge",
@@ -146,7 +148,9 @@
   "messages.flash.actionSuccess": "Aktion abgeschlossen.",
   "messages.flash.conversationArchived": "Konversation archiviert.",
   "messages.flash.conversationDeleted": "Konversation gelöscht.",
+  "messages.flash.conversationMarkedRead": "Konversation als gelesen markiert.",
   "messages.flash.conversationMarkedUnread": "Konversation als ungelesen markiert.",
+  "messages.flash.conversationUnarchived": "Konversation wiederhergestellt.",
   "messages.flash.deleted": "Nachricht gelöscht.",
   "messages.flash.draftSaved": "Entwurf gespeichert.",
   "messages.flash.forwardSuccess": "Nachricht weitergeleitet.",

package/src/modules/messages/i18n/en.json

@@ -9,6 +9,7 @@
   "messages.actions.edit": "Edit",
   "messages.actions.executing": "Executing...",
   "messages.actions.forwardAll": "Forward all",
+  "messages.actions.markAllRead": "Mark all read",
   "messages.actions.markAllUnread": "Mark all unread",
   "messages.actions.markRead": "Mark read",
   "messages.actions.markUnread": "Mark unread",
@@ -16,6 +17,7 @@
   "messages.actions.taken": "Action taken",
   "messages.actions.title": "Actions",
   "messages.actions.unarchive": "Unarchive",
+  "messages.actions.unarchiveConversation": "Unarchive conversation",
   "messages.attachFiles": "Attach files",
   "messages.attachObject": "Attach object",
   "messages.attachedFiles": "Attachments",
@@ -146,7 +148,9 @@
   "messages.flash.actionSuccess": "Action completed.",
   "messages.flash.conversationArchived": "Conversation archived.",
   "messages.flash.conversationDeleted": "Conversation deleted.",
+  "messages.flash.conversationMarkedRead": "Conversation marked read.",
   "messages.flash.conversationMarkedUnread": "Conversation marked unread.",
+  "messages.flash.conversationUnarchived": "Conversation restored from archive.",
   "messages.flash.deleted": "Message deleted.",
   "messages.flash.draftSaved": "Draft saved.",
   "messages.flash.forwardSuccess": "Message forwarded.",

package/src/modules/messages/i18n/es.json

@@ -9,6 +9,7 @@
   "messages.actions.edit": "Editar",
   "messages.actions.executing": "Ejecutando...",
   "messages.actions.forwardAll": "Reenviar todo",
+  "messages.actions.markAllRead": "Marcar todo como leído",
   "messages.actions.markAllUnread": "Marcar todo como no leído",
   "messages.actions.markRead": "Marcar como leído",
   "messages.actions.markUnread": "Marcar como no leído",
@@ -16,6 +17,7 @@
   "messages.actions.taken": "Acción realizada",
   "messages.actions.title": "Acciones",
   "messages.actions.unarchive": "Desarchivar",
+  "messages.actions.unarchiveConversation": "Desarchivar conversación",
   "messages.attachFiles": "Adjuntar archivos",
   "messages.attachObject": "Adjuntar objeto",
   "messages.attachedFiles": "Adjuntos",
@@ -146,7 +148,9 @@
   "messages.flash.actionSuccess": "Acción completada.",
   "messages.flash.conversationArchived": "Conversación archivada.",
   "messages.flash.conversationDeleted": "Conversación eliminada.",
+  "messages.flash.conversationMarkedRead": "Conversación marcada como leída.",
   "messages.flash.conversationMarkedUnread": "Conversación marcada como no leída.",
+  "messages.flash.conversationUnarchived": "Conversación desarchivada.",
   "messages.flash.deleted": "Mensaje eliminado.",
   "messages.flash.draftSaved": "Borrador guardado.",
   "messages.flash.forwardSuccess": "Mensaje reenviado.",

package/src/modules/messages/i18n/pl.json

@@ -9,6 +9,7 @@
   "messages.actions.edit": "Edytuj",
   "messages.actions.executing": "Wykonywanie...",
   "messages.actions.forwardAll": "Przekaż cały wątek",
+  "messages.actions.markAllRead": "Oznacz wszystko jako przeczytane",
   "messages.actions.markAllUnread": "Oznacz wszystko jako nieprzeczytane",
   "messages.actions.markRead": "Oznacz jako przeczytane",
   "messages.actions.markUnread": "Oznacz jako nieprzeczytane",
@@ -16,6 +17,7 @@
   "messages.actions.taken": "Wykonana akcja",
   "messages.actions.title": "Akcje",
   "messages.actions.unarchive": "Przywróć z archiwum",
+  "messages.actions.unarchiveConversation": "Przywróć konwersację z archiwum",
   "messages.attachFiles": "Dołącz pliki",
   "messages.attachObject": "Dołącz obiekt",
   "messages.attachedFiles": "Załączniki",
@@ -146,7 +148,9 @@
   "messages.flash.actionSuccess": "Akcja wykonana.",
   "messages.flash.conversationArchived": "Konwersacja zarchiwizowana.",
   "messages.flash.conversationDeleted": "Konwersacja usunięta.",
+  "messages.flash.conversationMarkedRead": "Konwersacja oznaczona jako przeczytana.",
   "messages.flash.conversationMarkedUnread": "Konwersacja oznaczona jako nieprzeczytana.",
+  "messages.flash.conversationUnarchived": "Konwersacja przywrócona z archiwum.",
   "messages.flash.deleted": "Wiadomość usunięta.",
   "messages.flash.draftSaved": "Szkic zapisany.",
   "messages.flash.forwardSuccess": "Wiadomość przekazana.",

package/src/modules/payment_gateways/api/cancel/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { cancelSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -73,6 +74,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Cancel failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -87,6 +91,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment cancelled' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/capture/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { captureSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -73,6 +74,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Capture failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -87,6 +91,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment captured' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/refund/route.ts

@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { refundSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -74,6 +75,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json(result)
   } catch (err: unknown) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
     const message = err instanceof Error ? err.message : 'Refund failed'
     return NextResponse.json({ error: message }, { status: 502 })
   }
@@ -88,6 +92,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment refunded' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],