@open-mercato/core 0.5.1-develop.2691.d8a0934b37 → 0.5.1-develop.2694.732417c5ec

package/src/modules/auth/cli.ts

@@ -59,17 +59,23 @@ const addUser: ModuleCli = {
       organizationId: org.id,
       tenantId: org.tenant.id,
     })
-    await em.persistAndFlush(u)
+    await em.persist(u).flush()
     if (rolesCsv) {
       const names = rolesCsv.split(',').map(s => s.trim()).filter(Boolean)
       for (const name of names) {
         let role = await em.findOne(Role, { name, tenantId: normalizedTenantId })
+        if (!role && normalizedTenantId !== null) {
+          role = await em.findOne(Role, { name, tenantId: null })
+        }
         if (!role) {
           role = em.create(Role, { name, tenantId: normalizedTenantId, createdAt: new Date() })
-          await em.persistAndFlush(role)
+          await em.persist(role).flush()
+        } else if (normalizedTenantId !== null && role.tenantId !== normalizedTenantId) {
+          role.tenantId = normalizedTenantId
+          await em.persist(role).flush()
         }
         const link = em.create(UserRole, { user: u, role })
-        await em.persistAndFlush(link)
+        await em.persist(link).flush()
       }
     }
     console.log('User created with id', u.id)
