@open-mercato/core 0.5.1-develop.2691.d8a0934b37 → 0.5.1-develop.2699.f8b50c8046

package/src/modules/query_index/api/status.ts

@@ -3,6 +3,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { getEntityIds } from '@open-mercato/shared/lib/encryption/entityIds'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { sql } from 'kysely'
 import { readCoverageSnapshot, refreshCoverageSnapshot } from '../lib/coverage'
 import type { FullTextSearchStrategy } from '@open-mercato/search/strategies'
 import type { SearchModuleConfig } from '@open-mercato/shared/modules/search'
@@ -21,7 +22,7 @@ export async function GET(req: Request) {
 
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
-  const knex = (em as any).getConnection().getKnex()
+  const db = (em as any).getKysely()
   const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })
 
   const organizationId = scope.selectedId ?? auth.orgId ?? null
@@ -119,23 +120,27 @@ export async function GET(req: Request) {
 
   // Limit to entities that have active custom field definitions in current scope
   try {
-    const cfRows = await knex('custom_field_defs')
-      .distinct('entity_id')
-      .where({ is_active: true })
-      .modify((qb: any) => {
-        if (tenantId != null) {
-          qb.andWhere((b: any) => b.where({ tenant_id: tenantId }).orWhereNull('tenant_id'))
-        } else {
-          qb.andWhere((b: any) => b.whereNull('tenant_id'))
-        }
-        if (Array.isArray(organizationScopeIds)) {
-          qb.andWhere((b: any) => {
-            b.whereIn('organization_id', organizationScopeIds)
-            b.orWhereNull('organization_id')
-          })
-        }
-      })
-    const enabled = new Set<string>((cfRows || []).map((r: any) => String(r.entity_id)))
+    let cfQuery = db
+      .selectFrom('custom_field_defs' as any)
+      .select(['entity_id' as any])
+      .distinct()
+      .where('is_active' as any, '=', true)
+    if (tenantId != null) {
+      cfQuery = cfQuery.where((eb: any) => eb.or([
+        eb('tenant_id' as any, '=', tenantId),
+        eb('tenant_id' as any, 'is', null),
+      ]))
+    } else {
+      cfQuery = cfQuery.where('tenant_id' as any, 'is', null as any)
+    }
+    if (Array.isArray(organizationScopeIds)) {
+      cfQuery = cfQuery.where((eb: any) => eb.or([
+        eb('organization_id' as any, 'in', organizationScopeIds),
+        eb('organization_id' as any, 'is', null),
+      ]))
+    }
+    const cfRows = await cfQuery.execute() as Array<{ entity_id: string }>
+    const enabled = new Set<string>((cfRows || []).map((r) => String(r.entity_id)))
     entityIds = entityIds.filter((id) => enabled.has(id))
   } catch {}
 
@@ -144,23 +149,22 @@ export async function GET(req: Request) {
 
   async function fetchJobSummary(entityType: string, tenantIdParam: string | null, organizationIdParam: string | null) {
     try {
-      const rows = await knex('entity_index_jobs')
-        .where({ entity_type: entityType })
-        .andWhere((qb: any) => {
-          if (tenantIdParam != null) {
-            qb.whereRaw('tenant_id is not distinct from ?', [tenantIdParam])
-          } else {
-            qb.whereRaw('tenant_id is not distinct from ?', [null])
-          }
-        })
-        .andWhere((qb: any) => {
-          if (organizationIdParam != null) {
-            qb.whereRaw('organization_id is not distinct from ?', [organizationIdParam]).orWhereNull('organization_id')
-          } else {
-            qb.whereRaw('organization_id is not distinct from ?', [null])
-          }
-        })
-        .orderBy('started_at', 'desc')
+      let jobQuery = db
+        .selectFrom('entity_index_jobs' as any)
+        .selectAll()
+        .where('entity_type' as any, '=', entityType)
+        .where(sql<boolean>`tenant_id is not distinct from ${tenantIdParam ?? null}`)
+      if (organizationIdParam != null) {
+        jobQuery = jobQuery.where((eb: any) => eb.or([
+          eb('organization_id' as any, '=', organizationIdParam),
+          eb('organization_id' as any, 'is', null),
+        ]))
+      } else {
+        jobQuery = jobQuery.where(sql<boolean>`organization_id is not distinct from ${null}`)
+      }
+      const rows = await jobQuery
+        .orderBy('started_at' as any, 'desc')
+        .execute() as Array<Record<string, any>>
 
       if (!rows.length) {
         return { status: 'idle' as const, partitions: [] as any[] }
@@ -294,7 +298,7 @@ export async function GET(req: Request) {
       withDeleted: false,
     } as const
     const ensureSnapshot = async () => {
-      let snapshot = await readCoverageSnapshot(knex, scope)
+      let snapshot = await readCoverageSnapshot(db, scope)
       const refreshedAt = snapshot?.refreshed_at instanceof Date
         ? snapshot.refreshed_at
         : snapshot?.refreshed_at
@@ -303,7 +307,7 @@ export async function GET(req: Request) {
       const stale = !snapshot || !refreshedAt || (Date.now() - refreshedAt.getTime() > COVERAGE_STALE_MS)
       if (forceRefresh || stale) {
         await refreshCoverageSnapshot(em, scope).catch(() => undefined)
-        snapshot = await readCoverageSnapshot(knex, scope)
+        snapshot = await readCoverageSnapshot(db, scope)
       }
       const finalRefreshed = snapshot?.refreshed_at instanceof Date
         ? snapshot.refreshed_at
@@ -378,24 +382,29 @@ export async function GET(req: Request) {
     } catch {}
   }
 
-  const errorRows = await knex('indexer_error_logs')
-    .modify((qb: any) => {
-      if (tenantId != null) {
-        qb.where((inner: any) => {
-          inner.where('tenant_id', tenantId).orWhereNull('tenant_id')
-        })
-      } else {
-        qb.whereNull('tenant_id')
-      }
-    })
-    .andWhere((qb: any) => {
-      qb.whereNull('organization_id')
-      if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-        qb.orWhereIn('organization_id', organizationScopeIds)
-      }
-    })
-    .orderBy('occurred_at', 'desc')
+  let errorQuery = db
+    .selectFrom('indexer_error_logs' as any)
+    .selectAll()
+  if (tenantId != null) {
+    errorQuery = errorQuery.where((eb: any) => eb.or([
+      eb('tenant_id' as any, '=', tenantId),
+      eb('tenant_id' as any, 'is', null),
+    ]))
+  } else {
+    errorQuery = errorQuery.where('tenant_id' as any, 'is', null as any)
+  }
+  if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
+    errorQuery = errorQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
+  } else {
+    errorQuery = errorQuery.where('organization_id' as any, 'is', null as any)
+  }
+  const errorRows = await errorQuery
+    .orderBy('occurred_at' as any, 'desc')
     .limit(100)
+    .execute() as Array<Record<string, any>>
 
   const errors = errorRows.map((row: any) => {
     const occurredAt = row.occurred_at instanceof Date ? row.occurred_at : row.occurred_at ? new Date(row.occurred_at) : null
@@ -414,24 +423,29 @@ export async function GET(req: Request) {
     }
   })
 
-  const logRows = await knex('indexer_status_logs')
-    .modify((qb: any) => {
-      if (tenantId != null) {
-        qb.where((inner: any) => {
-          inner.where('tenant_id', tenantId).orWhereNull('tenant_id')
-        })
-      } else {
-        qb.whereNull('tenant_id')
-      }
-    })
-    .andWhere((qb: any) => {
-      qb.whereNull('organization_id')
-      if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-        qb.orWhereIn('organization_id', organizationScopeIds)
-      }
-    })
-    .orderBy('occurred_at', 'desc')
+  let logsQuery = db
+    .selectFrom('indexer_status_logs' as any)
+    .selectAll()
+  if (tenantId != null) {
+    logsQuery = logsQuery.where((eb: any) => eb.or([
+      eb('tenant_id' as any, '=', tenantId),
+      eb('tenant_id' as any, 'is', null),
+    ]))
+  } else {
+    logsQuery = logsQuery.where('tenant_id' as any, 'is', null as any)
+  }
+  if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
+    logsQuery = logsQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
+  } else {
+    logsQuery = logsQuery.where('organization_id' as any, 'is', null as any)
+  }
+  const logRows = await logsQuery
+    .orderBy('occurred_at' as any, 'desc')
     .limit(100)
+    .execute() as Array<Record<string, any>>
 
   const logs = logRows.map((row: any) => {
     const occurredAt = row.occurred_at instanceof Date ? row.occurred_at : row.occurred_at ? new Date(row.occurred_at) : null

package/src/modules/query_index/cli.ts

@@ -1,7 +1,7 @@
 import type { ModuleCli } from '@open-mercato/shared/modules/registry'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 import { createProgressBar } from '@open-mercato/shared/lib/cli/progress'
 import { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encryption/customFieldValues'
 import { decryptIndexDocForSearch, encryptIndexDocForStorage } from '@open-mercato/shared/lib/encryption/indexDoc'
@@ -141,7 +141,7 @@ const DEFAULT_BATCH_SIZE = 200
 
 type RebuildExecutionOptions = {
   em: EntityManager
-  knex: Knex
+  db: Kysely<any>
   entityType: string
   tableName: string
   orgOverride?: string
@@ -165,7 +165,7 @@ type RebuildResult = {
 async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<RebuildResult> {
   const {
     em,
-    knex,
+    db,
     entityType,
     tableName,
     orgOverride,
@@ -220,28 +220,41 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
     }
   }
 
-  const filters: Record<string, unknown> = {}
-  if (!global) {
-    if (orgOverride !== undefined && supportsOrgFilter) filters.organization_id = orgOverride
-    if (tenantOverride !== undefined && supportsTenantFilter) filters.tenant_id = tenantOverride
+  const applyFilters = <QB extends { where: (...args: any[]) => QB }>(q: QB): QB => {
+    let chain = q
+    if (!global) {
+      if (orgOverride !== undefined && supportsOrgFilter) {
+        chain = chain.where('organization_id' as any, '=', orgOverride)
+      }
+      if (tenantOverride !== undefined && supportsTenantFilter) {
+        chain = chain.where('tenant_id' as any, '=', tenantOverride)
+      }
+    }
+    if (!includeDeleted && supportsDeletedFilter) {
+      chain = chain.where('deleted_at' as any, 'is', null as any)
+    }
+    return chain
   }
-  if (!includeDeleted && supportsDeletedFilter) filters.deleted_at = null
-
-  const baseQuery = knex(tableName).where(filters)
 
   if (recordId) {
-    const row = await baseQuery.clone().where({ id: recordId }).first<AnyRow>()
+    const row = await applyFilters(
+      db.selectFrom(tableName as any).selectAll() as any,
+    )
+      .where('id' as any, '=', recordId)
+      .executeTakeFirst() as AnyRow | undefined
     if (!row) return { processed: 0, matched: 0 }
     const bar = createProgressBar(progressLabel ?? `Rebuilding ${entityType}`, 1)
-    await upsertIndexBatch(knex, entityType, [row], { orgId: orgOverride, tenantId: tenantOverride }, { encryptDoc, decryptDoc })
+    await upsertIndexBatch(db, entityType, [row], { orgId: orgOverride, tenantId: tenantOverride }, { encryptDoc, decryptDoc })
     bar.update(1)
     bar.complete()
     return { processed: 1, matched: 1 }
   }
 
-  const countRow = await baseQuery.clone().count<{ count: string }>({ count: '*' }).first()
-  const totalRaw = countRow?.count ?? (countRow as any)?.['count(*)']
-  const total = totalRaw ? Number(totalRaw) : 0
+  const countRow = await applyFilters(
+    db.selectFrom(tableName as any).select(sql<string>`count(*)`.as('count')) as any,
+  ).executeTakeFirst() as { count: string | number } | undefined
+  const totalRaw = countRow?.count
+  const total = totalRaw != null ? Number(totalRaw) : 0
   const effectiveOffset = Math.max(0, offset)
   const matchedWithoutLimit = Math.max(0, total - effectiveOffset)
   const limitValue = toPositiveInt(limit)
@@ -257,15 +270,17 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
 
   while (processed < intended) {
     const chunkLimit = remaining !== undefined ? Math.min(batchSize, remaining) : batchSize
-    const chunk = await baseQuery
-      .clone()
-      .select('*')
-      .orderBy('id')
-      .limit(chunkLimit)
-      .offset(cursorOffset)
+    const chunk = await applyFilters(
+      db
+        .selectFrom(tableName as any)
+        .selectAll()
+        .orderBy('id' as any)
+        .limit(chunkLimit)
+        .offset(cursorOffset) as any,
+    ).execute() as AnyRow[]
     if (!chunk.length) break
 
-    await upsertIndexBatch(knex, entityType, chunk as AnyRow[], {
+    await upsertIndexBatch(db, entityType, chunk as AnyRow[], {
       orgId: orgOverride,
       tenantId: tenantOverride,
     }, { encryptDoc, decryptDoc })
@@ -284,10 +299,15 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
   return { processed, matched: intended }
 }
 
-async function getColumnSet(knex: Knex, tableName: string): Promise<Set<string>> {
+async function getColumnSet(db: Kysely<any>, tableName: string): Promise<Set<string>> {
   try {
-    const info = await knex(tableName).columnInfo()
-    return new Set(Object.keys(info).map((key) => key.toLowerCase()))
+    const rows = await db
+      .selectFrom('information_schema.columns' as any)
+      .select(['column_name' as any])
+      .where(sql<boolean>`table_schema = current_schema()`)
+      .where('table_name' as any, '=', tableName)
+      .execute() as Array<{ column_name: string }>
+    return new Set(rows.map((row) => String(row.column_name).toLowerCase()))
   } catch {
     return new Set<string>()
   }
@@ -336,9 +356,9 @@ const rebuild: ModuleCli = {
     const container = await createRequestContainer()
     const em = (container.resolve('em') as EntityManager)
     try {
-      const knex = em.getConnection().getKnex()
+      const db = em.getKysely<any>()
       const tableName = resolveEntityTableName(em, entity)
-      const columns = await getColumnSet(knex, tableName)
+      const columns = await getColumnSet(db, tableName)
       const supportsOrg = columns.has('organization_id')
       const supportsTenant = columns.has('tenant_id')
       const supportsDeleted = columns.has('deleted_at')
@@ -355,7 +375,7 @@ const rebuild: ModuleCli = {
 
       const result = await rebuildEntityIndexes({
         em,
-        knex,
+        db,
         entityType: entity,
         tableName,
         orgOverride: orgId,
@@ -440,7 +460,7 @@ const rebuildAll: ModuleCli = {
     const container = await createRequestContainer()
     const em = (container.resolve('em') as EntityManager)
     try {
-      const knex = em.getConnection().getKnex()
+      const db = em.getKysely<any>()
 
       const { getEntityIds } = await import('@open-mercato/shared/lib/encryption/entityIds')
       const entityIds = flattenSystemEntityIds(getEntityIds() as Record<string, Record<string, string>>)
@@ -453,7 +473,7 @@ const rebuildAll: ModuleCli = {
       for (let idx = 0; idx < entityIds.length; idx += 1) {
         const entity = entityIds[idx]!
         const tableName = resolveEntityTableName(em, entity)
-        const columns = await getColumnSet(knex, tableName)
+        const columns = await getColumnSet(db, tableName)
         const supportsOrg = columns.has('organization_id')
         const supportsTenant = columns.has('tenant_id')
         const supportsDeleted = columns.has('deleted_at')
@@ -481,7 +501,7 @@ const rebuildAll: ModuleCli = {
         console.log(`[${idx + 1}/${entityIds.length}] Rebuilding ${entity}${scopeLabel}`)
         const result = await rebuildEntityIndexes({
           em,
-          knex,
+          db,
           entityType: entity,
           tableName,
           orgOverride: orgId,

package/src/modules/query_index/data/entities.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property, Index, Unique } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 // Generic JSONB-backed index rows for any entity ('<module>:<entity>')
 @Entity({ tableName: 'entity_indexes' })

package/src/modules/query_index/di.ts

@@ -72,25 +72,42 @@ export function register(container: AppContainer) {
         if (!id) return
         if (!orgId || !tenantId) {
           try {
-            const knex = (em as any).getConnection().getKnex()
+            const db = (em as any).getKysely()
             const table = resolveEntityTableName(em, entityType)
-            const row = await knex(table).select(['organization_id', 'tenant_id']).where({ id }).first()
+            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 {}
         }
         // Optional: only index when custom field definitions exist for this entity (org/global)
         try {
-          const knex = (em as any).getConnection().getKnex()
-          const hasCf = await knex('custom_field_defs')
-            .where({ entity_id: entityType, is_active: true })
-            .modify((qb: any) => {
-              if (orgId != null) qb.andWhere((b: any) => b.where({ organization_id: orgId }).orWhereNull('organization_id'))
-              else qb.whereNull('organization_id')
-              if (tenantId != null) qb.andWhere((b: any) => b.where({ tenant_id: tenantId }).orWhereNull('tenant_id'))
-              else qb.whereNull('tenant_id')
-            })
-            .first()
+          const db = (em as any).getKysely()
+          let cfQuery = db
+            .selectFrom('custom_field_defs' as any)
+            .select(['id' as any])
+            .where('entity_id' as any, '=', entityType)
+            .where('is_active' as any, '=', true)
+          if (orgId != null) {
+            cfQuery = cfQuery.where((eb: any) => eb.or([
+              eb('organization_id' as any, '=', orgId),
+              eb('organization_id' as any, 'is', null),
+            ]))
+          } else {
+            cfQuery = cfQuery.where('organization_id' as any, 'is', null as any)
+          }
+          if (tenantId != null) {
+            cfQuery = cfQuery.where((eb: any) => eb.or([
+              eb('tenant_id' as any, '=', tenantId),
+              eb('tenant_id' as any, 'is', null),
+            ]))
+          } else {
+            cfQuery = cfQuery.where('tenant_id' as any, 'is', null as any)
+          }
+          const hasCf = await cfQuery.executeTakeFirst()
           if (!hasCf) return
         } catch {}
         try {
@@ -107,9 +124,13 @@ export function register(container: AppContainer) {
         if (!id) return
         if (!orgId) {
           try {
-            const knex = (em as any).getConnection().getKnex()
+            const db = (em as any).getKysely()
             const table = resolveEntityTableName(em, entityType)
-            const row = await knex(table).select(['organization_id']).where({ id }).first()
+            const row = await db
+              .selectFrom(table as any)
+              .select(['organization_id' as any])
+              .where('id' as any, '=', id)
+              .executeTakeFirst() as { organization_id: string | null } | undefined
             orgId = row?.organization_id ?? orgId
           } catch {}
         }
@@ -123,9 +144,13 @@ export function register(container: AppContainer) {
     // Build list of entity ids to subscribe to
     try {
       const em = (container.resolve('em') as any)
-      const knex = (em as any).getConnection().getKnex()
+      const db = (em as any).getKysely()
       const cfEntityIds: string[] = []
-      knex('custom_field_defs').distinct('entity_id')
+      db
+        .selectFrom('custom_field_defs' as any)
+        .select(['entity_id' as any])
+        .distinct()
+        .execute()
         .then((rows: any[]) => {
           for (const r of rows || []) cfEntityIds.push(String(r.entity_id))
         })