@open-mercato/core 0.4.7-develop-0a657b411f → 0.4.7-develop-e249d3e7d0

package/src/modules/payment_gateways/lib/webhook-utils.ts

@@ -0,0 +1,52 @@
+import { UniqueConstraintViolationException } from '@mikro-orm/core'
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { WebhookProcessedEvent } from '../data/entities'
+
+export async function claimWebhookProcessing(
+  em: EntityManager,
+  idempotencyKey: string,
+  providerKey: string,
+  scope: { organizationId: string; tenantId: string },
+  eventType: string,
+): Promise<boolean> {
+  const record = em.create(WebhookProcessedEvent, {
+    idempotencyKey,
+    providerKey,
+    eventType,
+    organizationId: scope.organizationId,
+    tenantId: scope.tenantId,
+  })
+
+  try {
+    await em.persistAndFlush(record)
+    return true
+  } catch (error: unknown) {
+    if (error instanceof UniqueConstraintViolationException) {
+      return false
+    }
+    throw error
+  }
+}
+
+export async function releaseWebhookClaim(
+  em: EntityManager,
+  idempotencyKey: string,
+  providerKey: string,
+  scope: { organizationId: string; tenantId: string },
+): Promise<void> {
+  const existing = await findOneWithDecryption(
+    em,
+    WebhookProcessedEvent,
+    {
+      idempotencyKey,
+      providerKey,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+    },
+    undefined,
+    scope,
+  )
+  if (!existing) return
+  await em.removeAndFlush(existing)
+}

package/src/modules/payment_gateways/migrations/.snapshot-open-mercato.json