@@ -280,16 +286,16 @@ const rotateEncryptionKey: ModuleCli = {
       const ids = pending.map((row: any) => String(row.id))
       const users = rotate
         ? await em.find(
-            User,
-            { id: { $in: ids }, tenantId: scopeTenantId, organizationId: scopeOrganizationId },
-          )
+          User,
+          { id: { $in: ids }, tenantId: scopeTenantId, organizationId: scopeOrganizationId },
+        )
         : await findWithDecryption(
-            em,
-            User,
-            { id: { $in: ids }, tenantId: scopeTenantId, organizationId: scopeOrganizationId },
-            {},
-            { tenantId: scopeTenantId, organizationId: scopeOrganizationId, encryptionService },
-          )
+          em,
+          User,
+          { id: { $in: ids }, tenantId: scopeTenantId, organizationId: scopeOrganizationId },
+          {},
+          { tenantId: scopeTenantId, organizationId: scopeOrganizationId, encryptionService },
+        )
       const usersById = new Map(users.map((user) => [String(user.id), user]))
       let updated = 0
       for (const row of pending) {
@@ -389,9 +395,9 @@ const addOrganization: ModuleCli = {
     const em = resolve('em') as any
     // Create tenant implicitly for simplicity
     const tenant = em.create(Tenant, { name: `${name} Tenant` })
-    await em.persistAndFlush(tenant)
+    await em.persist(tenant).flush()
     const org = em.create(Organization, { name, tenant })
-    await em.persistAndFlush(org)
+    await em.persist(org).flush()
     await rebuildHierarchyForTenant(em, String(tenant.id))
     console.log('Organization created with id', org.id, 'in tenant', tenant.id)
   },
@@ -448,7 +454,7 @@ const setupApp: ModuleCli = {
         console.log('⚠️  Updated roles if missing and reused tenant/organization.')
       }
 
-      if(env.NODE_ENV !== 'test') { 
+      if (env.NODE_ENV !== 'test') {
         for (const snapshot of result.users) {
           if (snapshot.created) {
             if (snapshot.user.email === email && password) {
@@ -462,7 +468,7 @@ const setupApp: ModuleCli = {
         }
       }
 
-      if(env.NODE_ENV !== 'test')   console.log('✅ Setup complete:', { tenantId: result.tenantId, organizationId: result.organizationId })
+      if (env.NODE_ENV !== 'test') console.log('✅ Setup complete:', { tenantId: result.tenantId, organizationId: result.organizationId })
     } catch (err) {
       if (err instanceof Error && err.message === 'USER_EXISTS') {
         console.error('Setup aborted: user already exists with the provided email.')
@@ -485,17 +491,17 @@ const listOrganizations: ModuleCli = {
       { populate: ['tenant'] },
       { tenantId: null, organizationId: null },
     )
-    
+
     if (orgs.length === 0) {
       console.log('No organizations found')
       return
     }
-    
+
     console.log(`Found ${orgs.length} organization(s):`)
     console.log('')
     console.log('ID                                   | Name                    | Tenant ID                            | Created')
     console.log('-------------------------------------|-------------------------|-------------------------------------|-------------------')
-    
+
     for (const org of orgs) {
       const created = org.createdAt ? new Date(org.createdAt).toLocaleDateString() : 'N/A'
       const id = org.id || 'N/A'
@@ -512,17 +518,17 @@ const listTenants: ModuleCli = {
     const { resolve } = await createRequestContainer()
     const em = resolve('em') as any
     const tenants = await em.find(Tenant, {})
-    
+
     if (tenants.length === 0) {
       console.log('No tenants found')
       return
     }
-    
+
     console.log(`Found ${tenants.length} tenant(s):`)
     console.log('')
     console.log('ID                                   | Name                    | Created')
     console.log('-------------------------------------|-------------------------|-------------------')
-    
+
     for (const tenant of tenants) {
       const created = tenant.createdAt ? new Date(tenant.createdAt).toLocaleDateString() : 'N/A'
       const id = tenant.id || 'N/A'
@@ -541,10 +547,10 @@ const listUsers: ModuleCli = {
       const v = rest[i + 1]
       if (k) args[k] = v
     }
-    
+
     const { resolve } = await createRequestContainer()
     const em = resolve('em') as any
-    
+
     // Build query with optional filters
     const where: any = {}
     if (args.organizationId || args.orgId || args.org) {
@@ -553,19 +559,19 @@ const listUsers: ModuleCli = {
     if (args.tenantId || args.tenant) {
       where.tenantId = args.tenantId || args.tenant
     }
-    
+
     const users = await em.find(User, where)
-    
+
     if (users.length === 0) {
       console.log('No users found')
       return
     }
-    
+
     console.log(`Found ${users.length} user(s):`)
     console.log('')
     console.log('ID                                   | Email                   | Name                    | Organization ID      | Tenant ID            | Roles')
     console.log('-------------------------------------|-------------------------|-------------------------|---------------------|---------------------|-------------------')
-    
+
     for (const user of users) {
       // Get user roles separately
       const userRoles = await findWithDecryption(
@@ -576,25 +582,25 @@ const listUsers: ModuleCli = {
         { tenantId: user.tenantId ?? null, organizationId: user.organizationId ?? null },
       )
       const roles = userRoles.map((ur: any) => ur.role?.name).filter(Boolean).join(', ') || 'None'
-      
+
       // Get organization and tenant names if IDs exist
       let orgName = 'N/A'
       let tenantName = 'N/A'
-      
+
       if (user.organizationId) {
         const org = await em.findOne(Organization, { id: user.organizationId })
         orgName = org?.name?.substring(0, 19) + '...' || user.organizationId.substring(0, 8) + '...'
       }
-      
+
       if (user.tenantId) {
         const tenant = await em.findOne(Tenant, { id: user.tenantId })
         tenantName = tenant?.name?.substring(0, 19) + '...' || user.tenantId.substring(0, 8) + '...'
       }
-      
+
       const id = user.id || 'N/A'
       const email = (user.email || 'N/A').padEnd(23)
       const name = (user.name || 'Unnamed').padEnd(23)
-      
+
       console.log(`${id.padEnd(35)} | ${email} | ${name} | ${orgName.padEnd(19)} | ${tenantName.padEnd(19)} | ${roles}`)
     }
   },
@@ -609,29 +615,29 @@ const setPassword: ModuleCli = {
       const v = rest[i + 1]
       if (k) args[k] = v
     }
-    
+
     const email = args.email
     const password = args.password
-    
+
     if (!email || !password) {
       console.error('Usage: mercato auth set-password --email <email> --password <newPassword>')
       return
     }
     if (!ensurePasswordPolicy(password)) return
-    
+
     const { resolve } = await createRequestContainer()
     const em = resolve('em') as any
     const emailHash = computeEmailHash(email)
     const user = await em.findOne(User, { $or: [{ email }, { emailHash }] })
-    
+
     if (!user) {
       console.error(`User with email "${email}" not found`)
       return
     }
-    
+
     user.passwordHash = await hash(password, 10)
-    await em.persistAndFlush(user)
-    
+    await em.persist(user).flush()
+
     console.log(`✅ Password updated successfully for user: ${email}`)
   },
 }

package/src/modules/auth/commands/users.ts

@@ -341,7 +341,7 @@ async function sendInviteToUser(
   const tokenHash = hashAuthToken(rawToken)
   const expiresAt = new Date(Date.now() + INVITE_TOKEN_TTL_MS)
   const row = em.create(PasswordReset, { user, token: tokenHash, expiresAt, createdAt: new Date() })
-  await em.persistAndFlush(row)
+  await em.persist(row).flush()
 
   const base = getSecurityEmailBaseUrl()
   const inviteUrl = `${base}/reset/${rawToken}`

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

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property, ManyToOne, Unique, Index } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'users' })
 export class User {

package/src/modules/auth/lib/setup-app.ts

@@ -517,7 +517,7 @@ async function ensureRoleAclFor(
       isSuperAdmin: !!options.isSuperAdmin,
       createdAt: new Date(),
     })
-    await em.persistAndFlush(acl)
+    await em.persist(acl).flush()
     return
   }
   const currentFeatures = Array.isArray(existing.featuresJson) ? existing.featuresJson : []
@@ -530,7 +530,7 @@ async function ensureRoleAclFor(
     existing.isSuperAdmin = true
   }
   if (changed || options.isSuperAdmin) {
-    await em.persistAndFlush(existing)
+    await em.persist(existing).flush()
   }
 }
 
@@ -550,7 +550,7 @@ async function deactivateDemoSuperAdminIfSelfOnboardingEnabled(em: EntityManager
       dirty = true
     }
     if (dirty) {
-      await em.persistAndFlush(user)
+      await em.persist(user).flush()
     }
   } catch (error) {
     console.error('[auth.setup] failed to deactivate demo superadmin user', error)

package/src/modules/auth/services/authService.ts

@@ -78,7 +78,7 @@ export class AuthService {
     const rawToken = generateAuthToken()
     const tokenHash = hashAuthToken(rawToken)
     const sess = this.em.create(Session as any, { user, token: tokenHash, expiresAt, createdAt: new Date() } as any)
-    await this.em.persistAndFlush(sess)
+    await this.em.persist(sess).flush()
     return { session: sess as Session, token: rawToken }
   }
 
@@ -126,7 +126,7 @@ export class AuthService {
     const tokenHash = hashAuthToken(rawToken)
     const expiresAt = new Date(Date.now() + 60 * 60 * 1000)
     const row = this.em.create(PasswordReset as any, { user, token: tokenHash, expiresAt, createdAt: new Date() } as any)
-    await this.em.persistAndFlush(row)
+    await this.em.persist(row).flush()
     return { user, token: rawToken }
   }
 

package/src/modules/business_rules/api/rules/route.ts

@@ -211,7 +211,7 @@ export async function POST(req: Request) {
   const rule = em.create(BusinessRule, data)
 
   try {
-    await em.persistAndFlush(rule)
+    await em.persist(rule).flush()
   } catch (error) {
     console.error('[business_rules.rules] Failed to persist new rule:', error)
     return NextResponse.json(
@@ -273,7 +273,7 @@ export async function PUT(req: Request) {
   em.assign(rule, parsed.data)
 
   try {
-    await em.persistAndFlush(rule)
+    await em.persist(rule).flush()
   } catch (error) {
     console.error('[business_rules.rules] Failed to persist rule update:', error)
     return NextResponse.json(
@@ -313,7 +313,7 @@ export async function DELETE(req: Request) {
   }
 
   rule.deletedAt = new Date()
-  await em.persistAndFlush(rule)
+  await em.persist(rule).flush()
 
   return NextResponse.json({ ok: true })
 }

package/src/modules/business_rules/api/sets/[id]/members/route.ts

@@ -119,12 +119,15 @@ export async function POST(req: Request, ctx: { params?: { id?: string } }) {
   const validatedPayload = createRuleSetMemberSchema.parse(payload)
 
   const member = em.create(RuleSetMember, {
-    ...validatedPayload,
+    sequence: validatedPayload.sequence,
+    enabled: validatedPayload.enabled,
+    tenantId: validatedPayload.tenantId,
+    organizationId: validatedPayload.organizationId,
     ruleSet: ruleSet,
     rule: rule,
   })
 
-  await em.persistAndFlush(member)
+  await em.persist(member).flush()
 
   return NextResponse.json({ id: member.id }, { status: 201 })
 }
@@ -174,7 +177,7 @@ export async function PUT(req: Request, ctx: { params?: { id?: string } }) {
     member.enabled = parsed.data.enabled
   }
 
-  await em.persistAndFlush(member)
+  await em.persist(member).flush()
 
   return NextResponse.json({ ok: true })
 }
@@ -211,7 +214,7 @@ export async function DELETE(req: Request, ctx: { params?: { id?: string } }) {
     return NextResponse.json({ error: 'Member not found' }, { status: 404 })
   }
 
-  await em.removeAndFlush(member)
+  await em.remove(member).flush()
 
   return NextResponse.json({ ok: true })
 }

package/src/modules/business_rules/api/sets/route.ts

@@ -171,7 +171,7 @@ export async function POST(req: Request) {
   }
 
   const ruleSet = em.create(RuleSet, parsed.data)
-  await em.persistAndFlush(ruleSet)
+  await em.persist(ruleSet).flush()
 
   return NextResponse.json({ id: ruleSet.id }, { status: 201 })
 }
@@ -222,7 +222,7 @@ export async function PUT(req: Request) {
   }
 
   em.assign(ruleSet, parsed.data)
-  await em.persistAndFlush(ruleSet)
+  await em.persist(ruleSet).flush()
 
   return NextResponse.json({ ok: true })
 }
@@ -255,7 +255,7 @@ export async function DELETE(req: Request) {
   }
 
   ruleSet.deletedAt = new Date()
-  await em.persistAndFlush(ruleSet)
+  await em.persist(ruleSet).flush()
 
   return NextResponse.json({ ok: true })
 }

package/src/modules/business_rules/cli.ts

@@ -69,7 +69,7 @@ const seedGuardRules: ModuleCli = {
           organizationId,
         })
 
-        await em.persistAndFlush(rule)
+        await em.persist(rule).flush()
         console.log(`  ✓ Seeded guard rule: ${rule.ruleName}`)
         seededCount++
       }

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

@@ -1,12 +1,5 @@
-import {
-  Entity,
-  PrimaryKey,
-  Property,
-  Index,
-  Unique,
-  OptionalProps,
-  ManyToOne,
-} from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 export type RuleType = 'GUARD' | 'VALIDATION' | 'CALCULATION' | 'ACTION' | 'ASSIGNMENT'
 export type ExecutionResult = 'SUCCESS' | 'FAILURE' | 'ERROR'

package/src/modules/business_rules/lib/rule-engine.ts

@@ -865,7 +865,7 @@ export async function logRuleExecution(
     executedBy: context.executedBy || null,
   })
 
-  await em.persistAndFlush(log)
+  await em.persist(log).flush()
 
   return String(log.id)
 }

package/src/modules/catalog/api/option-schemas/route.ts

@@ -62,7 +62,6 @@ export async function buildOptionSchemaFilters(
   }
   const active = parseBooleanFlag(query.isActive)
   if (active !== undefined) filters.is_active = active
-  if (!query.withDeleted) filters.deleted_at = null
   const tenantId = ctx.auth?.tenantId ?? null
   if (tenantId) {
     try {

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

@@ -1,14 +1,5 @@
-import {
-  Collection,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  OptionalProps,
-  PrimaryKey,
-  Property,
-  Unique,
-} from '@mikro-orm/core'
+import { Collection, OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, OneToMany, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 import type {
   CatalogPriceDisplayMode,
   CatalogProductOptionSchema,

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

@@ -1,4 +1,5 @@
-import { Entity, Index, OptionalProps, PrimaryKey, Property, Unique } from '@mikro-orm/core'
+import { OptionalProps } from '@mikro-orm/core'
+import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'module_configs' })
 @Unique({ name: 'module_configs_module_name_unique', properties: ['moduleId', 'name'] })

package/src/modules/currencies/commands/fetch-configs.ts

@@ -40,7 +40,7 @@ export async function createFetchConfig(
     updatedAt: new Date(),
   })
 
-  await em.persistAndFlush(config)
+  await em.persist(config).flush()
   return config
 }
 
@@ -63,7 +63,7 @@ export async function updateFetchConfig(
   }
 
   em.assign(config, validated)
-  await em.persistAndFlush(config)
+  await em.persist(config).flush()
 
   return config
 }
