From 387781d6f11661aa3c7c055da4d2c0a16127fbc4 Mon Sep 17 00:00:00 2001
From: Wilson Wong <wilwong89@gmail.com>
Date: Wed, 24 Apr 2024 17:55:26 -0700
Subject: [PATCH] Additional handling for email delimiters in roadmap feature
 and unit tests

---
 frontend/src/components/note/NoteModal.vue    |  2 +-
 frontend/src/components/roadmap/Roadmap.vue   |  5 +-
 frontend/src/services/roadmapService.ts       |  8 +-
 frontend/src/utils/utils.ts                   | 10 +++
 .../tests/unit/service/roadmapService.spec.ts | 79 +++++++++++++++++++
 5 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 frontend/tests/unit/service/roadmapService.spec.ts

diff --git a/frontend/src/components/note/NoteModal.vue b/frontend/src/components/note/NoteModal.vue
index 01ec21a9..4aeb2596 100644
--- a/frontend/src/components/note/NoteModal.vue
+++ b/frontend/src/components/note/NoteModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Form } from 'vee-validate';
-import { nextTick, ref, watch } from 'vue';
+import { ref } from 'vue';
 import { mixed, object, string } from 'yup';
 
 import { Calendar, Dropdown, InputText, TextArea } from '@/components/form';
diff --git a/frontend/src/components/roadmap/Roadmap.vue b/frontend/src/components/roadmap/Roadmap.vue
index 2f5b61d7..4483ce6e 100644
--- a/frontend/src/components/roadmap/Roadmap.vue
+++ b/frontend/src/components/roadmap/Roadmap.vue
@@ -11,6 +11,7 @@ import { roadmapService, userService } from '@/services';
 import { useConfigStore, useSubmissionStore } from '@/store';
 import { PERMIT_NEEDED, PERMIT_STATUS } from '@/utils/enums';
 import { roadmapTemplate } from '@/utils/templates';
+import { delimitEmails } from '@/utils/utils';
 
 import type { Ref } from 'vue';
 import type { Document } from '@/types';
@@ -38,7 +39,7 @@ const emailValidator = array()
     if (this.isType(value) && value !== null) {
       return value;
     }
-    return originalValue ? originalValue.split(/[\s;]+/) : [];
+    return originalValue ? delimitEmails(originalValue) : [];
   })
   .of(string().email(({ value }) => `${value} is not a valid email`));
 
@@ -69,7 +70,7 @@ const confirmSubmit = (data: any) => {
         );
         toast.success('Roadmap sent');
       } catch (e: any) {
-        toast.error('Failed to send roadmap', e.response.data);
+        toast.error('Failed to send roadmap', e?.response?.statusText);
       }
     }
   });
diff --git a/frontend/src/services/roadmapService.ts b/frontend/src/services/roadmapService.ts
index 90fa6f04..b2de31c8 100644
--- a/frontend/src/services/roadmapService.ts
+++ b/frontend/src/services/roadmapService.ts
@@ -1,6 +1,6 @@
 import { appAxios } from './interceptors';
 
-import { parseCSV } from '@/utils/utils';
+import { delimitEmails } from '@/utils/utils';
 
 import type { Email } from '@/types';
 
