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

package/src/modules/customers/cli.ts

@@ -2,6 +2,7 @@ import type { ModuleCli } from '@open-mercato/shared/modules/registry'
 import { createRequestContainer, type AppContainer } from '@open-mercato/shared/lib/di/container'
 import { randomUUID } from 'crypto'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { type Kysely, sql } from 'kysely'
 import { Dictionary, DictionaryEntry, type DictionaryManagerVisibility } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { installCustomEntitiesFromModules } from '@open-mercato/core/modules/entities/lib/install-from-ce'
 import type { CacheStrategy } from '@open-mercato/cache/types'
@@ -1855,12 +1856,18 @@ async function seedCustomerStressTest(
   const assignmentFlushThreshold = includeExtras ? 100 : 0
   const cfInsertBatchSize = 500
   const flushInterval = 100
-  const knex = em.getConnection().getKnex()
-  const entityIndexesColumns = await knex('entity_indexes')
-    .columnInfo()
-    .catch(() => ({} as Record<string, unknown>))
-  const hasColumn = (name: string) =>
-    Object.keys(entityIndexesColumns).some((col) => col.toLowerCase() === name.toLowerCase())
+  const db = em.getKysely<any>() as any
+  const entityIndexesColumnRows = await db
+    .selectFrom('information_schema.columns')
+    .select(['column_name'])
+    .where(sql<boolean>`table_schema = current_schema()`)
+    .where('table_name', '=', 'entity_indexes')
+    .execute()
+    .catch(() => [] as Array<{ column_name: string }>)
+  const entityIndexesColumnSet = new Set<string>(
+    entityIndexesColumnRows.map((row: any) => String(row.column_name).toLowerCase()),
+  )
+  const hasColumn = (name: string) => entityIndexesColumnSet.has(name.toLowerCase())
   const supportsOrgCoalesced = hasColumn('organization_id_coalesced')
 
   type PendingIndexDoc = {
@@ -1992,37 +1999,42 @@ async function seedCustomerStressTest(
       return
     }
     if (supportsOrgCoalesced) {
-      await trx('entity_indexes')
-        .insert(rows)
-        .onConflict(['entity_type', 'entity_id', 'organization_id_coalesced'])
-        .merge({
-          doc: trx.raw('excluded.doc'),
-          index_version: trx.raw('excluded.index_version'),
-          organization_id: trx.raw('excluded.organization_id'),
-          tenant_id: trx.raw('excluded.tenant_id'),
-          deleted_at: trx.raw('excluded.deleted_at'),
-          updated_at: trx.raw('excluded.updated_at'),
-        })
+      await trx
+        .insertInto('entity_indexes')
+        .values(rows.map((row) => ({ ...row, doc: sql`${JSON.stringify(row.doc)}::jsonb` })))
+        .onConflict((oc: any) => oc
+          .columns(['entity_type', 'entity_id', 'organization_id_coalesced'])
+          .doUpdateSet({
+            doc: sql`excluded.doc`,
+            index_version: sql`excluded.index_version`,
+            organization_id: sql`excluded.organization_id`,
+            tenant_id: sql`excluded.tenant_id`,
+            deleted_at: sql`excluded.deleted_at`,
+            updated_at: sql`excluded.updated_at`,
+          }))
+        .execute()
     } else {
       for (const row of rows) {
-        const updatePayload = {
-          doc: row.doc,
-          index_version: row.index_version,
-          organization_id: row.organization_id,
-          tenant_id: row.tenant_id,
-          updated_at: row.updated_at,
-          deleted_at: null as null,
-        }
-        const updated = await trx('entity_indexes')
-          .where({
-            entity_type: row.entity_type,
-            entity_id: row.entity_id,
+        const updated = await trx
+          .updateTable('entity_indexes')
+          .set({
+            doc: sql`${JSON.stringify(row.doc)}::jsonb`,
+            index_version: row.index_version,
             organization_id: row.organization_id,
-          })
-          .update(updatePayload)
-        if (updated) continue
+            tenant_id: row.tenant_id,
+            updated_at: row.updated_at,
+            deleted_at: null,
+          } as any)
+          .where('entity_type', '=', row.entity_type)
+          .where('entity_id', '=', row.entity_id)
+          .where('organization_id', row.organization_id === null ? 'is' : '=', row.organization_id as any)
+          .executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined
+        if (updated && Number(updated.numUpdatedRows ?? 0) > 0) continue
         try {
-          await trx('entity_indexes').insert(row)
+          await trx.insertInto('entity_indexes').values({
+            ...row,
+            doc: sql`${JSON.stringify(row.doc)}::jsonb`,
+          } as any).execute()
         } catch {
           // ignored: row inserted concurrently
         }
@@ -2129,7 +2141,7 @@ async function seedCustomerStressTest(
         created_at: timestamp,
         deleted_at: null,
       }))
-      await knex.insert(payload).into('custom_field_values')
+      await db.insertInto('custom_field_values').values(payload).execute()
     }
   }
 
