From 62c76f90372e69c8d17aeb80605b26125b08c728 Mon Sep 17 00:00:00 2001
From: Sanjay Babu <sanjaytkbabu@gmail.com>
Date: Sat, 19 Oct 2024 16:43:44 -0700
Subject: [PATCH 1/2] ATS client push UI: New ATSUserCreateModal,
 SubmissionForm, ATSUserLinkModal, atsService updated

---
 .../housing/submission/SubmissionForm.vue     |  26 ++-
 .../components/user/ATSUserCreateModal.vue    | 171 ++++++++++++++++++
 .../src/components/user/ATSUserLinkModal.vue  |  32 +++-
 frontend/src/services/atsService.ts           |   8 +
 4 files changed, 227 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/components/user/ATSUserCreateModal.vue

diff --git a/frontend/src/components/housing/submission/SubmissionForm.vue b/frontend/src/components/housing/submission/SubmissionForm.vue
index 09b0af84..e7811dcb 100644
--- a/frontend/src/components/housing/submission/SubmissionForm.vue
+++ b/frontend/src/components/housing/submission/SubmissionForm.vue
@@ -17,6 +17,7 @@ import {
   TextArea
 } from '@/components/form';
 import ATSUserLinkModal from '@/components/user/ATSUserLinkModal.vue';
+import ATSUserCreateModal from '@/components/user/ATSUserCreateModal.vue';
 import ATSUserDetailsModal from '@/components/user/ATSUserDetailsModal.vue';
 import { Button, Message, useToast } from '@/lib/primevue';
 import { submissionService, userService } from '@/services';
@@ -60,6 +61,7 @@ const assigneeOptions: Ref<Array<User>> = ref([]);
 const atsClientNumber: Ref<string | undefined> = ref(undefined);
 const atsUserLinkModalVisible: Ref<boolean> = ref(false);
 const atsUserDetailsModalVisible: Ref<boolean> = ref(false);
+const atsUserCreateModalVisible: Ref<boolean> = ref(false);
 const formRef: Ref<InstanceType<typeof Form> | null> = ref(null);
 const initialFormValues: Ref<any | undefined> = ref(undefined);
 const showCancelMessage: Ref<boolean> = ref(false);
