@defra-fish/gafl-webapp-service 1.25.0 → 1.26.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.25.0",
+  "version": "1.26.0-rc.2",
   "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.25.0",
-    "@defra-fish/connectors-lib": "1.25.0",
+    "@defra-fish/business-rules-lib": "1.26.0-rc.2",
+    "@defra-fish/connectors-lib": "1.26.0-rc.2",
     "@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": "568226f08abee6272fe1d506f65c57615af50fd2"
+  "gitHead": "18ce5b8127253c6d844197ba6eda5d1d5264f966"
 }

package/src/handlers/new-session-handler.js

@@ -1,10 +1,11 @@
 import { CONTROLLER } from '../uri.js'
 import { initialiseAnalyticsSessionData } from '../processors/analytics.js'
+import { addLanguageCodeToUri } from '../processors/uri-helper.js'
 
 export default async (request, h) => {
   // The user may have an existing session, in which case we need to examine this for attribution and/or clientId
   const existingCacheStatus = await request.cache().helpers.status.get()
   await request.cache().initialize()
   await initialiseAnalyticsSessionData(request, existingCacheStatus)
-  return h.redirect(CONTROLLER.uri)
+  return h.redirect(addLanguageCodeToUri(request, CONTROLLER.uri))
 }

package/src/locales/cy.json

@@ -84,14 +84,14 @@
   "address_lookup_crown_copyright": "© Hawlfrant y goron a hawliau cronfa ddata 2022 ",
   "address_lookup_error_empty_name_num": "Nodwch rif neu enw adeilad",
   "address_lookup_error_empty_postcode": "Nodwch god post",
-  "address_lookup_error_max_name_num": "The building number or name must be less than 50 characters",
-  "address_lookup_error_pattern_postcode": "Enter a UK postcode. If the address is outside the UK, enter the address manually.",
-  "address_lookup_manually_enter": "Nodwch eich cyfeiriad",
+  "address_lookup_error_max_name_num": "Mae’n rhaid i rif neu enw’r adeilad fod yn llai na 50 nod",
+  "address_lookup_error_pattern_postcode": "Rhowch god post yn y DU. Os mae’r cyfeiriad y tu allan i’r DU, teipiwch y cyfeiriad.",
+  "address_lookup_manually_enter": "Rhowch eich cyfeiriad",
   "address_lookup_name_num_hint": "Er enghraifft, 47, Fflat 2a neu Rose Cottage",
   "address_lookup_name_num_label": "Rhif neu enw’r adeilad",
   "address_lookup_postcode_hint": "Er enghraifft, WA4 1AB",
   "address_lookup_postcode_label": "Cod post",
-  "address_lookup_title_other": "Find their address",
+  "address_lookup_title_other": "Chwiliwch am eu cyfeiriad",
   "address_lookup_title_you": "Dewch o hyd i’ch cyfeiriad",
   "address_select_error_choose": "Dewisiwch gyfeiriad",
   "address_select_addresses": " chyfeiriad",

package/src/pages/contact/address/select/__tests__/route.spec.js

@@ -1,4 +1,8 @@
 import { getData } from '../route'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import { ADDRESS_LOOKUP } from '../../../../../uri.js'
+
+jest.mock('../../../../../processors/uri-helper.js')
 
 describe('address-select > route', () => {
   const mockTransactionCacheGet = jest.fn()
@@ -13,7 +17,10 @@ describe('address-select > route', () => {
           getCurrentPermission: jest.fn(() => ({}))
         }
       }
-    })
+    }),
+    url: {
+      search: ''
+    }
   }
 
   describe('getData', () => {
@@ -28,5 +35,38 @@ describe('address-select > route', () => {
       const result = await getData(mockRequest)
       expect(result.isLicenceForYou).toBeFalsy()
     })
+
+    it('should return the addressLookup page uri', async () => {
+      mockTransactionCacheGet.mockImplementationOnce(() => ({
+        licenceStartDate: '2021-07-01',
+        numberOfRods: '3',
+        licenceType: 'Salmon and sea trout',
+        licenceLength: '12M',
+        licensee: {
+          firstName: 'Graham',
+          lastName: 'Willis',
+          birthDate: '1946-01-01'
+        },
+        permit: {
+          cost: 6
+        }
+      }))
+
+      const returnValue = Symbol('return value')
+      addLanguageCodeToUri.mockReturnValueOnce(returnValue)
+
+      const result = await getData(mockRequest)
+      const ret = result.lookupPage
+
+      expect(ret).toEqual(returnValue)
+    })
+
+    it('addLanguageCodeToUri is called with the expected arguments for address lookup', async () => {
+      mockTransactionCacheGet.mockImplementationOnce(() => ({ isLicenceForYou: true }))
+
+      await getData(mockRequest)
+
+      expect(addLanguageCodeToUri).toHaveBeenCalledWith(mockRequest, ADDRESS_LOOKUP.uri)
+    })
   })
 })

