Merge pull request #77 from internxt/fixture/send-the-correct-email

fix/send the correct recipients when sending drafted email

Author: xabg2

src/modules/infrastructure/jmap/jmap-mail.provider.spec.ts

@@ -350,6 +350,58 @@ describe('JmapMailProvider', () => {
         'Failed to create email for sending',
       );
     });
+
+    test('When sending from an existing draft, then the new email is created with the latest content and the previous draft is removed in the same operation', async () => {
+      const sentMailbox = newJmapMailbox({ role: 'sent' });
+      const identity = newJmapIdentity();
+
+      jmapService.request.mockResolvedValueOnce(
+        jmapResponse({ list: [identity] }),
+      );
+      jmapService.request.mockResolvedValueOnce(
+        jmapResponse({ list: [sentMailbox] }),
+      );
+      jmapService.request.mockResolvedValueOnce(
+        jmapMultiResponse(
+          { created: { draft: { id: 'sent-email-id' } } },
+          { created: { submission: { id: 'sub-id' } } },
+        ),
+      );
+
+      const dto = newSendEmailDto({ draftId: 'old-draft-id' });
+      const result = await provider.sendEmail('user@test.com', dto);
+
+      const lastCall = jmapService.request.mock.calls.at(-1)!;
+      const [emailSetName, emailSetArgs] = lastCall[1][0]!;
+      expect(emailSetName).toBe('Email/set');
+      expect(emailSetArgs['destroy']).toEqual(['old-draft-id']);
+      expect(emailSetArgs['create']).toBeDefined();
+      expect(result).toEqual({ id: 'sent-email-id' });
+    });
+
+    test('When sending without a draftId, then the Email/set call does not include any destroy operation', async () => {
+      const sentMailbox = newJmapMailbox({ role: 'sent' });
+      const identity = newJmapIdentity();
+
+      jmapService.request.mockResolvedValueOnce(
+        jmapResponse({ list: [identity] }),
+      );
+      jmapService.request.mockResolvedValueOnce(
+        jmapResponse({ list: [sentMailbox] }),
+      );
+      jmapService.request.mockResolvedValueOnce(
+        jmapMultiResponse(
+          { created: { draft: { id: 'sent-email-id' } } },
+          { created: { submission: { id: 'sub-id' } } },
+        ),
+      );
+
+      await provider.sendEmail('user@test.com', newSendEmailDto());
+
+      const lastCall = jmapService.request.mock.calls.at(-1)!;
+      const [, emailSetArgs] = lastCall[1][0]!;
+      expect(emailSetArgs['destroy']).toBeUndefined();
+    });
   });
 
   describe('saveDraft', () => {

src/modules/infrastructure/jmap/jmap-mail.provider.ts

@@ -385,10 +385,6 @@ export class JmapMailProvider extends MailProvider {
     dto: SendEmailDto,
     threading?: ThreadingHeaders,
   ): Promise<{ id: string }> {
-    if (dto.draftId) {
-      return this.submitExistingDraft(userEmail, dto.draftId);
-    }
-
     const [accountId, identity, sentMailboxId] = await Promise.all([
       this.jmap.getPrimaryAccountId(userEmail),
       this.resolveIdentity(userEmail),
@@ -408,6 +404,7 @@ export class JmapMailProvider extends MailProvider {
         {
           accountId,
           create: { draft: emailCreate },
+          ...(dto.draftId && { destroy: [dto.draftId] }),
         },
         'r0',
       ],
@@ -437,44 +434,6 @@ export class JmapMailProvider extends MailProvider {
     return { id: createdId };
   }
 
-  private async submitExistingDraft(
-    userEmail: string,
-    draftId: string,
-  ): Promise<{ id: string }> {
-    const [accountId, identity, draftsMailboxId, sentMailboxId] =
-      await Promise.all([
-        this.jmap.getPrimaryAccountId(userEmail),
-        this.resolveIdentity(userEmail),
-        this.resolveMailboxId(userEmail, 'drafts'),
-        this.resolveMailboxId(userEmail, 'sent'),
-      ]);
-
-    await this.jmap.request(userEmail, [
-      [
-        'EmailSubmission/set',
-        {
-          accountId,
-          create: {
-            submission: {
-              identityId: identity.id,
-              emailId: draftId,
-            },
-          },
-          onSuccessUpdateEmail: {
-            '#submission': {
-              [`mailboxIds/${draftsMailboxId}`]: null,
-              [`mailboxIds/${sentMailboxId}`]: true,
-              'keywords/$draft': null,
-            },
-          },
-        },
-        'r0',
-      ],
-    ]);
-
-    return { id: draftId };
-  }
-
   private async destroyDraft(
     userEmail: string,
     accountId: string,