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

package/src/modules/translations/lib/batch.ts

@@ -1,19 +1,21 @@
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 
 export async function batchLoadTranslations(
-  knex: Knex,
+  db: Kysely<any>,
   entityType: string,
   entityIds: string[],
   scope: { tenantId?: string | null; organizationId?: string | null },
 ): Promise<Map<string, Record<string, Record<string, unknown>>>> {
   if (!entityIds.length) return new Map()
 
-  const rows = await knex('entity_translations')
-    .where('entity_type', entityType)
-    .whereIn('entity_id', entityIds)
-    .andWhereRaw('tenant_id is not distinct from ?', [scope.tenantId ?? null])
-    .andWhereRaw('organization_id is not distinct from ?', [scope.organizationId ?? null])
+  const rows = await (db as any)
+    .selectFrom('entity_translations')
     .select(['entity_id', 'translations'])
+    .where('entity_type', '=', entityType)
+    .where('entity_id', 'in', entityIds)
+    .where(sql<boolean>`tenant_id is not distinct from ${scope.tenantId ?? null}`)
+    .where(sql<boolean>`organization_id is not distinct from ${scope.organizationId ?? null}`)
+    .execute() as Array<{ entity_id: string; translations: Record<string, Record<string, unknown>> | null }>
 
   const map = new Map<string, Record<string, Record<string, unknown>>>()
   for (const row of rows) {

package/src/modules/translations/subscribers/cleanup.ts

@@ -1,4 +1,4 @@
-import type { Knex } from 'knex'
+import { type Kysely, sql } from 'kysely'
 
 export const metadata = { event: 'query_index.delete_one', persistent: false }
 
@@ -14,16 +14,15 @@ export default async function handle(
   const tenantId = payload?.tenantId ?? null
 
   try {
-    const em = ctx.resolve<{ getConnection(): { getKnex(): Knex } }>('em')
-    const knex = em.getConnection().getKnex()
-    await knex('entity_translations')
-      .where({
-        entity_type: entityType,
-        entity_id: recordId,
-      })
-      .andWhereRaw('tenant_id is not distinct from ?', [tenantId])
-      .andWhereRaw('organization_id is not distinct from ?', [organizationId])
-      .del()
+    const em = ctx.resolve<{ getKysely<T = any>(): Kysely<T> }>('em')
+    const db = em.getKysely<any>() as any
+    await db
+      .deleteFrom('entity_translations')
+      .where('entity_type', '=', entityType)
+      .where('entity_id', '=', recordId)
+      .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+      .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)
+      .execute()
   } catch (err) {
     console.warn('[translations/cleanup] Failed to delete translations:', err instanceof Error ? err.message : 'unknown')
   }

package/src/modules/workflows/api/definitions/route.ts

@@ -207,7 +207,7 @@ export async function POST(request: NextRequest) {
       updatedAt: new Date(),
     })
 
-    await em.persistAndFlush(definition)
+    await em.persist(definition).flush()
 
     return NextResponse.json(
       {

package/src/modules/workflows/cli.ts

@@ -69,7 +69,7 @@ const seedDemo: ModuleCli = {
         organizationId,
       })
 
-      await em.persistAndFlush(workflow)
+      await em.persist(workflow).flush()
 
       console.log(`✅ Seeded demo workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
@@ -150,7 +150,7 @@ const seedDemoWithRules: ModuleCli = {
           organizationId,
         })
 
-        await em.persistAndFlush(rule)
+        await em.persist(rule).flush()
         console.log(`  ✓ Seeded guard rule: ${rule.ruleName}`)
         seededCount++
       }
@@ -208,7 +208,7 @@ const seedSalesPipeline: ModuleCli = {
         organizationId,
       })
 
-      await em.persistAndFlush(workflow)
+      await em.persist(workflow).flush()
 
       console.log(`✅ Seeded sales pipeline workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
@@ -268,7 +268,7 @@ const seedSimpleApproval: ModuleCli = {
         organizationId,
       })
 
-      await em.persistAndFlush(workflow)
+      await em.persist(workflow).flush()
 
       console.log(`✅ Seeded simple approval workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)
@@ -371,7 +371,7 @@ const seedOrderApproval: ModuleCli = {
         organizationId,
       })
 
-      await em.persistAndFlush(workflow)
+      await em.persist(workflow).flush()
 
       console.log(`✅ Seeded order approval workflow: ${workflow.workflowName}`)
       console.log(`  - ID: ${workflow.id}`)

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

@@ -4,7 +4,8 @@
  * MikroORM entities for workflow engine.
  */
 
-import { Entity, PrimaryKey, Property, Index, Unique, OptionalProps } from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 // ============================================================================
 // Type Definitions

package/src/modules/workflows/lib/event-logger.ts

@@ -135,7 +135,7 @@ export async function logWorkflowEvent(
     occurredAt: new Date(),
   })
 
-  await em.persistAndFlush(workflowEvent)
+  await em.persist(workflowEvent).flush()
 
   return workflowEvent
 }
@@ -164,7 +164,7 @@ export async function logWorkflowEvents(
     })
   )
 
-  await em.persistAndFlush(workflowEvents)
+  await em.persist(workflowEvents).flush()
 
   return workflowEvents
 }

package/src/modules/workflows/lib/seeds.ts

@@ -160,8 +160,23 @@ async function seedGuardRules(
       continue
     }
     const entry = em.create(BusinessRule, {
-      ...rule,
       ruleId,
+      ruleName: rule.ruleName,
+      ruleType: rule.ruleType,
+      entityType: rule.entityType,
+      conditionExpression: rule.conditionExpression,
+      eventType: rule.eventType,
+      ruleCategory: rule.ruleCategory,
+      description: rule.description,
+      successActions: rule.successActions,
+      failureActions: rule.failureActions,
+      enabled: rule.enabled,
+      priority: rule.priority,
+      version: rule.version,
+      effectiveFrom: rule.effectiveFrom,
+      effectiveTo: rule.effectiveTo,
+      createdBy: rule.createdBy,
+      updatedBy: rule.updatedBy,
       tenantId: scope.tenantId,
       organizationId: scope.organizationId,
     })

package/src/modules/workflows/lib/step-handler.ts

@@ -109,7 +109,7 @@ export async function enterStep(
     updatedAt: now,
   })
 
-  await em.persistAndFlush(stepInstance)
+  await em.persist(stepInstance).flush()
 
   // Log STEP_ENTERED event
   await logStepEvent(em, {
@@ -534,7 +534,7 @@ async function handleUserTaskStep(
     updatedAt: now,
   })
 
-  await em.persistAndFlush(userTask)
+  await em.persist(userTask).flush()
 
   // Log USER_TASK_CREATED event
   await logStepEvent(em, {
@@ -836,7 +836,7 @@ async function logStepEvent(
     occurredAt: new Date(),
   })
 
-  await em.persistAndFlush(workflowEvent)
+  await em.persist(workflowEvent).flush()
   return workflowEvent
 }
 

package/src/modules/workflows/lib/task-handler.ts

@@ -319,7 +319,7 @@ async function logWorkflowEvent(
     occurredAt: new Date(),
   })
 
-  await em.persistAndFlush(workflowEvent)
+  await em.persist(workflowEvent).flush()
   return workflowEvent
 }
 

package/src/modules/workflows/lib/transition-handler.ts

@@ -970,6 +970,6 @@ async function logTransitionEvent(
     occurredAt: new Date(),
   })
 
-  await em.persistAndFlush(workflowEvent)
+  await em.persist(workflowEvent).flush()
   return workflowEvent
 }

package/src/modules/workflows/lib/workflow-executor.ts

@@ -193,7 +193,7 @@ export async function startWorkflow(
     updatedAt: now,
   })
 
-  await em.persistAndFlush(instance)
+  await em.persist(instance).flush()
 
   // Log WORKFLOW_STARTED event
   await logWorkflowEvent(em, {
@@ -966,6 +966,6 @@ async function logWorkflowEvent(
     occurredAt: new Date(),
   })
 
-  await em.persistAndFlush(workflowEvent)
+  await em.persist(workflowEvent).flush()
   return workflowEvent
 }