@defra-fish/gafl-webapp-service 1.63.0-rc.8 → 1.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.63.0-rc.8",
+  "version": "1.63.0",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.63.0-rc.8",
-    "@defra-fish/connectors-lib": "1.63.0-rc.8",
+    "@defra-fish/business-rules-lib": "1.63.0",
+    "@defra-fish/connectors-lib": "1.63.0",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "4376fb63f6e1867708241521e43c4bce5791e08a"
+  "gitHead": "7cfb8ef668002fc340b755dd3aaa4572063e115c"
 }

package/src/__tests__/server.spec.js

@@ -2,6 +2,7 @@ import { createServer, init, server, layoutContextAmalgamation } from '../server
 import CatboxMemory from '@hapi/catbox-memory'
 import uris from '../uri.js'
 import { addLanguageCodeToUri } from '../processors/uri-helper.js'
+import fs from 'fs'
 
 jest.mock('../processors/uri-helper.js', () => ({
   addLanguageCodeToUri: jest.fn(),
@@ -19,6 +20,14 @@ jest.mock('../uri.js', () => ({
   RECURRING_TERMS_CONDITIONS: { uri: '/RECURRING_TERMS_CONDITIONS' }
 }))
 
+jest.mock('fs', () => {
+  const actual = jest.requireActual('fs')
+  return {
+    ...actual,
+    readFileSync: jest.fn(() => JSON.stringify({ name: 'gafl-webapp-test', version: '1.2.3' }))
+  }
+})
+
 export const catboxOptions = {
   port: 1234,
   cache: [
@@ -30,8 +39,10 @@ export const catboxOptions = {
   ]
 }
 
-afterEach(() => {
-  server.stop()
+afterEach(async () => {
+  if (server && server.info && server.info.started && server.phase !== 'stopping') {
+    await server.stop()
+  }
 })
 
 describe('The server', () => {
@@ -130,6 +141,22 @@ describe('The server', () => {
     })
   })
 
+  it('logs startup details including name and version', async () => {
+    const mockPkg = { name: 'gafl-webapp-test', version: '1.2.3' }
+    fs.readFileSync.mockReturnValue(JSON.stringify(mockPkg))
+    const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {})
+
+    createServer(catboxOptions)
+    await init()
+
+    expect(logSpy).toHaveBeenCalledWith(
+      expect.stringContaining('Server running on %s. name: %s. version: %s'),
+      server.info.uri,
+      mockPkg.name,
+      mockPkg.version
+    )
+  })
+
   describe('layoutContextAmalgamation', () => {
     it('should add query parameters to the response', () => {
       const request = getSampleRequest()

package/src/pages/summary/contact-summary/__tests__/__snapshots__/route.spec.js.snap

@@ -66,7 +66,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -131,7 +131,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -196,7 +196,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -261,7 +261,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -326,7 +326,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -392,7 +392,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -458,7 +458,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -563,7 +563,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -648,7 +648,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -753,7 +753,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -838,7 +838,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -944,7 +944,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1030,7 +1030,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1136,7 +1136,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1222,7 +1222,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1327,7 +1327,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1432,7 +1432,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1537,7 +1537,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1642,7 +1642,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1748,7 +1748,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1854,7 +1854,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -1960,7 +1960,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2046,7 +2046,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2152,7 +2152,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2238,7 +2238,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2345,7 +2345,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2432,7 +2432,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2539,7 +2539,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {
@@ -2626,7 +2626,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England",
     },
   },
   Object {

package/src/pages/summary/contact-summary/__tests__/route.spec.js

@@ -30,7 +30,7 @@ jest.mock('../../../../processors/mapping-constants', () => ({
 
 jest.mock('../../../../processors/refdata-helper.js', () => ({
   countries: {
-    nameFromCode: async () => 'GB'
+    nameFromCode: async () => 'England'
   }
 }))
 
@@ -124,16 +124,65 @@ const getRequestMock = ({
 })
 
 describe('contact-summary > route', () => {
-  it('omits undefined address fields from the output string', () => {
-    const permission = getMockPermission({
-      locality: undefined
-    })
+  describe('generateAddressRow', () => {
+    it.each([
+      [
+        'premises',
+        {
+          premises: undefined,
+          street: 'howecroft court',
+          locality: 'eastmead lane',
+          town: 'bristol',
+          postcode: 'BS9 1HJ',
+          country: 'England'
+        },
+        'Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, England'
+      ],
+      [
+        'street',
+        {
+          premises: '14',
+          street: undefined,
+          locality: 'eastmead lane',
+          town: 'bristol',
+          postcode: 'BS9 1HJ',
+          country: 'England'
+        },
+        '14, Eastmead Lane, Bristol, BS9 1HJ, England'
+      ],
+      [
+        'locality',
+        {
+          premises: '14',
+          street: 'howecroft court',
+          locality: undefined,
+          town: 'bristol',
+          postcode: 'BS9 1HJ',
+          country: 'Northern Ireland'
+        },
+        '14, Howecroft Court, Bristol, BS9 1HJ, Northern Ireland'
+      ],
+      [
+        'town',
+        {
+          premises: '14',
+          street: 'howecroft court',
+          locality: 'eastmead lane',
+          town: undefined,
+          postcode: 'BS9 1HJ',
+          country: 'Wales'
+        },
+        '14, Howecroft Court, Eastmead Lane, BS9 1HJ, Wales'
+      ]
+    ])('omits %s when undefined', (missingField, licenseeOverrides, expectedAddress) => {
+      const permission = getMockPermission(licenseeOverrides)
+      const request = getRequestMock({ permission })
+      const rowGenerator = new route.RowGenerator(request, permission)
 
-    const request = getRequestMock({ permission })
-    const rowGenerator = new route.RowGenerator(request, permission)
-    const row = rowGenerator.generateAddressRow('GB')
+      const row = rowGenerator.generateAddressRow(licenseeOverrides.country)
 
-    expect(row.value.text).toBe('14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB')
+      expect(row.value.text).toBe(expectedAddress)
+    })
   })
 
   it('should set status.fromSummary to seen', async () => {

package/src/pages/summary/contact-summary/contact-summary.njk

@@ -15,9 +15,7 @@
         isPageHeading: true
       }
     }) %}
-        <div class="address_list">
-            {{ govukSummaryList({ rows: data.summaryTable }) }}
-        </div>
+    {{ govukSummaryList({ rows: data.summaryTable }) }}
     {% endcall %}
 {% endset -%}
 

package/src/pages/summary/contact-summary/route.js

@@ -41,6 +41,14 @@ const CHANGE_CONTACT = 'change-contact'
 
 const META_TAG_TELEPHONE_NO = '<meta name="format-detection" content="telephone=no">'
 
+function capitalise (str) {
+  if (!str) {
+    return undefined
+  } else {
+    return str.toLowerCase().replace(/\b\w/g, char => char.toUpperCase())
+  }
+}
+
 export class RowGenerator {
   constructor (request, permission) {
     this.request = request
@@ -114,12 +122,12 @@ export class RowGenerator {
     const { licensee } = this.permission
 
     const text = [
-      licensee.premises?.toLowerCase(),
-      licensee.street?.toLowerCase(),
-      licensee.locality?.toLowerCase(),
-      licensee.town?.toLowerCase(),
+      capitalise(licensee.premises),
+      capitalise(licensee.street),
+      capitalise(licensee.locality),
+      capitalise(licensee.town),
       licensee.postcode?.toUpperCase(),
-      countryName?.toUpperCase()
+      countryName
     ]
       .filter(Boolean)
       .join(', ')

package/src/server.js

@@ -34,6 +34,7 @@ import { initialise as initialiseOIDC } from './handlers/oidc-handler.js'
 import { getPlugins } from './plugins.js'
 import { airbrake } from '@defra-fish/connectors-lib'
 import { addEmptyFragmentToUri, addLanguageCodeToUri } from './processors/uri-helper.js'
+import fs from 'fs'
 
 airbrake.initialise()
 let server
@@ -220,7 +221,10 @@ const init = async () => {
 
   logGtmConfig(process.env.GTM_CONTAINER_ID)
 
-  console.log('Server running on %s', server.info.uri)
+  const pkgPath = path.join(process.cwd(), 'package.json')
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
+
+  console.log('Server running on %s. name: %s. version: %s.', server.info.uri, pkg.name, pkg.version)
 }
 
 const shutdownBehavior = () => {