@open-mercato/shared 0.6.4-develop.4210.1.d412061cfe → 0.6.4-develop.4236.1.9fa6806b34

package/src/lib/crud/custom-field-definition-index.ts

@@ -0,0 +1,233 @@
+// Core-free building blocks for the custom-field definition index.
+//
+// This module intentionally has ZERO dependency on `@open-mercato/core` (no ORM
+// entity imports) so that infrastructure code such as the query engine can build
+// the same definition index that `custom-fields.ts` produces via MikroORM, without
+// pulling a domain package into the query layer.
+
+export type CustomFieldDefinitionSummary = {
+  key: string
+  label: string | null
+  kind: string | null
+  multi: boolean
+  dictionaryId?: string | null
+  organizationId?: string | null
+  tenantId?: string | null
+  priority: number
+  updatedAt: number
+}
+
+export type CustomFieldDefinitionIndex = Map<string, CustomFieldDefinitionSummary[]>
+
+// Plain-row representation of a `custom_field_defs` record. Both the ORM-backed
+// loader (`custom-fields.ts`) and the Kysely-backed query engine map their native
+// rows into this shape before building an index, so the two paths stay in lockstep.
+export type CustomFieldDefinitionRow = {
+  key: string
+  entityId: string
+  kind: string | null
+  configJson: unknown
+  organizationId: string | null
+  tenantId: string | null
+  deletedAt: Date | string | number | null
+  updatedAt: Date | string | number | null
+}
+
+// The resolved definition index the query engine threads onto its result so the
+// CRUD factory can decorate list rows without reloading definitions (issue #2133).
+export type ResolvedCustomFieldDefinitions = {
+  index: CustomFieldDefinitionIndex
+  entityIds: string[]
+  tenantId: string | null
+  organizationIds: string[]
+}
+
+export function normalizeDefinitionKey(key: unknown): string {
+  if (typeof key !== 'string') return ''
+  const trimmed = key.trim()
+  return trimmed.length ? trimmed.toLowerCase() : ''
+}
+
+export function normalizeDefinitionConfig(raw: unknown): Record<string, any> {
+  if (!raw) return {}
+  if (typeof raw === 'string') {
+    try {
+      const parsed = JSON.parse(raw)
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        return { ...(parsed as Record<string, any>) }
+      }
+      return {}
+    } catch {
+      return {}
+    }
+  }
+  if (typeof raw === 'object' && !Array.isArray(raw)) {
+    return { ...(raw as Record<string, any>) }
+  }
+  return {}
+}
+
+export function normalizeFieldsetFilter(input?: string | string[] | null): Set<string | null> | null {
+  if (input == null) return null
+  const values = Array.isArray(input) ? input : [input]
+  const normalized = new Set<string | null>()
+  for (const raw of values) {
+    if (raw == null) continue
+    const trimmed = String(raw).trim()
+    if (!trimmed) {
+      normalized.add(null)
+    } else {
+      normalized.add(trimmed)
+    }
+  }
+  return normalized.size ? normalized : null
+}
+
+function toTimeMs(value: Date | string | number | null | undefined): number {
+  if (value == null) return 0
+  if (value instanceof Date) return value.getTime()
+  const parsed = new Date(value as any).getTime()
+  return Number.isNaN(parsed) ? 0 : parsed
+}
+
+export function summarizeDefinitionRow(row: CustomFieldDefinitionRow): CustomFieldDefinitionSummary | null {
+  const normalizedKey = normalizeDefinitionKey(row.key)
+  if (!normalizedKey) return null
+  const cfg = normalizeDefinitionConfig(row.configJson)
+  const label =
+    typeof cfg.label === 'string' && cfg.label.trim().length
+      ? cfg.label.trim()
+      : row.key
+  const dictionaryId =
+    typeof cfg.dictionaryId === 'string' && cfg.dictionaryId.trim().length
+      ? cfg.dictionaryId.trim()
+      : null
+  const multi = cfg.multi !== undefined ? Boolean(cfg.multi) : false
+  const priority = typeof cfg.priority === 'number' ? cfg.priority : 0
+  return {
+    key: row.key,
+    label,
+    kind: typeof row.kind === 'string' ? row.kind : null,
+    multi,
+    dictionaryId,
+    organizationId: row.organizationId ?? null,
+    tenantId: row.tenantId ?? null,
+    priority,
+    updatedAt: toTimeMs(row.updatedAt),
+  }
+}
+
+export function sortDefinitionSummaries(defs: CustomFieldDefinitionSummary[]): CustomFieldDefinitionSummary[] {
+  return [...defs].sort((a, b) => {
+    const priorityDiff = (a.priority ?? 0) - (b.priority ?? 0)
+    if (priorityDiff !== 0) return priorityDiff
+    const updatedDiff = (b.updatedAt ?? 0) - (a.updatedAt ?? 0)
+    if (updatedDiff !== 0) return updatedDiff
+    return a.key.localeCompare(b.key)
+  })
+}
+
+export function selectDefinitionForRecord(
+  defs: CustomFieldDefinitionSummary[],
+  organizationId: string | null,
+  tenantId: string | null,
+): CustomFieldDefinitionSummary | null {
+  if (!defs.length) return null
+  const prioritizedForOrg = defs.filter(
+    (def) => def.organizationId && organizationId && def.organizationId === organizationId,
+  )
+  if (prioritizedForOrg.length) return sortDefinitionSummaries(prioritizedForOrg)[0]
+  const prioritizedForTenant = defs.filter(
+    (def) => def.tenantId && tenantId && def.tenantId === tenantId && !def.organizationId,
+  )
+  if (prioritizedForTenant.length) return sortDefinitionSummaries(prioritizedForTenant)[0]
+  const global = defs.filter((def) => !def.organizationId)
+  if (global.length) return sortDefinitionSummaries(global)[0]
+  return sortDefinitionSummaries(defs)[0] ?? null
+}
+
+// Resolve the effective list of organization candidates for a definition index
+// lookup, mirroring `loadCustomFieldDefinitionIndex`: when explicit org ids are
+// present they win, otherwise the fallback (selected org) is used. Null/empty
+// entries are dropped — the null-org branch is always allowed by the index filter.
+export function resolveCfDefIndexOrgCandidates(
+  organizationIds: Array<string | null | undefined> | null | undefined,
+  fallbackOrganizationId: string | null | undefined,
+): string[] {
+  const source = Array.isArray(organizationIds) && organizationIds.length
+    ? organizationIds
+    : [fallbackOrganizationId ?? null]
+  return source
+    .map((id) => (typeof id === 'string' ? id.trim() : id))
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+}
+
+function matchesFieldset(configJson: unknown, fieldsetFilter: Set<string | null>): boolean {
+  const config = normalizeDefinitionConfig(configJson)
+  const fieldsets = Array.isArray(config.fieldsets)
+    ? config.fieldsets
+        .filter((entry: unknown): entry is string => typeof entry === 'string')
+        .map((entry: string) => entry.trim())
+        .filter((entry: string) => entry.length > 0)
+    : []
+  const fieldset = typeof config.fieldset === 'string' && config.fieldset.trim().length > 0
+    ? config.fieldset.trim()
+    : null
+  return fieldsets.length > 0
+    ? fieldsets.some((entry: string) => fieldsetFilter.has(entry))
+    : fieldsetFilter.has(fieldset)
+}
+
+// Build the grouped + sorted definition index from plain rows. Callers must
+// pre-filter rows by tenant + is_active (both the ORM loader and the query engine
+// already do so in SQL); this function additionally applies the org candidate
+// filter, the soft-delete guard, and the optional fieldset filter so its output is
+// byte-for-byte identical to the ORM-backed loader for the same logical scope.
+export function buildCustomFieldDefinitionIndexFromRows(
+  rows: CustomFieldDefinitionRow[],
+  opts: { organizationIds?: string[] | null; fieldset?: string | string[] | null } = {},
+): CustomFieldDefinitionIndex {
+  const orgCandidates = opts.organizationIds ?? []
+  const fieldsetFilter = normalizeFieldsetFilter(opts.fieldset)
+  const index: CustomFieldDefinitionIndex = new Map()
+  for (const row of rows) {
+    if (row.deletedAt != null) continue
+    const org = row.organizationId ?? null
+    if (org !== null && !(orgCandidates.length > 0 && orgCandidates.includes(org))) continue
+    if (fieldsetFilter && !matchesFieldset(row.configJson, fieldsetFilter)) continue
+    const summary = summarizeDefinitionRow(row)
+    if (!summary) continue
+    const normalizedKey = normalizeDefinitionKey(summary.key)
+    if (!normalizedKey) continue
+    if (!index.has(normalizedKey)) index.set(normalizedKey, [])
+    index.get(normalizedKey)!.push(summary)
+  }
+  index.forEach((entries, key) => {
+    index.set(key, sortDefinitionSummaries(entries))
+  })
+  return index
+}
+
+function sameStringSet(a: readonly string[], b: readonly string[]): boolean {
+  const left = new Set(a)
+  const right = new Set(b)
+  if (left.size !== right.size) return false
+  for (const value of left) {
+    if (!right.has(value)) return false
+  }
+  return true
+}
+
+// Decide whether a precomputed definition index from a QueryEngine result can be
+// reused for a decoration request. Reuse is only safe when the engine resolved
+// definitions for exactly the same entity-id set, tenant, and org candidates.
+export function canReuseCustomFieldDefinitions(
+  resolved: ResolvedCustomFieldDefinitions | null | undefined,
+  request: { entityIds: string[]; tenantId: string | null; organizationIds: string[] },
+): boolean {
+  if (!resolved) return false
+  if ((resolved.tenantId ?? null) !== (request.tenantId ?? null)) return false
+  if (!sameStringSet(resolved.entityIds.map(String), request.entityIds.map(String))) return false
+  if (!sameStringSet(resolved.organizationIds, request.organizationIds)) return false
+  return true
+}

