@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

package/src/modules/wms/commands/configuration.ts

@@ -31,22 +31,13 @@
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import {
-  emitCrudSideEffects,
-  emitCrudUndoSideEffects,
-  parseWithCustomFields,
-  setCustomFieldsIfAny,
-} from '@open-mercato/shared/lib/commands/helpers'
-import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
-import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import { CrudHttpError, isUniqueViolation } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
 import type { JsonValue } from '@open-mercato/shared/lib/json'
-import { E } from '#generated/entities.ids.generated'
 import {
   InventoryLot,
   type InventoryLotStatus,
@@ -85,8 +76,6 @@ import {
   normalizeOptionalString,
   requireId,
   toNumericString,
-  warehouseCrudIndexer,
-  warehouseZoneCrudIndexer,
 } from './shared'
 import { emitWmsEvent } from '../events'
 
@@ -106,22 +95,6 @@ function toJsonValue(value: Record<string, unknown> | null | undefined): JsonVal
   return (value ?? null) as JsonValue | null
 }
 
-async function persistWarehouseCustomFields(
-  ctx: CommandRuntimeContext,
-  warehouse: { id: string; organizationId: string; tenantId: string },
-  custom: Record<string, unknown>,
-) {
-  if (!custom || Object.keys(custom).length === 0) return
-  await setCustomFieldsIfAny({
-    dataEngine: ctx.container.resolve('dataEngine'),
-    entityId: E.wms.warehouse,
-    recordId: warehouse.id,
-    organizationId: warehouse.organizationId,
-    tenantId: warehouse.tenantId,
-    values: custom,
-  })
-}
-
 async function buildCrudLog(
   ctx: CommandRuntimeContext,
   input: { tenantId?: string | null; organizationId?: string | null; id?: string | null } | undefined,
@@ -201,7 +174,6 @@ type WarehouseSnapshot = {
   metadata: JsonValue | null
   createdAt: string
   updatedAt: string
-  custom?: Record<string, unknown> | null
 }
 
 type PrimaryDemotionSnapshot = {
@@ -224,7 +196,6 @@ type WarehouseZoneSnapshot = {
   name: string
   priority: number
   metadata: JsonValue | null
-  custom?: Record<string, unknown>
   createdAt: string
   updatedAt: string
 }
@@ -335,16 +306,7 @@ async function loadWarehouseSnapshot(
   id: string,
 ): Promise<WarehouseSnapshot | null> {
   const record = await findOneWithDecryption(em, Warehouse, { id }, undefined, resolveScope(ctx))
-  if (!record) return null
-  const snapshot = snapshotWarehouse(record)
-  const custom = await loadCustomFieldSnapshot(em, {
-    entityId: E.wms.warehouse,
-    recordId: record.id,
-    tenantId: record.tenantId,
-    organizationId: record.organizationId,
-  })
-  snapshot.custom = custom && Object.keys(custom).length ? custom : null
-  return snapshot
+  return record ? snapshotWarehouse(record) : null
 }
 
 function snapshotWarehouseZone(record: WarehouseZone): WarehouseZoneSnapshot {
@@ -369,91 +331,7 @@ async function loadWarehouseZoneSnapshot(
   id: string,
 ): Promise<WarehouseZoneSnapshot | null> {
   const record = await findOneWithDecryption(em, WarehouseZone, { id }, undefined, resolveScope(ctx))
-  if (!record) return null
-  const snapshot = snapshotWarehouseZone(record)
-  // The snapshot always carries custom values because undo has to restore them, and
-  // every caller (prepare on update/delete, captureAfter on create/update) feeds undo.
-  // For the common tenant that defined no zone custom fields this costs a single
-  // `custom_field_values` lookup: `loadCustomFieldValues` returns early on an empty
-  // result and never reaches the `custom_field_defs` query.
-  snapshot.custom = await loadCustomFieldSnapshot(em, {
-    entityId: E.wms.warehouse_zone,
-    recordId: record.id,
-    tenantId: record.tenantId,
-    organizationId: record.organizationId,
-  })
-  return snapshot
-}
-
-async function writeZoneCustomFields(
-  ctx: CommandRuntimeContext,
-  zone: { id: string; organizationId: string; tenantId: string },
-  values: Record<string, unknown>,
-): Promise<void> {
-  if (!values || !Object.keys(values).length) return
-  await setCustomFieldsIfAny({
-    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
-    entityId: E.wms.warehouse_zone,
-    recordId: zone.id,
-    organizationId: zone.organizationId,
-    tenantId: zone.tenantId,
-    values,
-  })
-}
-
-// Zone reads go through the hybrid query engine, which projects `cf:*` from
-// `entity_indexes`. Emitting the CRUD side effect is therefore what makes a
-// custom field value written above observable through the zones list API — without
-// it the value sits in `custom_field_values` that no read path consults (#5239).
-// `events` is deliberately omitted: the module already emits `wms.zone.*` itself,
-// and adding an events config here would introduce a second, undeclared
-// `wms.warehouse_zone.*` event id for the same write.
-async function emitWarehouseCrudSideEffects(
-  ctx: CommandRuntimeContext,
-  action: 'created' | 'updated' | 'deleted',
-  warehouse: Warehouse,
-  origin: 'write' | 'undo' = 'write',
-): Promise<void> {
-  const options = {
-    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
-    action,
-    entity: warehouse,
-    identifiers: {
-      id: warehouse.id,
-      organizationId: warehouse.organizationId,
-      tenantId: warehouse.tenantId,
-    },
-    indexer: warehouseCrudIndexer,
-  }
-  if (origin === 'undo') {
-    await emitCrudUndoSideEffects(options)
-    return
-  }
-  await emitCrudSideEffects(options)
-}
-
-async function emitZoneCrudSideEffects(
-  ctx: CommandRuntimeContext,
-  action: 'created' | 'updated' | 'deleted',
-  zone: WarehouseZone,
-  origin: 'write' | 'undo' = 'write',
-): Promise<void> {
-  const options = {
-    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
-    action,
-    entity: zone,
-    identifiers: {
-      id: zone.id,
-      organizationId: zone.organizationId,
-      tenantId: zone.tenantId,
-    },
-    indexer: warehouseZoneCrudIndexer,
-  }
-  if (origin === 'undo') {
-    await emitCrudUndoSideEffects(options)
-    return
-  }
-  await emitCrudSideEffects(options)
+  return record ? snapshotWarehouseZone(record) : null
 }
 
 function snapshotWarehouseLocation(record: WarehouseLocation): WarehouseLocationSnapshot {
@@ -765,11 +643,11 @@ async function resolveParentLocation(
 
 const createWarehouseCommand: CommandHandler<
   WarehouseCreateInput,
-  { warehouseId: string; updatedAt?: string | null; demotedPrimariesBefore?: PrimaryDemotionSnapshot[] }
+  { warehouseId: string; demotedPrimariesBefore?: PrimaryDemotionSnapshot[] }
 > = {
   id: 'wms.warehouses.create',
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(warehouseCreateSchema, rawInput ?? {})
+    const parsed = warehouseCreateSchema.parse(rawInput ?? {})
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
     const em = resolveEm(ctx)
@@ -827,8 +705,6 @@ const createWarehouseCommand: CommandHandler<
       }
       throw err
     }
-    await persistWarehouseCustomFields(ctx, warehouse, custom)
-    await emitWarehouseCrudSideEffects(ctx, 'created', warehouse)
     void emitWmsEvent('wms.warehouse.created', {
       id: warehouse.id,
       warehouseId: warehouse.id,
@@ -837,7 +713,6 @@ const createWarehouseCommand: CommandHandler<
     }).catch(() => undefined)
     return {
       warehouseId: warehouse.id,
-      updatedAt: isoOrNull(warehouse.updatedAt),
       ...(demotedPrimariesBefore.length > 0 ? { demotedPrimariesBefore } : {}),
     }
   },
@@ -877,8 +752,6 @@ const createWarehouseCommand: CommandHandler<
     ensureOrganizationScope(ctx, record.organizationId)
     record.deletedAt = new Date()
     await em.flush()
-    await persistWarehouseCustomFields(ctx, after, buildCustomFieldResetMap(undefined, after.custom ?? undefined))
-    await emitWarehouseCrudSideEffects(ctx, 'deleted', record, 'undo')
     if (payload.demotedPrimariesBefore?.length) {
       await restoreDemotedPrimaryWarehouses(em, ctx, payload.demotedPrimariesBefore)
       await em.flush()
@@ -898,7 +771,7 @@ const updateWarehouseCommand: CommandHandler<
     return before ? { before } : {}
   },
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(warehouseUpdateSchema, rawInput ?? {})
+    const parsed = warehouseUpdateSchema.parse(rawInput ?? {})
     const em = resolveEm(ctx)
     const warehouse = await loadWarehouse(em, ctx, parsed.id)
     if (parsed.code !== undefined && parsed.code !== warehouse.code) {
@@ -958,8 +831,6 @@ const updateWarehouseCommand: CommandHandler<
       }
       throw err
     }
-    await persistWarehouseCustomFields(ctx, warehouse, custom)
-    await emitWarehouseCrudSideEffects(ctx, 'updated', warehouse)
     void emitWmsEvent('wms.warehouse.updated', {
       id: warehouse.id,
       warehouseId: warehouse.id,
@@ -1040,12 +911,6 @@ const updateWarehouseCommand: CommandHandler<
       record.deletedAt = null
     }
     await em.flush()
-    await persistWarehouseCustomFields(
-      ctx,
-      before,
-      buildCustomFieldResetMap(before.custom ?? undefined, payload.after?.custom ?? undefined),
-    )
-    await emitWarehouseCrudSideEffects(ctx, 'updated', record, 'undo')
     if (payload.demotedPrimariesBefore?.length) {
       await restoreDemotedPrimaryWarehouses(em, ctx, payload.demotedPrimariesBefore)
       await em.flush()
@@ -1067,7 +932,6 @@ const deleteWarehouseCommand: CommandHandler<{ id?: string }, { warehouseId: str
     const warehouse = await loadWarehouse(em, ctx, warehouseId)
     warehouse.deletedAt = new Date()
     await em.flush()
-    await emitWarehouseCrudSideEffects(ctx, 'deleted', warehouse)
     return { warehouseId: warehouse.id }
   },
   buildLog: async ({ input, result, ctx, snapshots }) => {
@@ -1122,11 +986,10 @@ const deleteWarehouseCommand: CommandHandler<{ id?: string }, { warehouseId: str
       record.metadata = before.metadata
     }
     await em.flush()
-    await emitWarehouseCrudSideEffects(ctx, 'created', record, 'undo')
   },
 }
 
-async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneSnapshot): Promise<WarehouseZone> {
+async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneSnapshot): Promise<void> {
   const scope = { tenantId: before.tenantId, organizationId: before.organizationId }
   const warehouseRef = await findOneWithDecryption(em, Warehouse, { id: before.warehouseId }, undefined, scope)
   if (!warehouseRef) {
@@ -1155,13 +1018,12 @@ async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneS
     record.metadata = before.metadata
     record.deletedAt = null
   }
-  return record
 }
 
 const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zoneId: string }> = {
   id: 'wms.zones.create',
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(warehouseZoneCreateSchema, rawInput ?? {})
+    const parsed = warehouseZoneCreateSchema.parse(rawInput ?? {})
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
     const em = resolveEm(ctx)
@@ -1177,8 +1039,6 @@ const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zon
       metadata: toJsonValue(parsed.metadata),
     })
     await em.persist(zone).flush()