@@ -83,5 +83,5 @@ export async function deleteFetchConfig(
     throw new Error('Fetch config not found')
   }
 
-  await em.removeAndFlush(config)
+  await em.remove(config).flush()
 }

package/src/modules/currencies/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'
 
 @Entity({ tableName: 'currencies' })
 @Index({

package/src/modules/customer_accounts/api/signup.ts

@@ -138,7 +138,7 @@ export async function POST(req: Request) {
     em.persist(userRole)
   }
 
-  await em.persistAndFlush(user)
+  await em.persist(user).flush()
 
   const verificationToken = await customerTokenService.createEmailVerification(user.id, tenantId)
   const verifyUrl = resolvePortalVerifyUrl(baseUrl, verificationToken, orgRow.slug)

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

@@ -1,4 +1,4 @@
-import { Entity, PrimaryKey, Property, ManyToOne, Unique, Index } from '@mikro-orm/core'
+import { Entity, Index, ManyToOne, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'customer_users' })
 @Unique({ properties: ['tenantId', 'emailHash'], name: 'customer_users_tenant_email_hash_uniq' })

package/src/modules/customer_accounts/services/customerInvitationService.ts

@@ -46,7 +46,7 @@ export class CustomerInvitationService {
       expiresAt,
       createdAt: new Date(),
     } as any) as CustomerUserInvitation
