@open-mercato/core 0.4.7-develop-78d7541539 → 0.4.7-develop-74069040de

package/src/modules/progress/lib/progressServiceImpl.ts

@@ -16,6 +16,7 @@ function buildJobPayload(job: ProgressJob): Record<string, unknown> {
     totalCount: job.totalCount ?? null,
     etaSeconds: job.etaSeconds ?? null,
     cancellable: job.cancellable,
+    meta: job.meta ?? null,
     startedAt: job.startedAt?.toISOString() ?? null,
     finishedAt: job.finishedAt?.toISOString() ?? null,
   }
@@ -53,6 +54,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
 
     async startJob(jobId, ctx) {
       const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (job.status === 'cancelled') {
+        return job
+      }
 
       job.status = 'running'
       job.startedAt = new Date()
@@ -71,6 +75,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
 
     async updateProgress(jobId, input, ctx) {
       const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {
+        return job
+      }
 
       if (input.processedCount !== undefined) {
         job.processedCount = input.processedCount
@@ -109,6 +116,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
 
     async incrementProgress(jobId, delta, ctx) {
       const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (job.status === 'completed' || job.status === 'failed' || job.status === 'cancelled') {
+        return job
+      }
 
       job.processedCount += delta
       job.heartbeatAt = new Date()
@@ -134,6 +144,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
     async completeJob(jobId, input, ctx) {
       const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
       if (!job) throw new Error(`Job ${jobId} not found`)
+      if (job.status === 'cancelled') {
+        return job
+      }
 
       job.status = 'completed'
       job.finishedAt = new Date()
@@ -158,6 +171,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
     async failJob(jobId, input, ctx) {
       const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
       if (!job) throw new Error(`Job ${jobId} not found`)
+      if (job.status === 'cancelled') {
+        return job
+      }
 
       job.status = 'failed'
       job.finishedAt = new Date()
@@ -203,6 +219,30 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       return job
     },
 
+    async markCancelled(jobId, ctx) {
+      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (!job) throw new Error(`Job ${jobId} not found`)
+      if (job.status === 'cancelled') {
+        return job
+      }
+
+      job.cancelRequestedAt = job.cancelRequestedAt ?? new Date()
+      job.cancelledByUserId = ctx.userId
+      job.status = 'cancelled'
+      job.finishedAt = job.finishedAt ?? new Date()
+      job.etaSeconds = 0
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {
+        ...buildJobPayload(job),
+        tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
+      })
+
+      return job
+    },
+
     async isCancellationRequested(jobId) {
       const job = await em.findOne(ProgressJob, { id: jobId })
       return job?.cancelRequestedAt != null
@@ -247,7 +287,13 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       const staleJobs = await em.find(ProgressJob, {
         tenantId,
         status: 'running',
-        heartbeatAt: { $lt: cutoff },
+        $or: [
+          { heartbeatAt: { $lt: cutoff } },
+          {
+            heartbeatAt: null,
+            startedAt: { $lt: cutoff },
+          },
+        ],
       })
 
       for (const job of staleJobs) {

package/src/modules/query_index/lib/document.ts

@@ -10,6 +10,8 @@ export type IndexCustomFieldValue = {
   tenantId?: string | null
 }
 
+export const AGGREGATE_SEARCH_FIELD = 'search_text'
+
 function normalizeScopeValue(value: string | null | undefined): string | null {
   if (value === undefined || value === null || value === '') return null
   return value
@@ -28,6 +30,55 @@ function normalizeValue(value: unknown): unknown {
   return value
 }
 
+function collectAggregateSearchValues(field: string, value: unknown): string[] {
+  const lower = field.toLowerCase()
+  if (
+    lower === AGGREGATE_SEARCH_FIELD
+    || lower === 'id'
+    || lower.endsWith('_id')
+    || lower.endsWith('.id')
+    || lower.endsWith('_at')
+    || ['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)
+  ) {
+    return []
+  }
+
+  if (typeof value === 'string') {
+    const trimmed = value.trim()
+    return trimmed.length > 0 ? [trimmed] : []
+  }
+
+  if (Array.isArray(value)) {
+    return value
+      .filter((entry): entry is string => typeof entry === 'string')
+      .map((entry) => entry.trim())
+      .filter((entry) => entry.length > 0)
+  }
+
+  return []
+}
+
+export function attachAggregateSearchField(doc: Record<string, unknown>): Record<string, unknown> {
+  const parts: string[] = []
+  const seen = new Set<string>()
+
+  for (const [field, value] of Object.entries(doc)) {
+    const values = collectAggregateSearchValues(field, value)
+    for (const entry of values) {
+      const key = entry.toLowerCase()
+      if (seen.has(key)) continue
+      seen.add(key)
+      parts.push(entry)
+    }
+  }
+
+  if (parts.length > 0) {
+    doc[AGGREGATE_SEARCH_FIELD] = parts.join('\n')
+  }
+
+  return doc
+}
+
 export function buildIndexDocument(
   baseRow: Record<string, unknown>,
   customFieldValues: Iterable<IndexCustomFieldValue> = [],
@@ -72,5 +123,5 @@ export function buildIndexDocument(
     }
   }
 
-  return doc
+  return attachAggregateSearchField(doc)
 }

package/src/modules/query_index/lib/engine.ts

@@ -561,14 +561,41 @@ export class HybridQueryEngine implements QueryEngine {
     }
 
     for (const filter of baseFilters) {
-      const baseField = resolveBaseColumn(String(filter.field))
-      if (!baseField) continue
+      const fieldName = String(filter.field)
+      const baseField = resolveBaseColumn(fieldName)
+      if (!baseField) {
+        builder = this.applyIndexDocFilterFromAlias(
+          knex,
+          builder,
+          'ei',
+          entity,
+          fieldName,
+          filter.op,
+          filter.value,
+          'b.id',
+          searchRuntime,
+        )
+        if (optimizedCountBuilder) {
+          optimizedCountBuilder = this.applyIndexDocFilterFromAlias(
+            knex,
+            optimizedCountBuilder,
+            'ei',
+            entity,
+            fieldName,
+            filter.op,
+            filter.value,
+            'b.id',
+            searchRuntime,
+          )
+        }
+        continue
+      }
       const column = qualify(baseField)
       builder = this.applyColumnFilter(builder, column, filter, {
         ...searchRuntime,
         knex,
         entity,
-        field: String(filter.field),
+        field: fieldName,
         recordIdColumn: 'b.id',
       })
       if (optimizedCountBuilder) {
@@ -576,7 +603,7 @@ export class HybridQueryEngine implements QueryEngine {
           ...searchRuntime,
           knex,
           entity,
-          field: String(filter.field),
+          field: fieldName,
           recordIdColumn: 'b.id',
         })
       }
@@ -1141,6 +1168,79 @@ export class HybridQueryEngine implements QueryEngine {
     }
   }
 
+  private applyIndexDocFilterFromAlias(
+    knex: Knex,
+    q: ResultBuilder,
+    alias: string,
+    entityType: string,
+    key: string,
+    op: FilterOp,
+    value: unknown,
+    recordIdColumn: string,
+    search?: SearchRuntime,
+  ): ResultBuilder {
+    const text = knex.raw(`(${alias}.doc ->> ?)`, [key])
+    if ((op === 'like' || op === 'ilike') && search?.enabled && typeof value === 'string') {
+      const tokens = tokenizeText(String(value), search.config)
+      const hashes = tokens.hashes
+      if (hashes.length) {
+        const applied = this.applySearchTokens(q, {
+          knex,
+          entity: entityType,
+          field: key,
+          hashes,
+          recordIdColumn,
+          tenantId: search.tenantId ?? null,
+          organizationScope: search.organizationScope ?? null,
+        })
+        this.logSearchDebug('search:index-doc-filter', {
+          entity: entityType,
+          field: key,
+          tokens: tokens.tokens,
+          hashes,
+          applied,
+          tenantId: search.tenantId ?? null,
+          organizationScope: search.organizationScope,
+        })
+        if (applied) return q
+      } else {
+        this.logSearchDebug('search:index-doc-skip-empty-hashes', {
+          entity: entityType,
+          field: key,
+          value,
+        })
+      }
+      return q
+    }
+    switch (op) {
+      case 'eq':
+        return q.where(text, '=', value as Knex.Value)
+      case 'ne':
+        return q.where(text, '!=', value as Knex.Value)
+      case 'in':
+        return q.whereIn(text as any, this.toArray(value) as readonly Knex.Value[])
+      case 'nin':
+        return q.whereNotIn(text as any, this.toArray(value) as readonly Knex.Value[])
+      case 'like':
+        return q.where(text, 'like', value as Knex.Value)
+      case 'ilike':
+        return q.where(text, 'ilike', value as Knex.Value)
+      case 'exists':
+        return value
+          ? q.whereRaw(`${text.toString()} is not null`)
+          : q.whereRaw(`${text.toString()} is null`)
+      case 'gt':
+      case 'gte':
+      case 'lt':
+      case 'lte': {
+        const operator = op === 'gt' ? '>' : op === 'gte' ? '>=' : op === 'lt' ? '<' : '<='
+        return q.where(text, operator, value as Knex.Value)
+      }
+      default:
+        return q
+    }
+  }
+
   private async queryCustomEntity<T = unknown>(entity: string, opts: QueryOptions = {}): Promise<QueryResult<T>> {
     const knex = this.getKnex()
     const alias = 'ce'

package/src/modules/query_index/lib/indexer.ts

@@ -4,6 +4,7 @@ import { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encrypt
 import { decryptIndexDocForSearch, encryptIndexDocForStorage } from '@open-mercato/shared/lib/encryption/indexDoc'
 import type { Knex } from 'knex'
 import { replaceSearchTokensForRecord, deleteSearchTokensForRecord } from './search-tokens'
+import { attachAggregateSearchField } from './document'
 
 type BuildDocParams = {
   entityType: string // '<module>:<entity>'
@@ -91,6 +92,7 @@ export async function buildIndexDoc(em: EntityManager, params: BuildDocParams):
   } catch {}
 
   try {
+    doc = attachAggregateSearchField(doc)
     const encryption = resolveTenantEncryptionService(em as any)
     doc = await encryptIndexDocForStorage(
       params.entityType,

package/src/modules/sales/api/adjustment-kinds/route.ts

@@ -8,13 +8,12 @@ import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/dictionary_entry'
 import { statusDictionaryCreateSchema, statusDictionaryUpdateSchema } from '../../data/validators'
 import { getSalesDictionaryDefinition, ensureSalesDictionary, type SalesDictionaryKind } from '../../lib/dictionaries'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import {
   createPagedListResponseSchema,
   createSalesCrudOpenApi,
   defaultDeleteRequestSchema,
 } from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 
 const rawBodySchema = z.object({}).passthrough()
 
@@ -143,13 +142,8 @@ const crud = makeCrudRoute({
       const filters: Record<string, unknown> = {
         dictionary_id: dictionaryId,
       }
-      if (query.search && query.search.trim().length > 0) {
-        const term = `%${escapeLikePattern(query.search.trim())}%`
-        filters.$or = [
-          { [F.value]: { $ilike: term } },
-          { [F.label]: { $ilike: term } },
-        ]
-      }
+      const searchFilter = buildAggregateSearchFilter(query.search)
+      if (searchFilter) Object.assign(filters, searchFilter)
       return filters
     },
     transformItem: (item: any) => ({

package/src/modules/sales/api/channels/route.ts

@@ -5,7 +5,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { SalesChannel } from '../../data/entities'
 import { channelCreateSchema, channelUpdateSchema } from '../../data/validators'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/sales_channel'
 import {
@@ -14,7 +14,6 @@ import {
   defaultDeleteRequestSchema,
 } from '../openapi'
 import { CatalogOffer } from '@open-mercato/core/modules/catalog/data/entities'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -76,14 +75,8 @@ export function buildSearchFilters(query: z.infer<typeof listSchema>): Record<st
     const ids = parseIdList(query.ids)
     if (ids.length) filters.id = { $in: ids }
   }
-  if (query.search && query.search.trim().length > 0) {
-    const term = `%${escapeLikePattern(query.search.trim())}%`
-    filters.$or = [
-      { name: { $ilike: term } },
-      { code: { $ilike: term } },
-      { description: { $ilike: term } },
-    ]
-  }
+  const searchFilter = buildAggregateSearchFilter(query.search)
+  if (searchFilter) Object.assign(filters, searchFilter)
   const isActive = parseBooleanToken(query.isActive)
   if (isActive !== null) filters.is_active = isActive
   return filters

package/src/modules/sales/api/delivery-windows/route.ts

@@ -4,7 +4,7 @@ import { splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fi
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { SalesDeliveryWindow } from '../../data/entities'
 import { deliveryWindowCreateSchema, deliveryWindowUpdateSchema } from '../../data/validators'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/sales_delivery_window'
 import {
@@ -12,7 +12,6 @@ import {
   createSalesCrudOpenApi,
   defaultDeleteRequestSchema,
 } from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -59,14 +58,8 @@ const deliveryWindowListResponseSchema = createPagedListResponseSchema(deliveryW
 
 function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown> {
   const filters: Record<string, unknown> = {}
-  if (query.search && query.search.trim().length > 0) {
-    const term = `%${escapeLikePattern(query.search.trim())}%`
-    filters.$or = [
-      { name: { $ilike: term } },
-      { code: { $ilike: term } },
-      { description: { $ilike: term } },
-    ]
-  }
+  const searchFilter = buildAggregateSearchFilter(query.search)
+  if (searchFilter) Object.assign(filters, searchFilter)
   const isActive = parseBooleanToken(query.isActive)
   if (isActive !== null) filters.is_active = isActive
   return filters

package/src/modules/sales/api/payment-methods/route.ts

@@ -4,7 +4,7 @@ import { splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fi
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { SalesPaymentMethod } from '../../data/entities'
 import { paymentMethodCreateSchema, paymentMethodUpdateSchema } from '../../data/validators'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/sales_payment_method'
 import {
@@ -12,7 +12,6 @@ import {
   createSalesCrudOpenApi,
   defaultDeleteRequestSchema,
 } from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -59,15 +58,8 @@ const paymentMethodListResponseSchema = createPagedListResponseSchema(paymentMet
 
 function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown> {
   const filters: Record<string, unknown> = {}
-  if (query.search && query.search.trim().length > 0) {
-    const term = `%${escapeLikePattern(query.search.trim())}%`
-    filters.$or = [
-      { name: { $ilike: term } },
-      { code: { $ilike: term } },
-      { provider_key: { $ilike: term } },
-      { description: { $ilike: term } },
-    ]
-  }
+  const searchFilter = buildAggregateSearchFilter(query.search)
+  if (searchFilter) Object.assign(filters, searchFilter)
   const isActive = parseBooleanToken(query.isActive)
   if (isActive !== null) filters.is_active = isActive
   return filters

package/src/modules/sales/api/price-kinds/route.ts

@@ -5,7 +5,7 @@ import { sanitizeSearchTerm, parseBooleanFlag } from '@open-mercato/core/modules
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/catalog_price_kind'
 import { createPagedListResponseSchema, createSalesCrudOpenApi } from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
+import { buildAggregateSearchFilter } from '../utils'
 
 const routeMetadata = {
   GET: { requireAuth: true, requireFeatures: ['sales.channels.manage'] },
@@ -45,10 +45,8 @@ const crud = makeCrudRoute({
     buildFilters: async (query) => {
       const filters: Record<string, unknown> = {}
       const term = sanitizeSearchTerm(query.search)
-      if (term) {
-        const like = `%${escapeLikePattern(term)}%`
-        filters.$or = [{ [F.code]: { $ilike: like } }, { [F.title]: { $ilike: like } }]
-      }
+      const searchFilter = buildAggregateSearchFilter(term)
+      if (searchFilter) Object.assign(filters, searchFilter)
       const isActive = parseBooleanFlag(query.isActive)
       if (isActive !== undefined) {
         filters[F.is_active] = isActive

package/src/modules/sales/api/shipping-methods/route.ts

@@ -4,7 +4,7 @@ import { splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fi
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { SalesShippingMethod } from '../../data/entities'
 import { shippingMethodCreateSchema, shippingMethodUpdateSchema } from '../../data/validators'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/sales_shipping_method'
 import {
@@ -12,7 +12,6 @@ import {
   createSalesCrudOpenApi,
   defaultDeleteRequestSchema,
 } from '../openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -65,15 +64,8 @@ const shippingMethodListResponseSchema = createPagedListResponseSchema(shippingM
 
 function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown> {
   const filters: Record<string, unknown> = {}
-  if (query.search && query.search.trim().length > 0) {
-    const term = `%${escapeLikePattern(query.search.trim())}%`
-    filters.$or = [
-      { name: { $ilike: term } },
-      { code: { $ilike: term } },
-      { carrier_code: { $ilike: term } },
-      { service_level: { $ilike: term } },
-    ]
-  }
+  const searchFilter = buildAggregateSearchFilter(query.search)
+  if (searchFilter) Object.assign(filters, searchFilter)
   if (query.currency && query.currency.trim().length > 0) {
     filters.currency_code = query.currency.trim().toUpperCase()
   }

package/src/modules/sales/api/tags/route.ts

@@ -4,10 +4,9 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { SalesDocumentTag } from '../../data/entities'
 import { salesTagCreateSchema, salesTagUpdateSchema } from '../../data/validators'
-import { withScopedPayload } from '../utils'
+import { buildAggregateSearchFilter, withScopedPayload } from '../utils'
 import { createPagedListResponseSchema, createSalesCrudOpenApi, defaultOkResponseSchema } from '../openapi'
 import { slugifyTagLabel } from '@open-mercato/shared/lib/utils'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 
 const rawBodySchema = z.object({}).passthrough()
 
@@ -44,13 +43,8 @@ const crud = makeCrudRoute({
     fields: ['id', 'slug', 'label', 'color', 'description', 'organization_id', 'tenant_id'],
     buildFilters: async (query: any) => {
       const filters: Record<string, any> = {}
-      if (query.search) {
-        const pattern = `%${escapeLikePattern(query.search)}%`
-        filters.$or = [
-          { label: { $ilike: pattern } },
-          { slug: { $ilike: pattern } },
-        ]
-      }
+      const searchFilter = buildAggregateSearchFilter(query.search)
+      if (searchFilter) Object.assign(filters, searchFilter)
       return filters
     },
   },

package/src/modules/sales/api/tax-rates/route.ts

@@ -5,10 +5,9 @@ import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { SalesTaxRate } from '../../data/entities'
 import { taxRateCreateSchema, taxRateUpdateSchema } from '../../data/validators'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { E } from '#generated/entities.ids.generated'
 import * as F from '#generated/entities/sales_tax_rate'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
 const rawBodySchema = z.object({}).passthrough()
@@ -76,17 +75,8 @@ const taxRateDeleteSchema = z.object({
 
 function buildFilters(query: z.infer<typeof listSchema>): Record<string, unknown> {
   const filters: Record<string, unknown> = {}
-  if (query.search && query.search.trim().length > 0) {
-    const term = `%${escapeLikePattern(query.search.trim())}%`
-    filters.$or = [
-      { name: { $ilike: term } },
-      { code: { $ilike: term } },
-      { country_code: { $ilike: term } },
-      { region_code: { $ilike: term } },
-      { postal_code: { $ilike: term } },
-      { city: { $ilike: term } },
-    ]
-  }
+  const searchFilter = buildAggregateSearchFilter(query.search)
+  if (searchFilter) Object.assign(filters, searchFilter)
   if (query.country && query.country.trim().length > 0) {
     filters.country_code = query.country.trim().toUpperCase()
   }

package/src/modules/sales/api/utils.ts

@@ -1,4 +1,5 @@
 import { createScopedApiHelpers } from '@open-mercato/shared/lib/api/scoped'
+import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 
 const {
   withScopedPayload,
@@ -14,3 +15,11 @@ const {
 })
 
 export { withScopedPayload, parseScopedCommandInput, requireRecordId, resolveCrudRecordId }
+
+export function buildAggregateSearchFilter(search?: string | null): Record<string, unknown> | null {
+  const term = typeof search === 'string' ? search.trim() : ''
+  if (!term) return null
+  return {
+    search_text: { $ilike: `%${escapeLikePattern(term)}%` },
+  }
+}

package/src/modules/sales/lib/makeStatusDictionaryRoute.ts

@@ -6,13 +6,12 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { Dictionary, DictionaryEntry } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { statusDictionaryCreateSchema, statusDictionaryUpdateSchema } from '../data/validators'
 import { getSalesDictionaryDefinition, ensureSalesDictionary, type SalesDictionaryKind } from './dictionaries'
-import { parseScopedCommandInput, resolveCrudRecordId } from '../api/utils'
+import { buildAggregateSearchFilter, parseScopedCommandInput, resolveCrudRecordId } from '../api/utils'
 import {
   createPagedListResponseSchema,
   createSalesCrudOpenApi,
   defaultDeleteRequestSchema,
 } from '../api/openapi'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 
 interface StatusDictionaryRouteConfig {
   kind: SalesDictionaryKind
@@ -153,13 +152,8 @@ export function makeStatusDictionaryRoute(config: StatusDictionaryRouteConfig) {
         const filters: Record<string, unknown> = {
           dictionary_id: dictionaryId,
         }
-        if (query.search && query.search.trim().length > 0) {
-          const term = `%${escapeLikePattern(query.search.trim())}%`
-          filters.$or = [
-            { [F.value]: { $ilike: term } },
-            { [F.label]: { $ilike: term } },
-          ]
-        }
+        const searchFilter = buildAggregateSearchFilter(query.search)
+        if (searchFilter) Object.assign(filters, searchFilter)
         return filters
       },
       transformItem: (item: Record<string, unknown>) => ({

package/src/modules/workflows/api/definitions/[id]/route.ts

@@ -17,6 +17,7 @@ import {
   updateWorkflowDefinitionInputSchema,
   type UpdateWorkflowDefinitionApiInput,
 } from '../../../data/validators'
+import { serializeWorkflowDefinition } from '../serialize'
 
 export const metadata = {
   requireAuth: true,
@@ -66,7 +67,7 @@ export async function GET(
       )
     }
 
-    return NextResponse.json({ data: definition })
+    return NextResponse.json({ data: serializeWorkflowDefinition(definition) })
   } catch (error) {
     console.error('Error getting workflow definition:', error)
     return NextResponse.json(
@@ -162,7 +163,7 @@ export async function PUT(
     await em.flush()
 
     return NextResponse.json({
-      data: definition,
+      data: serializeWorkflowDefinition(definition),
       message: 'Workflow definition updated successfully',
     })
   } catch (error) {