-    await writeZoneCustomFields(ctx, zone, custom)
-    await emitZoneCrudSideEffects(ctx, 'created', zone)
     void emitWmsEvent('wms.zone.created', {
       id: zone.id,
       zoneId: zone.id,
@@ -1214,8 +1074,6 @@ const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zon
     ensureOrganizationScope(ctx, record.organizationId)
     record.deletedAt = new Date()
     await em.flush()
-    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(undefined, after.custom))
-    await emitZoneCrudSideEffects(ctx, 'deleted', record, 'undo')
   },
 }
 
@@ -1228,7 +1086,7 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     return before ? { before } : {}
   },
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(warehouseZoneUpdateSchema, rawInput ?? {})
+    const parsed = warehouseZoneUpdateSchema.parse(rawInput ?? {})
     const em = resolveEm(ctx)
     const zone = await loadZone(em, ctx, parsed.id)
     if (parsed.warehouseId !== undefined) {
@@ -1244,8 +1102,6 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     if (parsed.priority !== undefined) zone.priority = parsed.priority
     if (parsed.metadata !== undefined) zone.metadata = toJsonValue(parsed.metadata)
     await em.flush()
-    await writeZoneCustomFields(ctx, zone, custom)
-    await emitZoneCrudSideEffects(ctx, 'updated', zone)
     void emitWmsEvent('wms.zone.updated', {
       id: zone.id,
       zoneId: zone.id,
@@ -1272,10 +1128,8 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     const em = resolveEm(ctx)
     ensureTenantScope(ctx, before.tenantId)
     ensureOrganizationScope(ctx, before.organizationId)
-    const record = await restoreZoneFromSnapshot(em, before)
+    await restoreZoneFromSnapshot(em, before)
     await em.flush()
-    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(before.custom, payload?.after?.custom))
-    await emitZoneCrudSideEffects(ctx, 'updated', record, 'undo')
   },
 }
 
