@open-mercato/core 0.4.2-canary-49d47ff90e → 0.4.2-canary-02d8ce2991

package/src/modules/notifications/subscribers/deliver-notification.ts

@@ -2,6 +2,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { Notification } from '../data/entities'
 import { NOTIFICATION_EVENTS } from '../lib/events'
 import { DEFAULT_NOTIFICATION_DELIVERY_CONFIG, resolveNotificationDeliveryConfig, resolveNotificationPanelUrl } from '../lib/deliveryConfig'
+import { getNotificationDeliveryStrategies } from '../lib/deliveryStrategies'
 import { sendEmail } from '@open-mercato/shared/lib/email/send'
 import NotificationEmail from '../emails/NotificationEmail'
 import { loadDictionary } from '@open-mercato/shared/lib/i18n/server'
@@ -100,7 +101,6 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
   const deliveryConfig = await resolveNotificationDeliveryConfig(ctx, { defaultValue: DEFAULT_NOTIFICATION_DELIVERY_CONFIG })
   if (!deliveryConfig.strategies.email.enabled) {
     debug('email delivery disabled')
-    return
   }
 
   const em = ctx.resolve('em') as EntityManager
@@ -121,7 +121,7 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
     encryptionService = null
   }
 
-  const recipient = await resolveRecipient(em, notification, encryptionService)
+  const recipient = (await resolveRecipient(em, notification, encryptionService)) ?? { email: null, name: null }
   if (!recipient?.email) {
     debug('recipient has no email', notification.recipientUserId)
   }
@@ -129,17 +129,18 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
   const panelUrl = resolveNotificationPanelUrl(deliveryConfig)
   if (!panelUrl) {
     debug('missing panelUrl; check appUrl/panelPath settings')
-    return
   }
 
-  const panelLink = buildPanelLink(panelUrl, notification.id)
-  const actionLinks = (notification.actionData?.actions ?? []).map((action) => ({
-    id: action.id,
-    label: action.labelKey ? t(action.labelKey, action.label) : action.label,
-    href: panelLink,
-  }))
+  const panelLink = panelUrl ? buildPanelLink(panelUrl, notification.id) : null
+  const actionLinks = panelLink
+    ? (notification.actionData?.actions ?? []).map((action) => ({
+        id: action.id,
+        label: action.labelKey ? t(action.labelKey, action.label) : action.label,
+        href: panelLink,
+      }))
+    : []
 
-  if (deliveryConfig.strategies.email.enabled && recipient?.email) {
+  if (deliveryConfig.strategies.email.enabled && recipient?.email && panelLink) {
     const subjectPrefix = deliveryConfig.strategies.email.subjectPrefix?.trim()
     const subject = subjectPrefix ? `${subjectPrefix} ${title}` : title
     const copy = {
@@ -171,5 +172,33 @@ export default async function handle(payload: NotificationCreatedPayload, ctx: R
     }
   }
 
+  const strategyConfigs = deliveryConfig.strategies.custom ?? {}
+  const strategies = getNotificationDeliveryStrategies()
+  for (const strategy of strategies) {
+    const strategyConfig = strategyConfigs[strategy.id]
+    const enabled = strategyConfig?.enabled ?? strategy.defaultEnabled ?? false
+    if (!enabled) {
+      debug('custom delivery disabled', strategy.id)
+      continue
+    }
+    try {
+      await strategy.deliver({
+        notification,
+        recipient,
+        title,
+        body,
+        panelUrl,
+        panelLink,
+        actionLinks,
+        deliveryConfig,
+        config: strategyConfig ?? {},
+        resolve: ctx.resolve,
+        t,
+      })
+    } catch (error) {
+      console.error(`[notifications] delivery strategy failed (${strategy.id})`, error)
+    }
+  }
+
   return
 }

package/src/modules/workflows/lib/transition-handler.ts

@@ -12,6 +12,7 @@
 
 import { EntityManager } from '@mikro-orm/core'
 import type { AwilixContainer } from 'awilix'
+import type { EventBus } from '@open-mercato/events'
 import {
   WorkflowInstance,
   WorkflowDefinition,
@@ -271,6 +272,13 @@ export async function executeTransition(
   context: TransitionExecutionContext
 ): Promise<TransitionExecutionResult> {
   try {
+    let eventBus: Pick<EventBus, 'emitEvent'> | null = null
+    try {
+      eventBus = container.resolve('eventBus') as EventBus
+    } catch {
+      eventBus = null
+    }
+
     // First, evaluate if transition is valid
     const evaluation = await evaluateTransition(
       em,
@@ -294,7 +302,8 @@ export async function executeTransition(
       em,
       instance,
       transition,
-      context
+      context,
+      eventBus
     )
 
     if (!preConditionsResult.allowed) {
@@ -505,7 +514,8 @@ export async function executeTransition(
       em,
       instance,
       transition,
-      context
+      context,
+      eventBus
     )
 
     if (!postConditionsResult.allowed) {
@@ -659,7 +669,8 @@ async function evaluatePreConditions(
   em: EntityManager,
   instance: WorkflowInstance,
   transition: any,
-  context: TransitionExecutionContext
+  context: TransitionExecutionContext,
+  eventBus: Pick<EventBus, 'emitEvent'> | null
 ): Promise<ruleEngine.RuleEngineResult> {
   try {
     // Load workflow definition to get workflow ID
@@ -698,7 +709,7 @@ async function evaluatePreConditions(
     }
 
     // Execute rules - only GUARD rules will affect the 'allowed' status
-    const result = await ruleEngine.executeRules(em, ruleContext)
+    const result = await ruleEngine.executeRules(em, ruleContext, { eventBus })
 
     return result
   } catch (error) {
@@ -728,7 +739,8 @@ async function evaluatePostConditions(
   em: EntityManager,
   instance: WorkflowInstance,
   transition: any,
-  context: TransitionExecutionContext
+  context: TransitionExecutionContext,
+  eventBus: Pick<EventBus, 'emitEvent'> | null
 ): Promise<ruleEngine.RuleEngineResult> {
   try {
     // Load workflow definition to get workflow ID
@@ -767,7 +779,7 @@ async function evaluatePostConditions(
     }
 
     // Execute rules
-    const result = await ruleEngine.executeRules(em, ruleContext)
+    const result = await ruleEngine.executeRules(em, ruleContext, { eventBus })
 
     return result
   } catch (error) {