@@ -2292,11 +2304,14 @@ async function seedCustomerStressTest(
   const entityInsertBatchSize = 1000
   const contactsPerCompany = Math.max(1, Math.ceil(toCreate / companyCount))
 
-  await warnIfStressTestSchemaChanged(knex)
+  await warnIfStressTestSchemaChanged(db)
 
   const insertRows = async (trx: any, table: string, rows: unknown[]) => {
     if (!rows.length) return
-    await trx.batchInsert(table, rows, entityInsertBatchSize)
+    for (let i = 0; i < rows.length; i += entityInsertBatchSize) {
+      const chunk = rows.slice(i, i + entityInsertBatchSize)
+      await trx.insertInto(table).values(chunk as any).execute()
+    }
     rows.length = 0
   }
 
@@ -2312,7 +2327,7 @@ async function seedCustomerStressTest(
       activityRows.length +
       commentRows.length
     if (pendingCount === 0) return
-    await knex.transaction(async (trx) => {
+    await db.transaction().execute(async (trx: any) => {
       await insertRows(trx, 'customer_entities', customerEntityRows)
       await insertRows(trx, 'customer_companies', companyProfileRows)
       await insertRows(trx, 'customer_people', personProfileRows)
@@ -2751,15 +2766,17 @@ const STRESS_TEST_REQUIRED_COLUMNS: Record<string, readonly string[]> = {
   ],
 }
 
-async function warnIfStressTestSchemaChanged(knex: any) {
+async function warnIfStressTestSchemaChanged(db: Kysely<any>) {
   try {
     const warnings: string[] = []
     for (const [table, requiredColumns] of Object.entries(STRESS_TEST_REQUIRED_COLUMNS)) {
-      const rows = await knex('information_schema.columns')
+      const rows = await (db as any)
+        .selectFrom('information_schema.columns')
         .select('column_name')
-        .whereRaw('table_schema = current_schema()')
-        .where({ table_name: table })
-      const existing = new Set(rows.map((row: { column_name: string }) => row.column_name))
+        .where(sql<boolean>`table_schema = current_schema()`)
+        .where('table_name', '=', table)
+        .execute() as Array<{ column_name: string }>
+      const existing = new Set(rows.map((row) => row.column_name))
       const missing = requiredColumns.filter((column) => !existing.has(column))
       if (missing.length) warnings.push(`${table}: missing ${missing.join(', ')}`)
     }
@@ -2969,7 +2986,7 @@ async function backfillInteractions(
   container: { resolve: (name: string) => unknown },
   args: SeedArgs,
 ): Promise<{ activitiesMigrated: number; todosMigrated: number; projectionsRecomputed: number; errors: number }> {
-  const knex = em.getKnex()
+  const db = em.getKysely<any>() as any
   const { tenantId, organizationId } = args
 
   let activitiesMigrated = 0
@@ -2981,8 +2998,9 @@ async function backfillInteractions(
   // Step 1: Migrate activities → interactions
   console.log('[backfill] Migrating activities to interactions...')
   while (true) {
-    const activities = await knex('customer_activities')
-      .select(
+    const activities = await db
+      .selectFrom('customer_activities')
+      .select([
         'customer_activities.id',
         'customer_activities.organization_id',
         'customer_activities.tenant_id',
@@ -2995,23 +3013,24 @@ async function backfillInteractions(
         'customer_activities.appearance_color',
         'customer_activities.entity_id',
         'customer_activities.deal_id',
-      )
-      .where('customer_activities.tenant_id', tenantId)
-      .andWhere('customer_activities.organization_id', organizationId)
-      .whereNotExists(
-        knex('customer_interactions')
-          .select(knex.raw('1'))
-          .whereRaw('customer_interactions.id = customer_activities.id')
-      )
+      ])
+      .where('customer_activities.tenant_id', '=', tenantId)
+      .where('customer_activities.organization_id', '=', organizationId)
+      .where((eb: any) => eb.not(eb.exists(
+        eb.selectFrom('customer_interactions')
+          .select(sql<number>`1`.as('one'))
+          .whereRef('customer_interactions.id', '=', 'customer_activities.id')
+      )))
       .orderBy('customer_activities.created_at', 'asc')
       .limit(BACKFILL_BATCH_SIZE)
+      .execute() as any[]
 
     if (activities.length === 0) break
 
     for (const activity of activities) {
       try {
         const status = activity.occurred_at ? 'done' : 'planned'
-        await knex('customer_interactions').insert({
+        await db.insertInto('customer_interactions').values({
           id: activity.id,
           organization_id: activity.organization_id,
           tenant_id: activity.tenant_id,
@@ -3029,7 +3048,7 @@ async function backfillInteractions(
           deal_id: activity.deal_id,
           created_at: new Date(),
           updated_at: new Date(),
-        })
+        } as any).execute()
         activitiesMigrated++
         affectedEntityIds.add(activity.entity_id)
       } catch (err) {
@@ -3054,8 +3073,9 @@ async function backfillInteractions(
   }
 
   while (true) {
-    const todoLinks = await knex('customer_todo_links')
-      .select(
+    const todoLinks = await db
+      .selectFrom('customer_todo_links')
+      .select([
         'customer_todo_links.id',
         'customer_todo_links.organization_id',
         'customer_todo_links.tenant_id',
@@ -3063,16 +3083,17 @@ async function backfillInteractions(
         'customer_todo_links.todo_source',
         'customer_todo_links.entity_id',
         'customer_todo_links.created_at',
-      )
-      .where('customer_todo_links.tenant_id', tenantId)
-      .andWhere('customer_todo_links.organization_id', organizationId)
-      .whereNotExists(
-        knex('customer_interactions')
-          .select(knex.raw('1'))
-          .whereRaw('customer_interactions.id = customer_todo_links.todo_id')
-      )
+      ])
+      .where('customer_todo_links.tenant_id', '=', tenantId)
+      .where('customer_todo_links.organization_id', '=', organizationId)
+      .where((eb: any) => eb.not(eb.exists(
+        eb.selectFrom('customer_interactions')
+          .select(sql<number>`1`.as('one'))
+          .whereRef('customer_interactions.id', '=', 'customer_todo_links.todo_id')
+      )))
       .orderBy('customer_todo_links.created_at', 'asc')
       .limit(BACKFILL_BATCH_SIZE)
+      .execute() as any[]
 
     if (todoLinks.length === 0) break
 
@@ -3118,7 +3139,7 @@ async function backfillInteractions(
         const title = summary?.title ?? 'Migrated task'
         const status = summary?.isDone ? 'done' : 'planned'
 
-        await knex('customer_interactions').insert({
+        await db.insertInto('customer_interactions').values({
           id: link.todo_id,
           organization_id: link.organization_id,
           tenant_id: link.tenant_id,
@@ -3136,7 +3157,7 @@ async function backfillInteractions(
           deal_id: null,
           created_at: new Date(),
           updated_at: new Date(),
-        })
+        } as any).execute()
         todosMigrated++
         affectedEntityIds.add(link.entity_id)
       } catch (err) {

package/src/modules/customers/commands/dictionaries.ts

@@ -294,7 +294,7 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
         { tenantId: after.tenantId, organizationId: after.organizationId },
       )
       if (entry) {
-        await em.removeAndFlush(entry)
+        await em.remove(entry).flush()
         await invalidateCache(ctx, after)
         return
       }

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

@@ -470,7 +470,7 @@ const unassignTagCommand: CommandHandler<TagAssignmentInput, { assignmentId: str
       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 de = (ctx.container.resolve('dataEngine') as DataEngine)

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

@@ -1,15 +1,5 @@
-import {
-  Entity,
-  PrimaryKey,
-  Property,
-  Index,
-  Unique,
-  OneToOne,
-  OneToMany,
-  ManyToOne,
-  Collection,
-  OptionalProps,
-} from '@mikro-orm/core'
+import { Collection, OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, OneToMany, OneToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 export type CustomerEntityKind = 'person' | 'company'
 export type CustomerAddressFormat = 'line_first' | 'street_first'

package/src/modules/customers/lib/interactionProjection.ts

@@ -1,4 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { sql } from 'kysely'
 
 export type NextInteractionProjectionResult = {
   nextInteractionId: string | null
@@ -18,54 +19,64 @@ export async function recomputeNextInteraction(
   entityId: string,
   organizationId?: string | null,
 ): Promise<NextInteractionProjectionResult> {
-  const knex = em.getKnex()
+  const db = em.getKysely<any>() as any
 
-  const query = knex('customer_interactions')
-    .select('id', 'scheduled_at', 'title', 'interaction_type', 'appearance_icon', 'appearance_color')
-    .where('entity_id', entityId)
-    .andWhere('status', 'planned')
-    .whereNotNull('scheduled_at')
-    .whereNull('deleted_at')
+  let query = db
+    .selectFrom('customer_interactions')
+    .select([
+      'id',
+      'scheduled_at',
+      'title',
+      'interaction_type',
+      'appearance_icon',
+      'appearance_color',
+    ])
+    .where('entity_id', '=', entityId)
+    .where('status', '=', 'planned')
+    .where('scheduled_at', 'is not', null)
+    .where('deleted_at', 'is', null)
   if (organizationId) {
-    query.andWhere('organization_id', organizationId)
+    query = query.where('organization_id', '=', organizationId)
   }
 
   const candidate = await query
-    .orderBy([
-      { column: 'scheduled_at', order: 'asc' },
-      { column: 'priority', order: 'desc', nulls: 'last' },
-      { column: 'created_at', order: 'asc' },
-      { column: 'id', order: 'asc' },
-    ])
-    .first()
+    .orderBy('scheduled_at', 'asc')
+    .orderBy(sql`priority desc nulls last`)
+    .orderBy('created_at', 'asc')
+    .orderBy('id', 'asc')
+    .executeTakeFirst() as Record<string, any> | undefined
 
   if (candidate) {
     const interactionName = candidate.title && candidate.title.trim() !== ''
       ? candidate.title
       : candidate.interaction_type
 
-    await knex('customer_entities')
-      .where('id', entityId)
-      .update({
+    await db
+      .updateTable('customer_entities')
+      .set({
         next_interaction_at: candidate.scheduled_at,
         next_interaction_name: interactionName,
         next_interaction_ref_id: candidate.id,
         next_interaction_icon: candidate.appearance_icon,
         next_interaction_color: candidate.appearance_color,
-        updated_at: knex.fn.now(),
-      })
+        updated_at: sql`now()`,
+      } as any)
+      .where('id', '=', entityId)
+      .execute()
     return { nextInteractionId: String(candidate.id) }
   } else {
-    await knex('customer_entities')
-      .where('id', entityId)
-      .update({
+    await db
+      .updateTable('customer_entities')
+      .set({
         next_interaction_at: null,
         next_interaction_name: null,
         next_interaction_ref_id: null,
         next_interaction_icon: null,
         next_interaction_color: null,
-        updated_at: knex.fn.now(),
-      })
+        updated_at: sql`now()`,
+      } as any)
+      .where('id', '=', entityId)
+      .execute()
     return { nextInteractionId: null }
   }
 }

package/src/modules/customers/lib/personCompanyLinkTable.ts

@@ -1,4 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { sql } from '@mikro-orm/postgresql'
 
 const PERSON_COMPANY_LINKS_TABLE = 'customer_person_company_links'
 const PERSON_COMPANY_LINKS_DELETED_AT_COLUMN = 'deleted_at'
@@ -6,29 +7,23 @@ const PERSON_COMPANY_LINKS_DELETED_AT_COLUMN = 'deleted_at'
 let supportsDeletedAtColumnPromise: Promise<boolean> | null = null
 let warnedAboutMissingDeletedAtColumn = false
 
-type KnexLike = (tableName: string) => {
-  where: (filters: Record<string, unknown>) => {
-    first: () => Promise<unknown>
-  }
-}
-
-function getKnex(em: EntityManager): KnexLike {
-  return (em.getConnection() as unknown as { getKnex: () => KnexLike }).getKnex()
-}
-
 export async function customerPersonCompanyLinksSupportDeletedAt(em: EntityManager): Promise<boolean> {
-  if (typeof (em as { getConnection?: unknown }).getConnection !== 'function') {
+  if (typeof (em as { getKysely?: unknown }).getKysely !== 'function') {
     return true
   }
   if (!supportsDeletedAtColumnPromise) {
-    supportsDeletedAtColumnPromise = getKnex(em)('information_schema.columns')
-      .where({
-        table_name: PERSON_COMPANY_LINKS_TABLE,
-        column_name: PERSON_COMPANY_LINKS_DELETED_AT_COLUMN,
-      })
-      .first()
-      .then((row) => !!row)
+    const db = em.getKysely<any>() as any
+    const probe: Promise<boolean> = db
+      .selectFrom('information_schema.columns')
+      .select(['column_name'])
+      .where(sql<boolean>`table_schema = current_schema()`)
+      .where('table_name', '=', PERSON_COMPANY_LINKS_TABLE)
+      .where('column_name', '=', PERSON_COMPANY_LINKS_DELETED_AT_COLUMN)
+      .executeTakeFirst()
+      .then((row: unknown) => !!row)
       .catch(() => false)
+    supportsDeletedAtColumnPromise = probe
+    return probe
   }
   return supportsDeletedAtColumnPromise
 }

package/src/modules/dashboards/api/roles/widgets/route.ts

@@ -128,7 +128,7 @@ export async function PUT(req: Request) {
 
   if (!widgetIds.length) {
     if (record) {
-      await em.removeAndFlush(record)
+      await em.remove(record).flush()
     }
     return NextResponse.json({ ok: true, widgetIds: [] })
   }

package/src/modules/dashboards/api/users/widgets/route.ts

@@ -128,7 +128,7 @@ export async function PUT(req: Request) {
 
   if (parsed.data.mode === 'inherit') {
     if (record) {
-      await em.remove(record)
+      await em.remove(record).flush()
       await em.flush()
     }
     return NextResponse.json({ ok: true, mode: 'inherit', widgetIds: [] })

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

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property, Unique } from '@mikro-orm/core'
+import { Entity, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 import type { DashboardLayoutItem } from '@open-mercato/shared/modules/dashboard/widgets'
 
 @Entity({ tableName: 'dashboard_layouts' })

package/src/modules/data_sync/api/mappings/route.ts

@@ -133,7 +133,7 @@ export async function POST(req: Request) {
     organizationId: scope.organizationId,
     tenantId: scope.tenantId,
   })
-  await em.persistAndFlush(created)
+  await em.persist(created).flush()
 
   return NextResponse.json({
     id: created.id,

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

@@ -1,4 +1,5 @@
-import { Entity, Index, OptionalProps, PrimaryKey, Property } from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'sync_runs' })
 @Index({ properties: ['integrationId', 'entityType', 'status', 'organizationId', 'tenantId'] })

package/src/modules/data_sync/lib/id-mapping.ts

@@ -116,7 +116,7 @@ export function createExternalIdMappingService(em: EntityManager) {
         tenantId: scope.tenantId,
       })
 
-      await em.persistAndFlush(created)
+      await em.persist(created).flush()
       return created
     },
   }

package/src/modules/data_sync/lib/sync-run-service.ts

@@ -32,7 +32,7 @@ export function createSyncRunService(em: EntityManager) {
         tenantId: scope.tenantId,
       })
 
-      await em.persistAndFlush(row)
+      await em.persist(row).flush()
       return row
     },
 

package/src/modules/dictionaries/commands/factory.ts

@@ -296,7 +296,7 @@ export function registerDictionaryEntryCommands<TCreate, TUpdate>(
       scopeEnsurer(ctx, { tenantId: after.tenantId, organizationId: after.organizationId })
       const entry = await em.findOne(DictionaryEntry, after.id)
       if (entry) {
-      await em.removeAndFlush(entry)
+      await em.remove(entry).flush()
       return
     }
     await em.nativeDelete(DictionaryEntry, { id: after.id })

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

@@ -1,12 +1,5 @@
-import {
-  Entity,
-  PrimaryKey,
-  Property,
-  Unique,
-  Index,
-  ManyToOne,
-  OptionalProps,
-} from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
+import { OptionalProps } from '@mikro-orm/core'
 
 export type DictionaryManagerVisibility = 'default' | 'hidden'
 

package/src/modules/directory/commands/organizations.ts

@@ -199,7 +199,7 @@ async function restoreChildParents(em: EntityManager, tenantId: string, snapshot
       toPersist.push(child)
     }
   }
-  if (toPersist.length) await em.persistAndFlush(toPersist)
+  if (toPersist.length) await em.persist(toPersist).flush()
 }
 
 function normalizeChildIds(ids: readonly string[], exclude: string[]): string[] {
@@ -239,7 +239,7 @@ async function assignChildren(
       toPersist.push(child)
     }
   }
-  if (toPersist.length) await em.persistAndFlush(toPersist)
+  if (toPersist.length) await em.persist(toPersist).flush()
 }
 
 async function clearRemovedChildren(em: EntityManager, tenantId: string, recordId: string, desiredChildIds: Set<string>): Promise<void> {
@@ -248,7 +248,7 @@ async function clearRemovedChildren(em: EntityManager, tenantId: string, recordI
   const toPersist = current.filter((child) => !desiredChildIds.has(String(child.id)))
   if (!toPersist.length) return
   for (const child of toPersist) child.parentId = null
-  await em.persistAndFlush(toPersist)
+  await em.persist(toPersist).flush()
 }
 
 async function resolveUniqueSlug(em: EntityManager, tenantId: string, baseSlug: string, excludeId?: string): Promise<string> {
@@ -669,7 +669,7 @@ const deleteOrganizationCommand: CommandHandler<{ body: any; query: Record<strin
       toPersist.push(child)
     }
     toPersist.push(deleted)
-    if (toPersist.length) await em.persistAndFlush(toPersist)
+    if (toPersist.length) await em.persist(toPersist).flush()
     setUndoMeta(deleted, { childParentsBefore: childSnapshotsBefore })
 
     await rebuildHierarchyForTenant(em, tenantId)

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

@@ -1,4 +1,5 @@
-import { Entity, PrimaryKey, Property, ManyToOne, OneToMany, Collection, Unique } from '@mikro-orm/core'
+import { Collection } from '@mikro-orm/core'
+import { Entity, ManyToOne, OneToMany, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'tenants' })
 export class Tenant {

package/src/modules/entities/api/definitions.ts

@@ -4,7 +4,7 @@ import type { CacheStrategy } from '@open-mercato/cache'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
-import { CustomFieldDef } from '@open-mercato/core/modules/entities/data/entities'
+import { CustomEntity, CustomFieldDef } from '@open-mercato/core/modules/entities/data/entities'
 import { upsertCustomFieldDefSchema, fieldsetCodeRegex } from '@open-mercato/core/modules/entities/data/validators'
 import {
   createDefinitionsCacheKey,
@@ -157,7 +157,7 @@ function parseEntityIds(url: URL): string[] {
 
 async function resolveEntityDefaultEditor(em: any, entityId: string, tenantId: string | null | undefined): Promise<string | undefined> {
   try {
-    const ent = await em.findOne('@open-mercato/core/modules/entities/data/entities:CustomEntity' as any, {
+    const ent = await em.findOne(CustomEntity, {
       entityId,
       $and: [
         { $or: [ { tenantId: tenantId ?? undefined as any }, { tenantId: null } ] },

package/src/modules/entities/api/encryption.ts

@@ -75,7 +75,7 @@ export async function POST(req: Request) {
     existing.fieldsJson = payload.fields
     existing.isActive = payload.isActive ?? true
     existing.updatedAt = new Date()
-    await em.persistAndFlush(existing)
+    await em.persist(existing).flush()
   } else {
     const map = repo.create({
       entityId: payload.entityId,
@@ -84,7 +84,7 @@ export async function POST(req: Request) {
       fieldsJson: payload.fields,
       isActive: payload.isActive ?? true,
     })
-    await em.persistAndFlush(map)
+    await em.persist(map).flush()
   }
 
   try {