Import contact data for a licence

app/presenters/import/legacy/contact.presenter.js

@@ -0,0 +1,28 @@
+'use strict'
+
+/**
+ * Maps the legacy NALD contact data to the WRLS format
+ * @module ContactPresenter
+ */
+
+/**
+ * Maps the legacy NALD contact data to the WRLS format
+ *
+ * @param {ImportLegacyContactType} contact - the legacy NALD contact
+ *
+ * @returns {object} the NALD contact data transformed into the WRLS format for a contact
+ * ready for validation and persisting
+ */
+function go (contact) {
+  return {
+    externalId: contact.external_id,
+    salutation: contact.salutation,
+    initials: contact.initials,
+    firstName: contact.first_name,
+    lastName: contact.last_name
+  }
+}
+
+module.exports = {
+  go
+}

app/services/import/legacy/fetch-company.service.js

@@ -29,24 +29,6 @@ function _query () {
   return `
   SELECT DISTINCT ON (np."ID")
     (concat_ws(':', np."FGAC_REGION_CODE", np."ID")) AS external_id,
-    (
-      CASE np."SALUTATION"
-        WHEN 'null' THEN NULL
-        ELSE np."SALUTATION"
-        END
-      )  AS salutation,
-    (
-      CASE np."FORENAME"
-        WHEN 'null' THEN NULL
-        ELSE np."FORENAME"
-        END
-      )  AS firstName,
-    (
-      CASE np."NAME"
-        WHEN 'null' THEN NULL
-        ELSE np."NAME"
-        END
-      )  AS lastName,
     (
       CASE np."APAR_TYPE"
         WHEN 'PER' THEN 'person'
@@ -72,8 +54,7 @@ function _query () {
           END
           )
         END
-      )) AS name,
-    np."ID" as id
+      )) AS name
   FROM import."NALD_PARTIES" np
     LEFT JOIN import."NALD_ABS_LIC_VERSIONS" nalv
       ON nalv."ACON_APAR_ID" = np."ID"
@@ -95,10 +76,6 @@ module.exports = {
 /**
  * @typedef {object} ImportLegacyCompanyType
  *
- * @property {string} - The party id
- * @property {string|null} salutation - The salutation of the person, or null if not applicable.
- * @property {string|null} firstName - The first name of the person, or null if not applicable.
- * @property {string|null} lastName - The last name of the person, or null if not applicable.
  * @property {string} type - Indicates whether the entry is a 'person' or an 'organisation'.
  * @property {string|null} name - The full name, concatenated from salutation, forename/initials, and name.
  * @property {string} external_id - The external ID, formatted as 'FGAC_REGION_CODE:ID'.

app/services/import/legacy/fetch-contacts.service.js

@@ -0,0 +1,86 @@
+'use strict'
+
+/**
+ * Fetches the company data from the import.NALD_PARTIES table for the licence ref
+ * @module FetchContactsService
+ */
+
+const { db } = require('../../../../db/db.js')
+
+/**
+ * Fetches the licence data from the import.NALD_PARTIES table for the licence ref
+ *
+ * When a company has at least one licence version and the type of contact is not an organisation.
+ * Then it will have a contact.
+ *
+ * @param {string} regionCode - The NALD region code
+ * @param {string} licenceId - The NALD licence ID
+ *
+ * @returns {Promise<ImportLegacyContactType[]>}
+ */
+async function go (regionCode, licenceId) {
+  const query = _query()
+
+  const { rows } = await db.raw(query, [regionCode, licenceId, regionCode, licenceId])
+
+  return rows
+}
+
+function _query () {
+  return `
+  SELECT DISTINCT ON (np."ID")
+    (concat_ws(':', np."FGAC_REGION_CODE", np."ID")) AS external_id,
+    (
+      CASE np."SALUTATION"
+        WHEN 'null' THEN NULL
+        ELSE np."SALUTATION"
+        END
+      )  AS salutation,
+    (
+      CASE np."INITIALS"
+        WHEN 'null' THEN NULL
+        ELSE np."INITIALS"
+        END
+      )  AS initials,
+    (
+      CASE np."FORENAME"
+        WHEN 'null' THEN NULL
+        ELSE np."FORENAME"
+        END
+      )  AS first_name,
+    (
+      CASE np."NAME"
+        WHEN 'null' THEN NULL
+        ELSE np."NAME"
+        END
+      )  AS last_name
+  FROM import."NALD_PARTIES" np
+    LEFT JOIN import."NALD_ABS_LIC_VERSIONS" nalv
+      ON nalv."ACON_APAR_ID" = np."ID"
+      AND nalv."FGAC_REGION_CODE" = np."FGAC_REGION_CODE"
+    LEFT JOIN import."NALD_LIC_ROLES" nlr
+      ON nlr."ACON_APAR_ID" = np."ID"
+      AND nlr."FGAC_REGION_CODE" = np."FGAC_REGION_CODE"
+  WHERE np."APAR_TYPE" != 'ORG'
+    AND (
+    (nalv."FGAC_REGION_CODE" = ? AND nalv."AABL_ID" = ?)
+      OR
+    (nlr."FGAC_REGION_CODE" = ? AND nlr."AABL_ID" = ?)
+    );
+  `
+}
+
+module.exports = {
+  go
+}
+
+/**
+ * @typedef {object} ImportLegacyContactType
+ *
+ * @property {string|null} salutation - The salutation of the person, or null if not applicable.
+ * @property {string|null} initials - The initials of the person, or null if not applicable.
+ * @property {string|null} firstName - The first name of the person, or null if not applicable.
+ * @property {string|null} lastName - The last name of the person, or null if not applicable.
+ * @property {string} external_id - The external ID, formatted as 'FGAC_REGION_CODE:ID'.
+ *
+ */

app/services/import/legacy/process-licence.service.js

@@ -9,6 +9,7 @@ const LicenceStructureValidator = require('../../../validators/import/licence-st
 const PersistLicenceService = require('../persist-licence.service.js')
 const ProcessLicenceReturnLogsService = require('../../jobs/return-logs/process-licence-return-logs.service.js')
 const TransformCompaniesService = require('./transform-companies.service.js')
+const TransformContactsService = require('./transform-contacts.service.js')
 const TransformLicenceService = require('./transform-licence.service.js')
 const TransformLicenceVersionPurposeConditionsService = require('./transform-licence-version-purpose-conditions.service.js')
 const TransformLicenceVersionPurposesService = require('./transform-licence-version-purposes.service.js')
@@ -38,6 +39,9 @@ async function go (licenceRef) {
     // Transform the company data
     const { transformedCompanies } = await TransformCompaniesService.go(regionCode, naldLicenceId)
 
+    // Pass the transformed companies through each transformation step, building the company as we go
+    await TransformContactsService.go(regionCode, naldLicenceId, transformedCompanies)
+
     // Ensure the built licence has all the valid child records we require
     LicenceStructureValidator.go(transformedLicence)
 

app/services/import/legacy/transform-contacts.service.js

@@ -0,0 +1,44 @@
+'use strict'
+
+/**
+ * Transforms NALD company data into a valid object that matches the WRLS structure
+ * @module ImportLegacyTransformContactsService
+ */
+
+const FetchContactsService = require('./fetch-contacts.service.js')
+const ContactPresenter = require('../../../presenters/import/legacy/contact.presenter.js')
+const ImportContactValidator = require('../../../validators/import/contact.validator.js')
+
+/**
+ * Transforms NALD company data into a validated object that matches the WRLS structure
+ *
+ * @param {string} regionCode - The NALD region code
+ * @param {string} licenceId - The NALD licence ID
+ * @param {object[]} transformedCompanies
+ *
+ * @returns {Promise<object>} an object representing an array of valid WRLS transformed companies and
+ * an array of companies from the db
+ */
+async function go (regionCode, licenceId, transformedCompanies) {
+  const naldContacts = await FetchContactsService.go(regionCode, licenceId)
+
+  naldContacts.forEach((naldContact) => {
+    const matchingCompany = _matchingCompany(transformedCompanies, naldContact)
+
+    const transformedContact = ContactPresenter.go(naldContact)
+
+    ImportContactValidator.go(transformedContact)
+
+    matchingCompany.contact = { ...transformedContact, dataSource: 'nald' }
+  })
+}
+
+function _matchingCompany (transformedCompanies, naldContact) {
+  return transformedCompanies.find((company) => {
+    return company.externalId === naldContact.external_id
+  })
+}
+
+module.exports = {
+  go
+}

app/services/import/persist-licence.service.js

@@ -5,12 +5,13 @@
  * @module PersistLicenceService
  */
 
-const { timestampForPostgres } = require('../../lib/general.lib.js')
+const CompanyModel = require('../../models/company.model.js')
+const ContactModel = require('../../models/contact.model.js')
 const LicenceModel = require('../../models/licence.model.js')
 const LicenceVersionModel = require('../../models/licence-version.model.js')
-const LicenceVersionPurposeModel = require('../../models/licence-version-purpose.model.js')
 const LicenceVersionPurposeConditionModel = require('../../models/licence-version-purpose-condition.model.js')
-const CompanyModel = require('../../models/company.model.js')
+const LicenceVersionPurposeModel = require('../../models/licence-version-purpose.model.js')
+const { timestampForPostgres } = require('../../lib/general.lib.js')
 
 /**
  * Creates or updates an imported licence and its child entities that have been transformed and validated
@@ -140,11 +141,15 @@ async function _persistLicenceVersionPurposeCondition (
 async function _persistCompanies (trx, updatedAt, companies) {
   for (const company of companies) {
     await _persistCompany(trx, updatedAt, company)
+
+    if (company.contact) {
+      await _persistContact(trx, updatedAt, company.contact)
+    }
   }
 }
 
 async function _persistCompany (trx, updatedAt, company) {
-  const { ...propertiesToPersist } = company
+  const { contact, ...propertiesToPersist } = company
 
   return CompanyModel.query(trx)
     .insert({ ...propertiesToPersist, updatedAt })
@@ -156,6 +161,19 @@ async function _persistCompany (trx, updatedAt, company) {
     ])
 }
 
+async function _persistContact (trx, updatedAt, contact) {
+  return ContactModel.query(trx)
+    .insert({ ...contact, updatedAt })
+    .onConflict('externalId')
+    .merge([
+      'salutation',
+      'initials',
+      'firstName',
+      'lastName',
+      'updatedAt'
+    ])
+}
+
 module.exports = {
   go
 }

app/validators/import/contact.validator.js

@@ -0,0 +1,34 @@
+'use strict'
+
+/**
+ * @module ImportContactValidator
+ */
+
+const Joi = require('joi')
+
+/**
+ * Checks that the imported contact data has been transformed and is valid for persisting to WRLS
+ *
+ * @param {object} contact - The transformed contact data
+ *
+ * @throws {Joi.ValidationError} - throws a Joi validation error if the validation fails
+ */
+function go (contact) {
+  const schema = Joi.object({
+    salutation: Joi.string().allow(null),
+    initials: Joi.string().allow(null),
+    firstName: Joi.string().allow(null),
+    lastName: Joi.string().allow(null),
+    externalId: Joi.string().required()
+  })
+
+  const result = schema.validate(contact, { convert: false })
+
+  if (result.error) {
+    throw result.error
+  }
+}
+
+module.exports = {
+  go
+}

test/presenters/import/legacy/contact.presenter.test.js

@@ -0,0 +1,41 @@
+'use strict'
+
+// Test framework dependencies
+const Lab = require('@hapi/lab')
+const Code = require('@hapi/code')
+
+const { describe, it, beforeEach } = exports.lab = Lab.script()
+const { expect } = Code
+
+// Thing under test
+const ContactPresenter = require('../../../../app/presenters/import/legacy/contact.presenter.js')
+
+describe('Import Legacy Contact presenter', () => {
+  let legacyContact
+
+  beforeEach(() => {
+    legacyContact = _legacyContact()
+  })
+
+  it('correctly transforms the data', () => {
+    const result = ContactPresenter.go(legacyContact)
+
+    expect(result).to.equal({
+      salutation: 'Mr',
+      initials: 'H',
+      firstName: 'James',
+      lastName: 'Bond',
+      externalId: '1:007'
+    })
+  })
+})
+
+function _legacyContact () {
+  return {
+    salutation: 'Mr',
+    initials: 'H',
+    first_name: 'James',
+    last_name: 'Bond',
+    external_id: '1:007'
+  }
+}

test/services/import/legacy/process-licence.service.test.js

@@ -20,6 +20,7 @@ const TransformLicenceVersionsService = require('../../../../app/services/import
 const TransformLicenceVersionPurposesService = require('../../../../app/services/import/legacy/transform-licence-version-purposes.service.js')
 const TransformLicenceVersionPurposeConditionsService = require('../../../../app/services/import/legacy/transform-licence-version-purpose-conditions.service.js')
 const TransformCompaniesService = require('../../../../app/services/import/legacy/transform-companies.service.js')
+const TransformContactsService = require('../../../../app/services/import/legacy/transform-contacts.service.js')
 
 // Thing under test
 const ProcessLicenceService = require('../../../../app/services/import/legacy/process-licence.service.js')
@@ -47,6 +48,7 @@ describe('Import Legacy Process Licence service', () => {
     Sinon.stub(TransformLicenceVersionPurposesService, 'go').resolves(transformedLicence)
     Sinon.stub(TransformLicenceVersionPurposeConditionsService, 'go').resolves(transformedLicence)
     Sinon.stub(TransformCompaniesService, 'go').resolves({ company: [], transformedCompany: [] })
+    Sinon.stub(TransformContactsService, 'go').resolves()
 
     // BaseRequest depends on the GlobalNotifier to have been set. This happens in app/plugins/global-notifier.plugin.js
     // when the app starts up and the plugin is registered. As we're not creating an instance of Hapi server in this