package/src/lib/crud/custom-fields.ts

@@ -6,6 +6,17 @@ import type { TenantDataEncryptionService } from '../encryption/tenantDataEncryp
 import { decryptCustomFieldValue, resolveTenantEncryptionService } from '../encryption/customFieldValues'
 import { parseBooleanToken } from '../boolean'
 import { extractCustomFieldEntries } from './custom-fields-client'
+import {
+  buildCustomFieldDefinitionIndexFromRows,
+  normalizeDefinitionKey,
+  normalizeFieldsetFilter,
+  selectDefinitionForRecord,
+  type CustomFieldDefinitionIndex,
+  type CustomFieldDefinitionRow,
+  type CustomFieldDefinitionSummary,
+} from './custom-field-definition-index'
+
+export type { CustomFieldDefinitionSummary, CustomFieldDefinitionIndex } from './custom-field-definition-index'
 
 export type CustomFieldSelectors = {
   keys: string[]
@@ -18,20 +29,6 @@ export type SplitCustomFieldPayload = {
   custom: Record<string, unknown>
 }
 
-export type CustomFieldDefinitionSummary = {
-  key: string
-  label: string | null
-  kind: string | null
-  multi: boolean
-  dictionaryId?: string | null
-  organizationId?: string | null
-  tenantId?: string | null
-  priority: number
-  updatedAt: number
-}
-
-export type CustomFieldDefinitionIndex = Map<string, CustomFieldDefinitionSummary[]>
-
 export type CustomFieldDisplayEntry = {
   key: string
   label: string | null
@@ -93,22 +90,6 @@ export function extractAllCustomFieldEntries(item: Record<string, unknown>): Rec
   return extractCustomFieldEntries(item)
 }
 
-function normalizeFieldsetFilter(input?: string | string[] | null): Set<string | null> | null {
-  if (input == null) return null
-  const values = Array.isArray(input) ? input : [input]
-  const normalized = new Set<string | null>()
-  for (const raw of values) {
-    if (raw == null) continue
-    const trimmed = String(raw).trim()
-    if (!trimmed) {
-      normalized.add(null)
-    } else {
-      normalized.add(trimmed)
-    }
-  }
-  return normalized.size ? normalized : null
-}
-
 export async function buildCustomFieldFiltersFromQuery(opts: {
   entityId?: EntityId
   entityIds?: EntityId[]
@@ -250,93 +231,6 @@ export function extractCustomFieldValuesFromPayload(raw: Record<string, unknown>
   return splitCustomFieldPayload(raw).custom
 }
 
-function normalizeDefinitionKey(key: unknown): string {
-  if (typeof key !== 'string') return ''
-  const trimmed = key.trim()
-  return trimmed.length ? trimmed.toLowerCase() : ''
-}
-
-function normalizeDefinitionConfig(raw: unknown): Record<string, any> {
-  if (!raw) return {}
-  if (typeof raw === 'string') {
-    try {
-      const parsed = JSON.parse(raw)
-      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-        return { ...(parsed as Record<string, any>) }
-      }
-      return {}
-    } catch {
-      return {}
-    }
-  }
-  if (typeof raw === 'object' && !Array.isArray(raw)) {
-    return { ...(raw as Record<string, any>) }
-  }
-  return {}
-}
-
-function summarizeDefinition(def: CustomFieldDef): CustomFieldDefinitionSummary | null {
-  const normalizedKey = normalizeDefinitionKey(def.key)
-  if (!normalizedKey) return null
-  const cfg = normalizeDefinitionConfig((def as any).configJson)
-  const label =
-    typeof cfg.label === 'string' && cfg.label.trim().length
-      ? cfg.label.trim()
-      : def.key
-  const dictionaryId =
-    typeof cfg.dictionaryId === 'string' && cfg.dictionaryId.trim().length
-      ? cfg.dictionaryId.trim()
-      : null
-  const multi =
-    cfg.multi !== undefined ? Boolean(cfg.multi) : false
-  const priority =
-    typeof cfg.priority === 'number' ? cfg.priority : 0
-  const updatedAt =
-    def.updatedAt instanceof Date
-      ? def.updatedAt.getTime()
-      : new Date(def.updatedAt as any).getTime()
-  return {
-    key: def.key,
-    label,
-    kind: typeof def.kind === 'string' ? def.kind : null,
-    multi,
-    dictionaryId,
-    organizationId: def.organizationId ?? null,
-    tenantId: def.tenantId ?? null,
-    priority,
-    updatedAt: Number.isNaN(updatedAt) ? 0 : updatedAt,
-  }
-}
-
-function sortDefinitionSummaries(defs: CustomFieldDefinitionSummary[]): CustomFieldDefinitionSummary[] {
-  return [...defs].sort((a, b) => {
-    const priorityDiff = (a.priority ?? 0) - (b.priority ?? 0)
-    if (priorityDiff !== 0) return priorityDiff
-    const updatedDiff = (b.updatedAt ?? 0) - (a.updatedAt ?? 0)
-    if (updatedDiff !== 0) return updatedDiff
-    return a.key.localeCompare(b.key)
-  })
-}
-
-function selectDefinitionForRecord(
-  defs: CustomFieldDefinitionSummary[],
-  organizationId: string | null,
-  tenantId: string | null,
-): CustomFieldDefinitionSummary | null {
-  if (!defs.length) return null
-  const prioritizedForOrg = defs.filter(
-    (def) => def.organizationId && organizationId && def.organizationId === organizationId,
-  )
-  if (prioritizedForOrg.length) return sortDefinitionSummaries(prioritizedForOrg)[0]
-  const prioritizedForTenant = defs.filter(
-    (def) => def.tenantId && tenantId && def.tenantId === tenantId && !def.organizationId,
-  )
-  if (prioritizedForTenant.length) return sortDefinitionSummaries(prioritizedForTenant)[0]
-  const global = defs.filter((def) => !def.organizationId)
-  if (global.length) return sortDefinitionSummaries(global)[0]
-  return sortDefinitionSummaries(defs)[0] ?? null
-}
-
 type LoadCustomFieldDefinitionIndexOptions = {
   em: EntityManager
   entityIds: string | string[]
@@ -463,36 +357,20 @@ async function loadCustomFieldDefinitionIndexFresh(
     $and: scopeClauses,
   }
   const defs = await em.find(CustomFieldDef, where as any)
-  const fieldsetFilter = normalizeFieldsetFilter(opts.fieldset)
-  const index: CustomFieldDefinitionIndex = new Map()
-  defs.forEach((def) => {
-    if (fieldsetFilter) {
-      const config = normalizeDefinitionConfig((def as any).configJson)
-      const fieldsets = Array.isArray(config.fieldsets)
-        ? config.fieldsets
-            .filter((entry: unknown): entry is string => typeof entry === 'string')
-            .map((entry: string) => entry.trim())
-            .filter((entry: string) => entry.length > 0)
-        : []
-      const fieldset = typeof config.fieldset === 'string' && config.fieldset.trim().length > 0
-        ? config.fieldset.trim()
-        : null
-      const matches = fieldsets.length > 0
-        ? fieldsets.some((entry: string) => fieldsetFilter.has(entry))
-        : fieldsetFilter.has(fieldset)
-      if (!matches) return
-    }
-    const summary = summarizeDefinition(def)
-    if (!summary) return
-    const normalizedKey = normalizeDefinitionKey(summary.key)
-    if (!normalizedKey) return
-    if (!index.has(normalizedKey)) index.set(normalizedKey, [])
-    index.get(normalizedKey)!.push(summary)
-  })
-  index.forEach((entries, key) => {
-    index.set(key, sortDefinitionSummaries(entries))
+  const rows: CustomFieldDefinitionRow[] = defs.map((def) => ({
+    key: def.key,
+    entityId: String((def as any).entityId),
+    kind: typeof def.kind === 'string' ? def.kind : null,
+    configJson: (def as any).configJson,
+    organizationId: def.organizationId ?? null,
+    tenantId: def.tenantId ?? null,
+    deletedAt: (def as any).deletedAt ?? null,
+    updatedAt: (def as any).updatedAt ?? null,
+  }))
+  return buildCustomFieldDefinitionIndexFromRows(rows, {
+    organizationIds: orgCandidates,
+    fieldset: opts.fieldset,
   })
-  return index
 }
 
 export async function loadCustomFieldDefinitionIndex(opts: LoadCustomFieldDefinitionIndexOptions & {

package/src/lib/crud/factory.ts

@@ -33,6 +33,12 @@ import {
   applyCustomFieldsNormalization,
   loadCustomFieldDefinitionIndex,
 } from './custom-fields'
+import {
+  canReuseCustomFieldDefinitions,
+  resolveCfDefIndexOrgCandidates,
+  type CustomFieldDefinitionIndex,
+  type ResolvedCustomFieldDefinitions,
+} from './custom-field-definition-index'
 import { serializeExport, normalizeExportFormat, defaultExportFilename, ensureColumns, type CrudExportFormat, type PreparedExport } from './exporters'
 import { CrudHttpError, isCrudHttpError } from './errors'
 import type { CommandBus, CommandLogMetadata } from '@open-mercato/shared/lib/commands'
@@ -956,7 +962,11 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
     return null
   }
 
-  const decorateItemsWithCustomFields = async (items: any[], ctx: CrudCtx): Promise<any[]> => {
+  const decorateItemsWithCustomFields = async (
+    items: any[],
+    ctx: CrudCtx,
+    precomputedDefinitions?: ResolvedCustomFieldDefinitions,
+  ): Promise<any[]> => {
     if (!listCustomFieldDecorator || !Array.isArray(items) || items.length === 0) return items
     const entityIds = Array.isArray(listCustomFieldDecorator.entityIds)
       ? listCustomFieldDecorator.entityIds
@@ -976,19 +986,33 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
         Array.isArray(ctx.organizationIds) && ctx.organizationIds.length
           ? ctx.organizationIds
           : [ctx.selectedOrganizationId ?? null]
-      let cfDefCache: CacheStrategy | null = null
-      try {
-        cfDefCache = ctx.container.resolve('cache') as CacheStrategy
-      } catch {}
-      const definitionIndex = await loadCustomFieldDefinitionIndex({
-        em,
-        entityIds,
-        tenantId: ctx.auth?.tenantId ?? null,
-        organizationIds,
-        cache: cfDefCache ?? null,
-        requestScope: ctx,
+      const tenantId = ctx.auth?.tenantId ?? null
+      // Reuse the index the query engine already resolved for this same scope
+      // (#2133) instead of issuing a second `custom_field_defs` round-trip.
+      const reusable = canReuseCustomFieldDefinitions(precomputedDefinitions, {
+        entityIds: entityIds.map(String),
+        tenantId,
+        organizationIds: resolveCfDefIndexOrgCandidates(ctx.organizationIds, ctx.selectedOrganizationId ?? null),
       })
-      cfProfiler.mark('definitions_loaded', { definitionCount: definitionIndex.size })
+      let definitionIndex: CustomFieldDefinitionIndex
+      if (reusable && precomputedDefinitions) {
+        definitionIndex = precomputedDefinitions.index
+        cfProfiler.mark('definitions_reused', { definitionCount: definitionIndex.size })
+      } else {
+        let cfDefCache: CacheStrategy | null = null
+        try {
+          cfDefCache = ctx.container.resolve('cache') as CacheStrategy
+        } catch {}
+        definitionIndex = await loadCustomFieldDefinitionIndex({
+          em,
+          entityIds,
+          tenantId,
+          organizationIds,
+          cache: cfDefCache ?? null,
+          requestScope: ctx,
+        })
+        cfProfiler.mark('definitions_loaded', { definitionCount: definitionIndex.size })
+      }
       const decoratedItems = items.map((raw) => {
         if (!raw || typeof raw !== 'object') return raw
         const item = raw as Record<string, unknown>
@@ -1572,7 +1596,7 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
         const rawItems = res.items || []
         let transformedItems = rawItems.map(i => (opts.list!.transformItem ? opts.list!.transformItem(i) : i))
         profiler.mark('transform_complete', { itemCount: transformedItems.length })
-        transformedItems = await decorateItemsWithCustomFields(transformedItems, ctx)
+        transformedItems = await decorateItemsWithCustomFields(transformedItems, ctx, res.customFieldDefinitions)
         profiler.mark('custom_fields_complete', { itemCount: transformedItems.length })
 
         if (opts.list?.entityId && request) {
@@ -1630,7 +1654,7 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
               const nextItemsRaw = nextRes.items || []
               if (!nextItemsRaw.length) break
               let nextTransformed = nextItemsRaw.map(i => (opts.list!.transformItem ? opts.list!.transformItem(i) : i))
-              nextTransformed = await decorateItemsWithCustomFields(nextTransformed, ctx)
+              nextTransformed = await decorateItemsWithCustomFields(nextTransformed, ctx, nextRes.customFieldDefinitions)
               const nextExportItems = exportFullRequested
                 ? nextItemsRaw.map(normalizeFullRecordForExport)
                 : nextTransformed
@@ -2094,25 +2118,31 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
         if (!ctx.auth.tenantId) return json({ error: 'Tenant context is required' }, { status: 400 })
         entityData[ormCfg.tenantField] = ctx.auth.tenantId
       }
-      const entity = await de.createOrmEntity({ entity: ormCfg.entity, data: entityData })
-
-      // Custom fields
-      if (createConfig.customFields && (createConfig.customFields as any).enabled) {
-        const cfc = createConfig.customFields as Exclude<CustomFieldsConfig, false>
-        const values = cfc.map
-          ? cfc.map(body)
-          : (cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body as Record<string, unknown>) : {})
-        if (values && Object.keys(values).length > 0) {
-          const de = (ctx.container.resolve('dataEngine') as DataEngine)
-          await de.setCustomFields({
-            entityId: cfc.entityId as any,
-            recordId: String((entity as any)[ormCfg.idField!]),
-            organizationId: targetOrgId,
-            tenantId: ctx.auth.tenantId!,
-            values,
-          })
+      const em = (ctx.container.resolve('em') as EntityManager)
+      const writeTenantId = ctx.auth.tenantId!
+      const entity = await em.transactional(async () => {
+        const created = await de.createOrmEntity({ entity: ormCfg.entity, data: entityData })
+
+        // Custom fields
+        if (createConfig.customFields && (createConfig.customFields as any).enabled) {
+          const cfc = createConfig.customFields as Exclude<CustomFieldsConfig, false>
+          const values = cfc.map
+            ? cfc.map(body)
+            : (cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body as Record<string, unknown>) : {})
+          if (values && Object.keys(values).length > 0) {
+            const de = (ctx.container.resolve('dataEngine') as DataEngine)
+            await de.setCustomFields({
+              entityId: cfc.entityId as any,
+              recordId: String((created as any)[ormCfg.idField!]),
+              organizationId: targetOrgId,
+              tenantId: writeTenantId,
+              values,
+            })
+          }
         }
-      }
+
+        return created
+      })
 
       await opts.hooks?.afterCreate?.(entity, { ...ctx, input: input as any })
 
@@ -2414,31 +2444,38 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
           softDeleteField: ormCfg.softDeleteField,
         }
       )
-      const entity = await de.updateOrmEntity({
-        entity: ormCfg.entity,
-        where,
-        apply: (e: any) => updateConfig.applyToEntity(e, input as any, ctx),
+      const em = (ctx.container.resolve('em') as EntityManager)
+      const writeTenantId = ctx.auth.tenantId!
+      const entity = await em.transactional(async () => {
+        const updated = await de.updateOrmEntity({
+          entity: ormCfg.entity,
+          where,
+          apply: (e: any) => updateConfig.applyToEntity(e, input as any, ctx),
+        })
+        if (!updated) return null
+
+        // Custom fields
+        if (updateConfig.customFields && (updateConfig.customFields as any).enabled) {
+          const cfc = updateConfig.customFields as Exclude<CustomFieldsConfig, false>
+          const values = cfc.map
+            ? cfc.map(body)
+            : (cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body as Record<string, unknown>) : {})
+          if (values && Object.keys(values).length > 0) {
+            const de = (ctx.container.resolve('dataEngine') as DataEngine)
+            await de.setCustomFields({
+              entityId: cfc.entityId as any,
+              recordId: String((updated as any)[ormCfg.idField!]),
+              organizationId: targetOrgId,
+              tenantId: writeTenantId,
+              values,
+            })
+          }
+        }
+
+        return updated
       })
       if (!entity) return json({ error: 'Not found' }, { status: 404 })
 
-      // Custom fields
-      if (updateConfig.customFields && (updateConfig.customFields as any).enabled) {
-        const cfc = updateConfig.customFields as Exclude<CustomFieldsConfig, false>
-        const values = cfc.map
-          ? cfc.map(body)
-          : (cfc.pickPrefixed ? extractCustomFieldValuesFromPayload(body as Record<string, unknown>) : {})
-        if (values && Object.keys(values).length > 0) {
-          const de = (ctx.container.resolve('dataEngine') as DataEngine)
-          await de.setCustomFields({
-            entityId: cfc.entityId as any,
-            recordId: String((entity as any)[ormCfg.idField!]),
-            organizationId: targetOrgId,
-            tenantId: ctx.auth.tenantId!,
-            values,
-          })
-        }
-      }
-
       await opts.hooks?.afterUpdate?.(entity, { ...ctx, input: input as any })
 
       // Guard afterSuccess callbacks (multi)