@open-mercato/core 0.6.7-develop.6863.1.61001cf9a8 → 0.6.7

package/src/modules/notifications/api/unread-count/route.ts

@@ -1,4 +1,3 @@
-import { createHash } from 'node:crypto'
 import type { EntityManager } from '@mikro-orm/core'
 import { runWithCacheTenant } from '@open-mercato/cache'
 import {
@@ -9,10 +8,6 @@ import {
 import { Notification } from '../../data/entities'
 import { unreadCountResponseSchema } from '../openapi'
 import { resolveNotificationContext } from '../../lib/routeHelpers'
-import {
-  buildNotificationReadScopeWhere,
-  getNotificationReadScopeTagOrganizationIds,
-} from '../../lib/notificationScope'
 
 export const metadata = {
   GET: { requireAuth: true },
@@ -21,21 +16,8 @@ export const metadata = {
 const UNREAD_COUNT_RESOURCE = 'notifications.notification'
 const UNREAD_COUNT_TTL_MS = 10_000
 
-function buildUnreadCountCacheKey(params: {
-  userId: string
-  organizationId: string | null
-  organizationIds: string[]
-}): string {
-  const normalizedIds = Array.from(new Set(
-    params.organizationIds.filter((value) => value.trim().length > 0),
-  )).sort((left, right) => left.localeCompare(right))
-  const scopeKey = normalizedIds.length === 0
-    ? 'no-access'
-    : `${params.organizationId ?? 'none'}:scope=${createHash('sha256')
-        .update(normalizedIds.join('\0'))
-        .digest('hex')
-        .slice(0, 16)}`
-  return `notifications:unread-count:u=${params.userId}:org=${scopeKey}`
+function buildUnreadCountCacheKey(userId: string): string {
+  return `notifications:unread-count:u=${userId}`
 }
 
 export async function GET(req: Request) {
@@ -43,22 +25,8 @@ export async function GET(req: Request) {
   const em = ctx.container.resolve('em') as EntityManager
 
   const userId = scope.userId
-  const cacheableOrganizationIds = Array.isArray(scope.organizationIds)
-    ? scope.organizationIds
-    : null
-  // Unrestricted and omitted legacy scopes cannot be safely tagged for invalidation:
-  // org-specific writes only invalidate their own collection tag. Keep those scopes
-  // uncached rather than serving a stale tenant-wide total until the TTL expires.
-  const cache = userId && cacheableOrganizationIds && isCrudCacheEnabled()
-    ? resolveCrudCache(ctx.container)
-    : null
-  const cacheKey = cache && userId && cacheableOrganizationIds
-    ? buildUnreadCountCacheKey({
-        userId,
-        organizationId: scope.organizationId,
-        organizationIds: cacheableOrganizationIds,
-      })
-    : null
+  const cache = userId && isCrudCacheEnabled() ? resolveCrudCache(ctx.container) : null
+  const cacheKey = cache && userId ? buildUnreadCountCacheKey(userId) : null
 
   if (cache && cacheKey) {
     try {
@@ -73,7 +41,6 @@ export async function GET(req: Request) {
     recipientUserId: userId,
     tenantId: scope.tenantId,
     status: 'unread',
-    ...buildNotificationReadScopeWhere(scope),
   })
 
   if (cache && cacheKey) {
@@ -81,11 +48,7 @@ export async function GET(req: Request) {
       await runWithCacheTenant(scope.tenantId, () =>
         cache.set(cacheKey, count, {
           ttl: UNREAD_COUNT_TTL_MS,
-          tags: buildCollectionTags(
-            UNREAD_COUNT_RESOURCE,
-            scope.tenantId,
-            getNotificationReadScopeTagOrganizationIds(scope),
-          ),
+          tags: buildCollectionTags(UNREAD_COUNT_RESOURCE, scope.tenantId, [null]),
         }),
       )
     } catch {}

package/src/modules/notifications/di.ts

@@ -5,7 +5,7 @@ import { createNotificationService } from './lib/notificationService'
 export function register(container: AppContainer): void {
   container.register({
     notificationService: asFunction(({ em, eventBus, commandBus }) =>
-      createNotificationService({ em, eventBus, commandBus, container })
+      createNotificationService({ em, eventBus, commandBus })
     ).scoped().proxy(),
   })
 }

package/src/modules/notifications/events.ts

@@ -8,7 +8,6 @@ const events = [
     entity: 'notification',
     category: 'system',
     clientBroadcast: true,
-    portalBroadcast: true,
   },
   {
     id: NOTIFICATION_SSE_EVENTS.BATCH_CREATED,
@@ -16,7 +15,6 @@ const events = [
     entity: 'notification',
     category: 'system',
     clientBroadcast: true,
-    portalBroadcast: true,
   },
 ] as const
 

package/src/modules/notifications/lib/notificationRecipients.ts

@@ -1,5 +1,5 @@
 import type { Kysely } from 'kysely'
-import { authorizeFeatures } from '@open-mercato/shared/security/featurePolicy'
+import { hasFeature } from '@open-mercato/shared/security/features'
 
 interface AclRow {
   user_id: string
@@ -22,11 +22,13 @@ function collectUsersWithFeature(
   requiredFeature: string
 ): void {
   for (const row of rows) {
-    const features = normalizeFeatures(row.features_json) ?? []
-    if (authorizeFeatures([requiredFeature], {
-      grantedFeatures: features,
-      unrestricted: row.is_super_admin,
-    })) {
+    if (row.is_super_admin) {
+      userIdsSet.add(row.user_id)
+      continue
+    }
+
+    const features = normalizeFeatures(row.features_json)
+    if (features && hasFeature(features, requiredFeature)) {
       userIdsSet.add(row.user_id)
     }
   }

package/src/modules/notifications/lib/notificationService.ts

@@ -1,7 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { type Kysely, sql } from 'kysely'
 import { CrudHttpError, conflict } from '@open-mercato/shared/lib/crud/errors'
-import { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'
 import { Notification, type NotificationStatus } from '../data/entities'
 import type { CreateNotificationInput, CreateBatchNotificationInput, CreateRoleNotificationInput, CreateFeatureNotificationInput, ExecuteActionInput } from '../data/validators'
 import type { NotificationPollData } from '@open-mercato/shared/modules/notifications/types'
@@ -15,7 +14,6 @@ import {
   type NotificationTenantContext,
 } from './notificationFactory'
 import { toNotificationDto } from './notificationMapper'
-import { buildNotificationReadScopeWhere } from './notificationScope'
 import {
   getRecipientUserIdsForFeature,
   getRecipientUserIdsForRole,
@@ -35,32 +33,11 @@ function getDb(em: EntityManager): Kysely<any> {
 }
 
 const UNIQUE_NOTIFICATION_ACTIVE_STATUSES: NotificationStatus[] = ['unread', 'read', 'actioned']
-const NOTIFICATION_RESOURCE_KIND = 'notifications.notification'
 
 function normalizeOrgScope(organizationId: string | null | undefined): string | null {
   return organizationId ?? null
 }
 
-async function invalidateNotificationCache(
-  container: NotificationServiceDeps['container'],
-  ctx: Pick<NotificationServiceContext, 'tenantId' | 'organizationId'>,
-  reason: string,
-  notificationId?: string,
-): Promise<void> {
-  if (!container) return
-  await invalidateCrudCache(
-    container as Parameters<typeof invalidateCrudCache>[0],
-    NOTIFICATION_RESOURCE_KIND,
-    {
-      id: notificationId,
-      tenantId: ctx.tenantId,
-      organizationId: normalizeOrgScope(ctx.organizationId),
-    },
-    ctx.tenantId,
-    reason,
-  )
-}
-
 async function assertNotificationRecipientsInScope(
   em: EntityManager,
   recipientUserIds: string[],
@@ -207,7 +184,6 @@ async function createOrRefreshNotification(
 export interface NotificationServiceContext {
   tenantId: string
   organizationId?: string | null
-  organizationIds?: string[] | null
   userId?: string | null
 }
 
@@ -265,7 +241,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         return entity
       })
 
-      await invalidateNotificationCache(container, ctx, 'created')
       await emitNotificationCreated(eventBus, notification, ctx)
       await eventBus.emit(NOTIFICATION_SSE_EVENTS.CREATED, {
         tenantId: notification.tenantId,
@@ -292,7 +267,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         await tx.flush()
       })
 
-      await invalidateNotificationCache(container, ctx, 'created')
       await emitNotificationCreatedBatch(eventBus, notifications, ctx)
       await emitNotificationSseEvents(eventBus, notifications, ctx, recipientUserIds)
 
@@ -321,7 +295,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         await tx.flush()
       })
 
-      await invalidateNotificationCache(container, ctx, 'created')
       await emitNotificationCreatedBatch(eventBus, notifications, ctx)
       await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)
 
@@ -353,7 +326,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         await tx.flush()
       })
 
-      await invalidateNotificationCache(container, ctx, 'created')
       await emitNotificationCreatedBatch(eventBus, notifications, ctx)
       await emitNotificationSseEvents(eventBus, notifications, ctx, uniqueRecipientUserIds)
 
@@ -369,7 +341,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         notification.readAt = new Date()
         await em.flush()
 
-        await invalidateNotificationCache(container, ctx, 'updated', notification.id)
         await eventBus.emit(NOTIFICATION_EVENTS.READ, {
           notificationId: notification.id,
           userId: ctx.userId,
@@ -416,8 +387,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
       ).executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined
       const result = Number(updateResult?.numUpdatedRows ?? targetRows.length)
 
-      await invalidateNotificationCache(container, ctx, 'updated')
-
       const notifications = await findWithDecryption(em, Notification, {
         id: { $in: targetRows.map((row) => row.id) },
       }, undefined, {
@@ -451,7 +420,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
       notification.dismissedAt = new Date()
       await em.flush()
 
-      await invalidateNotificationCache(container, ctx, 'updated', notification.id)
       await eventBus.emit(NOTIFICATION_EVENTS.DISMISSED, {
         notificationId: notification.id,
         userId: ctx.userId,
@@ -481,7 +449,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
 
       await em.flush()
 
-      await invalidateNotificationCache(container, ctx, 'updated', notification.id)
       await eventBus.emit(NOTIFICATION_EVENTS.RESTORED, {
         notificationId: notification.id,
         userId: ctx.userId,
@@ -611,7 +578,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
 
       await em.flush()
 
-      await invalidateNotificationCache(container, ctx, 'updated', notification.id)
       await eventBus.emit(NOTIFICATION_EVENTS.ACTIONED, {
         notificationId: notification.id,
         actionId: input.actionId,
@@ -628,7 +594,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         recipientUserId: ctx.userId,
         tenantId: ctx.tenantId,
         status: 'unread',
-        ...buildNotificationReadScopeWhere(ctx),
       })
     },
 
@@ -637,7 +602,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
       const filters: Record<string, unknown> = {
         recipientUserId: ctx.userId,
         tenantId: ctx.tenantId,
-        ...buildNotificationReadScopeWhere(ctx),
       }
 
       if (since) {
@@ -653,7 +617,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
           recipientUserId: ctx.userId,
           tenantId: ctx.tenantId,
           status: 'unread',
-          ...buildNotificationReadScopeWhere(ctx),
         }),
       ])
 
@@ -672,19 +635,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
       const em = rootEm.fork()
       const db = getDb(em)
 
-      const affectedScopes = await db
-        .selectFrom('notifications' as any)
-        .select([
-          'tenant_id' as any,
-          'organization_id' as any,
-        ])
-        .where('expires_at' as any, '<', sql`now()`)
-        .where('status' as any, 'not in', ['actioned', 'dismissed'])
-        .distinct()
-        .execute() as Array<{ tenant_id: string; organization_id: string | null }>
-
-      if (!affectedScopes.length) return 0
-
       const updateResult = await db
         .updateTable('notifications' as any)
         .set({
@@ -695,13 +645,6 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         .where('status' as any, 'not in', ['actioned', 'dismissed'])
         .executeTakeFirst() as { numUpdatedRows?: bigint | number } | undefined
 
-      for (const scope of affectedScopes) {
-        await invalidateNotificationCache(container, {
-          tenantId: scope.tenant_id,
-          organizationId: scope.organization_id,
-        }, 'updated')
-      }
-
       return Number(updateResult?.numUpdatedRows ?? 0)
     },
 
@@ -716,12 +659,7 @@ export function createNotificationService(deps: NotificationServiceDeps): Notifi
         .where('tenant_id' as any, '=', ctx.tenantId)
         .executeTakeFirst() as { numDeletedRows?: bigint | number } | undefined
 
-      const deletedCount = Number(deleteResult?.numDeletedRows ?? 0)
-      if (deletedCount > 0) {
-        await invalidateNotificationCache(container, ctx, 'deleted')
-      }
-
-      return deletedCount
+      return Number(deleteResult?.numDeletedRows ?? 0)
     },
   }
 }

package/src/modules/notifications/lib/routeHelpers.ts

@@ -4,7 +4,6 @@ import { resolveRequestContext } from '@open-mercato/shared/lib/api/context'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { resolveNotificationService, type NotificationService } from './notificationService'
 
 /**
@@ -23,7 +22,6 @@ export const NOTIFICATION_SETTINGS_RESOURCE_KIND = 'notifications.settings'
 export interface NotificationScope {
   tenantId: string
   organizationId: string | null
-  organizationIds?: string[] | null
   userId: string | null
 }
 
@@ -66,26 +64,11 @@ export function notificationCrudErrorResponse(error: unknown): Response | null {
  */
 export async function resolveNotificationContext(req: Request): Promise<NotificationRequestContext> {
   const { ctx } = await resolveRequestContext(req)
-  const organizationScope = await resolveOrganizationScopeForRequest({
-    container: ctx.container,
-    auth: ctx.auth,
-    request: req,
-    ...(ctx.selectedOrganizationId === undefined
-      ? {}
-      : { selectedId: ctx.selectedOrganizationId }),
-  })
-  const tenantId = organizationScope.tenantId ?? ctx.auth?.tenantId ?? ''
-  const organizationId = organizationScope.selectedId
-  const organizationIds = organizationScope.filterIds
-  ctx.organizationScope = organizationScope
-  ctx.selectedOrganizationId = organizationId
-  ctx.organizationIds = organizationIds
   return {
     service: resolveNotificationService(ctx.container),
     scope: {
-      tenantId,
-      organizationId,
-      organizationIds,
+      tenantId: ctx.auth?.tenantId ?? '',
+      organizationId: ctx.selectedOrganizationId ?? null,
       userId: ctx.auth?.sub ?? null,
     },
     ctx,

package/src/modules/payment_gateways/api/capture/route.ts

@@ -92,7 +92,7 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 200, description: 'Payment captured' },
-        { status: 409, description: 'Invalid payment status transition, cumulative capture ceiling exceeded, or conflicting capture operation' },
+        { status: 409, description: 'Invalid payment status transition' },
         { status: 422, description: 'Invalid payload' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/sessions/route.ts

@@ -2,7 +2,6 @@ import { NextResponse } from 'next/server'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { createSessionSchema } from '../../data/validators'
 import type { PaymentGatewayService } from '../../lib/gateway-service'
 import { paymentGatewaysTag } from '../openapi'
@@ -99,10 +98,9 @@ export async function POST(req: Request) {
       paymentId: transaction.paymentId,
     }, { status: 201 })
   } catch (err: unknown) {
-    if (isCrudHttpError(err)) {
-      return NextResponse.json(err.body, { status: err.status })
-    }
-    return NextResponse.json({ error: 'Failed to create payment session' }, { status: 502 })
+    const message = err instanceof Error ? err.message : 'Failed to create payment session'
+    const status = message.includes('No gateway adapter') ? 422 : 502
+    return NextResponse.json({ error: message }, { status })
   }
 }
 
@@ -115,7 +113,6 @@ export const openApi = {
       tags: [paymentGatewaysTag],
       responses: [
         { status: 201, description: 'Payment session created' },
-        { status: 409, description: 'Amount or currency does not match the referenced order' },
         { status: 422, description: 'Invalid payload or unknown provider' },
         { status: 502, description: 'Gateway provider error' },
       ],

package/src/modules/payment_gateways/api/webhook/[provider]/route.ts

@@ -14,7 +14,6 @@ import { getPaymentGatewayQueue } from '../../../lib/queue'
 import { processPaymentGatewayWebhookJob } from '../../../lib/webhook-processor'
 import { paymentGatewaysTag } from '../../openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
-import { readBoundedRequestBody, WebhookBodyTooLargeError } from '@open-mercato/shared/lib/webhooks'
 
 const logger = createLogger('payment_gateways').child({ component: 'webhook' })
 
@@ -43,17 +42,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ provide
   const rateLimitResponse = await checkProviderWebhookRateLimit(container, req, providerKey)
   if (rateLimitResponse) return rateLimitResponse
 
-  let rawBody: string
-  try {
-    rawBody = registration.maxBodyBytes === undefined
-      ? await req.text()
-      : await readBoundedRequestBody(req, { maxBytes: registration.maxBodyBytes })
-  } catch (error) {
-    if (error instanceof WebhookBodyTooLargeError) {
-      return NextResponse.json({ error: 'Webhook payload too large' }, { status: 413 })
-    }
-    throw error
-  }
+  const rawBody = await req.text()
   const headers: Record<string, string> = {}
   req.headers.forEach((value, key) => {
     headers[key] = value
@@ -175,7 +164,6 @@ export const openApi = {
       responses: [
         { status: 202, description: 'Webhook accepted for async processing' },
         { status: 401, description: 'Signature verification failed' },
-        { status: 413, description: 'Webhook payload too large' },
         { status: 404, description: 'Unknown provider' },
       ],
     },

package/src/modules/payment_gateways/backend/payment-gateways/page.tsx

@@ -1,6 +1,5 @@
 "use client"
 import * as React from 'react'
-import { extensionPoints } from '@open-mercato/core/modules/payment_gateways/extension-points'
 import { useSearchParams } from 'next/navigation'
 import type { ColumnDef } from '@tanstack/react-table'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
@@ -473,7 +472,7 @@ export default function PaymentTransactionsPage() {
           searchValue={search}
           onSearchChange={(value) => { setSearch(value); setPage(1) }}
           searchPlaceholder={t('payment_gateways.transactions.searchPlaceholder', 'Search by payment, transaction, session, or gateway id')}
-          perspective={{ tableId: extensionPoints.hosts.transactionsTable.tableId }}
+          perspective={{ tableId: 'payment_gateways.transactions.list' }}
           pagination={{ page, pageSize: 20, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
           onRowClick={(row) => setSelectedId((current) => current === row.id ? null : row.id)}
@@ -692,7 +691,7 @@ export default function PaymentTransactionsPage() {
                         className="p-4"
                       />
                       <InjectionSpot
-                        spotId={extensionPoints.hosts.transactionsAfter.spotId}
+                        spotId="admin.page:payment-gateways/transactions:after"
                         context={{ selectedPaymentId: detail.transaction.paymentId }}
                       />
                     </div>

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

@@ -6,7 +6,7 @@ import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorato
 @Index({ properties: ['providerKey', 'providerSessionId', 'organizationId'] })
 @Index({ properties: ['organizationId', 'tenantId', 'unifiedStatus'] })
 export class GatewayTransaction {
-  [OptionalProps]?: 'unifiedStatus' | 'gatewayStatus' | 'providerSessionId' | 'gatewayPaymentId' | 'gatewayRefundId' | 'redirectUrl' | 'clientSecret' | 'capturedAmount' | 'gatewayMetadata' | 'webhookLog' | 'lastWebhookAt' | 'lastPolledAt' | 'expiresAt' | 'createdAt' | 'updatedAt' | 'deletedAt'
+  [OptionalProps]?: 'unifiedStatus' | 'gatewayStatus' | 'providerSessionId' | 'gatewayPaymentId' | 'gatewayRefundId' | 'redirectUrl' | 'clientSecret' | 'gatewayMetadata' | 'webhookLog' | 'lastWebhookAt' | 'lastPolledAt' | 'expiresAt' | 'createdAt' | 'updatedAt' | 'deletedAt'
 
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -41,9 +41,6 @@ export class GatewayTransaction {
   @Property({ name: 'amount', type: 'numeric', precision: 18, scale: 4 })
   amount!: string
 
-  @Property({ name: 'captured_amount', type: 'numeric', precision: 18, scale: 4, default: '0' })
-  capturedAmount: string = '0'
-
   @Property({ name: 'currency_code', type: 'text' })
   currencyCode!: string
 
@@ -86,7 +83,7 @@ export class GatewayTransaction {
 @Index({ properties: ['transactionId', 'operationType', 'organizationId', 'tenantId'] })
 @Index({ properties: ['status', 'leaseExpiresAt'] })
 export class GatewayPaymentOperation {
-  [OptionalProps]?: 'status' | 'attemptCount' | 'result' | 'reservedAmount' | 'leaseExpiresAt' | 'createdAt' | 'updatedAt'
+  [OptionalProps]?: 'status' | 'attemptCount' | 'result' | 'leaseExpiresAt' | 'createdAt' | 'updatedAt'
 
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -121,9 +118,6 @@ export class GatewayPaymentOperation {
   @Property({ name: 'result', type: 'jsonb', nullable: true })
   result?: Record<string, unknown> | null
 
-  @Property({ name: 'reserved_amount', type: 'numeric', precision: 18, scale: 4, nullable: true })
-  reservedAmount?: string | null
-
   @Property({ name: 'lease_expires_at', type: Date, nullable: true })
   leaseExpiresAt?: Date | null
 
@@ -145,11 +139,6 @@ export class GatewayPaymentOperation {
   name: 'gateway_session_initializations_scope_operation_unique',
   properties: ['operationKey', 'providerKey', 'organizationId', 'tenantId'],
 })
-@Index({
-  name: 'gateway_session_initializations_prune_idx',
-  expression:
-    'create index "gateway_session_initializations_prune_idx" on "gateway_session_initializations" ("tenant_id", "organization_id", "updated_at") where "gateway_transaction_id" is not null',
-})
 export class GatewaySessionInitialization {
   [OptionalProps]?: 'claimToken' | 'claimedAt' | 'gatewayTransactionId' | 'createdAt' | 'updatedAt'
 

package/src/modules/payment_gateways/di.ts

@@ -4,11 +4,9 @@ import type { AppContainer } from '@open-mercato/shared/lib/di/container'
 import type { CredentialsService } from '../integrations/lib/credentials-service'
 import type { IntegrationLogService } from '../integrations/lib/log-service'
 import type { IntegrationStateService } from '../integrations/lib/state-service'
-import type { PaymentOrderTotalResolver } from '@open-mercato/shared/modules/payment_gateways/types'
 import { GatewayTransaction, WebhookProcessedEvent } from './data/entities'
 import { createPaymentGatewayDescriptorService } from './lib/descriptor-service'
 import { createPaymentGatewayService } from './lib/gateway-service'
-import { isPaymentOrderTotalResolver } from './lib/order-amount-reconciliation'
 
 type Cradle = {
   em: EntityManager
@@ -17,34 +15,10 @@ type Cradle = {
   integrationStateService: IntegrationStateService
 }
 
-const ORDER_TOTAL_RESOLVER_NAME = 'paymentOrderTotalResolver'
-
-/**
- * The order-total resolver is owned by whichever module owns orders (`sales`
- * registers the default one). Its absence is the only supported reason to skip
- * amount reconciliation, so this only tolerates a missing registration: a
- * registered resolver that fails to build or does not satisfy the contract
- * throws instead of silently disabling the check.
- */
-function resolveOrderTotalResolver(container: AppContainer, cradle: Cradle): PaymentOrderTotalResolver | null {
-  if (!container.hasRegistration(ORDER_TOTAL_RESOLVER_NAME)) return null
-  const candidate = (cradle as Cradle & { paymentOrderTotalResolver?: unknown })[ORDER_TOTAL_RESOLVER_NAME]
-  if (!isPaymentOrderTotalResolver(candidate)) {
-    throw new Error(`[internal] ${ORDER_TOTAL_RESOLVER_NAME} does not implement resolveOrderTotal`)
-  }
-  return candidate
-}
-
 export function register(container: AppContainer) {
   container.register({
-    paymentGatewayService: asFunction((cradle: Cradle) =>
-      createPaymentGatewayService({
-        em: cradle.em,
-        integrationCredentialsService: cradle.integrationCredentialsService,
-        integrationLogService: cradle.integrationLogService,
-        integrationStateService: cradle.integrationStateService,
-        paymentOrderTotalResolver: resolveOrderTotalResolver(container, cradle),
-      }),
+    paymentGatewayService: asFunction(({ em, integrationCredentialsService, integrationLogService, integrationStateService }: Cradle) =>
+      createPaymentGatewayService({ em, integrationCredentialsService, integrationLogService, integrationStateService }),
     ).scoped().proxy(),
     paymentGatewayDescriptorService: asFunction(({ integrationCredentialsService, integrationStateService }: Cradle) =>
       createPaymentGatewayDescriptorService({ integrationCredentialsService, integrationStateService }),

package/src/modules/payment_gateways/i18n/de.json

@@ -2,9 +2,6 @@
   "payment_gateways.captureMethod.automatic": "Automatisch",
   "payment_gateways.captureMethod.manual": "Manuell",
   "payment_gateways.column.gatewayStatus": "Gateway-Status",
-  "payment_gateways.errors.sessionAmountMismatch": "Der Betrag der Zahlungssitzung {amount} stimmt nicht mit dem fälligen Betrag der Bestellung {orderId} überein",
-  "payment_gateways.errors.sessionCurrencyMismatch": "Die Währung der Zahlungssitzung {currencyCode} stimmt nicht mit der Währung der Bestellung {orderId} überein",
-  "payment_gateways.errors.sessionOrderNotFound": "Bestellung {orderId} wurde im aktuellen Gültigkeitsbereich nicht gefunden",
   "payment_gateways.feature.capture": "Autorisierte Zahlungen erfassen",
   "payment_gateways.feature.manage": "Zahlungssitzungen verwalten",
   "payment_gateways.feature.refund": "Erfasste Zahlungen erstatten",
@@ -79,9 +76,5 @@
   "payment_gateways.transactions.success.capture": "Payment erfasst",
   "payment_gateways.transactions.success.refreshStatus": "Der Transaktionsstatus wurde aktualisiert",
   "payment_gateways.transactions.tableTitle": "Transaktionen",
-  "payment_gateways.transactions.title": "Zahlungstransaktionen",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.cta": "Bereinigung der Ansprüche planen",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.loading": "Bereinigung der Ansprüche wird geplant…",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.message": "Registrieren Sie den täglichen Bereinigungsplan, der abgeschlossene Zahlungssitzungsansprüche nach ihrem 24-stündigen Wiederholungsfenster entfernt.",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.success": "Die Bereinigung der Zahlungssitzungsansprüche ist geplant."
+  "payment_gateways.transactions.title": "Zahlungstransaktionen"
 }

package/src/modules/payment_gateways/i18n/en.json

@@ -2,9 +2,6 @@
   "payment_gateways.captureMethod.automatic": "Automatic",
   "payment_gateways.captureMethod.manual": "Manual",
   "payment_gateways.column.gatewayStatus": "Gateway status",
-  "payment_gateways.errors.sessionAmountMismatch": "Payment session amount {amount} does not match the amount due for order {orderId}",
-  "payment_gateways.errors.sessionCurrencyMismatch": "Payment session currency {currencyCode} does not match the currency of order {orderId}",
-  "payment_gateways.errors.sessionOrderNotFound": "Order {orderId} was not found in the current scope",
   "payment_gateways.feature.capture": "Capture authorized payments",
   "payment_gateways.feature.manage": "Manage payment sessions",
   "payment_gateways.feature.refund": "Refund captured payments",
@@ -79,9 +76,5 @@
   "payment_gateways.transactions.success.capture": "Payment captured",
   "payment_gateways.transactions.success.refreshStatus": "Transaction status refreshed",
   "payment_gateways.transactions.tableTitle": "Transactions",
-  "payment_gateways.transactions.title": "Payment Transactions",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.cta": "Schedule claim cleanup",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.loading": "Scheduling claim cleanup…",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.message": "Register the daily cleanup schedule that removes completed payment-session claims after their 24-hour replay window.",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.success": "Payment-session claim cleanup is scheduled."
+  "payment_gateways.transactions.title": "Payment Transactions"
 }

package/src/modules/payment_gateways/i18n/es.json

@@ -2,9 +2,6 @@
   "payment_gateways.captureMethod.automatic": "Automatica",
   "payment_gateways.captureMethod.manual": "Manual",
   "payment_gateways.column.gatewayStatus": "Estado de la pasarela",
-  "payment_gateways.errors.sessionAmountMismatch": "El importe de la sesión de pago {amount} no coincide con el importe pendiente del pedido {orderId}",
-  "payment_gateways.errors.sessionCurrencyMismatch": "La moneda de la sesión de pago {currencyCode} no coincide con la moneda del pedido {orderId}",
-  "payment_gateways.errors.sessionOrderNotFound": "No se encontró el pedido {orderId} en el ámbito actual",
   "payment_gateways.feature.capture": "Capturar pagos autorizados",
   "payment_gateways.feature.manage": "Gestionar sesiones de pago",
   "payment_gateways.feature.refund": "Reembolsar pagos capturados",
@@ -79,9 +76,5 @@
   "payment_gateways.transactions.success.capture": "Pago capturado",
   "payment_gateways.transactions.success.refreshStatus": "El estado de la transaccion se actualizo",
   "payment_gateways.transactions.tableTitle": "Transacciones",
-  "payment_gateways.transactions.title": "Transacciones de pago",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.cta": "Programar limpieza de reclamaciones",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.loading": "Programando limpieza de reclamaciones…",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.message": "Registra la limpieza diaria que elimina las reclamaciones de sesiones de pago completadas después de su ventana de repetición de 24 horas.",
-  "payment_gateways.upgradeActions.sessionInitializationPrune.success": "La limpieza de reclamaciones de sesiones de pago está programada."
+  "payment_gateways.transactions.title": "Transacciones de pago"
 }