@open-mercato/core 0.6.6-develop.6460.1.f94c74174c → 0.6.6-develop.6471.1.9ab5bdd79a

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

@@ -2,6 +2,9 @@ import { type Kysely, sql } from 'kysely'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { buildIndexDocument, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'reindex-batch' })
 
 export type AnyRow = Record<string, any> & { id: string | number }
 
@@ -199,7 +202,7 @@ export async function upsertIndexBatch(
         brand_name: (tokenDoc as any).brand_name,
         legal_name: (tokenDoc as any).legal_name,
       }
-      console.info('[reindex:batch:doc]', {
+      logger.debug('Reindex batch document', {
         entityType,
         recordId,
         organizationId: scopeOrg ?? null,
@@ -254,7 +257,7 @@ export async function upsertIndexBatch(
       ).catch(() => undefined)
     }
     if (debugEnabled) {
-      console.info('[reindex:batch:tokens]', {
+      logger.debug('Reindex batch tokens', {
         entityType,
         records: basePayloads.length,
         scopeOrg: scope.orgId ?? null,

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

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely, sql } from 'kysely'
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'coverage' })
 
 export type CoverageScope = {
   entityType: string
@@ -423,7 +426,7 @@ export async function refreshCoverageSnapshot(
       const vectorRow = await vectorQuery.executeTakeFirst() as { count: unknown } | undefined
       return toCount(vectorRow?.count)
     } catch (err) {
-      console.warn('[query_index] Failed to resolve vector count for coverage snapshot', {
+      logger.warn('Failed to resolve vector count for coverage snapshot', {
         entityType,
         tenantId,
         organizationId,

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

@@ -24,6 +24,9 @@ import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { runBeforeQueryPipeline, runAfterQueryPipeline, type QueryExtensionContext } from '@open-mercato/shared/lib/query/query-extension-runner'
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from '@open-mercato/shared/lib/query/encrypted-sort'
 import { mapWithConcurrency } from '@open-mercato/shared/lib/query/bounded-decrypt'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'engine' })
 
 const DECRYPT_CONCURRENCY = 8
 
@@ -317,10 +320,10 @@ export class HybridQueryEngine implements QueryEngine {
             const force = this.isForcePartialIndexEnabled()
             if (!force) {
               if (gap.stats) {
-                console.warn('[HybridQueryEngine] Partial index coverage detected; falling back to basic engine:', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
+                logger.warn('Partial index coverage detected; falling back to basic engine', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
                 if (debugEnabled) this.debug('query:fallback:partial-coverage', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
               } else {
-                console.warn('[HybridQueryEngine] Partial index coverage detected; falling back to basic engine:', { entity })
+                logger.warn('Partial index coverage detected; falling back to basic engine', { entity })
                 if (debugEnabled) this.debug('query:fallback:partial-coverage', { entity })
               }
               const fallbackResult = await this.fallback.query(entity, opts)
@@ -347,10 +350,10 @@ export class HybridQueryEngine implements QueryEngine {
               return await applyAfterExtensions(resultWithWarning)
             }
             if (gap.stats) {
-              console.warn('[HybridQueryEngine] Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
+              logger.warn('Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity, baseCount: gap.stats.baseCount, indexedCount: gap.stats.indexedCount, scope: gap.scope })
             } else {
-              console.warn('[HybridQueryEngine] Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity })
+              logger.warn('Partial index coverage detected; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity })
             }
             partialIndexWarning = {
@@ -510,7 +513,7 @@ export class HybridQueryEngine implements QueryEngine {
             const globalIndexed = globalStats.indexedCount
             const globalGap = (globalBase > 0 && globalIndexed < globalBase) || globalIndexed > globalBase
             if (globalGap) {
-              console.warn('[HybridQueryEngine] Partial index coverage detected at global scope; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES:', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
+              logger.warn('Partial index coverage detected at global scope; forcing query index usage due to FORCE_QUERY_INDEX_ON_PARTIAL_INDEXES', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
               if (debugEnabled) this.debug('query:partial-coverage:forced', { entity, baseCount: globalBase, indexedCount: globalIndexed, scope: 'global' })
               partialIndexWarning = {
                 entity, entityLabel: this.resolveEntityLabel(entity),
@@ -792,7 +795,7 @@ export class HybridQueryEngine implements QueryEngine {
           resolvedKeys.forEach((key) => selectFieldSet.add(`cf:${key}`))
           if (this.isDebugVerbosity()) this.debug('query:cf:resolved-keys', { entity, keys: resolvedKeys })
         } catch (err) {
-          console.warn('[HybridQueryEngine] Failed to resolve custom field keys for', entity, err)
+          logger.warn('Failed to resolve custom field keys', { entity, err })
         }
       } else if (Array.isArray(opts.includeCustomFields)) {
         opts.includeCustomFields.map((key) => String(key)).forEach((key) => selectFieldSet.add(`cf:${key}`))
@@ -909,7 +912,7 @@ export class HybridQueryEngine implements QueryEngine {
             )
             next = { ...next, ...decrypted }
           } catch (err) {
-            console.error('Error decrypting entity payload', err)
+            logger.error('Error decrypting entity payload', { err })
           }
         }
         if (encSvc) {
@@ -1973,9 +1976,7 @@ export class HybridQueryEngine implements QueryEngine {
         await bus.emitEvent('query_index.reindex', payload, { persistent: true })
         if (this.isDebugVerbosity()) this.debug('query:auto-reindex:scheduled', context)
       } catch (err) {
-        console.warn('[HybridQueryEngine] Failed to schedule auto reindex:', {
-          ...context, error: err instanceof Error ? err.message : err,
-        })
+        logger.warn('Failed to schedule auto reindex', { ...context, err })
       }
     })
   }
@@ -2184,11 +2185,7 @@ export class HybridQueryEngine implements QueryEngine {
 
   private logSearchDebug(event: string, payload: Record<string, unknown>) {
     if (!this.isDebugVerbosity()) return
-    try {
-      console.info('[query-index:search]', event, JSON.stringify(payload))
-    } catch {
-      console.info('[query-index:search]', event, payload)
-    }
+    logger.debug('Search debug event', { event, payload })
   }
 
   private applyColumnFilter(
@@ -2348,7 +2345,7 @@ export class HybridQueryEngine implements QueryEngine {
   private debug(message: string, context?: Record<string, unknown>): void {
     if (!this.isDebugVerbosity()) return
     if (!this.isSqlDebugEnabled()) return
-    if (context) console.debug('[HybridQueryEngine]', message, context)
-    else console.debug('[HybridQueryEngine]', message)
+    if (context) logger.debug(message, context)
+    else logger.debug(message)
   }
 }

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

@@ -9,6 +9,9 @@ import { prepareJob, updateJobProgress, finalizeJob, type JobScope } from './job
 import { purgeOrphans } from './stale'
 import type { VectorIndexService } from '@open-mercato/search/vector'
 import { isSearchDebugEnabled } from './search-tokens'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'reindexer' })
 
 export type ReindexJobOptions = {
   entityType: string
@@ -153,7 +156,7 @@ export async function reindexEntity(
   const table = resolveRegisteredEntityTableName(em, entityType)
   if (!table || entityType === 'query_index:search_token' || table === 'search_tokens') {
     if (!table) {
-      console.warn('[HybridQueryEngine] Refusing to reindex unregistered entity type', {
+      logger.warn('Refusing to reindex unregistered entity type', {
         entityType,
       })
     }
@@ -319,7 +322,7 @@ export async function reindexEntity(
         }
         await purgeQuery.execute()
       } catch (error) {
-        console.warn('[HybridQueryEngine] Failed to purge index rows before force reindex', {
+        logger.warn('Failed to purge index rows before force reindex', {
           entityType,
           tenantId: tenantId ?? null,
           organizationId: organizationId ?? null,
@@ -337,7 +340,7 @@ export async function reindexEntity(
           try {
             await eventBus.emitEvent('query_index.vectorize_purge', payload)
           } catch (err) {
-            console.warn('[HybridQueryEngine] Failed to queue vector purge before force reindex', {
+            logger.warn('Failed to queue vector purge before force reindex', {
               entityType,
               tenantId: tenantId ?? null,
               organizationId: organizationId ?? null,
@@ -345,7 +348,7 @@ export async function reindexEntity(
             })
           }
         } else {
-          console.warn('[HybridQueryEngine] Skipping vector purge for force reindex without tenant scope', {
+          logger.warn('Skipping vector purge for force reindex without tenant scope', {
             entityType,
           })
         }
@@ -414,7 +417,7 @@ export async function reindexEntity(
           dekKeyCache,
         )
         if (isSearchDebugEnabled()) {
-          console.info('[reindex:decrypt]', buildReindexDecryptDebugPayload(targetEntity, result as Record<string, unknown>, scope))
+          logger.debug('Reindex decrypt', buildReindexDecryptDebugPayload(targetEntity, result as Record<string, unknown>, scope))
         }
         return result
       }
@@ -499,7 +502,7 @@ export async function reindexEntity(
           olderThan: jobStartedAt,
         })
       } catch (error) {
-        console.warn('[HybridQueryEngine] Failed to prune vector orphans after reindex', {
+        logger.warn('Failed to prune vector orphans after reindex', {
           entityType,
           tenantId: tenantId ?? null,
           organizationId: organizationId ?? null,

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

@@ -2,6 +2,9 @@ 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'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'search-tokens' })
 
 const INSERT_BATCH_SIZE = 500
 
@@ -41,8 +44,7 @@ export const isSearchDebugEnabled = (): boolean => {
 const debug = (event: string, payload: Record<string, unknown>) => {
   if (!isSearchDebugEnabled()) return
   try {
-    // eslint-disable-next-line no-console
-    console.debug(`[search-tokens] ${event}`, payload)
+    logger.debug('Search token event', { event, payload })
   } catch {
     // ignore
   }

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

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { refreshCoverageSnapshot } from '../lib/coverage'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('query_index').child({ component: 'coverage-refresh' })
 
 export const metadata = { event: 'query_index.coverage.refresh', persistent: false }
 
@@ -48,7 +51,7 @@ export default async function handle(payload: Payload, ctx: { resolve: <T = any>
     try {
       await refreshCoverageSnapshot(em, { entityType, tenantId, organizationId, withDeleted })
     } catch (err) {
-      console.warn('[query_index] Failed to refresh coverage snapshot', {
+      logger.warn('Failed to refresh coverage snapshot', {
         entityType,
         tenantId,
         organizationId,

package/src/modules/resources/api/comments.ts

@@ -12,6 +12,9 @@ import {
 import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { E } from '#generated/entities.ids.generated'
 import { createResourcesCrudOpenApi, createPagedListResponseSchema, defaultOkResponseSchema } from './openapi'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'comments' })
 
 const rawBodySchema = z.object({}).passthrough()
 
@@ -159,7 +162,7 @@ const crud = makeCrudRoute({
           if (!('author_email' in record)) record.author_email = meta.email
         })
       } catch (err) {
-        console.warn('[resources.comments] failed to enrich author metadata', err)
+        logger.warn('Failed to enrich author metadata', { err })
       }
     },
   },

package/src/modules/resources/api/resources/tags/assign/route.ts

@@ -17,6 +17,9 @@ import {
   resourcesResourceTagAssignmentSchema,
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'tags' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['resources.manage_resources'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('resources.resourceTags.assign failed', err)
+    logger.error('Tag assign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/resources/api/resources/tags/unassign/route.ts

@@ -17,6 +17,9 @@ import {
   resourcesResourceTagAssignmentSchema,
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'tags' })
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['resources.manage_resources'] },
@@ -110,7 +113,7 @@ export async function POST(req: Request) {
       return NextResponse.json(err.body, { status: err.status })
     }
     const { translate } = await resolveTranslations()
-    console.error('resources.resourceTags.unassign failed', err)
+    logger.error('Tag unassign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })
   }
 }

package/src/modules/resources/backend/resources/resource-types/[id]/edit/page.tsx

@@ -11,6 +11,9 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { extractCustomFieldValues } from '@open-mercato/core/modules/sales/components/documents/customFieldHelpers'
 import { buildResourceTypePayload, ResourceTypeCrudForm, type ResourceTypeFormValues } from '@open-mercato/core/modules/resources/components/ResourceTypeCrudForm'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'resource-types-edit-page' })
 
 type ResourceTypesResponse = {
   items?: Array<Record<string, unknown>>
@@ -77,7 +80,7 @@ export default function ResourcesResourceTypeEditPage({ params }: { params?: { i
               : 0)
         }
       } catch (err) {
-        console.error('resources.resource-types.load', err)
+        logger.error('Failed to load resource types', { err })
         if (!cancelled) setError(t('resources.resourceTypes.errors.load', 'Failed to load resource types.'))
       } finally {
         if (!cancelled) setLoading(false)

package/src/modules/resources/backend/resources/resource-types/page.tsx

@@ -20,6 +20,9 @@ import { Package } from 'lucide-react'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('resources').child({ component: 'resource-types-page' })
 
 const PAGE_SIZE = 50
 const DESCRIPTION_CLASSNAME = 'line-clamp-3 whitespace-pre-line text-sm text-foreground'
@@ -228,7 +231,7 @@ export default function ResourcesResourceTypesPage() {
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
     } catch (error) {
-      console.error('resources.resource-types.list', error)
+      logger.error('Failed to list resource types', { err: error })
       flash(translations.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -271,7 +274,7 @@ export default function ResourcesResourceTypesPage() {
       flash(translations.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
-      console.error('resources.resource-types.delete', error)
+      logger.error('Failed to delete resource type', { err: error })
       flash(translations.errors.delete, 'error')
     }
   }, [confirm, handleRefresh, runResourceTypeMutation, translations.actions.deleteConfirm, translations.errors.delete, translations.errors.deleteAssigned, translations.messages.deleted])

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

@@ -7,7 +7,6 @@ import {
   emitCrudUndoSideEffects,
   buildChanges,
   requireId,
-  normalizeAuthorUserId,
 } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
@@ -30,7 +29,7 @@ import {
   type ResourcesResourceActivityUpdateInput,
 } from '../data/validators'
 import { resourcesResourceActivityCrudEvents } from '../lib/crud'
-import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireResource } from './shared'
+import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireResource, resolveResourceAuthorUserId } from './shared'
 import { E } from '#generated/entities.ids.generated'
 
 const ACTIVITY_ENTITY_ID = E.resources.resources_resource_activity
@@ -117,12 +116,15 @@ const createActivityCommand: CommandHandler<ResourcesResourceActivityCreateInput
     const { parsed, custom } = parseWithCustomFields(resourcesResourceActivityCreateSchema, rawInput)
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
-    const normalizedAuthor = normalizeAuthorUserId(parsed.authorUserId, ctx.auth)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const resource = await requireResource(em, parsed.entityId, 'Resource not found')
     ensureTenantScope(ctx, resource.tenantId)
     ensureOrganizationScope(ctx, resource.organizationId)
+    const normalizedAuthor = await resolveResourceAuthorUserId(em, parsed.authorUserId, ctx, {
+      tenantId: resource.tenantId,
+      organizationId: resource.organizationId,
+    })
 
     const activity = em.create(ResourcesResourceActivity, {
       organizationId: parsed.organizationId,
@@ -287,7 +289,6 @@ const updateActivityCommand: CommandHandler<ResourcesResourceActivityUpdateInput
     if (parsed.subject !== undefined) activity.subject = parsed.subject ?? null
     if (parsed.body !== undefined) activity.body = parsed.body ?? null
     if (parsed.occurredAt !== undefined) activity.occurredAt = parsed.occurredAt ?? null
-    if (parsed.authorUserId !== undefined) activity.authorUserId = parsed.authorUserId ?? null
     if (parsed.appearanceIcon !== undefined) activity.appearanceIcon = parsed.appearanceIcon ?? null
     if (parsed.appearanceColor !== undefined) activity.appearanceColor = parsed.appearanceColor ?? null
 

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

@@ -1,6 +1,6 @@
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
-import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges, requireId, normalizeAuthorUserId } from '@open-mercato/shared/lib/commands/helpers'
+import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges, requireId } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -15,7 +15,7 @@ import {
 } from '../data/validators'
 import { resourcesResourceCommentCrudEvents } from '../lib/crud'
 import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
-import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireResource } from './shared'
+import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireResource, resolveResourceAuthorUserId } from './shared'
 import { E } from '#generated/entities.ids.generated'
 
 const commentCrudIndexer: CrudIndexerConfig<ResourcesResourceComment> = {
@@ -62,12 +62,15 @@ const createCommentCommand: CommandHandler<
     const parsed = resourcesResourceCommentCreateSchema.parse(rawInput)
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
-    const normalizedAuthor = normalizeAuthorUserId(parsed.authorUserId, ctx.auth)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const resource = await requireResource(em, parsed.entityId, 'Resource not found')
     ensureTenantScope(ctx, resource.tenantId)
     ensureOrganizationScope(ctx, resource.organizationId)
+    const normalizedAuthor = await resolveResourceAuthorUserId(em, parsed.authorUserId, ctx, {
+      tenantId: resource.tenantId,
+      organizationId: resource.organizationId,
+    })
 
     const comment = em.create(ResourcesResourceComment, {
       organizationId: parsed.organizationId,
@@ -177,7 +180,6 @@ const updateCommentCommand: CommandHandler<ResourcesResourceCommentUpdateInput,
       comment.resource = resource
     }
     if (parsed.body !== undefined) comment.body = parsed.body
-    if (parsed.authorUserId !== undefined) comment.authorUserId = parsed.authorUserId ?? null
     if (parsed.appearanceIcon !== undefined) comment.appearanceIcon = parsed.appearanceIcon ?? null
     if (parsed.appearanceColor !== undefined) comment.appearanceColor = parsed.appearanceColor ?? null
 

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

@@ -1,7 +1,11 @@
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { ensureOrganizationScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
+import { normalizeAuthorUserId } from '@open-mercato/shared/lib/commands/helpers'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { ResourcesResource } from '../data/entities'
 
 export { ensureOrganizationScope, ensureTenantScope, extractUndoPayload }
@@ -15,3 +19,35 @@ export async function requireResource(
   if (!resource) throw new CrudHttpError(404, { error: message })
   return resource
 }
+
+export async function resolveResourceAuthorUserId(
+  em: EntityManager,
+  explicitAuthorUserId: string | undefined | null,
+  ctx: CommandRuntimeContext,
+  scope: { tenantId: string; organizationId: string },
+): Promise<string | null> {
+  const normalizedAuthor = normalizeAuthorUserId(explicitAuthorUserId, ctx.auth)
+  const fallbackAuthor = normalizeAuthorUserId(null, ctx.auth)
+  const isExplicitSuperAdminAuthor =
+    Boolean(explicitAuthorUserId) &&
+    normalizedAuthor === explicitAuthorUserId &&
+    ctx.auth?.isApiKey !== true &&
+    (ctx.auth as { isSuperAdmin?: boolean } | null)?.isSuperAdmin === true
+
+  if (!isExplicitSuperAdminAuthor || !normalizedAuthor) return normalizedAuthor
+
+  const author = await findOneWithDecryption(
+    em,
+    User,
+    {
+      id: normalizedAuthor,
+      tenantId: scope.tenantId,
+      organizationId: scope.organizationId,
+      deletedAt: null,
+    },
+    undefined,
+    { tenantId: scope.tenantId, organizationId: scope.organizationId },
+  )
+
+  return author ? normalizedAuthor : fallbackAuthor
+}

package/src/modules/sales/api/channels/route.ts

@@ -15,6 +15,9 @@ import {
 } from '../openapi'
 import { CatalogOffer } from '@open-mercato/core/modules/catalog/data/entities'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('sales')
 
 const rawBodySchema = z.object({}).passthrough()
 
@@ -248,6 +251,6 @@ export async function decorateChannelsWithOfferCounts(
       ;(item as Record<string, unknown>).offerCount = countMap.get(id) ?? 0
     })
   } catch (err) {
-    console.warn('[sales.channels] failed to resolve channel offer counts', err)
+    logger.warn('sales.channels failed to resolve channel offer counts', { err })
   }
 }