-    await this.em.persistAndFlush(invitation)
+    await this.em.persist(invitation).flush()
     return { invitation, rawToken: token }
   }
 

package/src/modules/customer_accounts/services/customerSessionService.ts

@@ -43,7 +43,7 @@ export class CustomerSessionService {
       lastUsedAt: new Date(),
       createdAt: new Date(),
     } as any) as CustomerUserSession
-    await this.em.persistAndFlush(session)
+    await this.em.persist(session).flush()
 
     const jwt = this.signCustomerJwt(user, resolvedFeatures, session.id)
 

package/src/modules/customer_accounts/services/customerTokenService.ts

@@ -1,4 +1,5 @@
 import { EntityManager } from '@mikro-orm/postgresql'
+import type { Kysely } from 'kysely'
 import {
   CustomerUser,
   CustomerUserEmailVerification,
@@ -6,6 +7,10 @@ import {
 } from '@open-mercato/core/modules/customer_accounts/data/entities'
 import { generateSecureToken, hashToken } from '@open-mercato/core/modules/customer_accounts/lib/tokenGenerator'
 
+function getKysely(em: EntityManager): Kysely<any> {
+  return (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
+}
+
 const EMAIL_VERIFICATION_TTL_MS = 24 * 60 * 60 * 1000 // 24 hours
 const MAGIC_LINK_TTL_MS = 15 * 60 * 1000 // 15 minutes
 const PASSWORD_RESET_TTL_MS = 60 * 60 * 1000 // 60 minutes
@@ -24,7 +29,7 @@ export class CustomerTokenService {
       expiresAt,
       createdAt: new Date(),
     } as any)
-    await this.em.persistAndFlush(record)
+    await this.em.persist(record).flush()
     return rawToken
   }
 
