@open-mercato/core 0.6.8-develop.6992.1.00c90fecff → 0.6.8-develop.6998.1.d2bc46c56c

package/src/modules/query_index/di.ts

@@ -1,17 +1,113 @@
-import type { AppContainer } from '@open-mercato/shared/lib/di/container'
-import { BasicQueryEngine, resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
-import { HybridQueryEngine } from './lib/engine'
-import { markDeleted } from './lib/indexer'
+import type { EntityManager } from '@mikro-orm/postgresql'
 import type { EventBus } from '@open-mercato/events'
 import type { VectorIndexService } from '@open-mercato/search/vector'
+import type { AppContainer } from '@open-mercato/shared/lib/di/container'
 import { CRUD_QUERY_INDEX_MANAGED_PAYLOAD_KEY } from '@open-mercato/shared/lib/crud/types'
+import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'
+import { HybridQueryEngine } from './lib/engine'
+import {
+  loadQueryIndexRowScope,
+  QueryIndexScopeError,
+  resolveQueryIndexRecordScope,
+  resolveQueryIndexSourceMetadata,
+} from './lib/subscriber-scope'
+
+const logger = createLogger('query_index').child({ component: 'crud-bridge' })
+
+function hasOwn(value: unknown, key: string): boolean {
+  return !!value && typeof value === 'object' && Object.prototype.hasOwnProperty.call(value, key)
+}
+
+function readScopeValue(
+  source: unknown,
+  keys: string[],
+): { value: string | null | undefined; present: boolean } {
+  const sourceRecord = source && typeof source === 'object' ? source as Record<string, unknown> : {}
+  const key = keys.find((candidate) => hasOwn(source, candidate))
+  if (!key) return { value: undefined, present: false }
+  const value = sourceRecord[key]
+  if (value === null) return { value: null, present: true }
+  if (typeof value === 'string' && value.trim().length > 0) return { value, present: true }
+  return { value: undefined, present: false }
+}
+
+async function resolveBridgeRecordScope(
+  em: EntityManager,
+  entityType: string,
+  recordId: string,
+  payload: unknown,
+  action: 'upsert' | 'delete',
+  options?: { validateCompletePayload?: boolean },
+) {
+  let organization = readScopeValue(payload, ['organizationId', 'orgId'])
+  let tenant = readScopeValue(payload, ['tenantId'])
+  if (organization.present && tenant.present && options?.validateCompletePayload !== true) {
+    return {
+      organizationId: organization.value ?? null,
+      tenantId: tenant.value ?? null,
+      sourceValidated: false,
+    }
+  }
+  const source = resolveQueryIndexSourceMetadata(em, entityType)
+  const sourceScope = await loadQueryIndexRowScope(em, source, recordId)
+
+  if (sourceScope.kind === 'global') {
+    if (!organization.present) organization = { value: null, present: true }
+    if (!tenant.present) tenant = { value: null, present: true }
+  } else if (sourceScope.kind === 'missing' && action === 'upsert') {
+    throw new QueryIndexScopeError(
+      'Query index upsert event source row scope could not be resolved',
+    )
+  }
 
-function toEntityTypeFromEvent(event: string): string | null {
-  // Expect '<module>.<entity>.<action>'
-  const parts = event.split('.')
-  if (parts.length !== 3) return null
-  const [mod, ent] = parts
-  return `${mod}:${ent}`
+  const resolvedScope = resolveQueryIndexRecordScope({
+    payloadOrganizationId: organization.value,
+    payloadTenantId: tenant.value,
+    hasPayloadOrganizationId: organization.present,
+    hasPayloadTenantId: tenant.present,
+    sourceScope,
+  })
+  return { ...resolvedScope, sourceValidated: true }
+}
+
+async function recordBridgeError(input: {
+  em: EntityManager | null
+  handler: 'upsert' | 'delete'
+  error: unknown
+  entityType: string
+  recordId: string
+  payload: unknown
+}): Promise<void> {
+  const handler = `event:query_index.crud_bridge.${input.handler}`
+  if (!input.em) {
+    logger.error('CRUD bridge event failed before the entity manager was resolved', {
+      handler,
+      entityType: input.entityType,
+      recordId: input.recordId,
+      err: input.error,
+    })
+    return
+  }
+  await recordIndexerError(
+    { em: input.em },
+    {
+      source: 'query_index',
+      handler,
+      error: input.error,
+      entityType: input.entityType,
+      recordId: input.recordId,
+      payload: input.payload,
+    },
+  ).catch((loggingError) => {
+    logger.error('Failed to record CRUD bridge error', {
+      handler,
+      entityType: input.entityType,
+      recordId: input.recordId,
+      err: loggingError,
+    })
+  })
 }
 
 export function register(container: AppContainer) {
@@ -65,30 +161,25 @@ export function register(container: AppContainer) {
     if (!bus) { setTimeout(setup, 0); return }
 
     const makeUpsertHandler = (entityType: string) => async (payload: any, ctx: any) => {
+      let em: EntityManager | null = null
+      let id = ''
       try {
         // DataEngine emits the canonical query_index.upsert_one itself. The
         // bridge only covers domain events from write paths that do not own an
         // indexer, otherwise failures and error logs are duplicated.
         if (payload?.[CRUD_QUERY_INDEX_MANAGED_PAYLOAD_KEY] === true) return
-        const em = ctx.resolve('em')
-        let orgId = payload?.organizationId || payload?.orgId || ctx?.organizationId || null
-        let tenantId = payload?.tenantId || ctx?.tenantId || null
-        const id = String(payload?.id || payload?.recordId || '')
+        em = ctx.resolve('em') as EntityManager
+        id = String(payload?.id || payload?.recordId || '')
         if (!id) return
-        if (!orgId || !tenantId) {
-          try {
-            const db = (em as any).getKysely()
-            const table = resolveEntityTableName(em, entityType)
-            const row = await db
-              .selectFrom(table as any)
-              .select(['organization_id' as any, 'tenant_id' as any])
-              .where('id' as any, '=', id)
-              .executeTakeFirst() as { organization_id: string | null; tenant_id: string | null } | undefined
-            orgId = row?.organization_id ?? orgId
-            tenantId = row?.tenant_id ?? tenantId
-          } catch {}
-        }
+        const { organizationId: orgId, tenantId, sourceValidated } = await resolveBridgeRecordScope(
+          em,
+          entityType,
+          id,
+          payload,
+          'upsert',
+        )
         // Optional: only index when custom field definitions exist for this entity (org/global)
+        let hasCustomFields: boolean | null = null
         try {
           const db = (em as any).getKysely()
           let cfQuery = db
@@ -112,41 +203,47 @@ export function register(container: AppContainer) {
           } else {
             cfQuery = cfQuery.where('tenant_id' as any, 'is', null as any)
           }
-          const hasCf = await cfQuery.executeTakeFirst()
-          if (!hasCf) return
+          hasCustomFields = !!await cfQuery.executeTakeFirst()
         } catch {}
-        try {
-          const bus = ctx.resolve('eventBus') as any
-          await bus.emitEvent('query_index.upsert_one', { entityType, recordId: id, organizationId: orgId, tenantId })
-        } catch {}
-      } catch {}
+        if (hasCustomFields === false) {
+          if (!sourceValidated) {
+            await resolveBridgeRecordScope(
+              em,
+              entityType,
+              id,
+              payload,
+              'upsert',
+              { validateCompletePayload: true },
+            )
+          }
+          return
+        }
+        const bus = ctx.resolve('eventBus') as any
+        await bus.emitEvent('query_index.upsert_one', { entityType, recordId: id, organizationId: orgId, tenantId })
+      } catch (error) {
+        await recordBridgeError({ em, handler: 'upsert', error, entityType, recordId: id, payload })
+      }
     }
     const makeDeleteHandler = (entityType: string) => async (payload: any, ctx: any) => {
+      let em: EntityManager | null = null
+      let id = ''
       try {
         if (payload?.[CRUD_QUERY_INDEX_MANAGED_PAYLOAD_KEY] === true) return
-        const em = ctx.resolve('em')
-        let orgId = payload?.organizationId || payload?.orgId || ctx?.organizationId || null
-        let tenantId = payload?.tenantId || ctx?.tenantId || null
-        const id = String(payload?.id || payload?.recordId || '')
+        em = ctx.resolve('em') as EntityManager
+        id = String(payload?.id || payload?.recordId || '')
         if (!id) return
-        if (!orgId || !tenantId) {
-          try {
-            const db = (em as any).getKysely()
-            const table = resolveEntityTableName(em, entityType)
-            const row = await db
-              .selectFrom(table as any)
-              .select(['organization_id' as any, 'tenant_id' as any])
-              .where('id' as any, '=', id)
-              .executeTakeFirst() as { organization_id: string | null; tenant_id: string | null } | undefined
-            orgId = row?.organization_id ?? orgId
-            tenantId = row?.tenant_id ?? tenantId
-          } catch {}
-        }
-        try {
-          const bus = ctx.resolve('eventBus') as any
-          await bus.emitEvent('query_index.delete_one', { entityType, recordId: id, organizationId: orgId, tenantId })
-        } catch {}
-      } catch {}
+        const { organizationId: orgId, tenantId } = await resolveBridgeRecordScope(
+          em,
+          entityType,
+          id,
+          payload,
+          'delete',
+        )
+        const bus = ctx.resolve('eventBus') as any
+        await bus.emitEvent('query_index.delete_one', { entityType, recordId: id, organizationId: orgId, tenantId })
+      } catch (error) {
+        await recordBridgeError({ em, handler: 'delete', error, entityType, recordId: id, payload })
+      }
     }
 
     // Build list of entity ids to subscribe to

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

@@ -4,8 +4,10 @@ import { splitCustomFieldPayload, extractAllCustomFieldEntries } from '@open-mer
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { E } from '#generated/entities.ids.generated'
+import type { EntityManager } from '@mikro-orm/postgresql'
 import type { SalesOrder, SalesQuote } from '../../data/entities'
-import { SalesDocumentTagAssignment } from '../../data/entities'
+import { SalesChannel, SalesDocumentTagAssignment } from '../../data/entities'
+import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import {
   ORDER_PAYMENT_LEDGER_FIELDS,
   ORDER_PAYMENT_LEDGER_WARNING_CODE,
@@ -298,6 +300,62 @@ const attachTags = async (payload: any, ctx: any) => {
   })
 }
 
+// Liveness note: this hook runs BEFORE the CRUD list cache stores the payload, so `channelName`
+// and `channelCode` are embedded in the cached entry. What keeps them fresh is that the hook also
+// runs on the cache-HIT path (shared/lib/crud/factory.ts:1683) and reassigns both fields
+// unconditionally for every item carrying a channel id. Anything that later skips this hook on a
+// hit — the way `skipEnrichersOnCacheHit` does for record-pure enrichers — would start serving the
+// stale names baked into the entry.
+export const attachChannelNames = async (
+  payload: { items?: Array<Record<string, unknown>> },
+  ctx: CrudCtx,
+) => {
+  const items = Array.isArray(payload?.items) ? payload.items : []
+  if (!items.length) return
+  const channelIds = Array.from(
+    new Set(
+      items
+        .map((item) => (item && typeof item.channelId === 'string' ? item.channelId : null))
+        .filter((value): value is string => !!value)
+    )
+  )
+  if (!channelIds.length) return
+  const em = ctx?.container?.resolve ? (ctx.container.resolve('em') as EntityManager) : null
+  if (!em) return
+
+  const where: Record<string, unknown> = { id: { $in: channelIds } }
+  if (ctx?.auth?.tenantId) where.tenantId = ctx.auth.tenantId
+  const orgIds =
+    Array.isArray(ctx?.organizationIds) && ctx.organizationIds.length
+      ? ctx.organizationIds.filter((val: string | null) => !!val)
+      : ctx?.selectedOrganizationId
+        ? [ctx.selectedOrganizationId]
+        : []
+  if (orgIds.length) where.organizationId = { $in: orgIds }
+
+  // Only `name` and `code` are read. Without this projection the query loads the whole channel row,
+  // and `sales/encryption.ts` declares eight of its columns encrypted (contact email/phone, the
+  // address block) — so every documents-list request would decrypt PII it never renders, on the
+  // cache-hit path too.
+  const channels = await findWithDecryption(
+    em,
+    SalesChannel,
+    where,
+    { fields: ['id', 'name', 'code'] },
+    {
+      tenantId: ctx?.auth?.tenantId ?? null,
+      organizationId: ctx?.selectedOrganizationId ?? ctx?.auth?.orgId ?? null,
+    }
+  )
+  const byId = new Map(channels.map((channel) => [channel.id, channel]))
+  items.forEach((item) => {
+    if (!item || typeof item.channelId !== 'string') return
+    const channel = byId.get(item.channelId)
+    item.channelName = channel?.name ?? null
+    item.channelCode = channel?.code ?? null
+  })
+}
+
 async function ensureNumberEditPermission(
   ctx: CrudCtx,
   translate: (key: string, fallback?: string) => string
@@ -557,6 +615,7 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
     hooks: {
       afterList: async (payload: any, ctx: CrudCtx) => {
         await attachTags(payload, { ...ctx, bindingKind: binding.kind })
+        await attachChannelNames(payload, ctx)
         if (binding.kind === 'order' && Array.isArray(payload?.items) && payload.items.length === 1) {
           const item = payload.items[0] as Record<string, unknown>
           const orderId = typeof item?.id === 'string' ? item.id : null
@@ -629,6 +688,8 @@ export function buildDocumentOpenApi(binding: DocumentBinding) {
     paymentMethodSnapshot: z.record(z.string(), z.unknown()).nullable().optional(),
     currencyCode: z.string().nullable(),
     channelId: z.string().uuid().nullable(),
+    channelName: z.string().nullable().optional(),
+    channelCode: z.string().nullable().optional(),
     organizationId: z.string().uuid().nullable(),
     tenantId: z.string().uuid().nullable(),
     validFrom: z.string().nullable().optional(),

package/src/modules/sales/commands/documents.ts

@@ -594,6 +594,11 @@ export const documentUpdateSchema = z
     customerReference: z.string().nullable().optional(),
     externalReference: z.string().nullable().optional(),
     comment: z.string().nullable().optional(),
+    // Same names and limits as the create schema (data/validators.ts), so a
+    // caller can send one payload shape to create and update. Nullable here
+    // because an update — unlike a create — has an existing value to clear.
+    comments: z.string().trim().max(4000).nullable().optional(),
+    internalNotes: z.string().trim().max(4000).nullable().optional(),
     orderNumber: z.string().trim().min(1).max(191).optional(),
     quoteNumber: z.string().trim().min(1).max(191).optional(),
     currencyCode: currencyCodeSchema.optional(),
@@ -637,6 +642,8 @@ export const documentUpdateSchema = z
       input.customerReference !== undefined ||
       input.externalReference !== undefined ||
       input.comment !== undefined ||
+      input.comments !== undefined ||
+      input.internalNotes !== undefined ||
       input.orderNumber !== undefined ||
       input.quoteNumber !== undefined ||
       input.shippingAddressSnapshot !== undefined ||
@@ -1162,6 +1169,32 @@ async function applyDocumentUpdate({
       typeof input.comment === "string" ? input.comment.trim() : "";
     entity.comments = normalized.length ? normalized : null;
   }
+  // After `comment`, so the canonical name wins when a payload carries both.
+  if (input.comments !== undefined) {
+    const normalized =
+      typeof input.comments === "string" ? input.comments.trim() : "";
+    entity.comments = normalized.length ? normalized : null;
+  }
+  // Orders only — SalesQuote has no internalNotes column. Reject rather than
+  // ignore it on a quote: the field now satisfies the schema's refine on its
+  // own, so silently dropping it would let an otherwise-empty payload run the
+  // update, and a quote in `sent` status loses its acceptance token and reverts
+  // to draft on any update that reaches execution.
+  if (kind === "quote" && input.internalNotes !== undefined) {
+    throw new CrudHttpError(400, {
+      error: translate(
+        "sales.quotes.internal_notes_unsupported",
+        "Internal notes are not available on quotes.",
+      ),
+    });
+  }
+  if (kind === "order" && input.internalNotes !== undefined) {
+    const normalized =
+      typeof input.internalNotes === "string" ? input.internalNotes.trim() : "";
+    (entity as SalesOrder).internalNotes = normalized.length
+      ? normalized
+      : null;
+  }
   if (typeof input.currencyCode === "string") {
     entity.currencyCode = input.currencyCode;
   }
@@ -3692,9 +3725,11 @@ function buildDocumentUpdateChangeKeys(kind: SalesDocumentKind, input: DocumentU
   if (input.customerSnapshot !== undefined) keys.add("customerSnapshot");
   if (input.metadata !== undefined) keys.add("metadata");
   if (input.comment !== undefined) keys.add("comments");
+  if (input.comments !== undefined) keys.add("comments");
   if (input.currencyCode !== undefined) keys.add("currencyCode");
   if (input.channelId !== undefined) keys.add("channelId");
   if (kind === "order") {
+    if (input.internalNotes !== undefined) keys.add("internalNotes");
     if (input.placedAt !== undefined) keys.add("placedAt");
     if (input.expectedDeliveryAt !== undefined) keys.add("expectedDeliveryAt");
   }
@@ -5159,10 +5194,6 @@ const updateQuoteCommand: CommandHandler<
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
     const shouldInvalidateSentToken = (quote.status ?? null) === "sent";
-    if (shouldInvalidateSentToken) {
-      quote.acceptanceToken = null;
-      quote.sentAt = null;
-    }
     const shouldRecalculateTotals =
       parsed.shippingMethodId !== undefined ||
       parsed.shippingMethodSnapshot !== undefined ||
@@ -5185,7 +5216,12 @@ const updateQuoteCommand: CommandHandler<
             input: parsed,
             em,
           });
+          // After applyDocumentUpdate, not before it: the reset must not happen
+          // for an update that turns out to be invalid, or a rejected payload
+          // still strips a sent quote of its acceptance link.
           if (shouldInvalidateSentToken) {
+            quote.acceptanceToken = null;
+            quote.sentAt = null;
             quote.status = "draft";
             quote.statusEntryId = await resolveStatusEntryIdByValue(em, {
               tenantId: quote.tenantId,

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

@@ -1287,6 +1287,7 @@
   "sales.quotes.form.general": "Allgemein",
   "sales.quotes.form.lines": "Positionen",
   "sales.quotes.form.notes": "Notizen",
+  "sales.quotes.internal_notes_unsupported": "Interne Notizen sind für Angebote nicht verfügbar.",
   "sales.quotes.lines.delete": "Angebotsposition löschen",
   "sales.quotes.lines.upsert": "Angebotsposition aktualisieren",
   "sales.quotes.list.title": "Angebote",

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

@@ -1287,6 +1287,7 @@
   "sales.quotes.form.general": "General",
   "sales.quotes.form.lines": "Line Items",
   "sales.quotes.form.notes": "Notes",
+  "sales.quotes.internal_notes_unsupported": "Internal notes are not available on quotes.",
   "sales.quotes.lines.delete": "Delete quote line",
   "sales.quotes.lines.upsert": "Update quote line",
   "sales.quotes.list.title": "Quotes",

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

@@ -1287,6 +1287,7 @@
   "sales.quotes.form.general": "General",
   "sales.quotes.form.lines": "Líneas",
   "sales.quotes.form.notes": "Notas",
+  "sales.quotes.internal_notes_unsupported": "Las notas internas no están disponibles en los presupuestos.",
   "sales.quotes.lines.delete": "Eliminar línea de cotización",
   "sales.quotes.lines.upsert": "Actualizar línea de cotización",
   "sales.quotes.list.title": "Cotizaciones",

package/src/modules/sales/i18n/ko.json

@@ -1287,6 +1287,7 @@
   "sales.quotes.form.general": "일반",
   "sales.quotes.form.lines": "라인 항목",
   "sales.quotes.form.notes": "메모",
+  "sales.quotes.internal_notes_unsupported": "내부 메모는 견적서에서 사용할 수 없습니다.",
   "sales.quotes.lines.delete": "견적 항목 삭제",
   "sales.quotes.lines.upsert": "견적 항목 업데이트",
   "sales.quotes.list.title": "견적",

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

@@ -1287,6 +1287,7 @@
   "sales.quotes.form.general": "Ogólne",
   "sales.quotes.form.lines": "Pozycje",
   "sales.quotes.form.notes": "Notatki",
+  "sales.quotes.internal_notes_unsupported": "Notatki wewnętrzne nie są dostępne dla ofert.",
   "sales.quotes.lines.delete": "Usuń pozycję oferty",
   "sales.quotes.lines.upsert": "Zaktualizuj pozycję oferty",
   "sales.quotes.list.title": "Oferty",