package/src/pages/contact/address/select/route.js

@@ -2,6 +2,7 @@ import { ADDRESS_SELECT, ADDRESS_LOOKUP, ADDRESS_ENTRY } from '../../../../uri.j
 import pageRoute from '../../../../routes/page-route.js'
 import Joi from 'joi'
 import { nextPage } from '../../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
 export const getData = async request => {
   const { addresses, searchTerms } = await request.cache().helpers.addressLookup.getCurrentPermission()
@@ -11,7 +12,7 @@ export const getData = async request => {
     isLicenceForYou,
     addresses,
     searchTerms,
-    lookupPage: ADDRESS_LOOKUP.uri,
+    lookupPage: addLanguageCodeToUri(request, ADDRESS_LOOKUP.uri),
     entryPage: ADDRESS_ENTRY.uri
   }
 }
@@ -20,7 +21,10 @@ export default pageRoute(
   ADDRESS_SELECT.page,
   ADDRESS_SELECT.uri,
   Joi.object({
-    address: Joi.number().integer().min(0).required()
+    address: Joi.number()
+      .integer()
+      .min(0)
+      .required()
   }).options({ abortEarly: false, allowUnknown: true }),
   nextPage,
   getData

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`contact-summary > route getLicenseeDetailsSummaryRows should have the newsletter row if isLicenceForYou is true 1`] = `
+exports[`contact-summary > route getLicenseeDetailsSummaryRows should have the newsletter is set have preferred method and if isLicenceForYou is true 1`] = `
 Array [
   Object {
     "actions": Object {
@@ -9,7 +9,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -29,7 +29,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -49,7 +49,7 @@ Array [
           "attributes": Object {
             "id": "change-newsletter",
           },
-          "href": "/buy/newsletter",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "newsletter",
         },
@@ -65,7 +65,7 @@ Array [
 ]
 `;
 
-exports[`contact-summary > route getLicenseeDetailsSummaryRows should not have the newsletter row if isLicenceForYou is false 1`] = `
+exports[`contact-summary > route getLicenseeDetailsSummaryRows should have the newsletter set to no if have preferred method and if isLicenceForYou is true 1`] = `
 Array [
   Object {
     "actions": Object {
@@ -74,7 +74,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -94,7 +94,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -107,6 +107,71 @@ Array [
       "text": "Make a note on confirmation",
     },
   },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-newsletter",
+          },
+          "href": Symbol(addLanguageCodeToUri),
+          "text": "Change",
+          "visuallyHiddenText": "newsletter",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "Newsletter",
+    },
+    "value": Object {
+      "text": "No",
+    },
+  },
+]
+`;
+
+exports[`contact-summary > route getLicenseeDetailsSummaryRows should not have the newsletter row if isLicenceForYou is false 1`] = `
+Array [
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-address",
+          },
+          "href": Symbol(addLanguageCodeToUri),
+          "text": "Change",
+          "visuallyHiddenText": "address",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "Address",
+    },
+    "value": Object {
+      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+    },
+  },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-contact",
+          },
+          "href": Symbol(addLanguageCodeToUri),
+          "text": "Change",
+          "visuallyHiddenText": "contact",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "Licence details",
+    },
+    "value": Object {
+      "text": "Text messages to undefined",
+    },
+  },
 ]
 `;
 
@@ -119,7 +184,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -139,7 +204,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -164,7 +229,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -184,7 +249,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -209,7 +274,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -229,7 +294,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -239,7 +304,7 @@ Array [
       "text": "Licence details",
     },
     "value": Object {
-      "text": "Text messages to 07700900900",
+      "text": "Make a note on confirmation",
     },
   },
 ]
@@ -254,7 +319,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -274,7 +339,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-fulfilment-option",
           },
