@open-mercato/core 0.5.1-develop.3045.b4b3320cc2 → 0.6.0

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

@@ -4,6 +4,9 @@
   "audit_logs.resource_kind.customers.comment": "Komentarz",
   "audit_logs.resource_kind.customers.todoLink": "Zadanie",
   "backend.nav.configuration": "Konfiguracja",
+  "customers.activities.actions.markDone": "Oznacz jako wykonane",
+  "customers.activities.actions.markDoneError": "Nie udało się oznaczyć aktywności jako wykonanej",
+  "customers.activities.actions.markDoneSuccess": "Aktywność oznaczona jako wykonana",
   "customers.activities.add.call": "Zarejestruj rozmowę",
   "customers.activities.add.email": "Napisz e-mail",
   "customers.activities.add.meeting": "Nowe spotkanie",
@@ -24,6 +27,10 @@
   "customers.activities.card.empty": "Nic nie zaplanowano na ten dzień.",
   "customers.activities.card.overdue": "{count} zaległych",
   "customers.activities.card.title": "Aktywności",
+  "customers.activities.errors.dateRequired": "Data jest wymagana",
+  "customers.activities.errors.phoneInvalid": "Wprowadź prawidłowy numer telefonu z numerem kierunkowym kraju (np. +48 123 456 789)",
+  "customers.activities.errors.phoneRequired": "Numer telefonu jest wymagany dla aktywności typu Połączenie",
+  "customers.activities.errors.timeRequired": "Godzina jest wymagana",
   "customers.activities.filters.clearAll": "Clear filters",
   "customers.activities.filters.dateRange": "Date range",
   "customers.activities.loadFailed": "Nie udało się załadować aktywności.",
@@ -52,6 +59,7 @@
   "customers.activityComposer.types.email": "E-mail",
   "customers.activityComposer.types.meeting": "Spotkanie",
   "customers.activityComposer.types.note": "Notatka",
+  "customers.activityComposer.types.task": "Zadanie",
   "customers.activityComposer.validation.descriptionRequired": "Opis jest wymagany",
   "customers.activityComposer.validation.typeRequired": "Select an activity type",
   "customers.activityComposer.weekPreviewTitle": "Ten tydzień",
@@ -59,6 +67,8 @@
   "customers.activityLog.direction.with": "z",
   "customers.activityLog.emptyDescription": "Poszerz zakres dat albo usuń część filtrów.",
   "customers.activityLog.error": "Nie udało się wczytać historii aktywności",
+  "customers.activityLog.filters.dateRangeLabel": "Filtruj według zakresu dat",
+  "customers.activityLog.filters.sortLabel": "Sortuj aktywności",
   "customers.activityLog.searchPlaceholder": "Szukaj po tytule, notatce lub autorze",
   "customers.activityLog.sort.recent": "Sortuj: najnowsze",
   "customers.activityLog.sort.titleAsc": "Sortuj: nazwa A-Z",
@@ -2022,6 +2032,7 @@
   "customers.timeline.filter.from": "Od daty",
   "customers.timeline.filter.meeting": "Spotkanie",
   "customers.timeline.filter.note": "Notatka",
+  "customers.timeline.filter.task": "Zadanie",
   "customers.timeline.filter.to": "Do daty",
   "customers.timeline.history.filtered": "filtered: {{types}} · {{count}} wyników",
   "customers.timeline.history.searchAriaLabel": "Szukaj w historii interakcji",

package/src/modules/customers/lib/legacyActivityBridge.ts

