@open-mercato/core 0.4.5-develop-3ce83a8b24 → 0.4.5-develop-539cff4960

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

@@ -1,5 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 export { assertFound } from '@open-mercato/shared/lib/crud/errors'
 export { ensureOrganizationScope, ensureSameScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
@@ -19,9 +20,13 @@ export async function requireScopedEntity<T extends { id: string; deletedAt?: Da
   em: EntityManager,
   entityClass: { new (): T },
   id: string,
-  message: string
+  message: string,
+  scope: { organizationId: string | null; tenantId: string | null } = { organizationId: null, tenantId: null },
 ): Promise<T> {
-  const entity = await em.findOne(entityClass, { id, deletedAt: null })
+  const where: Record<string, unknown> = { id, deletedAt: null }
+  if (scope.organizationId) where.organizationId = scope.organizationId
+  if (scope.tenantId) where.tenantId = scope.tenantId
+  const entity = await findOneWithDecryption(em, entityClass, where, {}, scope)
   if (!entity) throw new CrudHttpError(404, { error: message })
   return entity
 }