-          "href": "/buy/fulfilment",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence fulfilment option",
         },
@@ -294,7 +359,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-confirmation-option",
           },
-          "href": "/buy/confirmation-method",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence confirmation option",
         },
@@ -314,7 +379,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -339,7 +404,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -359,7 +424,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-fulfilment-option",
           },
-          "href": "/buy/fulfilment",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence fulfilment option",
         },
@@ -379,7 +444,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-confirmation-option",
           },
-          "href": "/buy/confirmation-method",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence confirmation option",
         },
@@ -389,7 +454,7 @@ Array [
       "text": "Licence Confirmation",
     },
     "value": Object {
-      "text": "Text message to 07700900900",
+      "text": "Note of licence",
     },
   },
   Object {
@@ -399,7 +464,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -409,7 +474,7 @@ Array [
       "text": "Contact",
     },
     "value": Object {
-      "text": "Text messages to 07700900900",
+      "text": "By post",
     },
   },
 ]
@@ -424,7 +489,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -444,7 +509,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-fulfilment-option",
           },
-          "href": "/buy/fulfilment",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence fulfilment option",
         },
@@ -464,7 +529,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-confirmation-option",
           },
-          "href": "/buy/confirmation-method",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence confirmation option",
         },
@@ -484,7 +549,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -509,7 +574,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -529,7 +594,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-confirmation-option",
           },
-          "href": "/buy/fulfilment",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence confirmation option",
         },
@@ -549,7 +614,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -574,7 +639,7 @@ Array [
           "attributes": Object {
             "id": "change-address",
           },
-          "href": "/buy/find-address",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "address",
         },
@@ -594,7 +659,7 @@ Array [
           "attributes": Object {
             "id": "change-licence-confirmation-option",
           },
-          "href": "/buy/fulfilment",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "licence confirmation option",
         },
@@ -604,7 +669,7 @@ Array [
       "text": "Licence",
     },
     "value": Object {
-      "text": "Text message to 07700900900",
+      "text": "Note of licence",
     },
   },
   Object {
@@ -614,7 +679,7 @@ Array [
           "attributes": Object {
             "id": "change-contact",
           },
-          "href": "/buy/contact",
+          "href": Symbol(addLanguageCodeToUri),
           "text": "Change",
           "visuallyHiddenText": "contact",
         },
@@ -624,7 +689,7 @@ Array [
       "text": "Contact",
     },
     "value": Object {
-      "text": "Text messages to 07700900900",
+      "text": "By post",
     },
   },
 ]

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

@@ -1,6 +1,19 @@
 import { getLicenseeDetailsSummaryRows, checkNavigation } from '../route'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