@@ -39,7 +44,7 @@ export class CustomerTokenService {
       expiresAt,
       createdAt: new Date(),
     } as any)
-    await this.em.persistAndFlush(record)
+    await this.em.persist(record).flush()
     return rawToken
   }
 
@@ -53,7 +58,7 @@ export class CustomerTokenService {
       expiresAt,
       createdAt: new Date(),
     } as any)
-    await this.em.persistAndFlush(record)
+    await this.em.persist(record).flush()
     return rawToken
   }
 
@@ -70,12 +75,15 @@ export class CustomerTokenService {
     const user = record.user as CustomerUser
     if (tenantId && user?.tenantId !== tenantId) return null
 
-    const knex = this.em.getKnex()
-    const consumed = await knex('customer_user_email_verifications')
-      .where('id', record.id)
-      .whereNull('used_at')
-      .where('expires_at', '>', new Date())
-      .update({ used_at: new Date() })
+    const db = getKysely(this.em)
+    const updateResult = await db
+      .updateTable('customer_user_email_verifications' as any)
+      .set({ used_at: new Date() } as any)
+      .where('id' as any, '=', record.id)
+      .where('used_at' as any, 'is', null)
+      .where('expires_at' as any, '>', new Date())
+      .executeTakeFirst()
+    const consumed = Number(updateResult?.numUpdatedRows ?? 0n)
     if (consumed === 0) return null
 
     const resolvedUserId = typeof user === 'string' ? user : user.id
@@ -95,12 +103,15 @@ export class CustomerTokenService {
     const user = record.user as CustomerUser
     if (tenantId && user?.tenantId !== tenantId) return null
 
-    const knex = this.em.getKnex()
-    const consumed = await knex('customer_user_password_resets')
-      .where('id', record.id)
-      .whereNull('used_at')
-      .where('expires_at', '>', new Date())
-      .update({ used_at: new Date() })
+    const db = getKysely(this.em)
+    const updateResult = await db
+      .updateTable('customer_user_password_resets' as any)
+      .set({ used_at: new Date() } as any)
+      .where('id' as any, '=', record.id)
+      .where('used_at' as any, 'is', null)
+      .where('expires_at' as any, '>', new Date())
+      .executeTakeFirst()
+    const consumed = Number(updateResult?.numUpdatedRows ?? 0n)
     if (consumed === 0) return null
 
     const resolvedUserId = typeof user === 'string' ? user : user.id