@@ -632,7 +634,15 @@ onMounted(async () => {
           class="h-2rem ml-2"
           @click="atsUserLinkModalVisible = true"
         >
-          Link to ATS
+          Search ATS
+        </Button>
+        <Button
+          v-if="!atsClientNumber"
+          aria-label="New ATS client"
+          class="h-2rem ml-4"
+          @click="atsUserCreateModalVisible = true"
+        >
+          New ATS Client
         </Button>
       </div>
       <Checkbox
@@ -723,8 +733,7 @@ onMounted(async () => {
     </div>
     <ATSUserLinkModal
       v-model:visible="atsUserLinkModalVisible"
-      :f-name="values.contactFirstName"
-      :l-name="values.contactLastName"
+      :submission="submission"
       @ats-user-link:link="
         (atsUser: ATSUser) => {
           atsClientNumber = atsUser.atsClientNumber;
@@ -743,6 +752,17 @@ onMounted(async () => {
         }
       "
     />
+    <ATSUserCreateModal
+      v-model:visible="atsUserCreateModalVisible"
+      :submission="submission"
+      @ats-user-link:link="
+        (atsClientId: string) => {
+          atsClientNumber = atsClientId;
+          submissionStore.setSubmission({ ...submission, atsClientNumber: atsClientId ?? null });
+          atsUserCreateModalVisible = false;
+        }
+      "
+    />
   </Form>
 </template>
 
diff --git a/frontend/src/components/user/ATSUserCreateModal.vue b/frontend/src/components/user/ATSUserCreateModal.vue
new file mode 100644
index 00000000..e28422d7
--- /dev/null
+++ b/frontend/src/components/user/ATSUserCreateModal.vue
@@ -0,0 +1,171 @@
+<script setup lang="ts">
+import axios from 'axios';
+import { onMounted, ref } from 'vue';
+import { Button, Column, DataTable, Dialog, useToast } from '@/lib/primevue';
+
+import { Spinner } from '@/components/layout';
+import { atsService } from '@/services';
+import { BasicResponse } from '@/utils/enums/application';
+
+import type { Ref } from 'vue';
+import type { ATSUser, Submission } from '@/types';
+
+// Props
+const { submission } = defineProps<{
+  submission: Submission;
+}>();
+
+// Emits
+const emit = defineEmits(['atsUserLink:link']);
+
+// Constants
+const REGION_BC = 'BC';
+
+// State
+const atsClientNumber: Ref<string> = ref('');
+const loading: Ref<boolean> = ref(false);
+const proponent: Ref<ATSUser | undefined> = ref(undefined);
+const selectedUser: Ref<ATSUser | undefined> = ref(undefined);
+const visible = defineModel<boolean>('visible');
+
+// Actions
+
+const toast = useToast();
+
+async function createATSClient() {
+  selectedUser.value = undefined;
+  try {
+    loading.value = true;
+
+    const data = setEmptyStringsToNullAndOmitNulls({
+      '@type': 'ClientResource',
+      address: {
+        '@type': 'AddressResource',
+        addressLine1: submission.streetAddress,
+        city: submission.locality,
+        provinceCode: submission.province,
+        primaryPhone: submission.contactPhoneNumber,
+        email: submission.contactEmail
+      },
+      firstName: submission.contactFirstName,
+      surName: submission.contactLastName,
+      regionName: REGION_BC,
+      optOutOfBCStatSurveyInd: BasicResponse.NO.toUpperCase()
+    });
+
+    const response = await atsService.createATSClient(data);
+    if (response.status === 201) {
+      atsClientNumber.value = response.data.clientId;
+      emit('atsUserLink:link', atsClientNumber.value);
+      toast.success('New client pushed to ATS');
+    } else {
+      toast.error('Error pushing client to ATS');
+    }
+  } catch (error) {
+    if (!axios.isCancel(error)) toast.error('Error pushing client to ATS ' + error);
+  } finally {
+    loading.value = false;
+  }
+}
+
+function setEmptyStringsToNullAndOmitNulls(obj: Record<string, any>): Record<string, any> {
+  const result: Record<string, any> = {};
+
+  for (const key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (typeof obj[key] === 'string' && obj[key].trim() === '') {
+        // Skip adding this key if the value is an empty string
+        continue;
+      } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+        const nestedResult = setEmptyStringsToNullAndOmitNulls(obj[key]);
+        if (Object.keys(nestedResult).length > 0) {
+          result[key] = nestedResult;
+        }
+      } else if (obj[key] !== null) {
+        result[key] = obj[key];
+      }
+    }
+  }
+
+  return result;
+}
+onMounted(async () => {
+  const locationAddressStr = [submission.streetAddress, submission.locality, submission.province]
+    .filter((str) => str?.trim())
+    .join(', ');
+
+  proponent.value = {
+    firstName: submission.contactFirstName ?? '',
+    lastName: submission.contactLastName ?? '',
+    email: submission.contactEmail ?? '',
+    address: locationAddressStr,
+    phone: submission.contactPhoneNumber ?? ''
+  };
+});
+</script>
+
+<template>
+  <Dialog
+    v-model:visible="visible"
+    :draggable="false"
+    :modal="true"
+    class="app-info-dialog w-max"
+  >
+    <template #header>
+      <span class="p-dialog-title title-colour">Create new client in ATS</span>
+    </template>
+    <div>
+      <DataTable
+        :row-hover="true"
+        class="datatable mt-3 mb-4"
+        :value="[proponent]"
+        selection-mode="single"
+        :rows="1"
+      >
+        <template #empty>
+          <div class="flex justify-content-center">
+            <h5 class="m-0">No users found.</h5>
+          </div>
+        </template>
+        <template #loading>
+          <Spinner />
+        </template>
+
+        <Column
+          field="firstName"
+          header="First Name"
+        />
+        <Column
+          field="lastName"
+          header="Last Name"
+        />
+        <Column
+          field="lastName"
+          header="Phone"
+        />
+        <Column
+          field="email"
+          header="Email"
+        />
+        <Column
+          field="address"
+          header="Location address"
+        />
+      </DataTable>
+      <div class="flex justify-content-end">
+        <Button
+          class="p-button-solid"
+          label="Push to ATS"
+          icon="pi pi-upload"
+          visible="false"
+          @click="createATSClient()"
+        />
+      </div>
+    </div>
+  </Dialog>
+</template>
+<style scoped lang="scss">
+.title-colour {
+  color: $app-primary;
+}
+</style>
diff --git a/frontend/src/components/user/ATSUserLinkModal.vue b/frontend/src/components/user/ATSUserLinkModal.vue
index 954b5e4d..fc737429 100644
--- a/frontend/src/components/user/ATSUserLinkModal.vue
+++ b/frontend/src/components/user/ATSUserLinkModal.vue
@@ -1,18 +1,17 @@
 <script setup lang="ts">
 import axios from 'axios';
 import { onMounted, ref } from 'vue';
+import { Button, Column, DataTable, Dialog, InputText, useToast } from '@/lib/primevue';
 
 import { Spinner } from '@/components/layout';
-import { Button, Column, DataTable, Dialog, InputText, useToast } from '@/lib/primevue';
 import { atsService } from '@/services';
 
 import type { Ref } from 'vue';
-import type { ATSUser } from '@/types';
+import type { ATSUser, Submission } from '@/types';
 
 // Props
-const { fName, lName } = defineProps<{
-  fName: string;
-  lName: string;
+const { submission } = defineProps<{
+  submission: Submission;
 }>();
 
 // Emits
@@ -25,7 +24,9 @@ const firstName: Ref<string> = ref('');
 const lastName: Ref<string> = ref('');
 const loading: Ref<boolean> = ref(false);
 const phone: Ref<string> = ref('');
+const proponent: Ref<ATSUser | undefined> = ref(undefined);
 const selectedUser: Ref<ATSUser | undefined> = ref(undefined);
+const showCreateATS = defineModel<boolean>('showCreateATS');
 const users: Ref<Array<ATSUser>> = ref([]);
 const visible = defineModel<boolean>('visible');
 
@@ -46,6 +47,8 @@ async function searchATSUsers() {
       email: email.value
     });
 
+    showCreateATS.value = true;
+
     users.value = response.data.clients.map((client: any) => {
       // Combine address lines and filter out empty lines
       const address = [client.address.addressLine1, client.address.addressLine2].filter((line) => line).join(', ');
@@ -67,8 +70,21 @@ async function searchATSUsers() {
 }
 
 onMounted(async () => {
-  firstName.value = fName;
-  lastName.value = lName;
+  if (submission.contactFirstName && submission.contactLastName) {
+    firstName.value = submission.contactFirstName;
+    lastName.value = submission.contactLastName;
+  }
+  const locationAddressStr = [submission.streetAddress, submission.locality, submission.province]
+    .filter((str) => str?.trim())
+    .join(', ');
+
+  proponent.value = {
+    firstName: submission.contactFirstName ?? '',
+    lastName: submission.contactLastName ?? '',
+    email: submission.contactEmail ?? '',
+    address: locationAddressStr,
+    phone: submission.contactPhoneNumber ?? ''
+  };
 });
 </script>
 
@@ -136,6 +152,8 @@ onMounted(async () => {
       data-key="atsClientNumber"
       :rows="5"
       :paginator="true"
+      paginator-template="RowsPerPageDropdown CurrentPageReport PrevPageLink NextPageLink "
+      current-page-report-template="{first}-{last} of {totalRecords}"
     >
       <template #empty>
         <div class="flex justify-content-center">
diff --git a/frontend/src/services/atsService.ts b/frontend/src/services/atsService.ts
index 1c88eb54..adfdddb5 100644
--- a/frontend/src/services/atsService.ts
+++ b/frontend/src/services/atsService.ts
@@ -10,5 +10,13 @@ export default {
 
   searchATSUsers(params?: any) {
     return appAxios().get('ats/clients', { params: params });
+  },
+
+  /**
+   * @function createATSClient
+   * @returns {Promise} An axios response
+   */
+  createATSClient(data?: any) {
+    return appAxios().post('ats/client', data);
   }
 };

From e715fe89a1ed79464424286a20e59043fee70218 Mon Sep 17 00:00:00 2001
From: Sanjay Babu <sanjaytkbabu@gmail.com>
Date: Sat, 19 Oct 2024 16:44:01 -0700
Subject: [PATCH 2/2] ATS client push API: New POST API, New backend type for
 ATSClient, atsController, route, services, validator updated Backend unti
 test added New ATSClientResource type, frontend components updated

---
 app/src/controllers/ats.ts                    |  17 +-
 app/src/routes/v1/ats.ts                      |  13 +-
 app/src/services/ats.ts                       |  30 ++-
 app/src/types/ATSClientResource.ts            |  21 ++
 app/src/types/index.ts                        |   1 +
 app/src/validators/ats.ts                     |  33 +++
 app/src/validators/index.ts                   |   1 +
 app/tests/unit/controllers/ats.spec.ts        | 228 ++++++++++++++++++
 .../housing/submission/SubmissionForm.vue     |  31 ++-
 .../components/user/ATSUserCreateModal.vue    |  89 +++----
 .../components/user/ATSUserDetailsModal.vue   |  71 ++----
 .../src/components/user/ATSUserLinkModal.vue  |  70 ++----
 frontend/src/services/atsService.ts           |   4 +-
 frontend/src/types/ATSClientResource.ts       |  46 ++++
 frontend/src/types/ATSUser.ts                 |   8 -
 frontend/src/types/index.ts                   |   2 +-
 16 files changed, 488 insertions(+), 177 deletions(-)
 create mode 100644 app/src/types/ATSClientResource.ts
 create mode 100644 app/src/validators/ats.ts
 create mode 100644 app/tests/unit/controllers/ats.spec.ts
 create mode 100644 frontend/src/types/ATSClientResource.ts
 delete mode 100644 frontend/src/types/ATSUser.ts

diff --git a/app/src/controllers/ats.ts b/app/src/controllers/ats.ts
index 0db33867..585aa2ea 100644
--- a/app/src/controllers/ats.ts
+++ b/app/src/controllers/ats.ts
@@ -1,7 +1,9 @@
 import { atsService } from '../services';
 
+import { getCurrentUsername } from '../utils/utils';
+
 import type { NextFunction, Request, Response } from 'express';
-import type { ATSUserSearchParameters } from '../types';
+import type { ATSClientResource, ATSUserSearchParameters } from '../types';
 
 const controller = {
   searchATSUsers: async (
@@ -12,6 +14,19 @@ const controller = {
     try {
       const response = await atsService.searchATSUsers(req.query);
 
+      res.status(response.status).json(response.data);
+    } catch (e: unknown) {
+      next(e);
+    }
+  },
+
+  createATSClient: async (req: Request<never, never, ATSClientResource, never>, res: Response, next: NextFunction) => {
+    try {
+      const identityProvider = req.currentContext?.tokenPayload?.identity_provider.toUpperCase();
+      const atsClient = req.body;
+      // Set the createdBy field to current user with \\ as the separator for the domain and username to match ATS DB
+      atsClient.createdBy = `${identityProvider}\\${getCurrentUsername(req.currentContext)}`;
+      const response = await atsService.createATSClient(atsClient);
       res.status(response.status).json(response.data);
     } catch (e: unknown) {
       next(e);
diff --git a/app/src/routes/v1/ats.ts b/app/src/routes/v1/ats.ts
index c97d635e..43ea5788 100644
--- a/app/src/routes/v1/ats.ts
+++ b/app/src/routes/v1/ats.ts
@@ -5,9 +5,10 @@ import { hasAuthorization } from '../../middleware/authorization';
 import { requireSomeAuth } from '../../middleware/requireSomeAuth';
 import { requireSomeGroup } from '../../middleware/requireSomeGroup';
 import { Action, Resource } from '../../utils/enums/application';
+import { atsValidator } from '../../validators';
 
 import type { NextFunction, Request, Response } from 'express';
-import type { ATSUserSearchParameters } from '../../types';
+import type { ATSClientResource, ATSUserSearchParameters } from '../../types';
 
 const router = express.Router();
 router.use(requireSomeAuth);
@@ -21,4 +22,14 @@ router.get(
   }
 );
 
+/** Creates a client in ATS */
+router.post(
+  '/client',
+  hasAuthorization(Resource.ATS, Action.CREATE),
+  atsValidator.createATSClient,
+  (req: Request<never, never, ATSClientResource, never>, res: Response, next: NextFunction): void => {
+    atsController.createATSClient(req, res, next);
+  }
+);
+
 export default router;
diff --git a/app/src/services/ats.ts b/app/src/services/ats.ts
index 77ebd38f..54c4dd52 100644
--- a/app/src/services/ats.ts
+++ b/app/src/services/ats.ts
@@ -2,14 +2,13 @@ import axios from 'axios';
 import config from 'config';
 
 import type { AxiosInstance } from 'axios';
-import type { ATSUserSearchParameters } from '../types';
+import type { ATSClientResource, ATSUserSearchParameters } from '../types';
 
 /**
  * @function getToken
  * Gets Auth token using ATS client credentials
  * @returns
  */
-
 async function getToken() {
   const response = await axios({
     method: 'GET',
@@ -33,7 +32,6 @@ async function getToken() {
  * @param {AxiosRequestConfig} options Axios request config options
  * @returns {AxiosInstance} An axios instance
  */
-
 function atsAxios(): AxiosInstance {
   // Create axios instance
   const atsAxios = axios.create({
@@ -57,7 +55,6 @@ const service = {
    * @param {ATSUserSearchParameters} data The search parameters
    * @returns {Promise<data | null>} The result of calling the search api
    */
-
   searchATSUsers: async (params?: ATSUserSearchParameters) => {
     try {
       const { data, status } = await atsAxios().get('/clients', { params: params });
@@ -75,6 +72,31 @@ const service = {
         };
       }
     }
+  },
+
+  /**
+   * @function createATSClient
+   * Creates a client in ATS
+   * @param {ATSClientResource} data The client data
+   * @returns {Promise<data | null>} The result of calling the post api
+   */
+  createATSClient: async (atsClient: ATSClientResource) => {
+    try {
+      const { data, status } = await atsAxios().post('/clients', atsClient);
+      return { data: data, status };
+    } catch (e: unknown) {
+      if (axios.isAxiosError(e)) {
+        return {
+          data: e.response?.data.message,
+          status: e.response ? e.response.status : 500
+        };
+      } else {
+        return {
+          data: 'Error',
+          status: 500
+        };
+      }
+    }
   }
 };
 
diff --git a/app/src/types/ATSClientResource.ts b/app/src/types/ATSClientResource.ts
new file mode 100644
index 00000000..e861deb5
--- /dev/null
+++ b/app/src/types/ATSClientResource.ts
@@ -0,0 +1,21 @@
+type AddressResource = {
+  '@type': string;
+  addressLine1: string;
+  addressLine2: string | null;
+  city: string;
+  provinceCode: string;
+  countryCode: string;
+  postalCode: string | null;
+  primaryPhone: string;
+  email: string;
+};
+
+export type ATSClientResource = {
+  '@type': string;
+  address: AddressResource;
+  firstName: string;
+  surName: string;
+  regionName: string;
+  optOutOfBCStatSurveyInd: string;
+  createdBy: string;
+};
diff --git a/app/src/types/index.ts b/app/src/types/index.ts
index 68ad06d6..844669b1 100644
--- a/app/src/types/index.ts
+++ b/app/src/types/index.ts
@@ -1,5 +1,6 @@
 export type { Activity } from './Activity';
 export type { AccessRequest } from './AccessRequest';
+export type { ATSClientResource } from './ATSClientResource';
 export type { ATSUserSearchParameters } from './ATSUserSearchParameters';
 export type { BceidSearchParameters } from './BceidSearchParameters';
 export type { BringForward } from './BringForward';
diff --git a/app/src/validators/ats.ts b/app/src/validators/ats.ts
new file mode 100644
index 00000000..33b2242d
--- /dev/null
+++ b/app/src/validators/ats.ts
@@ -0,0 +1,33 @@
+import Joi from 'joi';
+
+import { validate } from '../middleware/validation';
+
+import { BasicResponse } from '../utils/enums/application';
+
+const addressBody = {
+  '@type': Joi.string().valid('AddressResource'),
+  addressLine1: Joi.string().max(255).allow(null),
+  city: Joi.string().max(255).allow(null),
+  provinceCode: Joi.string().max(255).allow(null),
+  primaryPhone: Joi.string().max(255).allow(null),
+  email: Joi.string().max(255).allow(null)
+};
+
+const clientBody = {
+  '@type': Joi.string().valid('ClientResource'),
+  firstName: Joi.string().max(255).required(),
+  surName: Joi.string().max(255).required(),
+  regionName: Joi.string().max(255).required(),
+  optOutOfBCStatSurveyInd: Joi.string().valid(BasicResponse.NO.toUpperCase()),
+  address: Joi.object(addressBody).allow(null)
+};
+
+const schema = {
+  createATSClient: {
+    body: Joi.object(clientBody)
+  }
+};
+
+export default {
+  createATSClient: validate(schema.createATSClient)
+};
diff --git a/app/src/validators/index.ts b/app/src/validators/index.ts
index f7f533c2..ffb9b0e5 100644
--- a/app/src/validators/index.ts
+++ b/app/src/validators/index.ts
@@ -1,4 +1,5 @@
 export { default as accessRequestValidator } from './accessRequest';
+export { default as atsValidator } from './ats';
 export { default as documentValidator } from './document';
 export { default as enquiryValidator } from './enquiry';
 export { default as noteValidator } from './note';
diff --git a/app/tests/unit/controllers/ats.spec.ts b/app/tests/unit/controllers/ats.spec.ts
new file mode 100644
index 00000000..12b8e26b
--- /dev/null
+++ b/app/tests/unit/controllers/ats.spec.ts
@@ -0,0 +1,228 @@
+import { atsController } from '../../../src/controllers';
+import { atsService } from '../../../src/services';
+
+// Mock config library - @see {@link https://stackoverflow.com/a/64819698}
+jest.mock('config');
+
+const mockResponse = () => {
+  const res: { status?: jest.Mock; json?: jest.Mock; end?: jest.Mock } = {};
+  res.status = jest.fn().mockReturnValue(res);
+  res.json = jest.fn().mockReturnValue(res);
+
+  return res;
+};
+
+let res = mockResponse();
+beforeEach(() => {
+  res = mockResponse();
+});
+
+afterEach(() => {
+  jest.resetAllMocks();
+});
+
+const CURRENT_CONTEXT = { authType: 'BEARER', tokenPayload: null, userId: 'abc-123' };
+
+describe('createATSClient', () => {
+  const next = jest.fn();
+
+  // Mock service calls
+  const createSpy = jest.spyOn(atsService, 'createATSClient');
+
+  it('should return 201 if all good', async () => {
+    const req = {
+      body: {
+        '@type': 'ClientResource',
+        address: {
+          '@type': 'AddressResource',
+          addressLine1: null,
+          city: null,
+          provinceCode: null,
+          primaryPhone: '(213) 213-2132',
+          email: 's@s.com'
+        },
+        firstName: 'Gill',
+        surName: 'Bates',
+        regionName: 'HOUSING',
+        optOutOfBCStatSurveyInd: 'NO'
+      },
+      currentContext: CURRENT_CONTEXT
+    };
+
+    const created = {
+      data: {
+        '@type': 'ClientResource',
+        address: {
+          '@type': 'AddressResource',
+          addressLine1: null,
+          city: null,
+          provinceCode: null,
+          primaryPhone: '(213) 213-2132',
+          email: 's@s.com'
+        },
+        firstName: 'Gill',
+        surName: 'Bates',
+        regionName: 'HOUSING',
+        optOutOfBCStatSurveyInd: 'NO'
+      },
+      status: 201
+    };
+
+    createSpy.mockResolvedValue(created);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await atsController.createATSClient(req as any, res as any, next);
+
+    expect(createSpy).toHaveBeenCalledTimes(1);
+    expect(createSpy).toHaveBeenCalledWith({
+      ...req.body
+    });
+    expect(res.status).toHaveBeenCalledWith(201);
+  });
+
+  it('calls next if the ats service fails to create', async () => {
+    const req = {
+      body: {
+        '@type': 'ClientResource',
+        address: {
+          '@type': 'AddressResource',
+          addressLine1: null,
+          city: null,
+          provinceCode: null,
+          primaryPhone: '(213) 213-2132',
+          email: 's@s.com'
+        },
+        firstName: 'Gill',
+        surName: 'Bates',
+        optOutOfBCStatSurveyInd: 'NO'
+      },
+      currentContext: CURRENT_CONTEXT
+    };
+
+    createSpy.mockImplementationOnce(() => {
+      throw new Error();
+    });
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await atsController.createATSClient(req as any, res as any, next);
+
+    expect(createSpy).toHaveBeenCalledTimes(1);
+    expect(createSpy).toHaveBeenCalledWith({
+      ...req.body
+    });
+    expect(res.status).toHaveBeenCalledTimes(0);
+    expect(next).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('searchATSUsers', () => {
+  const next = jest.fn();
+
+  // Mock service calls
+  const searchATSUsersSpy = jest.spyOn(atsService, 'searchATSUsers');
+
+  it('should return 200 if all good', async () => {
+    const req = {
+      query: { firstName: 'John' },
+      currentContext: CURRENT_CONTEXT
+    };
+
+    const atsUsers = {
+      data: {
+        '@type': 'ClientsResource',
+        links: [
+          {
+            '@type': 'RelLink',
+            rel: 'self',
+            href: 'https://t1api.nrs.gov.bc.ca/ats-api/clients?firstName=John',
+            method: 'GET'
+          },
+          {
+            '@type': 'RelLink',
+            rel: 'next',
+            href: 'https://t1api.nrs.gov.bc.ca/ats-api/clients?firstName=John',
+            method: 'GET'
+          }
+        ],
+        pageNumber: 0,
+        pageRowCount: 956,
+        totalRowCount: 956,
+        totalPageCount: 1,
+        clients: [
+          {
+            '@type': 'ClientResource',
+            links: [
+              {
+                '@type': 'RelLink',
+                rel: 'self',
+                href: 'https://t1api.nrs.gov.bc.ca/ats-api/clients',
+                method: 'GET'
+              }
+            ],
+            clientId: 96,
+            address: {
+              '@type': 'AddressResource',
+              links: [],
+              addressId: 443,
+              addressLine1: null,
+              addressLine2: null,
+              city: 'Fqmrpml',
+              provinceCode: 'Alberta',
+              countryCode: 'Canada',
+              postalCode: null,
+              primaryPhone: null,
+              secondaryPhone: null,
+              fax: null,
+              email: null,
+              createdBy: null,
+              createdDateTime: null,
+              updatedBy: null,
+              updatedDateTime: null
+            },
+            businessOrgCode: null,
+            firstName: 'John',
+            surName: 'Nike',
+            companyName: null,
+            organizationNumber: null,
+            confirmedIndicator: false,
+            createdBy: 'IDIR\\JNNIKE',
+            createdDateTime: 1166734440000,
+            updatedBy: 'ATS',
+            updatedDateTime: 1166734440000,
+            regionName: 'Skeena',
+            optOutOfBCStatSurveyInd: 'NO'
+          }
+        ]
+      },
+      status: 200
+    };
+
+    searchATSUsersSpy.mockResolvedValue(atsUsers);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await atsController.searchATSUsers(req as any, res as any, next);
+
+    expect(searchATSUsersSpy).toHaveBeenCalledTimes(1);
+    expect(searchATSUsersSpy).toHaveBeenCalledWith({ firstName: 'John' });
+    expect(res.status).toHaveBeenCalledWith(200);
+  });
+
+  it('calls next if the ats service fails to get ats users', async () => {
+    const req = {
+      query: { firstName: 'John' },
+      currentContext: CURRENT_CONTEXT
+    };
+
+    searchATSUsersSpy.mockImplementationOnce(() => {
+      throw new Error();
+    });
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await atsController.searchATSUsers(req as any, res as any, next);
+
+    expect(searchATSUsersSpy).toHaveBeenCalledTimes(1);
+    expect(searchATSUsersSpy).toHaveBeenCalledWith({ firstName: 'John' });
+    expect(res.status).toHaveBeenCalledTimes(0);
+    expect(next).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/frontend/src/components/housing/submission/SubmissionForm.vue b/frontend/src/components/housing/submission/SubmissionForm.vue
index e7811dcb..391556ec 100644
--- a/frontend/src/components/housing/submission/SubmissionForm.vue
+++ b/frontend/src/components/housing/submission/SubmissionForm.vue
@@ -38,7 +38,7 @@ import { applicantValidator, assignedToValidator, latitudeValidator, longitudeVa
 
 import type { Ref } from 'vue';
 import type { IInputEvent } from '@/interfaces';
-import type { ATSUser, Submission, User } from '@/types';
+import type { ATSClientResource, Submission, User } from '@/types';
 import { omit, setEmptyStringsToNull } from '@/utils/utils';
 
 // Interfaces
@@ -58,7 +58,6 @@ const submissionStore = useSubmissionStore();
 
 // State
 const assigneeOptions: Ref<Array<User>> = ref([]);
-const atsClientNumber: Ref<string | undefined> = ref(undefined);
 const atsUserLinkModalVisible: Ref<boolean> = ref(false);
 const atsUserDetailsModalVisible: Ref<boolean> = ref(false);
 const atsUserCreateModalVisible: Ref<boolean> = ref(false);
@@ -197,7 +196,6 @@ const onSubmit = async (values: any) => {
     const submitData: Submission = omit(setEmptyStringsToNull(values) as SubmissionForm, ['locationAddress', 'user']);
     submitData.assignedUserId = values.user?.userId ?? undefined;
     submitData.consentToFeedback = values.consentToFeedback === BasicResponse.YES;
-    submitData.atsClientNumber = atsClientNumber.value?.toString() ?? null;
     const result = await submissionService.updateSubmission(values.submissionId, submitData);
     submissionStore.setSubmission(result.data);
     formRef.value?.resetForm({
@@ -283,7 +281,6 @@ onMounted(async () => {
     applicationStatus: submission.applicationStatus,
     waitingOn: submission.waitingOn
   };
-  atsClientNumber.value = submission.atsClientNumber ?? undefined;
 });
 </script>
 
@@ -617,7 +614,7 @@ onMounted(async () => {
       <SectionHeader title="ATS" />
       <div class="flex align-items-center mb-2">
         <div
-          v-if="atsClientNumber"
+          v-if="values.atsClientNumber"
           class="ml-2 mr-2"
         >
           <h5 class="inline mr-2">Client #</h5>
@@ -625,11 +622,15 @@ onMounted(async () => {
             class="atsclass"
             @click="atsUserDetailsModalVisible = true"
           >
-            {{ atsClientNumber }}
+            {{ values.atsClientNumber }}
           </a>
         </div>
+        <input
+          type="hidden"
+          name="atsClientNumber"
+        />
         <Button
-          v-if="!atsClientNumber"
+          v-if="!values.atsClientNumber"
           aria-label="Link to ATS"
           class="h-2rem ml-2"
           @click="atsUserLinkModalVisible = true"
@@ -637,9 +638,9 @@ onMounted(async () => {
           Search ATS
         </Button>
         <Button
-          v-if="!atsClientNumber"
+          v-if="!values.atsClientNumber"
           aria-label="New ATS client"
-          class="h-2rem ml-4"
+          class="h-2rem ml-3"
           @click="atsUserCreateModalVisible = true"
         >
           New ATS Client
@@ -735,20 +736,19 @@ onMounted(async () => {
       v-model:visible="atsUserLinkModalVisible"
       :submission="submission"
       @ats-user-link:link="
-        (atsUser: ATSUser) => {
-          atsClientNumber = atsUser.atsClientNumber;
-          submissionStore.setSubmission({ ...submission, atsClientNumber: atsUser.atsClientNumber ?? null });
+        (atsClientResource: ATSClientResource) => {
           atsUserLinkModalVisible = false;
+          setFieldValue('atsClientNumber', atsClientResource.clientId?.toString());
         }
       "
     />
     <ATSUserDetailsModal
       v-model:visible="atsUserDetailsModalVisible"
-      :submission="submission"
+      :ats-client-number="values.atsClientNumber"
       @ats-user-details:un-link="
         () => {
-          atsClientNumber = undefined;
           atsUserDetailsModalVisible = false;
+          setFieldValue('atsClientNumber', null);
         }
       "
     />
@@ -757,9 +757,8 @@ onMounted(async () => {
       :submission="submission"
       @ats-user-link:link="
         (atsClientId: string) => {
-          atsClientNumber = atsClientId;
-          submissionStore.setSubmission({ ...submission, atsClientNumber: atsClientId ?? null });
           atsUserCreateModalVisible = false;
+          setFieldValue('atsClientNumber', atsClientId.toString());
         }
       "
     />
diff --git a/frontend/src/components/user/ATSUserCreateModal.vue b/frontend/src/components/user/ATSUserCreateModal.vue
index e28422d7..79df091f 100644
--- a/frontend/src/components/user/ATSUserCreateModal.vue
+++ b/frontend/src/components/user/ATSUserCreateModal.vue
@@ -1,14 +1,23 @@
 <script setup lang="ts">
-import axios from 'axios';
 import { onMounted, ref } from 'vue';
-import { Button, Column, DataTable, Dialog, useToast } from '@/lib/primevue';
 
 import { Spinner } from '@/components/layout';
+import { Button, Column, DataTable, Dialog, useToast } from '@/lib/primevue';
 import { atsService } from '@/services';
-import { BasicResponse } from '@/utils/enums/application';
+import { BasicResponse, Initiative } from '@/utils/enums/application';
+import { setEmptyStringsToNull } from '@/utils/utils';
 
 import type { Ref } from 'vue';
-import type { ATSUser, Submission } from '@/types';
+import type { ATSClientResource, Submission } from '@/types';
+
+// Types
+type ATSUser = {
+  address: string;
+  email: string;
+  firstName: string;
+  lastName: string;
+  phone: string;
+};
 
 // Props
 const { submission } = defineProps<{
@@ -18,14 +27,10 @@ const { submission } = defineProps<{
 // Emits
 const emit = defineEmits(['atsUserLink:link']);
 
-// Constants
-const REGION_BC = 'BC';
-
 // State
 const atsClientNumber: Ref<string> = ref('');
 const loading: Ref<boolean> = ref(false);
-const proponent: Ref<ATSUser | undefined> = ref(undefined);
-const selectedUser: Ref<ATSUser | undefined> = ref(undefined);
+const atsUser: Ref<ATSUser | undefined> = ref(undefined);
 const visible = defineModel<boolean>('visible');
 
 // Actions
@@ -33,11 +38,9 @@ const visible = defineModel<boolean>('visible');
 const toast = useToast();
 
 async function createATSClient() {
-  selectedUser.value = undefined;
   try {
     loading.value = true;
-
-    const data = setEmptyStringsToNullAndOmitNulls({
+    const data = {
       '@type': 'ClientResource',
       address: {
         '@type': 'AddressResource',
@@ -49,52 +52,34 @@ async function createATSClient() {
       },
       firstName: submission.contactFirstName,
       surName: submission.contactLastName,
-      regionName: REGION_BC,
+      regionName: Initiative.HOUSING,
       optOutOfBCStatSurveyInd: BasicResponse.NO.toUpperCase()
-    });
+    };
+
+    const submitData: ATSClientResource = setEmptyStringsToNull(data);
 
-    const response = await atsService.createATSClient(data);
+    const response = await atsService.createATSClient(submitData);
     if (response.status === 201) {
       atsClientNumber.value = response.data.clientId;
       emit('atsUserLink:link', atsClientNumber.value);
+      visible.value = false;
       toast.success('New client pushed to ATS');
     } else {
       toast.error('Error pushing client to ATS');
     }
   } catch (error) {
-    if (!axios.isCancel(error)) toast.error('Error pushing client to ATS ' + error);
+    toast.error('Error pushing client to ATS ' + error);
   } finally {
     loading.value = false;
   }
 }
 
-function setEmptyStringsToNullAndOmitNulls(obj: Record<string, any>): Record<string, any> {
-  const result: Record<string, any> = {};
-
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (typeof obj[key] === 'string' && obj[key].trim() === '') {
-        // Skip adding this key if the value is an empty string
-        continue;
-      } else if (typeof obj[key] === 'object' && obj[key] !== null) {
-        const nestedResult = setEmptyStringsToNullAndOmitNulls(obj[key]);
-        if (Object.keys(nestedResult).length > 0) {
-          result[key] = nestedResult;
-        }
-      } else if (obj[key] !== null) {
-        result[key] = obj[key];
-      }
-    }
-  }
-
-  return result;
-}
-onMounted(async () => {
+onMounted(() => {
   const locationAddressStr = [submission.streetAddress, submission.locality, submission.province]
     .filter((str) => str?.trim())
     .join(', ');
 
-  proponent.value = {
+  atsUser.value = {
     firstName: submission.contactFirstName ?? '',
     lastName: submission.contactLastName ?? '',
     email: submission.contactEmail ?? '',
@@ -112,13 +97,13 @@ onMounted(async () => {
     class="app-info-dialog w-max"
   >
     <template #header>
-      <span class="p-dialog-title title-colour">Create new client in ATS</span>
+      <span class="p-dialog-title app-primary-color">Create new client in ATS</span>
     </template>
     <div>
       <DataTable
         :row-hover="true"
         class="datatable mt-3 mb-4"
-        :value="[proponent]"
+        :value="[atsUser]"
         selection-mode="single"
         :rows="1"
       >
@@ -140,7 +125,7 @@ onMounted(async () => {
           header="Last Name"
         />
         <Column
-          field="lastName"
+          field="phone"
           header="Phone"
         />
         <Column
@@ -152,20 +137,24 @@ onMounted(async () => {
           header="Location address"
         />
       </DataTable>
-      <div class="flex justify-content-end">
+      <div
+        v-if="!loading"
+        class="flex justify-content-start"
+      >
         <Button
-          class="p-button-solid"
+          class="p-button-solid mr-3"
           label="Push to ATS"
           icon="pi pi-upload"
-          visible="false"
           @click="createATSClient()"
         />
+        <Button
+          class="mr-0"
+          outlined
+          label="Cancel"
+          @click="visible = false"
+        />
       </div>
+      <Spinner v-if="loading" />
     </div>
   </Dialog>
 </template>
-<style scoped lang="scss">
-.title-colour {
-  color: $app-primary;
-}
-</style>
diff --git a/frontend/src/components/user/ATSUserDetailsModal.vue b/frontend/src/components/user/ATSUserDetailsModal.vue
index 60577f5f..3fa9c7f1 100644
--- a/frontend/src/components/user/ATSUserDetailsModal.vue
+++ b/frontend/src/components/user/ATSUserDetailsModal.vue
@@ -1,17 +1,16 @@
 <script setup lang="ts">
-import axios from 'axios';
-import { onMounted, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 
 import { Spinner } from '@/components/layout';
 import { Button, Column, DataTable, Dialog, useToast } from '@/lib/primevue';
 import { atsService } from '@/services';
 
 import type { Ref } from 'vue';
-import type { ATSUser } from '@/types';
+import type { ATSClientResource } from '@/types';
 
 // Props
-const { submission } = defineProps<{
-  submission: any;
+const { atsClientNumber } = defineProps<{
+  atsClientNumber: string | null;
 }>();
 
 // Emits
@@ -19,8 +18,7 @@ const emit = defineEmits(['atsUserDetails:unLink']);
 
 // State
 const loading: Ref<boolean> = ref(false);
-const atsUsers: Ref<Array<ATSUser>> = ref([]);
-const proponent: Ref<ATSUser | undefined> = ref(undefined);
+const users: Ref<Array<ATSClientResource>> = ref([]);
 
 const visible = defineModel<boolean>('visible');
 
@@ -33,45 +31,25 @@ async function getATSClientInformation() {
     loading.value = true;
 
     const response = await atsService.searchATSUsers({
-      clientId: submission.atsClientNumber
+      clientId: atsClientNumber
     });
 
-    atsUsers.value = response.data.clients.map((client: any) => {
+    users.value = response.data.clients;
+
+    users.value.forEach((client: ATSClientResource) => {
       // Combine address lines and filter out empty lines
       const address = [client.address.addressLine1, client.address.addressLine2].filter((line) => line).join(', ');
-
-      return {
-        atsClientNumber: client.clientId,
-        firstName: client.firstName,
-        lastName: client.surName,
-        email: client.address.email,
-        phone: client.address.primaryPhone ?? client.address.secondaryPhone,
-        address: address
-      };
+      client.formattedAddress = address;
     });
   } catch (error) {
-    if (!axios.isCancel(error)) toast.error('Error searching for users ' + error);
+    toast.error('Error searching for users ' + error);
   } finally {
     loading.value = false;
   }
 }
 
-onMounted(async () => {
-  const locationAddressStr = [submission.streetAddress, submission.locality, submission.province]
-    .filter((str) => str?.trim())
-    .join(', ');
-
-  proponent.value = {
-    firstName: submission.contactFirstName ?? '',
-    lastName: submission.contactLastName ?? '',
-    email: submission.contactEmail ?? '',
-    address: locationAddressStr,
-    phone: submission.contactPhoneNumber ?? ''
-  };
-});
-
 watch(visible, () => {
-  getATSClientInformation();
+  if (atsClientNumber) getATSClientInformation();
 });
 </script>
 
@@ -83,13 +61,13 @@ watch(visible, () => {
     class="app-info-dialog w-7"
   >
     <template #header>
-      <span class="p-dialog-title title-colour">ATS Client link</span>
+      <span class="p-dialog-title app-primary-color">ATS Client link</span>
     </template>
     <DataTable
       :row-hover="true"
       :loading="loading"
       class="datatable mt-3 mb-2"
-      :value="atsUsers"
+      :value="users"
       selection-mode="single"
       data-key="atsClientNumber"
       :rows="1"
@@ -104,7 +82,7 @@ watch(visible, () => {
       </template>
 
       <Column
-        field="atsClientNumber"
+        field="clientId"
         header="Client #"
       />
       <Column
@@ -112,19 +90,19 @@ watch(visible, () => {
         header="First Name"
       />
       <Column
-        field="lastName"
+        field="surName"
         header="Last Name"
       />
       <Column
-        field="phone"
+        field="address.primaryPhone"
         header="Phone"
       />
       <Column
-        field="email"
+        field="address.email"
         header="Email"
       />
       <Column
-        field="address"
+        field="formattedAddress"
         header="Location address"
       />
       <Column
@@ -135,8 +113,8 @@ watch(visible, () => {
         <template #body="{ data }">
           <Button
             class="p-button-lg p-button-text p-button-danger p-0"
-            aria-label="Delete enquiry"
-            @click="atsUsers = atsUsers.filter((atsUser) => atsUser.atsClientNumber !== data.atsClientNumber)"
+            aria-label="Delete user"
+            @click="users = users.filter((atsUser) => atsUser.clientId !== data.clientId)"
           >
             <font-awesome-icon icon="fa-solid fa-trash" />
           </Button>
@@ -147,7 +125,7 @@ watch(visible, () => {
       <Button
         class="p-button-solid mr-3"
         label="Save"
-        @click="atsUsers.length == 0 ? emit('atsUserDetails:unLink') : (visible = false)"
+        @click="users.length == 0 ? emit('atsUserDetails:unLink') : (visible = false)"
       />
       <Button
         class="mr-0"
@@ -158,8 +136,3 @@ watch(visible, () => {
     </div>
   </Dialog>
 </template>
-<style scoped lang="scss">
-.title-colour {
-  color: $app-primary;
-}
-</style>
diff --git a/frontend/src/components/user/ATSUserLinkModal.vue b/frontend/src/components/user/ATSUserLinkModal.vue
index fc737429..7c82ff69 100644
--- a/frontend/src/components/user/ATSUserLinkModal.vue
+++ b/frontend/src/components/user/ATSUserLinkModal.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import axios from 'axios';
 import { onMounted, ref } from 'vue';
-import { Button, Column, DataTable, Dialog, InputText, useToast } from '@/lib/primevue';
 
 import { Spinner } from '@/components/layout';
+import { Button, Column, DataTable, Dialog, InputText, useToast } from '@/lib/primevue';
 import { atsService } from '@/services';
 
 import type { Ref } from 'vue';
-import type { ATSUser, Submission } from '@/types';
+import type { ATSClientResource, Submission } from '@/types';
 
 // Props
 const { submission } = defineProps<{
@@ -24,10 +23,8 @@ const firstName: Ref<string> = ref('');
 const lastName: Ref<string> = ref('');
 const loading: Ref<boolean> = ref(false);
 const phone: Ref<string> = ref('');
-const proponent: Ref<ATSUser | undefined> = ref(undefined);
-const selectedUser: Ref<ATSUser | undefined> = ref(undefined);
-const showCreateATS = defineModel<boolean>('showCreateATS');
-const users: Ref<Array<ATSUser>> = ref([]);
+const selectedUser: Ref<ATSClientResource | undefined> = ref(undefined);
+const users: Ref<Array<ATSClientResource>> = ref([]);
 const visible = defineModel<boolean>('visible');
 
 // Actions
@@ -46,45 +43,25 @@ async function searchATSUsers() {
       phone: phone.value,
       email: email.value
     });
+    users.value = response.data.clients;
 
-    showCreateATS.value = true;
-
-    users.value = response.data.clients.map((client: any) => {
+    users.value.forEach((client: ATSClientResource) => {
       // Combine address lines and filter out empty lines
       const address = [client.address.addressLine1, client.address.addressLine2].filter((line) => line).join(', ');
-
-      return {
-        atsClientNumber: client.clientId,
-        firstName: client.firstName,
-        lastName: client.surName,
-        email: client.address.email,
-        phone: client.address.primaryPhone ?? client.address.secondaryPhone,
-        address: address
-      };
+      client.formattedAddress = address;
     });
   } catch (error) {
-    if (!axios.isCancel(error)) toast.error('Error searching for users ' + error);
+    toast.error('Error searching for users ' + error);
   } finally {
     loading.value = false;
   }
 }
 
-onMounted(async () => {
+onMounted(() => {
   if (submission.contactFirstName && submission.contactLastName) {
     firstName.value = submission.contactFirstName;
     lastName.value = submission.contactLastName;
   }
-  const locationAddressStr = [submission.streetAddress, submission.locality, submission.province]
-    .filter((str) => str?.trim())
-    .join(', ');
-
-  proponent.value = {
-    firstName: submission.contactFirstName ?? '',
-    lastName: submission.contactLastName ?? '',
-    email: submission.contactEmail ?? '',
-    address: locationAddressStr,
-    phone: submission.contactPhoneNumber ?? ''
-  };
 });
 </script>
 
@@ -96,7 +73,7 @@ onMounted(async () => {
     class="app-info-dialog w-max"
   >
     <template #header>
-      <span class="p-dialog-title title-colour">Search ATS</span>
+      <span class="p-dialog-title app-primary-color">Search ATS</span>
     </template>
     <div class="pt-1 mb-4 mr-1 grid">
       <div class="col pr-0">
@@ -149,7 +126,7 @@ onMounted(async () => {
       class="datatable mt-3 mb-2"
       :value="users"
       selection-mode="single"
-      data-key="atsClientNumber"
+      data-key="clientId"
       :rows="5"
       :paginator="true"
       paginator-template="RowsPerPageDropdown CurrentPageReport PrevPageLink NextPageLink "
@@ -165,7 +142,7 @@ onMounted(async () => {
       </template>
 
       <Column
-        field="atsClientNumber"
+        field="clientId"
         header="Client #"
         sortable
       />
@@ -175,38 +152,39 @@ onMounted(async () => {
         sortable
       />
       <Column
-        field="lastName"
+        field="surName"
         header="Last Name"
         sortable
       />
       <Column
-        field="phone"
+        field="address.primaryPhone"
         header="Phone"
         sortable
       />
       <Column
-        field="email"
+        field="address.email"
         header="Email"
         sortable
       />
       <Column
-        field="address"
+        field="formattedAddress"
         header="Location address"
         sortable
       />
     </DataTable>
-    <div class="flex justify-content-end">
+    <div class="flex justify-content-start">
       <Button
-        class="p-button-solid mr-0"
+        class="p-button-solid mr-3"
         label="Link to PCNS"
         :disabled="!selectedUser"
         @click="emit('atsUserLink:link', selectedUser)"
       />
+      <Button
+        class="mr-0"
+        outlined
+        label="Cancel"
+        @click="visible = false"
+      />
     </div>
   </Dialog>
 </template>
-<style scoped lang="scss">
-.title-colour {
-  color: $app-primary;
-}
-</style>
diff --git a/frontend/src/services/atsService.ts b/frontend/src/services/atsService.ts
index adfdddb5..76368cac 100644
--- a/frontend/src/services/atsService.ts
+++ b/frontend/src/services/atsService.ts
@@ -1,5 +1,7 @@
 import { appAxios } from './interceptors';
 
+import type { ATSClientResource } from '@/types';
+
 export default {
   /**
    * @function searchATSUsers
@@ -16,7 +18,7 @@ export default {
    * @function createATSClient
    * @returns {Promise} An axios response
    */
-  createATSClient(data?: any) {
+  createATSClient(data?: ATSClientResource) {
     return appAxios().post('ats/client', data);
   }
 };
diff --git a/frontend/src/types/ATSClientResource.ts b/frontend/src/types/ATSClientResource.ts
new file mode 100644
index 00000000..d5111d26
--- /dev/null
+++ b/frontend/src/types/ATSClientResource.ts
@@ -0,0 +1,46 @@
+export type RelLink = {
+  '@type': string;
+  rel: string;
+  href: string;
+  method: string;
+};
+
+export type AddressResource = {
+  '@type': string;
+  links: RelLink[];
+  addressId: number;
+  addressLine1: string;
+  addressLine2: string | null;
+  city: string;
+  provinceCode: string;
+  countryCode: string;
+  postalCode: string | null;
+  primaryPhone: string | null;
+  secondaryPhone: string | null;
+  fax: string | null;
+  email: string | null;
+  createdBy: string | null;
+  createdDateTime: number | null;
+  updatedBy: string | null;
+  updatedDateTime: number | null;
+};
+
+export type ATSClientResource = {
+  '@type': string | undefined;
+  links: RelLink[] | undefined;
+  clientId: number | undefined;
+  address: AddressResource;
+  businessOrgCode: string | null;
+  firstName: string;
+  formattedAddress: string;
+  surName: string;
+  companyName: string | null;
+  organizationNumber: string | null;
+  confirmedIndicator: boolean;
+  createdBy: string | undefined;
+  createdDateTime: number | undefined;
+  updatedBy: string | undefined;
+  updatedDateTime: number | undefined;
+  regionName: string | undefined;
+  optOutOfBCStatSurveyInd: string | undefined;
+};
diff --git a/frontend/src/types/ATSUser.ts b/frontend/src/types/ATSUser.ts
deleted file mode 100644
index 7dbd7cb8..00000000
--- a/frontend/src/types/ATSUser.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type ATSUser = {
-  address: string;
-  atsClientNumber?: string | undefined;
-  email: string;
-  firstName: string;
-  phone: string;
-  lastName: string;
-};
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index f5d2a2b0..e6d3bdb7 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -1,5 +1,5 @@
 export type { AccessRequest } from './AccessRequest';
-export type { ATSUser } from './ATSUser';
+export type { ATSClientResource } from './ATSClientResource';
 export type { BasicBCeIDAttribute } from './BasicBCeIDAttribute';
 export type { BringForward } from './BringForward';
 export type { BusinessBCeIDAttribute } from './BusinessBCeIDAttribute';