@@ -1293,7 +1147,6 @@ const deleteWarehouseZoneCommand: CommandHandler<{ id?: string }, { zoneId: stri
     const zone = await loadZone(em, ctx, zoneId)
     zone.deletedAt = new Date()
     await em.flush()
-    await emitZoneCrudSideEffects(ctx, 'deleted', zone)
     return { zoneId: zone.id }
   },
   buildLog: async ({ input, result, ctx, snapshots }) => {
@@ -1308,10 +1161,8 @@ const deleteWarehouseZoneCommand: CommandHandler<{ id?: string }, { zoneId: stri
     const em = resolveEm(ctx)
     ensureTenantScope(ctx, before.tenantId)
     ensureOrganizationScope(ctx, before.organizationId)
-    const record = await restoreZoneFromSnapshot(em, before)
+    await restoreZoneFromSnapshot(em, before)
     await em.flush()
-    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(before.custom, undefined))
-    await emitZoneCrudSideEffects(ctx, 'created', record, 'undo')
   },
 }
 

package/src/modules/wms/commands/inventory-actions.ts

@@ -1197,9 +1197,6 @@ const allocateInventoryReservationCommand: CommandHandler<InventoryReservationAl
     const result = await runInTransaction(em, async (trx) => {
       const scope = resolveScope(ctx, input)
       const reservation = await requireReservation(trx, ctx, input.reservationId, scope, true)
-      if (reservation.status !== 'active') {
-        throw new CrudHttpError(409, { error: 'invalid_reservation_state' })
-      }
       const metadata = extractReservationMetadata(reservation)
       if (metadata.allocationState === 'allocated') {
         return {

package/src/modules/wms/commands/shared.ts

@@ -7,8 +7,6 @@ import {
   InventoryBalance,
   InventoryMovement,
   InventoryReservation,
-  Warehouse,
-  WarehouseZone,
 } from '../data/entities'
 
 export function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {
@@ -50,21 +48,6 @@ export const inventoryMovementCrudIndexer: CrudIndexerConfig<InventoryMovement>
   entityType: E.wms.inventory_movement,
 }
 
-// Zones are read through the hybrid query engine, which projects `cf:*` out of
-// `entity_indexes` rather than joining `custom_field_values`. Without this indexer the
-// zone commands write custom field values that no read path can ever see (#5239).
-export const warehouseZoneCrudIndexer: CrudIndexerConfig<WarehouseZone> = {
-  entityType: E.wms.warehouse_zone,
-}
-
-// Warehouse list/search goes through the hybrid query engine. Writing a custom
-// field upserts `entity_indexes`; delete must tombstone that row. A leftover
-// live index document makes `indexAnyRows` true and hides later warehouses that
-// were never indexed (empty combobox on the same integration shard).
-export const warehouseCrudIndexer: CrudIndexerConfig<Warehouse> = {
-  entityType: E.wms.warehouse,
-}
-
 export const inventoryBalanceCrudEvents: CrudEventsConfig<InventoryBalance> = {
   module: 'wms',
   entity: 'inventory_balance',