From 67cc761f19719b1a1eadc8f999724f1fce4acbb5 Mon Sep 17 00:00:00 2001
From: Gosha <djabarov.george@gmail.com>
Date: Mon, 3 Feb 2025 21:18:07 +0200
Subject: [PATCH 1/2] fix(worker): remove payload email override

---
 .../usecases/send-message/send-message-email.usecase.ts        | 3 +--
 .../usecases/trigger-multicast/trigger-multicast.usecase.ts    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
index 9109ac9015a..92015f4ef46 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
@@ -5,7 +5,6 @@ import { addBreadcrumb } from '@sentry/node';
 
 import {
   MessageRepository,
-  NotificationStepEntity,
   SubscriberRepository,
   EnvironmentRepository,
   IntegrationEntity,
@@ -110,7 +109,7 @@ export class SendMessageEmail extends SendMessageBase {
     if (!step.template) throw new PlatformException('Email channel template not found');
 
     const { subscriber } = command.compileContext;
-    const email = command.payload.email || subscriber.email;
+    const { email } = subscriber;
 
     addBreadcrumb({
       message: 'Sending Email',
diff --git a/libs/application-generic/src/usecases/trigger-multicast/trigger-multicast.usecase.ts b/libs/application-generic/src/usecases/trigger-multicast/trigger-multicast.usecase.ts
index cf099eed70e..8f57e2f7977 100644
--- a/libs/application-generic/src/usecases/trigger-multicast/trigger-multicast.usecase.ts
+++ b/libs/application-generic/src/usecases/trigger-multicast/trigger-multicast.usecase.ts
@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException, Logger } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import _ from 'lodash';
 import {
   TopicEntity,
@@ -14,7 +14,6 @@ import {
   TriggerRecipientSubscriber,
 } from '@novu/shared';
 
-import { PinoLogger } from '../../logging';
 import { InstrumentUsecase } from '../../instrumentation';
 import { ApiException } from '../../utils/exceptions';
 import { SubscriberProcessQueueService } from '../../services/queues/subscriber-process-queue.service';

From 536f5adde73cb41629a1f392a10b8011bd996601 Mon Sep 17 00:00:00 2001
From: Gosha <djabarov.george@gmail.com>
Date: Tue, 4 Feb 2025 13:51:05 +0200
Subject: [PATCH 2/2] feat(worker): added support for to recipient

---
 apps/api/src/app/events/e2e/trigger-event.e2e.ts          | 8 ++++----
 .../usecases/send-message/send-message-email.usecase.ts   | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/app/events/e2e/trigger-event.e2e.ts b/apps/api/src/app/events/e2e/trigger-event.e2e.ts
index bff45f67d8f..030504f2d7b 100644
--- a/apps/api/src/app/events/e2e/trigger-event.e2e.ts
+++ b/apps/api/src/app/events/e2e/trigger-event.e2e.ts
@@ -1141,10 +1141,10 @@ describe('Trigger event - /v1/events/trigger (POST) #novu-v2', function () {
           { subscriberId: subscriber.subscriberId, email: 'gg@ff.com' },
           { subscriberId, email: 'gg@ff.com' },
         ],
-        payload: {
-          email: 'new-test-email@gmail.com',
-          firstName: 'Testing of User Name',
-          urlVar: '/test/url/path',
+        overrides: {
+          email: {
+            toRecipient: 'new-test-email@gmail.com',
+          },
         },
       });
 
diff --git a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
index 92015f4ef46..35ed128f67a 100644
--- a/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
+++ b/apps/worker/src/app/workflow/usecases/send-message/send-message-email.usecase.ts
@@ -18,7 +18,6 @@ import {
   ExecutionDetailsStatusEnum,
   IAttachmentOptions,
   IEmailOptions,
-  LogCodeEnum,
   FeatureFlagsKeysEnum,
 } from '@novu/shared';
 import {
@@ -109,7 +108,7 @@ export class SendMessageEmail extends SendMessageBase {
     if (!step.template) throw new PlatformException('Email channel template not found');
 
     const { subscriber } = command.compileContext;
-    const { email } = subscriber;
+    const email = command.overrides?.email?.toRecipient || subscriber.email;
 
     addBreadcrumb({
       message: 'Sending Email',
@@ -148,8 +147,8 @@ export class SendMessageEmail extends SendMessageBase {
     }
 
     const overrides: Record<string, any> = {
-      ...(command.overrides.email || {}),
-      ...(command.overrides[integration?.providerId] || {}),
+      ...(command.overrides?.email || {}),
+      ...(command.overrides?.[integration?.providerId] || {}),
     };
     const bridgeOutputs = command.bridgeData?.outputs;