Merge branch 'main' into feature/CCM-4893_email-automated-tested

Author: Fawad Ali

amplify/__tests__/functions/send-email/handler.test.ts

@@ -15,12 +15,18 @@ type HandlerCallbackType = Parameters<
   Schema['sendEmail']['functionHandler']
 >[2];
 
+const notifyDomainName = process.env.NOTIFY_DOMAIN_NAME;
+
 beforeAll(() => {
   jest.useFakeTimers();
   jest.setSystemTime(new Date('2022-01-01 10:00'));
   process.env.NOTIFY_DOMAIN_NAME = 'test.notify.nhs.uk';
 });
 
+afterAll(() => {
+  process.env.NOTIFY_DOMAIN_NAME = notifyDomainName;
+});
+
 test('sends email', async () => {
   const mockSESClient = mockDeep<SESClient>({
     send: jest.fn().mockReturnValue({
@@ -52,29 +58,16 @@ test('sends email', async () => {
 
   const messageId = rawMimeMessage?.match(/Message-ID: <([^@]+)@/)?.[1];
 
-  const messageBoundary = rawMimeMessage?.match(/boundary=([\dA-z]+)/)?.[1];
-
   const expectedMessage = `Date: Sat, 01 Jan 2022 10:00:00 +0000
 From: =?utf-8?B?TkhTIE5vdGlmeQ==?= <[email protected]>
 To: <recipient-email>
 Message-ID: <${messageId}@test.notify.nhs.uk>
 Subject: =?utf-8?B?VGVtcGxhdGUgc3VibWl0dGVkIC0gdGVtcGxhdGUtbmFtZQ==?=
 MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary=${messageBoundary}
-
---${messageBoundary}
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-${emailTemplate('template-id', 'template-name', 'template-message')}
-
---${messageBoundary}
-Content-Type: text/markdown; name="template-content.md"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="template-content.md"
-
-dGVtcGxhdGUtbWVzc2FnZQ==
---${messageBoundary}--`;
+${emailTemplate('template-id', 'template-name', 'template-message')}`;
 
   expect(rawMimeMessage?.toString()).toEqual(expectedMessage);
 });

amplify/data/resource.ts

@@ -43,6 +43,7 @@ const schema = a.schema({
       templateId: a.string().required(),
       templateName: a.string().required(),
       templateMessage: a.string().required(),
+      templateSubjectLine: a.string(),
     })
     .returns(a.string())
     .handler(a.handler.function(sendEmail))

amplify/functions/send-email/email-template.html

@@ -209,6 +209,14 @@
                 <p class="dataValueShort">{{templateId}}</p>
               </td>
             </tr>
+            {{#if templateSubjectLine}}
+              <tr>
+                <td colspan="2">
+                  <p class="dataLabel">Subject line</p>
+                  <p class="dataValueShort">{{templateSubjectLine}}</p>
+                </td>
+              </tr>
+            {{/if}}
             <tr>
               <td colspan="2">
                 <p class="dataLabel">Template content</p>

amplify/functions/send-email/email-template.ts

@@ -8,12 +8,14 @@ const encoder = (rawText: string) => encode(rawText).replaceAll('\n', '<br />');
 export const emailTemplate = (
   templateId: string,
   templateName: string,
-  templateMessage: string
+  templateMessage: string,
+  templateSubjectLine?: string | null
 ): string => {
   const parameters = {
     templateId,
     templateName,
     templateMessage: encoder(templateMessage),
+    templateSubjectLine,
   };
   return htmlTemplate(parameters);
 };

amplify/functions/send-email/handler.ts

@@ -14,8 +14,13 @@ export const handler: Schema['sendEmail']['functionHandler'] = async (
   const client = new SESClient({ region: 'eu-west-2' });
 
   const { senderEmail } = config();
-  const { recipientEmail, templateId, templateName, templateMessage } =
-    event.arguments;
+  const {
+    recipientEmail,
+    templateId,
+    templateName,
+    templateMessage,
+    templateSubjectLine,
+  } = event.arguments;
 
   logger.info(
     `Sending email for template ${templateName} with ID ${templateId}`
@@ -27,12 +32,12 @@ export const handler: Schema['sendEmail']['functionHandler'] = async (
   msg.setSubject(`Template submitted - ${templateName}`);
   msg.addMessage({
     contentType: 'text/html',
-    data: emailTemplate(templateId, templateName, templateMessage),
-  });
-  msg.addAttachment({
-    filename: 'template-content.md',
-    contentType: 'text/markdown',
-    data: Buffer.from(templateMessage).toString('base64'),
+    data: emailTemplate(
+      templateId,
+      templateName,
+      templateMessage,
+      templateSubjectLine
+    ),
   });
 
   const command = new SendRawEmailCommand({