Replace view licence contact details page

app/controllers/licences.controller.js

@@ -10,6 +10,7 @@ const InitiateSessionService = require('../services/return-requirements/initiate
 const ViewLicenceBillsService = require('../services/licences/view-licence-bills.service.js')
 const ViewLicenceCommunicationsService = require('../services/licences/view-licence-communications.service.js')
 const ViewLicenceContactDetailsService = require('../services/licences/view-licence-contact-details.service.js')
+const ViewLicenceContactsService = require('../services/licences/view-licence-contacts.service.js')
 const ViewLicenceHistoryService = require('../services/licences/view-licence-history.service.js')
 const ViewLicenceReturnsService = require('../services/licences/view-licence-returns.service.js')
 const ViewLicenceSetUpService = require('../services/licences/view-licence-set-up.service.js')
@@ -63,10 +64,20 @@ async function viewCommunications (request, h) {
   })
 }
 
-async function viewContacts (request, h) {
+async function viewLicenceContactDetails (request, h) {
+  const { id } = request.params
+
+  const data = await ViewLicenceContactDetailsService.go(id)
+
+  return h.view('licences/licence-contact-details.njk', {
+    ...data
+  })
+}
+
+async function viewLicenceContacts (request, h) {
   const { params: { id }, auth } = request
 
-  const data = await ViewLicenceContactDetailsService.go(id, auth)
+  const data = await ViewLicenceContactsService.go(id, auth)
 
   return h.view(ViewLicencePage, {
     ...data
@@ -115,8 +126,9 @@ module.exports = {
   supplementary,
   viewBills,
   viewCommunications,
-  viewContacts,
+  viewLicenceContacts,
   viewHistory,
+  viewLicenceContactDetails,
   viewReturns,
   viewSetUp,
   viewSummary

app/presenters/licences/customer-contacts.presenter.js

@@ -2,7 +2,7 @@
 
 /**
  * Formats data for the `/licences/{id}/contact-details` view customer contact details page
- * @module CustomerContactDetailsPresenter
+ * @module CustomerContactsPresenter
  */
 
 const ContactModel = require('../../models/contact.model.js')

app/presenters/licences/licence-contacts.presenter.js

@@ -2,7 +2,7 @@
 
 /**
  * Formats data for the `/licences/{id}/contact-details` view licence contact details page
- * @module ViewLicenceContactDetailsPresenter
+ * @module ViewLicenceContactsPresenter
  */
 
 /**

app/presenters/licences/view-licence-contact-details.presenter.js

@@ -0,0 +1,91 @@
+'use strict'
+
+/**
+ * Formats data for the `/licences/{id}/licence-contact` view licence contact details link page
+ * @module ViewLicenceContactDetailsPresenter
+ */
+
+/**
+ * Formats data for the `/licences/{id}/licence-contact` view licence contact details link page
+ *
+ * @param {module:LicenceModel} licence - The licence and related licenceDocumentHeader
+ *
+ * @returns {object} The data formatted for the view template
+ */
+function go (licence) {
+  const { id: licenceId, licenceDocumentHeader, licenceRef } = licence
+
+  return {
+    licenceId,
+    licenceRef,
+    licenceContactDetails: _licenceContactDetails(licenceDocumentHeader),
+    pageTitle: 'Licence contact details'
+  }
+}
+
+function _licenceContactAddress (contact) {
+  const contactAddressFields = [
+    'addressLine1',
+    'addressLine2',
+    'addressLine3',
+    'addressLine4',
+    'town',
+    'county',
+    'postcode',
+    'country'
+  ]
+
+  // NOTE:  Maps over the `contactAddressFields` array to create an array of values from the `contact` object. Each
+  // `contactAddressField` corresponds to a property in the `contact` object, mapping and creating a contactAddress
+  // array. The `filter(Boolean)` function then removes falsy values from the `contactAddress` array.
+  const contactAddress = contactAddressFields.map((contactAddressField) => {
+    return contact[contactAddressField]
+  }).filter(Boolean)
+
+  return contactAddress
+}
+
+function _licenceContactName (contact) {
+  if (contact.type === 'Person') {
+    const { salutation, forename, initials, name } = contact
+
+    // NOTE: Prioritise the initials and use the contact forename if initials is null
+    const initialsOrForename = initials || forename
+
+    const nameComponents = [
+      salutation,
+      initialsOrForename,
+      name
+    ]
+
+    const filteredNameComponents = nameComponents.filter((item) => {
+      return item
+    })
+
+    return filteredNameComponents.join(' ')
+  }
+
+  return contact.name
+}
+
+function _licenceContactDetails (licenceDocumentHeader) {
+  const licenceContactDetailsData = licenceDocumentHeader.metadata.contacts
+
+  const roles = ['Licence holder', 'Returns to', 'Licence contact']
+
+  const filteredContactDetails = licenceContactDetailsData.filter((licenceContactDetail) => {
+    return roles.includes(licenceContactDetail.role)
+  })
+
+  return filteredContactDetails.map((contact) => {
+    return {
+      address: _licenceContactAddress(contact),
+      role: contact.role,
+      name: _licenceContactName(contact)
+    }
+  })
+}
+
+module.exports = {
+  go
+}

app/routes/licence.routes.js

@@ -20,10 +20,15 @@ const routes = [
     path: '/licences/{id}/communications',
     handler: LicencesController.viewCommunications
   },
+  {
+    method: 'GET',
+    path: '/licences/{id}/licence-contact',
+    handler: LicencesController.viewLicenceContactDetails
+  },
   {
     method: 'GET',
     path: '/licences/{id}/contact-details',
-    handler: LicencesController.viewContacts
+    handler: LicencesController.viewLicenceContacts
   },
   {
     method: 'GET',

app/services/licences/fetch-customer-contacts.service.js

@@ -2,7 +2,7 @@
 
 /**
  * Fetches all customer contacts for a licence which is needed for the view '/licences/{id}/contact-details` page
- * @module FetchCustomerContactDetailsService
+ * @module FetchCustomerContactsService
  */
 
 const { db } = require('../../../db/db.js')

app/services/licences/fetch-licence-contact-details.service.js

@@ -0,0 +1,42 @@
+'use strict'
+
+/**
+ * Fetches data needed for the view '/licences/{id}/licence-contact` page
+ * @module FetchLicenceContactDetailsService
+ */
+
+const LicenceModel = require('../../models/licence.model.js')
+
+/**
+ * Fetch the matching licence and return data needed for the licence contact details link page
+ *
+ * Was built to provide the data needed for the '/licences/{id}/licence-contact' page
+ *
+ * @param {string} licenceId - The UUID for the licence to fetch
+ *
+ * @returns {Promise<module:LicenceModel>} the matching `licenceModel` populated with the data needed for the view
+ * licence contact details page
+ */
+async function go (licenceId) {
+  return _fetch(licenceId)
+}
+
+async function _fetch (licenceId) {
+  return LicenceModel.query()
+    .findById(licenceId)
+    .select([
+      'id',
+      'licenceRef'
+    ])
+    .withGraphFetched('licenceDocumentHeader')
+    .modifyGraph('licenceDocumentHeader', (builder) => {
+      builder.select([
+        'id',
+        'metadata'
+      ])
+    })
+}
+
+module.exports = {
+  go
+}

app/services/licences/fetch-licence-contacts.service.js

@@ -2,7 +2,7 @@
 
 /**
  * Fetches all return logs for a licence which is needed for the view '/licences/{id}/contact-details` page
- * @module FetchLicenceContactDetailsService
+ * @module FetchLicenceContactService
  */
 
 const { db } = require('../../../db/db.js')

app/services/licences/fetch-licence.service.js

@@ -33,6 +33,13 @@ async function _fetch (licenceId) {
       'licenceRef',
       'revokedDate'
     ])
+    // .withGraphFetched('licenceDocumentHeader')
+    // .modifyGraph('licenceDocumentHeader', (builder) => {
+    //   builder.select([
+    //     'licenceDocumentHeaders.id',
+    //     'licenceDocumentHeaders.metadata'
+    //   ])
+    // })
     .modify('licenceName')
     .modify('primaryUser')
     .withGraphFetched('licenceSupplementaryYears')

app/services/licences/view-licence-contact-details.service.js

@@ -1,40 +1,27 @@
 'use strict'
 
 /**
- * Orchestrates fetching and presenting the data needed for the view licence contact details tab
+ * Orchestrates fetching and presenting the data needed for the view licence contact details link page
  * @module ViewLicenceContactDetailsService
  */
 
-const CustomerContactDetailsPresenter = require('../../presenters/licences/customer-contacts.presenter.js')
-const FetchCustomerContactDetailsService = require('./fetch-customer-contacts.service.js')
-const FetchLicenceContactsService = require('./fetch-licence-contacts.service.js')
-const LicenceContactsPresenter = require('../../presenters/licences/licence-contacts.presenter.js')
-const ViewLicenceService = require('./view-licence.service.js')
+const ViewLicenceContactDetailsPresenter = require('../../presenters/licences/view-licence-contact-details.presenter.js')
+const FetchLicenceContactDetailsService = require('./fetch-licence-contact-details.service.js')
 
 /**
- * Orchestrates fetching and presenting the data needed for the licence contact details page
+ * Orchestrates fetching and presenting the data needed for the licence contact details link page
  *
  * @param {string} licenceId - The UUID of the licence
- * @param {object} auth - The auth object taken from `request.auth` containing user details
  *
- * @returns {Promise<object>} an object representing the `pageData` needed by the licence contact details template.
+ * @returns {Promise<object>} The view data for the licence contacts page
  */
-async function go (licenceId, auth) {
-  const commonData = await ViewLicenceService.go(licenceId, auth)
-
-  // Licence contact details
-  const licenceContacts = await FetchLicenceContactsService.go(licenceId)
-  const licenceContactsData = LicenceContactsPresenter.go(licenceContacts)
-
-  // Customer contacts details
-  const customerContacts = await FetchCustomerContactDetailsService.go(licenceId)
-  const customerContactsData = CustomerContactDetailsPresenter.go(customerContacts)
+async function go (licenceId) {
+  const licence = await FetchLicenceContactDetailsService.go(licenceId)
+  const formattedData = await ViewLicenceContactDetailsPresenter.go(licence)
 
   return {
-    activeTab: 'contact-details',
-    ...commonData,
-    ...customerContactsData,
-    ...licenceContactsData
+    activeNavBar: 'search',
+    ...formattedData
   }
 }
 

app/services/licences/view-licence-contacts.service.js

@@ -0,0 +1,43 @@
+'use strict'
+
+/**
+ * Orchestrates fetching and presenting the data needed for the view licence contact details tab
+ * @module ViewLicenceContactsService
+ */
+
+const CustomerContactsPresenter = require('../../presenters/licences/customer-contacts.presenter.js')
+const FetchCustomerContactsService = require('./fetch-customer-contacts.service.js')
+const FetchLicenceContactsService = require('./fetch-licence-contacts.service.js')
+const LicenceContactsPresenter = require('../../presenters/licences/licence-contacts.presenter.js')
+const ViewLicenceService = require('./view-licence.service.js')
+
+/**
+ * Orchestrates fetching and presenting the data needed for the licence contact details page
+ *
+ * @param {string} licenceId - The UUID of the licence
+ * @param {object} auth - The auth object taken from `request.auth` containing user details
+ *
+ * @returns {Promise<object>} an object representing the `pageData` needed by the licence contact details template.
+ */
+async function go (licenceId, auth) {
+  const commonData = await ViewLicenceService.go(licenceId, auth)
+
+  // Licence contact details
+  const licenceContacts = await FetchLicenceContactsService.go(licenceId)
+  const licenceContactsData = LicenceContactsPresenter.go(licenceContacts)
+
+  // Customer contacts details
+  const customerContacts = await FetchCustomerContactsService.go(licenceId)
+  const customerContactsData = CustomerContactsPresenter.go(customerContacts)
+
+  return {
+    activeTab: 'contact-details',
+    ...commonData,
+    ...customerContactsData,
+    ...licenceContactsData
+  }
+}
+
+module.exports = {
+  go
+}

app/views/licences/licence-contact-details.njk

@@ -0,0 +1,58 @@
+{% extends 'layout.njk' %}
+{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+{% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
+{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
+{% from "govuk/components/table/macro.njk" import govukTable %}
+{% from "govuk/components/tabs/macro.njk" import govukTabs %}
+{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
+
+{% block breadcrumbs %}
+  {{ govukBackLink({
+    text: 'Back to summary',
+    href: '/system/licences/' + licenceId + '/summary'
+  }) }}
+{% endblock %}
+
+{% block content %}
+  <h1 class="govuk-heading-l">
+    <span class="govuk-caption-l">Licence {{ licenceRef }}</span>
+    {{ pageTitle }}
+  </h1>
+
+  {% macro displayAddress(address) %}
+    {% for item in address %}
+      <p class="govuk-body govuk-!-margin-bottom-0"> {{ item }} </p>
+    {% endfor %}
+  {% endmacro %}
+
+  {% for licenceContactDetail in licenceContactDetails %}
+    {{ govukSummaryList({
+      card: {
+        title: {
+          text: licenceContactDetail.role
+        }
+      },
+      rows: [
+        {
+          key: {
+            text: "Name",
+            classes:"govuk-!-font-weight-regular"
+          },
+          value: {
+            text:  licenceContactDetail.name
+          }
+        },
+        {
+          key: {
+            text: "Address",
+            classes:"govuk-!-font-weight-regular"
+          },
+          value: {
+            html: displayAddress(licenceContactDetail.address)
+          }
+        }
+      ]
+    })
+  }}
+  {% endfor %}
+{% endblock %}