-import { LICENCE_FULFILMENT, LICENCE_CONFIRMATION_METHOD } from '../../../../uri.js'
+import { ADDRESS_LOOKUP, CONTACT, LICENCE_FULFILMENT, LICENCE_CONFIRMATION_METHOD, NEWSLETTER } from '../../../../uri.js'
+import { HOW_CONTACTED } from '../../../../processors/mapping-constants.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+
+jest.mock('../../../../processors/uri-helper.js', () => ({
+  addLanguageCodeToUri: jest.fn(() => Symbol('addLanguageCodeToUri'))
+}))
+
+jest.mock('../../../../processors/mapping-constants', () => ({
+  HOW_CONTACTED: {
+    email: 'Email',
+    none: 'Prefer not to be contacted'
+  }
+}))
 
 const address = {
   firstName: 'Fester',
@@ -11,6 +24,13 @@ const address = {
   postcode: 'BS9 1HJ'
 }
 
+const generateRequestMock = query => ({
+  query,
+  url: {
+    search: ''
+  }
+})
+
 describe('contact-summary > route', () => {
   describe('getLicenseeDetailsSummaryRows', () => {
     describe('when purchasing a 12 month (physical licence) with postal fulfilment', () => {
@@ -26,7 +46,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Prefer not to be contacted'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
 
@@ -42,7 +62,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Yes'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
 
@@ -56,7 +76,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfReminder: 'Letter'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
     })
@@ -74,7 +94,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Prefer not to be contacted'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
 
@@ -87,10 +107,10 @@ describe('contact-summary > route', () => {
             preferredMethodOfConfirmation: 'Text',
             preferredMethodOfReminder: 'Text',
             mobilePhone: '07700900900',
-            preferredMethodOfNewsletter: 'Yes'
+            preferredMethodOfNewsletter: 'Text'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
     })
@@ -107,7 +127,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Prefer not to be contacted'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
 
@@ -123,7 +143,7 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Yes'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
 
@@ -138,20 +158,46 @@ describe('contact-summary > route', () => {
             preferredMethodOfNewsletter: 'Yes'
           }
         }
-        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+        const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
         expect(summaryTable).toMatchSnapshot()
       })
     })
 
-    it('should have the newsletter row if isLicenceForYou is true', () => {
+    it('should have the newsletter is set have preferred method and if isLicenceForYou is true', () => {
       const permission = {
         licenceLength: '1D',
         licensee: {
-          ...address
+          ...address,
+          postalFulfilment: false,
+          preferredMethodOfConfirmation: 'Prefer not to be contacted',
+          preferredMethodOfReminder: 'Prefer not to be contacted',
+          preferredMethodOfNewsletter: 'Email'
         },
         isLicenceForYou: true
       }
-      const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+      const query = {
+        [HOW_CONTACTED.email]: 'Email'
+      }
+      const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock(query))
+      expect(summaryTable).toMatchSnapshot()
+    })
+
+    it('should have the newsletter set to no if have preferred method and if isLicenceForYou is true', () => {
+      const permission = {
+        licenceLength: '1D',
+        licensee: {
+          ...address,
+          postalFulfilment: false,
+          preferredMethodOfConfirmation: 'Prefer not to be contacted',
+          preferredMethodOfReminder: 'Prefer not to be contacted',
+          preferredMethodOfNewsletter: 'Prefer not to be contacted'
+        },
+        isLicenceForYou: true
+      }
+      const query = {
+        [HOW_CONTACTED.email]: 'Prefer not to be contacted'
+      }
+      const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock(query))
       expect(summaryTable).toMatchSnapshot()
     })
 
@@ -163,9 +209,36 @@ describe('contact-summary > route', () => {
         },
         isLicenceForYou: false
       }
-      const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB')
+      const summaryTable = getLicenseeDetailsSummaryRows(permission, 'GB', generateRequestMock())
       expect(summaryTable).toMatchSnapshot()
     })