@@ -12,13 +12,13 @@ export default {
    */
   send(activityId: string, selectedFileIds: Array<string>, emailData: Email) {
     if (emailData.to && !Array.isArray(emailData.to)) {
-      emailData.to = parseCSV(emailData.to, ';');
+      emailData.to = delimitEmails(emailData.to);
     }
     if (emailData.cc && !Array.isArray(emailData.cc)) {
-      emailData.cc = parseCSV(emailData.cc, ';');
+      emailData.cc = delimitEmails(emailData.cc);
     }
     if (emailData.bcc && !Array.isArray(emailData.bcc)) {
-      emailData.bcc = parseCSV(emailData.bcc, ';');
+      emailData.bcc = delimitEmails(emailData.bcc);
     }
 
     return appAxios().put('roadmap', { activityId, selectedFileIds, emailData });
diff --git a/frontend/src/utils/utils.ts b/frontend/src/utils/utils.ts
index 2660667f..ec787ef8 100644
--- a/frontend/src/utils/utils.ts
+++ b/frontend/src/utils/utils.ts
@@ -1,5 +1,15 @@
 import { DELIMITER, FILE_CATEGORIES } from '@/utils/constants';
 
+/**
+ * @function delimitEmails
+ * Converts a space, semi-colon, or comma-separated value string into an array of string values
+ * @param {string} value The string to parse
+ * @returns {string[]} An array of string values
+ */
+export function delimitEmails(value: string): Array<string> {
+  return value.split(/[\s;,]+/g).map((s) => s.trim());
+}
+
 /**
  * @function differential
  * Create a key/value differential from source against comparer
diff --git a/frontend/tests/unit/service/roadmapService.spec.ts b/frontend/tests/unit/service/roadmapService.spec.ts
new file mode 100644
index 00000000..2f18f8fd
--- /dev/null
+++ b/frontend/tests/unit/service/roadmapService.spec.ts
@@ -0,0 +1,79 @@
+import { roadmapService } from '@/services';
+import { appAxios } from '@/services/interceptors';
+
+vi.mock('vue-router', () => ({
+  useRouter: () => ({
+    push: vi.fn()
+  })
+}));
+
+const PATH = 'roadmap';
+// const getSpy = vi.fn();
+const putSpy = vi.fn();
+
+vi.mock('@/services/interceptors');
+vi.mocked(appAxios).mockReturnValue({
+  // get: getSpy,
+  put: putSpy
+} as any);
+
+const testAddressString = ['test.1.address@test.bc.ca', 'testAddress2@test.com', 'test3Email@test.ca'];
+const unformattedEmailList = 'test.1.address@test.bc.ca, testAddress2@test.com,; test3Email@test.ca';
+const bccField = 'addressTest2@test.com';
+
+const testData = {
+  activityId: '123-123',
+  emailData: {
+    from: 'fromAddress@test.com',
+    to: testAddressString,
+    bcc: [bccField],
+    subject: 'Here is your housing project Permit Roadmap',
+    bodyType: 'text',
+    body: 'testText'
+  }
+};
+
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+describe('roadmapService test', () => {
+  it('sends email when called with right params', async () => {
+    await roadmapService.send(testData.activityId, ['testSelectedFileIds'], testData.emailData);
+
+    expect(putSpy).toHaveBeenCalledTimes(1);
+    expect(putSpy).toHaveBeenCalledWith(PATH, {
+      activityId: testData.activityId,
+      selectedFileIds: ['testSelectedFileIds'],
+      emailData: expect.objectContaining({
+        to: ['test.1.address@test.bc.ca', 'testAddress2@test.com', 'test3Email@test.ca'],
+        bcc: [bccField]
+      })
+    });
+    expect(putSpy).not.toHaveBeenCalledWith(expect.objectContaining({ cc: expect.anything() }));
+  });
+
+  it('formats improper to/cc/bcc fields', async () => {
+    const modifiedEmail = {
+      ...testData.emailData,
+      to: unformattedEmailList,
+      cc: unformattedEmailList,
+      bcc: unformattedEmailList
+    };
+
+    // @ts-expect-error: testing if email object it not proper type
+    await roadmapService.send(testData.activityId, ['testSelectedFileIds'], modifiedEmail);
+
+    expect(putSpy).toHaveBeenCalledTimes(1);
+    expect(putSpy).toHaveBeenCalledWith(
+      PATH,
+      expect.objectContaining({
+        emailData: expect.objectContaining({
+          to: ['test.1.address@test.bc.ca', 'testAddress2@test.com', 'test3Email@test.ca'],
+          cc: ['test.1.address@test.bc.ca', 'testAddress2@test.com', 'test3Email@test.ca'],
+          bcc: ['test.1.address@test.bc.ca', 'testAddress2@test.com', 'test3Email@test.ca']
+        })
+      })
+    );
+  });
+});