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

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

@@ -1,5 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
 import { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encryption/customFieldValues'
 import { decryptIndexDocForSearch, encryptIndexDocForStorage } from '@open-mercato/shared/lib/encryption/indexDoc'
@@ -41,7 +41,7 @@ const COVERAGE_REFRESH_THROTTLE_MS = 5 * 60 * 1000
 const lastCoverageReset = new Map<string, number>()
 
 async function cleanupLegacyJobScopes(
-  knex: Knex,
+  db: Kysely<any>,
   options: {
     entityType: string
     organizationId: string | null
@@ -49,12 +49,13 @@ async function cleanupLegacyJobScopes(
     activePartitionCount: number | null
   },
 ): Promise<void> {
-  await knex('entity_index_jobs')
-    .where('entity_type', options.entityType)
-    .andWhereRaw('organization_id is not distinct from ?', [options.organizationId])
-    .andWhereRaw('tenant_id is not distinct from ?', [options.tenantId])
-    .andWhereRaw('partition_count is distinct from ?', [options.activePartitionCount])
-    .del()
+  await db
+    .deleteFrom('entity_index_jobs' as any)
+    .where('entity_type' as any, '=', options.entityType)
+    .where(sql<boolean>`organization_id is not distinct from ${options.organizationId}`)
+    .where(sql<boolean>`tenant_id is not distinct from ${options.tenantId}`)
+    .where(sql<boolean>`partition_count is distinct from ${options.activePartitionCount}`)
+    .execute()
 }
 
 function toNumber(value: unknown): number {
@@ -66,10 +67,15 @@ function toNumber(value: unknown): number {
   return 0
 }
 
-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>()
   }
@@ -111,7 +117,7 @@ export async function reindexEntity(
     : null
   const resetCoverage = options?.resetCoverage ?? (!usingPartitions || partitionIndex === 0)
 
-  const knex = (em as any).getConnection().getKnex() as Knex
+  const db = (em as any).getKysely() as Kysely<any>
   const table = resolveEntityTableName(em, entityType)
   if (entityType === 'query_index:search_token' || table === 'search_tokens') {
     return {
@@ -121,7 +127,7 @@ export async function reindexEntity(
       scopes: [],
     }
   }
-  const columns = await getColumnSet(knex, table)
+  const columns = await getColumnSet(db, table)
   const hasOrgCol = columns.has('organization_id')
   const hasTenantCol = columns.has('tenant_id')
   const hasDeletedCol = columns.has('deleted_at')
@@ -135,16 +141,16 @@ export async function reindexEntity(
   }
 
   if (!force) {
-    const activeJob = await (async () => {
-      let query = knex('entity_index_jobs')
-        .where('entity_type', entityType)
-        .whereNull('finished_at')
-      query = query.whereRaw('organization_id is not distinct from ?', [null])
-      query = query.whereRaw('tenant_id is not distinct from ?', [tenantId ?? null])
-      query = query.whereRaw('partition_index is not distinct from ?', [partitionIndex])
-      query = query.whereRaw('partition_count is not distinct from ?', [usingPartitions ? partitionCountRaw : null])
-      return query.first()
-    })()
+    const activeJob = await db
+      .selectFrom('entity_index_jobs' as any)
+      .select(['id' as any])
+      .where('entity_type' as any, '=', entityType)
+      .where('finished_at' as any, 'is', null as any)
+      .where(sql<boolean>`organization_id is not distinct from ${null}`)
+      .where(sql<boolean>`tenant_id is not distinct from ${tenantId ?? null}`)
+      .where(sql<boolean>`partition_index is not distinct from ${partitionIndex}`)
+      .where(sql<boolean>`partition_count is not distinct from ${usingPartitions ? partitionCountRaw : null}`)
+      .executeTakeFirst()
     if (activeJob) {
       return {
         processed: 0,
@@ -156,7 +162,7 @@ export async function reindexEntity(
   }
 
   if (resetCoverage) {
-    await cleanupLegacyJobScopes(knex, {
+    await cleanupLegacyJobScopes(db, {
       entityType,
       organizationId: jobScope.organizationId ?? null,
       tenantId: jobScope.tenantId ?? null,
@@ -165,19 +171,24 @@ export async function reindexEntity(
   }
 
   const scopeKey = (tenantValue: string | null, orgValue: string | null) => `${tenantValue ?? '__null__'}|${orgValue ?? '__null__'}`
-  const baseWhere = (builder: Knex.QueryBuilder<any, any>) => {
-    if (hasDeletedCol) builder.whereNull('b.deleted_at')
+
+  const applyBaseWhere = <QB extends { where: (...args: any[]) => QB }>(q: QB): QB => {
+    let chain = q
+    if (hasDeletedCol) chain = chain.where('b.deleted_at' as any, 'is', null as any)
     if (tenantId !== undefined && hasTenantCol) {
-      if (tenantId === null) builder.whereNull('b.tenant_id')
-      else builder.where('b.tenant_id', tenantId)
+      chain = tenantId === null
+        ? chain.where('b.tenant_id' as any, 'is', null as any)
+        : chain.where('b.tenant_id' as any, '=', tenantId)
     }
     if (organizationId !== undefined && hasOrgCol) {
-      if (organizationId === null) builder.whereNull('b.organization_id')
-      else builder.where('b.organization_id', organizationId)
+      chain = organizationId === null
+        ? chain.where('b.organization_id' as any, 'is', null as any)
+        : chain.where('b.organization_id' as any, '=', organizationId)
     }
     if (usingPartitions && partitionIndex !== null) {
-      builder.whereRaw('mod(abs(hashtext(b.id::text)), ?) = ?', [partitionCountRaw, partitionIndex])
+      chain = chain.where(sql<boolean>`mod(abs(hashtext(b.id::text)), ${partitionCountRaw}) = ${partitionIndex}`)
     }
+    return chain
   }
 
   type ScopeStats = { tenantId: string | null; organizationId: string | null; count: number }
@@ -191,17 +202,16 @@ export async function reindexEntity(
   const groupByOrg = hasOrgCol && organizationId === undefined
 
   if (groupByTenant || groupByOrg) {
-    const rows = await knex({ b: table })
-      .modify(baseWhere)
-      .modify((qb) => {
-        if (groupByTenant) qb.select(knex.raw('b.tenant_id as tenant_id'))
-        if (groupByOrg) qb.select(knex.raw('b.organization_id as organization_id'))
-      })
-      .count<{ count: unknown }[]>({ count: '*' })
-      .modify((qb) => {
-        if (groupByTenant) qb.groupBy('b.tenant_id')
-        if (groupByOrg) qb.groupBy('b.organization_id')
-      })
+    let groupQuery = applyBaseWhere(
+      db.selectFrom(`${table} as b` as any).select(sql<number>`count(*)`.as('count')),
+    )
+    if (groupByTenant) {
+      groupQuery = groupQuery.select('b.tenant_id as tenant_id' as any).groupBy('b.tenant_id' as any)
+    }
+    if (groupByOrg) {
+      groupQuery = groupQuery.select('b.organization_id as organization_id' as any).groupBy('b.organization_id' as any)
+    }
+    const rows = await groupQuery.execute() as Array<Record<string, unknown>>
     for (const row of rows) {
       const bucketTenant = groupByTenant
         ? ((row as any)?.tenant_id ?? null)
@@ -212,25 +222,26 @@ export async function reindexEntity(
       registerBaseCount(bucketTenant, bucketOrg, toNumber((row as any)?.count))
     }
   } else {
-    const row = await knex({ b: table })
-      .modify(baseWhere)
-      .count({ count: '*' })
-      .first()
+    const row = await applyBaseWhere(
+      db.selectFrom(`${table} as b` as any).select(sql<number>`count(*)`.as('count')),
+    ).executeTakeFirst() as { count: unknown } | undefined
     const bucketTenant = tenantId === undefined ? null : tenantId ?? null
     const bucketOrg = organizationId === undefined ? null : organizationId ?? null
     registerBaseCount(bucketTenant, bucketOrg, toNumber(row?.count))
   }
 
   const total = Array.from(baseCounts.values()).reduce((acc, value) => acc + (Number.isFinite(value.count) ? value.count : 0), 0)
-  await prepareJob(knex, jobScope, 'reindexing', { totalCount: total })
-  const jobRow = await knex('entity_index_jobs')
-    .where({ entity_type: entityType })
-    .whereNull('organization_id')
-    .andWhereRaw('tenant_id is not distinct from ?', [tenantId ?? null])
-    .andWhereRaw('partition_index is not distinct from ?', [partitionIndex])
-    .andWhereRaw('partition_count is not distinct from ?', [usingPartitions ? partitionCountRaw : null])
-    .orderBy('started_at', 'desc')
-    .first<{ started_at: Date }>()
+  await prepareJob(db, jobScope, 'reindexing', { totalCount: total })
+  const jobRow = await db
+    .selectFrom('entity_index_jobs' as any)
+    .select(['started_at' as any])
+    .where('entity_type' as any, '=', entityType)
+    .where('organization_id' as any, 'is', null as any)
+    .where(sql<boolean>`tenant_id is not distinct from ${tenantId ?? null}`)
+    .where(sql<boolean>`partition_index is not distinct from ${partitionIndex}`)
+    .where(sql<boolean>`partition_count is not distinct from ${usingPartitions ? partitionCountRaw : null}`)
+    .orderBy('started_at' as any, 'desc')
+    .executeTakeFirst() as { started_at: Date | string } | undefined
   const jobStartedAt = jobRow?.started_at ? new Date(jobRow.started_at) : new Date()
   const deriveOrg = deriveOrgFromId.has(entityType)
     ? (row: AnyRow) => String(row.id)
@@ -259,25 +270,25 @@ export async function reindexEntity(
 
   if (resetCoverage) {
     if (force) {
-      await knex('entity_indexes')
-        .where('entity_type', entityType)
-        .modify((qb) => {
-          if (tenantId !== undefined) {
-            qb.andWhereRaw('tenant_id is not distinct from ?', [tenantId ?? null])
-          }
-          if (organizationId !== undefined) {
-            qb.andWhereRaw('organization_id is not distinct from ?', [organizationId ?? null])
-          }
-        })
-        .del()
-        .catch((error) => {
-          console.warn('[HybridQueryEngine] Failed to purge index rows before force reindex', {
-            entityType,
-            tenantId: tenantId ?? null,
-            organizationId: organizationId ?? null,
-            error: error instanceof Error ? error.message : error,
-          })
+      try {
+        let purgeQuery = db
+          .deleteFrom('entity_indexes' as any)
+          .where('entity_type' as any, '=', entityType)
+        if (tenantId !== undefined) {
+          purgeQuery = purgeQuery.where(sql<boolean>`tenant_id is not distinct from ${tenantId ?? null}`)
+        }
+        if (organizationId !== undefined) {
+          purgeQuery = purgeQuery.where(sql<boolean>`organization_id is not distinct from ${organizationId ?? null}`)
+        }
+        await purgeQuery.execute()
+      } catch (error) {
+        console.warn('[HybridQueryEngine] Failed to purge index rows before force reindex', {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          error: error instanceof Error ? error.message : error,
         })
+      }
 
       if (emitVectorize && eventBus) {
         if (tenantId !== undefined) {
@@ -326,15 +337,17 @@ export async function reindexEntity(
 
   try {
     while (true) {
-      let query = knex({ b: table })
-        .modify(baseWhere)
-        .select('b.*')
-        .orderBy('b.id', 'asc')
-        .limit(batchSize)
+      let query = applyBaseWhere(
+        db
+          .selectFrom(`${table} as b` as any)
+          .selectAll('b' as any)
+          .orderBy('b.id' as any, 'asc')
+          .limit(batchSize),
+      )
       if (lastId !== null) {
-        query = query.where('b.id', '>', lastId)
+        query = query.where('b.id' as any, '>', lastId)
       }
-      const rows = await query as AnyRow[]
+      const rows = await query.execute() as AnyRow[]
       if (!rows.length) break
 
       const encryption = resolveTenantEncryptionService(em as any)
@@ -380,7 +393,7 @@ export async function reindexEntity(
         return result
       }
 
-      await upsertIndexBatch(knex, entityType, rows, scopeOverrides, { deriveOrganizationId: deriveOrg, encryptDoc, decryptDoc })
+      await upsertIndexBatch(db, entityType, rows, scopeOverrides, { deriveOrganizationId: deriveOrg, encryptDoc, decryptDoc })
 
       const coverageDeltas = new Map<string, { tenantId: string | null; organizationId: string | null; delta: number }>()
       for (const row of rows) {
@@ -439,10 +452,10 @@ export async function reindexEntity(
       processed += rows.length
       lastId = String(rows[rows.length - 1]!.id)
       options?.onProgress?.({ processed, total, chunkSize: rows.length })
-      await updateJobProgress(knex, jobScope, rows.length)
+      await updateJobProgress(db, jobScope, rows.length)
     }
 
-    await purgeOrphans(knex, {
+    await purgeOrphans(db, {
       entityType,
       tenantId,
       organizationId,
@@ -481,7 +494,7 @@ export async function reindexEntity(
       )
     }
   } finally {
-    await finalizeJob(knex, jobScope)
+    await finalizeJob(db, jobScope)
   }
 
   return {

package/src/modules/query_index/lib/search-tokens.ts

@@ -1,8 +1,17 @@
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 
+const INSERT_BATCH_SIZE = 500
+
+function chunk<T>(items: T[], size: number): T[][] {
+  if (size <= 0) return [items]
+  const out: T[][] = []
+  for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size))
+  return out
+}
+
 export type SearchTokenRow = {
   entity_type: string
   entity_id: string
@@ -130,7 +139,7 @@ function buildFieldPairs(recordId: string, doc?: Record<string, unknown> | null)
 }
 
 export async function replaceSearchTokensForRecord(
-  knex: Knex,
+  db: Kysely<any>,
   params: BuildTokenOptions
 ): Promise<void> {
   const rows = buildSearchTokenRows(params)
@@ -140,38 +149,48 @@ export async function replaceSearchTokensForRecord(
   const tenantId = params.tenantId ?? null
   const fieldPairs = buildFieldPairs(String(params.recordId), params.doc)
 
-  await knex.transaction(async (trx) => {
-    const deleteQuery = trx('search_tokens')
-      .where({ entity_type: params.entityType })
-      .andWhereRaw('organization_id is not distinct from ?', [organizationId])
-      .andWhereRaw('tenant_id is not distinct from ?', [tenantId])
-    if (fieldPairs.length) deleteQuery.whereIn(['entity_id', 'field'], fieldPairs)
-    else deleteQuery.where('entity_id', String(params.recordId))
-    await deleteQuery.del()
+  await db.transaction().execute(async (trx) => {
+    let deleteQuery = trx
+      .deleteFrom('search_tokens' as any)
+      .where('entity_type' as any, '=', params.entityType)
+      .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)
+      .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+    if (fieldPairs.length) {
+      deleteQuery = deleteQuery.where((eb: any) => eb.or(
+        fieldPairs.map(([rid, field]) => eb.and([
+          eb('entity_id' as any, '=', rid),
+          eb('field' as any, '=', field),
+        ])),
+      ))
+    } else {
+      deleteQuery = deleteQuery.where('entity_id' as any, '=', String(params.recordId))
+    }
+    await deleteQuery.execute()
     if (!rows.length) return
-    const payloads = rows.map((row) => ({
-      ...row,
-      created_at: trx.fn.now(),
-    }))
-    await trx.batchInsert('search_tokens', payloads, 500)
+    const payloads = rows.map((row) => ({ ...row, created_at: sql`now()` }))
+    for (const batch of chunk(payloads, INSERT_BATCH_SIZE)) {
+      await trx.insertInto('search_tokens' as any).values(batch as any).execute()
+    }
   })
 }
 
 export async function deleteSearchTokensForRecord(
-  knex: Knex,
+  db: Kysely<any>,
   params: { entityType: string; recordId: string; organizationId?: string | null; tenantId?: string | null }
 ): Promise<void> {
   const organizationId = params.organizationId ?? null
   const tenantId = params.tenantId ?? null
-  await knex('search_tokens')
-    .where({ entity_type: params.entityType, entity_id: String(params.recordId) })
-    .andWhereRaw('organization_id is not distinct from ?', [organizationId])
-    .andWhereRaw('tenant_id is not distinct from ?', [tenantId])
-    .del()
+  await db
+    .deleteFrom('search_tokens' as any)
+    .where('entity_type' as any, '=', params.entityType)
+    .where('entity_id' as any, '=', String(params.recordId))
+    .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)
+    .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+    .execute()
 }
 
 export async function replaceSearchTokensForBatch(
-  knex: Knex,
+  db: Kysely<any>,
   payloads: Array<BuildTokenOptions & { doc: Record<string, unknown> }>
 ): Promise<void> {
   if (!payloads.length) return
@@ -183,7 +202,11 @@ export async function replaceSearchTokensForBatch(
     const entityType = payloads[0]?.entityType
     if (!entityType) return
     const ids = payloads.map((p) => String(p.recordId))
-    await knex('search_tokens').where({ entity_type: entityType }).whereIn('entity_id', ids).del()
+    await db
+      .deleteFrom('search_tokens' as any)
+      .where('entity_type' as any, '=', entityType)
+      .where('entity_id' as any, 'in', ids)
+      .execute()
     return
   }
 
@@ -218,21 +241,29 @@ export async function replaceSearchTokensForBatch(
     seenPairsByScope.set(key, seen)
   }
 
-  await knex.transaction(async (trx) => {
+  await db.transaction().execute(async (trx) => {
     for (const [key, bucket] of scopeBuckets.entries()) {
       const pairs = fieldPairsByScope.get(key) ?? []
-      const deleteQuery = trx('search_tokens')
-        .where({ entity_type: payloads[0].entityType })
-        .andWhereRaw('organization_id is not distinct from ?', [bucket.organizationId])
-        .andWhereRaw('tenant_id is not distinct from ?', [bucket.tenantId])
-      if (pairs.length) deleteQuery.whereIn(['entity_id', 'field'], pairs)
-      else deleteQuery.whereIn('entity_id', Array.from(bucket.ids))
-      await deleteQuery.del()
+      let deleteQuery = trx
+        .deleteFrom('search_tokens' as any)
+        .where('entity_type' as any, '=', payloads[0].entityType)
+        .where(sql<boolean>`organization_id is not distinct from ${bucket.organizationId}`)
+        .where(sql<boolean>`tenant_id is not distinct from ${bucket.tenantId}`)
+      if (pairs.length) {
+        deleteQuery = deleteQuery.where((eb: any) => eb.or(
+          pairs.map(([rid, field]) => eb.and([
+            eb('entity_id' as any, '=', rid),
+            eb('field' as any, '=', field),
+          ])),
+        ))
+      } else {
+        deleteQuery = deleteQuery.where('entity_id' as any, 'in', Array.from(bucket.ids))
+      }
+      await deleteQuery.execute()
+    }
+    const payloadWithTimestamps = rows.map((row) => ({ ...row, created_at: sql`now()` }))
+    for (const batch of chunk(payloadWithTimestamps, INSERT_BATCH_SIZE)) {
+      await trx.insertInto('search_tokens' as any).values(batch as any).execute()
     }
-    const payloadWithTimestamps = rows.map((row) => ({
-      ...row,
-      created_at: trx.fn.now(),
-    }))
-    await trx.batchInsert('search_tokens', payloadWithTimestamps, 500)
   })
 }

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

@@ -1,4 +1,4 @@
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 
 type PurgeOrphansOptions = {
   entityType: string
@@ -10,23 +10,20 @@ type PurgeOrphansOptions = {
 }
 
 export async function purgeOrphans(
-  knex: Knex,
+  db: Kysely<any>,
   options: PurgeOrphansOptions,
 ): Promise<void> {
   const { entityType, tenantId, partitionIndex, partitionCount, startedAt } = options
-  await knex('entity_indexes')
-    .where('entity_type', entityType)
-    .modify((qb) => {
-      if (tenantId !== undefined) {
-        qb.andWhereRaw('tenant_id is not distinct from ?', [tenantId ?? null])
-      }
-      if (options.organizationId !== undefined) {
-        qb.andWhereRaw('organization_id is not distinct from ?', [options.organizationId ?? null])
-      }
-      if (partitionIndex != null && partitionCount != null) {
-        qb.andWhereRaw('mod(abs(hashtext(entity_id::text)), ?) = ?', [partitionCount, partitionIndex])
-      }
-    })
-    .andWhere('updated_at', '<', startedAt)
-    .del()
+  let q = db.deleteFrom('entity_indexes' as any).where('entity_type' as any, '=', entityType)
+  if (tenantId !== undefined) {
+    q = q.where(sql<boolean>`tenant_id is not distinct from ${tenantId ?? null}`)
+  }
+  if (options.organizationId !== undefined) {
+    q = q.where(sql<boolean>`organization_id is not distinct from ${options.organizationId ?? null}`)
+  }
+  if (partitionIndex != null && partitionCount != null) {
+    q = q.where(sql<boolean>`mod(abs(hashtext(entity_id::text)), ${partitionCount}) = ${partitionIndex}`)
+  }
+  q = q.where('updated_at' as any, '<', startedAt as any)
+  await q.execute()
 }

package/src/modules/query_index/lib/subscriber-scope.ts

@@ -32,12 +32,13 @@ export async function loadQueryIndexRowScope(
   entityType: string,
   recordId: string
 ): Promise<QueryIndexScope | null> {
-  const knex = (em as any).getConnection().getKnex()
+  const db = em.getKysely<any>()
   const table = resolveEntityTableName(em, entityType)
-  const row = await knex(table)
-    .select(['organization_id', 'tenant_id'])
-    .where({ id: recordId })
-    .first()
+  const row = await db
+    .selectFrom(table as any)
+    .select(['organization_id' as any, 'tenant_id' as any])
+    .where('id' as any, '=', recordId)
+    .executeTakeFirst() as { organization_id: string | null; tenant_id: string | null } | undefined
 
   if (!row) {
     return null

package/src/modules/query_index/subscribers/delete_one.ts

@@ -1,5 +1,6 @@
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
+import { sql } from 'kysely'
 import { markDeleted } from '../lib/indexer'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '../lib/coverage'
 import { loadQueryIndexRowScope, resolveQueryIndexRecordScope } from '../lib/subscriber-scope'
@@ -33,13 +34,15 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     let baseDelta = 0
     let baseCheckSucceeded = false
     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(['deleted_at'])
-        .where({ id: recordId, organization_id: organizationId })
-        .andWhereRaw('tenant_id is not distinct from ?', [tenantId])
-        .first()
+      const row = await db
+        .selectFrom(table as any)
+        .select(['deleted_at' as any])
+        .where('id' as any, '=', recordId)
+        .where('organization_id' as any, organizationId === null ? 'is' : '=', organizationId as any)
+        .where(sql`tenant_id is not distinct from ${tenantId}`)
+        .executeTakeFirst() as { deleted_at: Date | null } | undefined
       const baseMissing = !row
       const baseDeleted = baseMissing || (row && row.deleted_at != null)
       baseCheckSucceeded = true

package/src/modules/resources/commands/tag-assignments.ts

@@ -140,7 +140,7 @@ const unassignResourceTagCommand: CommandHandler<ResourcesResourceTagAssignmentI
       organizationId: parsed.organizationId,
     })
     if (!existing) throw new CrudHttpError(404, { error: 'Tag assignment not found.' })
-    await em.remove(existing)
+    await em.remove(existing).flush()
     await em.flush()
 
     const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)

package/src/modules/resources/commands/tags.ts

@@ -40,7 +40,7 @@ const createTagCommand: CommandHandler<ResourcesResourceTagCreateInput, { tagId:
       createdAt: new Date(),
       updatedAt: new Date(),
     })
-    await em.persistAndFlush(tag)
+    await em.persist(tag).flush()
     return { tagId: tag.id }
   },
   buildLog: async ({ input, result, ctx }) => {

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

@@ -1,4 +1,5 @@
-import { Entity, PrimaryKey, Property, Index, OneToMany, ManyToOne, Collection, Unique } from '@mikro-orm/core'
+import { Collection } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, OneToMany, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'resources_resource_types' })
 @Index({ name: 'resources_resource_types_tenant_org_idx', properties: ['tenantId', 'organizationId'] })

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

@@ -87,7 +87,7 @@ const createDocumentAddress: CommandHandler<DocumentAddressCreateInput, { id: st
       order: input.documentKind === 'order' ? (document as SalesOrder) : null,
       quote: input.documentKind === 'quote' ? (document as SalesQuote) : null,
     })
-    await em.persistAndFlush(entity)
+    await em.persist(entity).flush()
     return { id: entity.id }
   },
 }
@@ -158,7 +158,7 @@ const deleteDocumentAddress: CommandHandler<
         status: (document as SalesOrder).status ?? null,
       })
     }
-    await em.removeAndFlush(entity)
+    await em.remove(entity).flush()
     return { ok: true }
   },
 }

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

@@ -122,7 +122,7 @@ async function requireContext(
     }
   }
   const repo = contextType === 'invoice' ? SalesInvoice : SalesCreditMemo
-  const entity = await em.findOne(repo, { id: contextId })
+  const entity = await em.findOne(repo as any, { id: contextId }) as (SalesInvoice | SalesCreditMemo) | null
   if (!entity) {
     throw new CrudHttpError(404, { error: 'sales.notes.context_not_found' })
   }

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

@@ -33,7 +33,7 @@ const createTagCommand: CommandHandler<SalesTagCreateInput, { tagId: string }> =
       color: parsed.color ?? null,
       description: parsed.description ?? null,
     })
-    await em.persistAndFlush(tag)
+    await em.persist(tag).flush()
     return { tagId: tag.id }
   },
 }