+
+    describe('addLanguageCodeToUri', () => {
+      beforeEach(jest.clearAllMocks)
+
+      it.each([[ADDRESS_LOOKUP.uri], [LICENCE_FULFILMENT.uri], [LICENCE_CONFIRMATION_METHOD.uri], [CONTACT.uri], [NEWSLETTER.uri]])(
+        'test addLanguageCodeToUri is called correctly',
+        async urlToCheck => {
+          const permission = {
+            permit: {
+              cost: 1
+            },
+            licenceLength: '12M',
+            isLicenceForYou: true,
+            licensee: {
+              birthDate: '1996-01-01',
+              postalFulfilment: true
+            }
+          }
+
+          const mockRequest = generateRequestMock
+
+          getLicenseeDetailsSummaryRows(permission, 'GB', mockRequest)
+
+          expect(addLanguageCodeToUri).toHaveBeenCalledWith(mockRequest, urlToCheck)
+        }
+      )
+    })
   })
 
   describe('checkNavigation', () => {

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

@@ -5,6 +5,7 @@ import { HOW_CONTACTED } from '../../../processors/mapping-constants.js'
 import { CONTACT_SUMMARY_SEEN } from '../../../constants.js'
 import { isPhysical } from '../../../processors/licence-type-display.js'
 import { nextPage } from '../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../processors/uri-helper.js'
 
 import {
   CONTACT_SUMMARY,
@@ -50,7 +51,7 @@ const getData = async request => {
   const countryName = await countries.nameFromCode(permission.licensee.countryCode)
 
   return {
-    summaryTable: getLicenseeDetailsSummaryRows(permission, countryName),
+    summaryTable: getLicenseeDetailsSummaryRows(permission, countryName, request),
     uri: {
       licenceSummary: LICENCE_SUMMARY.uri
     }
@@ -59,10 +60,16 @@ const getData = async request => {
 
 export default pageRoute(CONTACT_SUMMARY.page, CONTACT_SUMMARY.uri, null, nextPage, getData)
 
-export const getLicenseeDetailsSummaryRows = (permission, countryName) => {
+export const getLicenseeDetailsSummaryRows = (permission, countryName, request) => {
   const licenseeSummaryArray = [
-    getRow('Address', getAddressText(permission.licensee, countryName), ADDRESS_LOOKUP.uri, 'address', 'change-address'),
-    ...getContactDetails(permission)
+    getRow(
+      'Address',
+      getAddressText(permission.licensee, countryName),
+      addLanguageCodeToUri(request, ADDRESS_LOOKUP.uri),
+      'address',
+      'change-address'
+    ),
+    ...getContactDetails(permission, request)
   ]
 
   if (permission.isLicenceForYou) {
@@ -70,7 +77,7 @@ export const getLicenseeDetailsSummaryRows = (permission, countryName) => {
       getRow(
         'Newsletter',
         permission.licensee.preferredMethodOfNewsletter !== HOW_CONTACTED.none ? 'Yes' : 'No',
-        NEWSLETTER.uri,
+        addLanguageCodeToUri(request, NEWSLETTER.uri),
         'newsletter',
         'change-newsletter'
       )
@@ -100,22 +107,28 @@ const CONTACT_TEXT_PHYSICAL = {
 
 const CHANGE_CONTACT = 'change-contact'
 
-const getContactDetails = permission => {
+const getContactDetails = (permission, request) => {
   if (isPhysical(permission)) {
     if (permission.licensee.postalFulfilment) {
       return [
-        getRow('Licence', 'By post', LICENCE_FULFILMENT.uri, 'licence fulfilment option', 'change-licence-fulfilment-option'),
+        getRow(
+          'Licence',
+          'By post',
+          addLanguageCodeToUri(request, LICENCE_FULFILMENT.uri),
+          'licence fulfilment option',
+          'change-licence-fulfilment-option'
+        ),
         getRow(
           'Licence Confirmation',
           getContactText(permission.licensee.preferredMethodOfConfirmation, permission.licensee),
-          LICENCE_CONFIRMATION_METHOD.uri,
+          addLanguageCodeToUri(request, LICENCE_CONFIRMATION_METHOD.uri),
           'licence confirmation option',
           'change-licence-confirmation-option'
         ),
         getRow(
           'Contact',
           getContactText(permission.licensee.preferredMethodOfReminder, permission.licensee, CONTACT_TEXT_PHYSICAL),
-          CONTACT.uri,
+          addLanguageCodeToUri(request, CONTACT.uri),
           'contact',
           CHANGE_CONTACT
         )
@@ -125,14 +138,14 @@ const getContactDetails = permission => {
         getRow(
           'Licence',
           getContactText(permission.licensee.preferredMethodOfConfirmation, permission.licensee),
-          LICENCE_FULFILMENT.uri,
+          addLanguageCodeToUri(request, LICENCE_FULFILMENT.uri),
           'licence confirmation option',
           'change-licence-confirmation-option'
         ),
         getRow(
           'Contact',
           getContactText(permission.licensee.preferredMethodOfReminder, permission.licensee, CONTACT_TEXT_PHYSICAL),
-          CONTACT.uri,
+          addLanguageCodeToUri(request, CONTACT.uri),
           'contact',
           CHANGE_CONTACT
         )
@@ -143,7 +156,7 @@ const getContactDetails = permission => {
       getRow(
         'Licence details',
         getContactText(permission.licensee.preferredMethodOfReminder, permission.licensee, CONTACT_TEXT_NON_PHYSICAL),
-        CONTACT.uri,
+        addLanguageCodeToUri(request, CONTACT.uri),
         'contact',
         CHANGE_CONTACT
       )

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

@@ -1,12 +1,23 @@
 import { getFromSummary, getData } from '../route'
 import { LICENCE_SUMMARY_SEEN, CONTACT_SUMMARY_SEEN } from '../../../../constants.js'
-import { NAME } from '../../../../uri.js'
+import {
+  DATE_OF_BIRTH,
+  DISABILITY_CONCESSION,
+  LICENCE_LENGTH,
+  LICENCE_TO_START,
+  LICENCE_TYPE,
+  NAME,
+  NEW_TRANSACTION,
+  RENEWAL_START_DATE
+} from '../../../../uri.js'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
 import '../../find-permit.js'
 import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
 jest.mock('../../find-permit.js')
 jest.mock('../../../../processors/licence-type-display.js')
+jest.mock('../../../../processors/uri-helper.js')
 
 describe('licence-summary > route', () => {
   beforeEach(jest.clearAllMocks)
@@ -64,26 +75,39 @@ describe('licence-summary > route', () => {
         getCatalog: () => ({
           licence_type_radio_salmon: 'Salmon and sea trout'
         })
-      }
+      },
+      url: {
+        search: ''
+      },
+      path: ''
     }
 
-    it('should return the name page uri', async () => {
-      mockTransactionCacheGet.mockImplementationOnce(() => ({
-        licenceStartDate: '2021-07-01',
-        numberOfRods: '3',
-        licenceType: 'Salmon and sea trout',
-        licenceLength: '12M',
+    it.each([
+      [NAME.uri],
+      [LICENCE_LENGTH.uri],
+      [LICENCE_TYPE.uri],
+      [LICENCE_TO_START.uri],
+      [DATE_OF_BIRTH.uri],
+      [DISABILITY_CONCESSION.uri],
+      [RENEWAL_START_DATE.uri],
+      [LICENCE_TO_START.uri],
+      [NEW_TRANSACTION.uri]
+    ])('addLanguageCodeToUri is called with the expected arguments', async uri => {
+      const permission = {
+        permit: {
+          cost: 1
+        },
         licensee: {
-          firstName: 'Graham',
-          lastName: 'Willis',
-          birthDate: '1946-01-01'
+          birthDate: '1996-01-01'
         },
-        permit: {
-          cost: 6
-        }
-      }))
-      const result = await getData(mockRequest)
-      expect(result.uri.name).toBe(NAME.uri)
+        isRenewal: true
+      }
+
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+
+      await getData(mockRequest)
+
+      expect(addLanguageCodeToUri).toHaveBeenCalledWith(mockRequest, uri)
     })
 
     it('should return a redirect error if firstName is not included on the licensee', async () => {

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

@@ -20,6 +20,7 @@ import { START_AFTER_PAYMENT_MINUTES, SERVICE_LOCAL_TIME } from '@defra-fish/bus
 import { LICENCE_SUMMARY_SEEN } from '../../../constants.js'
 import { CONCESSION, CONCESSION_PROOF } from '../../../processors/mapping-constants.js'
 import { nextPage } from '../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../processors/uri-helper.js'
 
 // Extracted to keep sonar happy
 const checkNavigation = permission => {
@@ -77,14 +78,16 @@ export const getData = async request => {
     cost: permission.permit.cost,
     birthDateStr: moment(permission.licensee.birthDate, cacheDateFormat).format('Do MMMM YYYY'),
     uri: {
-      name: NAME.uri,
-      licenceLength: LICENCE_LENGTH.uri,
-      licenceType: LICENCE_TYPE.uri,
-      licenceToStart: LICENCE_TO_START.uri,
-      dateOfBirth: DATE_OF_BIRTH.uri,
-      disabilityConcession: DISABILITY_CONCESSION.uri,
-      licenceStartDate: permission.isRenewal ? RENEWAL_START_DATE.uri : LICENCE_TO_START.uri,
-      clear: NEW_TRANSACTION.uri
+      name: addLanguageCodeToUri(request, NAME.uri),
+      licenceLength: addLanguageCodeToUri(request, LICENCE_LENGTH.uri),
+      licenceType: addLanguageCodeToUri(request, LICENCE_TYPE.uri),
+      licenceToStart: addLanguageCodeToUri(request, LICENCE_TO_START.uri),
+      dateOfBirth: addLanguageCodeToUri(request, DATE_OF_BIRTH.uri),
+      disabilityConcession: addLanguageCodeToUri(request, DISABILITY_CONCESSION.uri),
+      licenceStartDate: permission.isRenewal
+        ? addLanguageCodeToUri(request, RENEWAL_START_DATE.uri)
+        : addLanguageCodeToUri(request, LICENCE_TO_START.uri),
+      clear: addLanguageCodeToUri(request, NEW_TRANSACTION.uri)
     }
   }
 }

package/src/routes/__tests__/misc-routes.spec.js

@@ -1,5 +1,33 @@
 import { start, stop, injectWithCookies, initialize } from '../../__mocks__/test-utils-system.js'
-import { REFUND_POLICY, ACCESSIBILITY_STATEMENT, COOKIES, PRIVACY_POLICY, RENEWAL_PUBLIC, IDENTIFY } from '../../uri.js'
+import { REFUND_POLICY, ACCESSIBILITY_STATEMENT, COOKIES, PRIVACY_POLICY, RENEWAL_PUBLIC, IDENTIFY, CONTROLLER } from '../../uri.js'
+import { addLanguageCodeToUri } from '../../processors/uri-helper.js'
+
+jest.mock('../../processors/uri-helper.js')
+
+const mockTransactionCacheGet = jest.fn(() => ({
+  licenceStartDate: '2021-07-01',
+  numberOfRods: '3',
+  licenceType: 'Salmon and sea trout',
+  licenceLength: '12M',
+  licensee: {
+    firstName: 'Graham',
+    lastName: 'Willis',
+    birthDate: '1946-01-01'
+  },
+  permit: {
+    cost: 6
+  }
+}))
+
+const mockRequest = {
+  cache: () => ({
+    helpers: {
+      transaction: {
+        getCurrentPermission: mockTransactionCacheGet
+      }
+    }
+  })
+}
 
 // Start application before running the test case
 beforeAll(() => new Promise(resolve => start(resolve)))
@@ -12,7 +40,7 @@ describe('The miscellaneous route handlers', () => {
   it('redirect to the main controller when / is requested', async () => {
     const data = await injectWithCookies('GET', '/')
     expect(data.statusCode).toBe(302)
-    expect(data.headers.location).toBe('/buy')
+    expect(data.headers.location).toBe(addLanguageCodeToUri(mockRequest, CONTROLLER.uri))
   })
 
   it('return the refund policy page when requested', async () => {

package/src/routes/journey-definition.js

@@ -58,6 +58,9 @@ export default [
     next: {
       [CommonResults.OK]: {
         page: NAME
+      },
+      [CommonResults.SUMMARY]: {
+        page: LICENCE_SUMMARY
       }
     },
     backLink: s => (s.fromSummary ? LICENCE_SUMMARY.uri : null)

package/src/routes/misc-routes.js

@@ -48,7 +48,7 @@ export default [
   {
     method: 'GET',
     path: '/',
-    handler: async (request, h) => h.redirect(CONTROLLER.uri)
+    handler: async (request, h) => h.redirect(addLanguageCodeToUri(request, CONTROLLER.uri))
   },
   {
     method: 'GET',
@@ -92,7 +92,7 @@ export default [
     path: ADD_PERMISSION.uri,
     handler: async (request, h) => {
       await addPermission(request)
-      return h.redirect(CONTROLLER.uri)
+      return h.redirect(addLanguageCodeToUri(request, CONTROLLER.uri))
     }
   },
   {