@@ -0,0 +1,373 @@
+{
+  "namespaces": [
+    "public"
+  ],
+  "name": "public",
+  "tables": [
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "payment_id": {
+          "name": "payment_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "provider_key": {
+          "name": "provider_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "provider_session_id": {
+          "name": "provider_session_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "gateway_payment_id": {
+          "name": "gateway_payment_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "gateway_refund_id": {
+          "name": "gateway_refund_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "unified_status": {
+          "name": "unified_status",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "'pending'",
+          "mappedType": "text"
+        },
+        "gateway_status": {
+          "name": "gateway_status",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "redirect_url": {
+          "name": "redirect_url",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "client_secret": {
+          "name": "client_secret",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "amount": {
+          "name": "amount",
+          "type": "numeric(18,4)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "precision": 18,
+          "scale": 4,
+          "mappedType": "decimal"
+        },
+        "currency_code": {
+          "name": "currency_code",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "gateway_metadata": {
+          "name": "gateway_metadata",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "webhook_log": {
+          "name": "webhook_log",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "last_webhook_at": {
+          "name": "last_webhook_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "last_polled_at": {
+          "name": "last_polled_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "gateway_transactions",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "gateway_transactions_organization_id_tenant_id_uni_5a9b9_index",
+          "columnNames": [
+            "organization_id",
+            "tenant_id",
+            "unified_status"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "gateway_transactions_provider_key_provider_session_d8577_index",
+          "columnNames": [
+            "provider_key",
+            "provider_session_id",
+            "organization_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "gateway_transactions_payment_id_organization_id_tenant_id_index",
+          "columnNames": [
+            "payment_id",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "gateway_transactions_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {},
+      "nativeEnums": {}
+    },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "provider_key": {
+          "name": "provider_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "gateway_webhook_events",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "gateway_webhook_events_idempotency_unique",
+          "columnNames": [
+            "idempotency_key",
+            "provider_key",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": true
+        },
+        {
+          "keyName": "gateway_webhook_events_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {},
+      "nativeEnums": {}
+    }
+  ],
+  "nativeEnums": {}
+}

package/src/modules/payment_gateways/migrations/Migration20260305122155.ts

@@ -0,0 +1,20 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260305122155 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "gateway_transactions" ("id" uuid not null default gen_random_uuid(), "payment_id" uuid not null, "provider_key" text not null, "provider_session_id" text null, "gateway_payment_id" text null, "gateway_refund_id" text null, "unified_status" text not null default 'pending', "gateway_status" text null, "redirect_url" text null, "client_secret" text null, "amount" numeric(18,4) not null, "currency_code" text not null, "gateway_metadata" jsonb null, "webhook_log" jsonb null, "last_webhook_at" timestamptz null, "last_polled_at" timestamptz null, "expires_at" timestamptz null, "organization_id" uuid not null, "tenant_id" uuid not null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "gateway_transactions_pkey" primary key ("id"));`);
+    this.addSql(`create index "gateway_transactions_organization_id_tenant_id_uni_5a9b9_index" on "gateway_transactions" ("organization_id", "tenant_id", "unified_status");`);
+    this.addSql(`create index "gateway_transactions_provider_key_provider_session_d8577_index" on "gateway_transactions" ("provider_key", "provider_session_id", "organization_id");`);
+    this.addSql(`create index "gateway_transactions_payment_id_organization_id_tenant_id_index" on "gateway_transactions" ("payment_id", "organization_id", "tenant_id");`);
+
+    this.addSql(`create table "gateway_webhook_events" ("id" uuid not null default gen_random_uuid(), "provider_key" text not null, "idempotency_key" text not null, "event_type" text not null, "organization_id" uuid not null, "tenant_id" uuid not null, "processed_at" timestamptz not null, constraint "gateway_webhook_events_pkey" primary key ("id"));`);
+    this.addSql(`create unique index "gateway_webhook_events_idempotency_unique" on "gateway_webhook_events" ("idempotency_key", "provider_key", "organization_id", "tenant_id");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop table if exists "gateway_webhook_events";`);
+    this.addSql(`drop table if exists "gateway_transactions";`);
+  }
+
+}

package/src/modules/payment_gateways/setup.ts

@@ -0,0 +1,11 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+
+export const setup: ModuleSetupConfig = {
+  defaultRoleFeatures: {
+    superadmin: ['payment_gateways.*'],
+    admin: ['payment_gateways.*'],
+    employee: ['payment_gateways.view'],
+  },
+}
+
+export default setup

package/src/modules/payment_gateways/widgets/injection-table.ts

@@ -0,0 +1,9 @@
+import type { ModuleInjectionTable } from '@open-mercato/shared/modules/widgets/injection'
+
+/**
+ * Keep hub module free of cross-module UI bindings.
+ * Consumer modules should map their own spots to payment_gateway widgets.
+ */
+export const injectionTable: ModuleInjectionTable = {}
+
+export default injectionTable

package/src/modules/payment_gateways/workers/status-poller.ts

@@ -0,0 +1,58 @@
+import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'
+import type { IntegrationLogService } from '../../integrations/lib/log-service'
+import type { PaymentGatewayService } from '../lib/gateway-service'
+
+type PollerJobPayload = {
+  scope?: {
+    organizationId?: string
+    tenantId?: string
+    providerKey?: string
+  }
+  limit?: number
+}
+
+type HandlerContext = JobContext & {
+  resolve: <T = unknown>(name: string) => T
+}
+
+export const metadata: WorkerMeta = {
+  queue: 'payment-gateways-status-poller',
+  id: 'payment-gateways:status-poller',
+  concurrency: 2,
+}
+
+export default async function handle(job: QueuedJob<PollerJobPayload>, ctx: HandlerContext): Promise<void> {
+  const service = ctx.resolve<PaymentGatewayService>('paymentGatewayService')
+  const integrationLogService = ctx.resolve<IntegrationLogService>('integrationLogService')
+  const transactions = await service.listTransactionsForStatusPolling({
+    organizationId: job.payload.scope?.organizationId,
+    tenantId: job.payload.scope?.tenantId,
+    providerKey: job.payload.scope?.providerKey,
+    limit: job.payload.limit ?? 100,
+  })
+
+  for (const transaction of transactions) {
+    try {
+      await service.getPaymentStatus(transaction.id, {
+        organizationId: transaction.organizationId,
+        tenantId: transaction.tenantId,
+      })
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Unknown polling error'
+      await integrationLogService.write({
+        integrationId: `gateway_${transaction.providerKey}`,
+        scopeEntityType: 'payment_transaction',
+        scopeEntityId: transaction.id,
+        level: 'error',
+        message: 'Payment status polling failed',
+        payload: {
+          transactionId: transaction.id,
+          message,
+        },
+      }, {
+        organizationId: transaction.organizationId,
+        tenantId: transaction.tenantId,
+      })
+    }
+  }
+}

package/src/modules/payment_gateways/workers/webhook-processor.ts

@@ -0,0 +1,30 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import type { WebhookEvent } from '@open-mercato/shared/modules/payment_gateways/types'
+import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'
+import type { IntegrationLogService } from '../../integrations/lib/log-service'
+import type { PaymentGatewayService } from '../lib/gateway-service'
+import { processPaymentGatewayWebhookJob, type PaymentGatewayWebhookJobPayload } from '../lib/webhook-processor'
+
+type WebhookJobPayload = PaymentGatewayWebhookJobPayload & {
+  event: WebhookEvent
+}
+
+type HandlerContext = JobContext & {
+  resolve: <T = unknown>(name: string) => T
+}
+
+export const metadata: WorkerMeta = {
+  queue: 'payment-gateways-webhook',
+  id: 'payment-gateways:webhook-processor',
+  concurrency: 5,
+}
+
+export default async function handle(job: QueuedJob<WebhookJobPayload>, ctx: HandlerContext): Promise<void> {
+  const em = ctx.resolve<EntityManager>('em')
+  const paymentGatewayService = ctx.resolve<PaymentGatewayService>('paymentGatewayService')
+  const integrationLogService = ctx.resolve<IntegrationLogService>('integrationLogService')
+  await processPaymentGatewayWebhookJob(
+    { em, paymentGatewayService, integrationLogService },
+    job.payload,
+  )
+}

package/src/modules/sales/data/enrichers.ts

@@ -0,0 +1,120 @@
+/**
+ * Catalog Image Enricher
+ *
+ * Overrides the snapshot's `thumbnailUrl` with a freshly built URL from the
+ * product/variant's current `defaultMediaId`. This ensures quote/order lines
+ * always reflect the latest product image, even when the underlying attachment
+ * changes. The snapshot serves as fallback for deleted products.
+ *
+ * Uses raw Knex queries because cross-module ORM entity class references
+ * do not resolve correctly at runtime (the imported class does not match the
+ * entity registered in MikroORM's metadata by the app bootstrap).
+ */
+
+import type { ResponseEnricher, EnricherContext } from '@open-mercato/shared/lib/crud/response-enricher'
+import { buildAttachmentImageUrl } from '../../attachments/lib/imageUrls'
+
+type LineRecord = Record<string, unknown> & { id: string }
+
+type SnapshotNode = { thumbnailUrl?: string | null; [key: string]: unknown }
+type CatalogSnapshot = { product?: SnapshotNode; variant?: SnapshotNode; [key: string]: unknown }
+
+function getKnex(em: unknown): unknown {
+  return (em as any).getConnection?.()?.getKnex?.()
+}
+
+async function fetchMediaIds(
+  knex: unknown,
+  table: string,
+  ids: Set<string>,
+  organizationId: string,
+): Promise<Map<string, string | null>> {
+  const map = new Map<string, string | null>()
+  if (ids.size === 0) return map
+
+  const rows: Array<{ id: string; default_media_id: string | null }> = await (knex as any)(table)
+    .select('id', 'default_media_id')
+    .whereIn('id', [...ids])
+    .where('organization_id', organizationId)
+    .whereNull('deleted_at')
+
+  for (const row of rows) {
+    map.set(row.id, row.default_media_id ? buildAttachmentImageUrl(row.default_media_id) : null)
+  }
+  return map
+}
+
+function enrichRecords(
+  records: LineRecord[],
+  productMedia: Map<string, string | null>,
+  variantMedia: Map<string, string | null>,
+): LineRecord[] {
+  return records.map((record) => {
+    const productId = record['product_id'] as string | undefined
+    const variantId = record['product_variant_id'] as string | undefined
+
+    const productUrl = productId ? productMedia.get(productId) : undefined
+    const variantUrl = variantId ? variantMedia.get(variantId) : undefined
+    if (productUrl === undefined && variantUrl === undefined) return record
+
+    const snapshot = (record['catalog_snapshot'] as CatalogSnapshot | null | undefined) ?? {}
+    const updatedSnapshot = { ...snapshot }
+
+    if (productUrl !== undefined) {
+      updatedSnapshot.product = { ...snapshot.product, thumbnailUrl: productUrl ?? snapshot.product?.thumbnailUrl }
+    }
+    if (variantUrl !== undefined) {
+      updatedSnapshot.variant = { ...snapshot.variant, thumbnailUrl: variantUrl ?? snapshot.variant?.thumbnailUrl }
+    }
+
+    const changed =
+      updatedSnapshot.product?.thumbnailUrl !== snapshot.product?.thumbnailUrl ||
+      updatedSnapshot.variant?.thumbnailUrl !== snapshot.variant?.thumbnailUrl
+    if (!changed) return record
+
+    return { ...record, catalog_snapshot: updatedSnapshot }
+  })
+}
+
+function createCatalogImageEnricher(targetEntity: string): ResponseEnricher<LineRecord> {
+  return {
+    id: `sales.catalog-image:${targetEntity}`,
+    targetEntity,
+    features: [],
+    priority: 5,
+    timeout: 1000,
+    critical: false,
+    fallback: {},
+
+    async enrichOne(record, context: EnricherContext) {
+      return (await this.enrichMany!([record], context))[0]
+    },
+
+    async enrichMany(records, context: EnricherContext) {
+      if (records.length === 0) return records
+
+      const knex = getKnex(context.em)
+      if (!knex) return records
+
+      const productIds = new Set<string>()
+      const variantIds = new Set<string>()
+      for (const record of records) {
+        if (typeof record['product_id'] === 'string') productIds.add(record['product_id'])
+        if (typeof record['product_variant_id'] === 'string') variantIds.add(record['product_variant_id'])
+      }
+      if (productIds.size === 0 && variantIds.size === 0) return records
+
+      const [productMedia, variantMedia] = await Promise.all([
+        fetchMediaIds(knex, 'catalog_products', productIds, context.organizationId),
+        fetchMediaIds(knex, 'catalog_product_variants', variantIds, context.organizationId),
+      ])
+
+      return enrichRecords(records, productMedia, variantMedia)
+    },
+  }
+}
+
+export const enrichers: ResponseEnricher[] = [
+  createCatalogImageEnricher('sales:sales_quote_line'),
+  createCatalogImageEnricher('sales:sales_order_line'),
+]

package/src/modules/sales/lib/makeSalesLineRoute.ts

@@ -152,6 +152,9 @@ export function makeSalesLineRoute(config: SalesLineRouteConfig) {
     indexer: {
       entityType: entityId,
     },
+    enrichers: {
+      entityId,
+    },
     list: {
       schema: listSchema,
       entityId,