@defra-fish/gafl-webapp-service 1.23.0 → 1.24.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.23.0",
+  "version": "1.24.0-rc.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.23.0",
-    "@defra-fish/connectors-lib": "1.23.0",
+    "@defra-fish/business-rules-lib": "1.24.0-rc.0",
+    "@defra-fish/connectors-lib": "1.24.0-rc.0",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -76,5 +76,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.1"
   },
-  "gitHead": "17bfa0e0f8071495932dd25f05f70f936f42d676"
+  "gitHead": "1076e2f084bbf1e767506b1a1e684f6ad7d3636c"
 }

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/__snapshots__/check-confirmation-contact.spec.js.snap

@@ -8,8 +8,8 @@ Object {
     "preferredMethodOfConfirmation": "email",
   },
   "uri": Object {
-    "contact": "/buy/contact",
-    "licenceConfirmationMethod": "/buy/confirmation-method",
+    "change": "licence-confirmation-method.url?change=mobile",
+    "contact": "contact.url",
   },
 }
 `;

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/check-confirmation-contact.spec.js

@@ -1,7 +1,22 @@
-import { CONTACT } from '../../../../../uri.js'
+import { CONTACT, LICENCE_CONFIRMATION_METHOD } from '../../../../../uri.js'
 import { HOW_CONTACTED } from '../../../../../processors/mapping-constants.js'
 import { getData } from '../route.js'
 import GetDataRedirect from '../../../../../handlers/get-data-redirect.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('../../../../../processors/mapping-constants.js', () => ({
+  HOW_CONTACTED: {
+    none: 'nada',
+    email: 'e-mail',
+    text: 'mobile-phone'
+  }
+}))
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CONTACT: { uri: 'contact.url' },
+  LICENCE_CONFIRMATION_METHOD: { uri: 'licence-confirmation-method.url' }
+}))
 
 describe('.getData', () => {
   const createRequestMock = (options = {}) => ({
@@ -20,13 +35,42 @@ describe('.getData', () => {
     }))
   })
 
+  beforeEach(jest.resetAllMocks)
+
   it('if preferred method of confirmation is none, redirects to contact page', async () => {
     const getDataRedirectError = new GetDataRedirect(CONTACT.uri)
     const func = async () => await getData(createRequestMock({ preferredMethodOfConfirmation: HOW_CONTACTED.none }))
     await expect(func).rejects.toThrow(getDataRedirectError)
   })
 
+  describe.each([
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=email`, preferredMethodOfConfirmation: HOW_CONTACTED.email },
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=mobile`, preferredMethodOfConfirmation: HOW_CONTACTED.text },
+    { urlName: 'contact', url: CONTACT.uri, preferredMethodOfConfirmation: HOW_CONTACTED.email }
+  ])('$urlName $confirmation is decorated by addLanguageCodeToUri', ({ urlName, url, preferredMethodOfConfirmation }) => {
+    it(`passes request and ${urlName} url to addLanguageCodeToUri`, async () => {
+      const request = createRequestMock({ preferredMethodOfConfirmation })
+      await getData(request)
+      expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, url)
+    })
+
+    it(`returns decorated value for ${urlName} from addLanguageCodeToUri`, async () => {
+      const expectedUrl = Symbol(urlName)
+      addLanguageCodeToUri.mockReturnValue(expectedUrl)
+      const request = createRequestMock()
+      const data = await getData(request)
+      expect(data).toEqual(
+        expect.objectContaining({
+          uri: expect.objectContaining({
+            [urlName]: expectedUrl
+          })
+        })
+      )
+    })
+  })
+
   it('returns the expected data', async () => {
+    addLanguageCodeToUri.mockImplementation((_request, uri) => uri)
     expect(await getData(createRequestMock())).toMatchSnapshot()
   })
 })

package/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk

@@ -1,15 +1,12 @@
 {% extends "standard-form.njk" %}
 {% from "back-link/macro.njk" import govukBackLink %}
 
-
 {% if data.licensee.preferredMethodOfConfirmation == 'Email' %} 
   {% set contactType = mssgs.email_address %}
   {% set contactInfo = data.licensee.email  %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=email' %}
 {% else %}
   {% set contactType = mssgs.phone_number  %}
   {% set contactInfo = data.licensee.mobilePhone %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=mobile' %}
 {% endif %}
 
 {% set title = mssgs.check_conf_contact_title_1 + contactType + mssgs.check_conf_contact_title_2 %}
@@ -36,7 +33,7 @@
       </p>
 
       <p class="govuk-body govuk-!-margin-bottom-6">
-        <a class="govuk-link" href="{{ changeLinkUrl }}">
+        <a class="govuk-link" href="{{ data.uri.change }}">
           {{ mssgs.licence_summary_change }} {{ contactType }}
         </a>
       </p>

package/src/pages/contact/digital-licence/check-confirmation-contact/route.js

@@ -3,6 +3,7 @@ import { HOW_CONTACTED } from '../../../../processors/mapping-constants.js'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
 import pageRoute from '../../../../routes/page-route.js'
 import { nextPage } from '../../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
 export const getData = async request => {
   const { licensee } = await request.cache().helpers.transaction.getCurrentPermission()
@@ -11,11 +12,14 @@ export const getData = async request => {
     throw new GetDataRedirect(CONTACT.uri)
   }
 
+  const whatToChange = licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email ? '?change=email' : '?change=mobile'
+  const change = addLanguageCodeToUri(request, `${LICENCE_CONFIRMATION_METHOD.uri}${whatToChange}`)
+
   return {
     licensee,
     uri: {
-      licenceConfirmationMethod: LICENCE_CONFIRMATION_METHOD.uri,
-      contact: CONTACT.uri
+      contact: addLanguageCodeToUri(request, CONTACT.uri),
+      change
     }
   }
 }

package/src/processors/__tests__/uri-helper.spec.js

@@ -18,4 +18,31 @@ describe('URI Helpers: addLanguageCodeToURI', () => {
     const result = addLanguageCodeToUri(mockRequest, uri)
     expect(result).toEqual(expect.stringMatching(new RegExp(expected)))
   })
+
+  describe.each([
+    ['https://my-url.com/path?data=true', 'https://my-url.com/path?data=true&lang=cy'],
+    ['https://my-url.com/path?data-1=false&data-2=9', 'https://my-url.com/path?data-1=false&data-2=9&lang=cy']
+  ])('', (urlToDecorate, decoratedUrl) => {
+    it('if the supplied url has a querystring already, the language parameter is added to the end with an ampersand', () => {
+      const mockRequest = {
+        path: '/any/page',
+        url: {
+          search: '?lang=cy'
+        }
+      }
+      const result = addLanguageCodeToUri(mockRequest, urlToDecorate)
+      expect(result).toEqual(decoratedUrl)
+    })
+
+    it('if the request.path is used instead of a url and has a querystring, the language parameter is added to the end with an ampersand', () => {
+      const mockRequest = {
+        path: urlToDecorate,
+        url: {
+          search: '?lang=cy'
+        }
+      }
+      const result = addLanguageCodeToUri(mockRequest, urlToDecorate)
+      expect(result).toEqual(decoratedUrl)
+    })
+  })
 })

package/src/processors/uri-helper.js

@@ -1,4 +1,5 @@
 export const addLanguageCodeToUri = (request, uri) => {
   const path = uri || request.path
-  return `${path}${/\?.*lang=cy.*$/.test(request.url.search) ? '?lang=cy' : ''}`
+  const languageSpecifier = /.*\?.*/.test(path) ? '&lang=cy' : '?lang=cy'
+  return `${path}${/\?.*lang=cy.*$/.test(request.url.search) ? languageSpecifier : ''}`
 }