@@ -0,0 +1,106 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import type { CommandBus } from '@open-mercato/shared/lib/commands'
+import { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fields'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { CustomerActivity, CustomerInteraction } from '../data/entities'
+import { CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE } from './interactionCompatibility'
+
+type CommandContext = Parameters<CommandBus['execute']>[1]['ctx']
+
+async function loadLegacyActivityCustomValues(
+  em: EntityManager,
+  activity: CustomerActivity,
+): Promise<Record<string, unknown> | null> {
+  const values = await loadCustomFieldValues({
+    em,
+    entityId: 'customers:customer_activity',
+    recordIds: [activity.id],
+    tenantIdByRecord: { [activity.id]: activity.tenantId },
+    organizationIdByRecord: { [activity.id]: activity.organizationId },
+    tenantFallbacks: [activity.tenantId],
+  })
+  return values[activity.id] ?? null
+}
+
+/**
+ * If the canonical `customer_interactions` row for `activity` does not yet
+ * exist, create it via the `customers.interactions.create` command using the
+ * legacy activity's primary key. Returns the canonical id (always equal to
+ * `activity.id` in this scheme).
+ *
+ * Mirrors the bridge in /api/customers/activities so the dialog editing flow
+ * can edit historical activities that still live only in `customer_activities`
+ * (root cause of #1807 PUT 404 "Interaction not found").
+ */
+export async function ensureCanonicalActivityBridge(
+  em: EntityManager,
+  commandBus: CommandBus,
+  commandContext: CommandContext,
+  activity: CustomerActivity,
+): Promise<string> {
+  const existing = await em.findOne(CustomerInteraction, { id: activity.id, tenantId: activity.tenantId })
+  if (existing) return existing.id
+
+  const entityId = typeof activity.entity === 'string' ? activity.entity : activity.entity.id
+  const dealId = activity.deal
+    ? (typeof activity.deal === 'string' ? activity.deal : activity.deal.id)
+    : null
+  const customValues = await loadLegacyActivityCustomValues(em, activity)
+
+  await commandBus.execute('customers.interactions.create', {
+    input: {
+      id: activity.id,
+      tenantId: activity.tenantId,
+      organizationId: activity.organizationId,
+      entityId,
+      interactionType: activity.activityType,
+      title: activity.subject ?? null,
+      body: activity.body ?? null,
+      occurredAt: activity.occurredAt ?? null,
+      status: activity.occurredAt ? 'done' : 'planned',
+      dealId,
+      authorUserId: activity.authorUserId ?? null,
+      appearanceIcon: activity.appearanceIcon ?? null,
+      appearanceColor: activity.appearanceColor ?? null,
+      source: CUSTOMER_INTERACTION_ACTIVITY_ADAPTER_SOURCE,
+      ...(customValues ? { customValues } : {}),
+    },
+    ctx: commandContext,
+  })
+
+  return activity.id
+}
+
+/**
+ * Returns the canonical `customer_interactions.id` for the given target id. If
+ * the canonical record already exists, returns it directly. Otherwise looks
+ * the id up in the legacy `customer_activities` table and bridges the row into
+ * `customer_interactions` via {@link ensureCanonicalActivityBridge}. If
+ * neither exists, returns the original id unchanged so downstream lookups can
+ * surface a normal 404.
+ */
+export async function resolveCanonicalActivityTargetId(
+  em: EntityManager,
+  commandBus: CommandBus,
+  commandContext: CommandContext,
+  targetId: string,
+  tenantId: string,
+): Promise<string> {
+  const existing = await em.findOne(CustomerInteraction, { id: targetId, tenantId })
+  if (existing) return existing.id
+
+  // Reads encrypted scalar fields (subject, body, appearanceIcon, appearanceColor)
+  // that are forwarded into `customers.interactions.create`. Use the decryption
+  // helper so the bridged interaction inherits plaintext values rather than
+  // ciphertext when tenant data encryption is enabled.
+  const legacy = await findOneWithDecryption(
+    em,
+    CustomerActivity,
+    { id: targetId, tenantId } as any,
+    { populate: ['entity', 'deal'] } as any,
+    { tenantId },
+  )
+  if (!legacy) return targetId
+
+  return ensureCanonicalActivityBridge(em, commandBus, commandContext, legacy)
+}

package/src/modules/integrations/data/validators.ts

@@ -40,12 +40,14 @@ export const listIntegrationLogsQuerySchema = z.object({
 
 export type ListIntegrationLogsQuery = z.infer<typeof listIntegrationLogsQuerySchema>
 
-const optionalBooleanQuery = z.preprocess((value) => {
-  if (value === undefined || value === '' || value === null) return undefined
-  if (value === true || value === 'true' || value === '1') return true
-  if (value === false || value === 'false' || value === '0') return false
-  return value
-}, z.boolean().optional()).optional()
+const optionalBooleanQuery = z.union([z.boolean(), z.string(), z.null(), z.undefined()])
+  .transform((value) => {
+    if (value === undefined || value === '' || value === null) return undefined
+    if (value === true || value === 'true' || value === '1') return true
+    if (value === false || value === 'false' || value === '0') return false
+    return value
+  })
+  .pipe(z.boolean().optional())
 
 export const integrationMarketplaceHealthStatusSchema = z.enum(['healthy', 'degraded', 'unhealthy', 'unconfigured'])
 

package/src/modules/integrations/lib/credentials-service.ts

@@ -3,6 +3,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { decryptWithAesGcm, encryptWithAesGcm } from '@open-mercato/shared/lib/encryption/aes'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { createKmsService } from '@open-mercato/shared/lib/encryption/kms'
+import { parseDecryptedFieldValue } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 import {
   getBundle,
   getIntegration,
@@ -15,6 +16,18 @@ import { IntegrationCredentials } from '../data/entities'
 const ENCRYPTED_CREDENTIALS_BLOB_KEY = '__om_encrypted_credentials_blob_v1'
 const DERIVED_KEY_CONTEXT = 'integrations.credentials'
 
+function isRecordValue(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object' && !Array.isArray(value)
+}
+
+function normalizeCredentialsRecord(value: unknown): Record<string, unknown> {
+  if (isRecordValue(value)) return value
+  if (typeof value !== 'string') return {}
+
+  const parsed = parseDecryptedFieldValue(value)
+  return isRecordValue(parsed) ? parsed : {}
+}
+
 function resolveFallbackEncryptionSecret(): string {
   const candidates = [
     process.env.TENANT_DATA_ENCRYPTION_FALLBACK_KEY,
@@ -100,9 +113,10 @@ export function createCredentialsService(em: EntityManager) {
   }
 
   async function decryptCredentialsBlob(
-    credentials: Record<string, unknown>,
+    credentialsInput: unknown,
     scope: IntegrationScope,
   ): Promise<Record<string, unknown>> {
+    const credentials = normalizeCredentialsRecord(credentialsInput)
     const encrypted = credentials[ENCRYPTED_CREDENTIALS_BLOB_KEY]
     if (typeof encrypted !== 'string' || !encrypted) return credentials
 

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

@@ -2,6 +2,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import { extractUndoPayload, type UndoPayload } from '@open-mercato/shared/lib/commands/undo'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { Message, MessageObject, MessageRecipient } from '../data/entities'
 import { emitMessagesEvent } from '../events'
 import {
@@ -9,6 +10,7 @@ import {
   isTerminalMessageAction,
   resolveActionCommandInput,
   resolveActionHref,
+  resolveMessageActionData,
 } from '../lib/actions'
 import { getMessageType } from '../lib/message-types-registry'
 import { assertOrganizationAccess, type MessageScopeInput } from './shared'
@@ -52,11 +54,17 @@ function toDate(value: string | null | undefined): Date | null {
 }
 
 async function requireActionTarget(em: EntityManager, input: RecordTerminalActionInput) {
-  const message = await em.findOne(Message, {
-    id: input.messageId,
-    tenantId: input.tenantId,
-    deletedAt: null,
-  })
+  const message = await findOneWithDecryption(
+    em,
+    Message,
+    {
+      id: input.messageId,
+      tenantId: input.tenantId,
+      deletedAt: null,
+    },
+    undefined,
+    { tenantId: input.tenantId, organizationId: input.organizationId },
+  )
   if (!message) throw new Error('Message not found')
   assertOrganizationAccess(input as MessageScopeInput, message)
 
@@ -70,11 +78,17 @@ async function requireActionTarget(em: EntityManager, input: RecordTerminalActio
 }
 
 async function requireActionMessage(em: EntityManager, input: ExecuteActionInput) {
-  const message = await em.findOne(Message, {
-    id: input.messageId,
-    tenantId: input.tenantId,
-    deletedAt: null,
-  })
+  const message = await findOneWithDecryption(
+    em,
+    Message,
+    {
+      id: input.messageId,
+      tenantId: input.tenantId,
+      deletedAt: null,
+    },
+    undefined,
+    { tenantId: input.tenantId, organizationId: input.organizationId },
+  )
   if (!message) throw new Error('Message not found')
   assertOrganizationAccess(input as MessageScopeInput, message)
   const recipient = await em.findOne(MessageRecipient, {
@@ -148,7 +162,7 @@ const recordTerminalActionCommand: CommandHandler<unknown, { ok: true }> = {
     const messageId = logEntry?.resourceId as string | null
     if (!messageId) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const message = await em.findOne(Message, { id: messageId })
+    const message = await findOneWithDecryption(em, Message, { id: messageId })
     if (!message) return
     message.actionTaken = before.actionTaken
     message.actionTakenByUserId = before.actionTakenByUserId
@@ -180,8 +194,9 @@ const executeActionCommand: CommandHandler<
 
     const shouldRecordActionTaken = isTerminalMessageAction(action)
 
-    if (message.actionData?.expiresAt) {
-      if (new Date(message.actionData.expiresAt) < new Date()) {
+    const actionData = resolveMessageActionData(message)
+    if (actionData?.expiresAt) {
+      if (new Date(actionData.expiresAt) < new Date()) {
         throw new Error('Actions have expired')
       }
     } else {

package/src/modules/messages/lib/actions.ts

@@ -1,3 +1,4 @@
+import { parseDecryptedFieldValue } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 import type { Message, MessageAction, MessageActionData, MessageObject } from '../data/entities'
 import { getMessageObjectType } from './message-objects-registry'
 import { getMessageType } from './message-types-registry'
@@ -22,6 +23,34 @@ export type MessageActionResolutionContext = {
   userId: string
 }
 
+function isRecordValue(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object' && !Array.isArray(value)
+}
+
+export function resolveMessageActionData(message: Pick<Message, 'actionData'>): MessageActionData | null {
+  const rawActionData = message.actionData as unknown
+  const parsedActionData = typeof rawActionData === 'string'
+    ? parseDecryptedFieldValue(rawActionData)
+    : rawActionData
+  if (!isRecordValue(parsedActionData)) return null
+
+  const actions = Array.isArray(parsedActionData.actions)
+    ? parsedActionData.actions.filter(isRecordValue) as MessageAction[]
+    : []
+  const primaryActionId = typeof parsedActionData.primaryActionId === 'string'
+    ? parsedActionData.primaryActionId
+    : undefined
+  const expiresAt = typeof parsedActionData.expiresAt === 'string'
+    ? parsedActionData.expiresAt
+    : undefined
+
+  return {
+    actions,
+    ...(primaryActionId ? { primaryActionId } : {}),
+    ...(expiresAt ? { expiresAt } : {}),
+  }
+}
+
 function normalizeActionLabel(
   action: Pick<MessageAction, 'label' | 'id'>,
   fallback?: string | null,
@@ -49,7 +78,8 @@ export function buildMessageObjectActionId(objectId: string, actionId: string):
 }
 
 function readActionDataExpiry(message: Message): string | undefined {
-  if (message.actionData?.expiresAt) return message.actionData.expiresAt
+  const actionData = resolveMessageActionData(message)
+  if (actionData?.expiresAt) return actionData.expiresAt
   const messageType = getMessageType(message.type)
   if (!messageType?.actionsExpireAfterHours || !message.sentAt) return undefined
   return new Date(
@@ -63,6 +93,7 @@ export function buildResolvedMessageActions(
 ): MessageActionData | null {
   const resolved: ResolvedMessageAction[] = []
   const usedIds = new Set<string>()
+  const actionData = resolveMessageActionData(message)
 
   const pushAction = (
     action: MessageAction,
@@ -83,7 +114,7 @@ export function buildResolvedMessageActions(
     })
   }
 
-  for (const action of message.actionData?.actions ?? []) {
+  for (const action of actionData?.actions ?? []) {
     pushAction(action, 'message')
   }
 
@@ -128,7 +159,7 @@ export function buildResolvedMessageActions(
     return null
   }
 
-  const configuredPrimaryActionId = message.actionData?.primaryActionId
+  const configuredPrimaryActionId = actionData?.primaryActionId
   const primaryActionId = configuredPrimaryActionId && resolved.some((entry) => entry.id === configuredPrimaryActionId)
     ? configuredPrimaryActionId
     : resolved[0]?.id

package/src/modules/sales/api/documents/factory.ts

@@ -21,6 +21,7 @@ import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import { recalculateOrderTotalsForDisplay } from '../../commands/returns'
+import { parseDecryptedFieldValue } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 
 type DocumentKind = 'order' | 'quote'
 
@@ -38,6 +39,17 @@ type DocumentBinding = {
 
 const rawBodySchema = z.object({}).passthrough()
 
+const normalizeJsonRecord = (value: unknown): Record<string, unknown> | null => {
+  if (value && typeof value === 'object' && !Array.isArray(value)) {
+    return value as Record<string, unknown>
+  }
+  if (typeof value !== 'string') return null
+  const parsed = parseDecryptedFieldValue(value)
+  return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+    ? parsed as Record<string, unknown>
+    : null
+}
+
 const resolveCustomerName = (snapshot: Record<string, unknown> | null, fallback?: string | null) => {
   if (!snapshot) return fallback ?? null
   const customer = snapshot.customer as Record<string, unknown> | undefined
@@ -155,38 +167,43 @@ function buildSortMap(numberColumn: string) {
   }
 }
 
-const mapUpdateResponse = (entity: any) => ({
-  id: entity?.id ?? null,
-  orderNumber: entity?.orderNumber ?? null,
-  quoteNumber: entity?.quoteNumber ?? null,
-  customerEntityId: entity?.customerEntityId ?? null,
-  customerContactId: entity?.customerContactId ?? null,
-  customerSnapshot: entity?.customerSnapshot ?? null,
-  metadata: entity?.metadata ?? null,
-  externalReference: entity?.externalReference ?? null,
-  customerReference: entity?.customerReference ?? null,
-  comment: entity?.comments ?? null,
-  statusEntryId: (entity as any)?.statusEntryId ?? null,
-  status: (entity as any)?.status ?? null,
-  channelId: (entity as any)?.channelId ?? null,
-  customerName: resolveCustomerName(entity?.customerSnapshot ?? null, entity?.customerEntityId ?? null),
-  contactEmail:
-    resolveCustomerEmail(entity?.customerSnapshot ?? null) ??
-    (typeof entity?.metadata?.customerEmail === 'string' ? entity.metadata.customerEmail : null),
-  currencyCode: entity?.currencyCode ?? null,
-  placedAt: entity?.placedAt ? entity.placedAt.toISOString() : null,
-  expectedDeliveryAt: entity?.expectedDeliveryAt ? entity.expectedDeliveryAt.toISOString() : null,
-  shippingAddressId: entity?.shippingAddressId ?? null,
-  billingAddressId: entity?.billingAddressId ?? null,
-  shippingAddressSnapshot: entity?.shippingAddressSnapshot ?? null,
-  billingAddressSnapshot: entity?.billingAddressSnapshot ?? null,
-  shippingMethodId: entity?.shippingMethodId ?? null,
-  shippingMethodCode: entity?.shippingMethodCode ?? null,
-  shippingMethodSnapshot: entity?.shippingMethodSnapshot ?? null,
-  paymentMethodId: entity?.paymentMethodId ?? null,
-  paymentMethodCode: entity?.paymentMethodCode ?? null,
-  paymentMethodSnapshot: entity?.paymentMethodSnapshot ?? null,
-})
+const mapUpdateResponse = (entity: any) => {
+  const customerSnapshot = normalizeJsonRecord(entity?.customerSnapshot)
+  const metadata = normalizeJsonRecord(entity?.metadata)
+
+  return {
+    id: entity?.id ?? null,
+    orderNumber: entity?.orderNumber ?? null,
+    quoteNumber: entity?.quoteNumber ?? null,
+    customerEntityId: entity?.customerEntityId ?? null,
+    customerContactId: entity?.customerContactId ?? null,
+    customerSnapshot,
+    metadata,
+    externalReference: entity?.externalReference ?? null,
+    customerReference: entity?.customerReference ?? null,
+    comment: entity?.comments ?? null,
+    statusEntryId: (entity as any)?.statusEntryId ?? null,
+    status: (entity as any)?.status ?? null,
+    channelId: (entity as any)?.channelId ?? null,
+    customerName: resolveCustomerName(customerSnapshot, entity?.customerEntityId ?? null),
+    contactEmail:
+      resolveCustomerEmail(customerSnapshot) ??
+      (typeof metadata?.customerEmail === 'string' ? metadata.customerEmail : null),
+    currencyCode: entity?.currencyCode ?? null,
+    placedAt: entity?.placedAt ? entity.placedAt.toISOString() : null,
+    expectedDeliveryAt: entity?.expectedDeliveryAt ? entity.expectedDeliveryAt.toISOString() : null,
+    shippingAddressId: entity?.shippingAddressId ?? null,
+    billingAddressId: entity?.billingAddressId ?? null,
+    shippingAddressSnapshot: normalizeJsonRecord(entity?.shippingAddressSnapshot),
+    billingAddressSnapshot: normalizeJsonRecord(entity?.billingAddressSnapshot),
+    shippingMethodId: entity?.shippingMethodId ?? null,
+    shippingMethodCode: entity?.shippingMethodCode ?? null,
+    shippingMethodSnapshot: normalizeJsonRecord(entity?.shippingMethodSnapshot),
+    paymentMethodId: entity?.paymentMethodId ?? null,
+    paymentMethodCode: entity?.paymentMethodCode ?? null,
+    paymentMethodSnapshot: normalizeJsonRecord(entity?.paymentMethodSnapshot),
+  }
+}
 
 const attachTags = async (payload: any, ctx: any) => {
   const items = Array.isArray(payload?.items) ? (payload.items as Array<Record<string, any>>) : []
@@ -369,10 +386,10 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
           shippingAddressId: item.shipping_address_id ?? null,
           shippingMethodId: item.shipping_method_id ?? null,
           shippingMethodCode: item.shipping_method_code ?? null,
-          shippingMethodSnapshot: item.shipping_method_snapshot ?? null,
+          shippingMethodSnapshot: normalizeJsonRecord(item.shipping_method_snapshot),
           paymentMethodId: item.payment_method_id ?? null,
           paymentMethodCode: item.payment_method_code ?? null,
-          paymentMethodSnapshot: item.payment_method_snapshot ?? null,
+          paymentMethodSnapshot: normalizeJsonRecord(item.payment_method_snapshot),
           currencyCode: item.currency_code ?? null,
           channelId: item.channel_id ?? null,
           externalReference: item.external_reference ?? null,
@@ -395,10 +412,10 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
           paidTotalAmount: toNumber(item.paid_total_amount),
           refundedTotalAmount: toNumber(item.refunded_total_amount),
           outstandingAmount: toNumber(item.outstanding_amount),
-          customerSnapshot: item.customer_snapshot ?? null,
-          billingAddressSnapshot: item.billing_address_snapshot ?? null,
-          shippingAddressSnapshot: item.shipping_address_snapshot ?? null,
-          metadata: item.metadata ?? null,
+          customerSnapshot: normalizeJsonRecord(item.customer_snapshot),
+          billingAddressSnapshot: normalizeJsonRecord(item.billing_address_snapshot),
+          shippingAddressSnapshot: normalizeJsonRecord(item.shipping_address_snapshot),
+          metadata: normalizeJsonRecord(item.metadata),
           organizationId: item.organization_id ?? null,
           tenantId: item.tenant_id ?? null,
           createdAt: item.created_at,