@defra-fish/gafl-webapp-service 1.64.0 → 1.65.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.64.0",
+  "version": "1.65.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.64.0",
-    "@defra-fish/connectors-lib": "1.64.0",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.0",
+    "@defra-fish/connectors-lib": "1.65.0-rc.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": "d6a3d30c7a20169fdf5afb1a93eb1d411fe96abf"
+  "gitHead": "cdf9253964871c4afe0ff85d085364ffe4e890cf"
 }

package/src/locales/cy.json

@@ -182,6 +182,7 @@
   "client_error_payment_start_again_pre": "Neu, os byddai’n well gennych, gallwch waredu’r drwydded hon a ",
   "client_error_payment_start_again": "dechrau eto",
   "concession_applied": "Consesiwn wedi’i gynnwys",
+  "confirm_continue": "Confirm and continue",
   "contact_summary_change": "Newid",
   "contact_summary_email": "e-bost i ",
   "contact_summary_hidden_address": "cyfeiriad",
@@ -787,7 +788,13 @@
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
   "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
-  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_details_last_purchased": "Last licence purchased",
+  "rp_cancel_details_licence_holder": "Licence holder",
+  "rp_cancel_details_licence_type": "Licence type",
+  "rp_cancel_details_licence_valid_until": "Licence valid until",
+  "rp_cancel_details_payment_card": "Payment card (last 4 digits)",
+  "rp_cancel_details_title": "Check your details",
+  "rp_cancel_details_summary_title": "If you need help checking your details",
   "save_changes": "Cadw newidiadau",
   "server_error_title_suffix": " - GOV.UK",
   "server_error_bulletpoint_1": "Os ydych chi wedi gofyn am hysbysiad dros e-bost neu neges destun, dylai’r hysbysiad gyrraedd o fewn 3 awr os bydd y taliad wedi cael ei gymryd.",

package/src/locales/en.json

@@ -182,6 +182,7 @@
   "client_error_payment_start_again_pre": "Or, if you wish, you can discard this licence and ",
   "client_error_payment_start_again": "start again",
   "concession_applied": "Concession applied",
+  "confirm_continue": "Confirm and continue",
   "contact_summary_change": "Change",
   "contact_summary_email": "Email to ",
   "contact_summary_hidden_address": "address",
@@ -787,7 +788,13 @@
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
   "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
-  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_details_last_purchased": "Last licence purchased",
+  "rp_cancel_details_licence_holder": "Licence holder",
+  "rp_cancel_details_licence_type": "Licence type",
+  "rp_cancel_details_licence_valid_until": "Licence valid until",
+  "rp_cancel_details_payment_card": "Payment card (last 4 digits)",
+  "rp_cancel_details_title": "Check your details",
+  "rp_cancel_details_summary_title": "If you need help checking your details",
   "save_changes": "Save changes",
   "server_error_title_suffix": " - GOV.UK",
   "server_error_bulletpoint_1": "If you have requested an email or text notification, this should be delivered in 3 hours if a payment has been taken.",

package/src/pages/recurring-payments/cancel/details/__tests__/route.spec.js

@@ -0,0 +1,131 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import { getData } from '../route.js'
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_DETAILS: { page: Symbol('cancel-rp-details-page'), uri: Symbol('cancel-rp-details-uri') },
+  CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+describe('route', () => {
+  beforeEach(jest.clearAllMocks)
+
+  describe('pageRoute receives expected arguments', () => {
+    it('should call the pageRoute with cancel-rp-details, /buy/cancel-recurring-payment/details, dateOfBirthValidator, nextPage and getData', async () => {
+      jest.isolateModules(() => {
+        require('../route.js')
+        expect(pageRoute).toHaveBeenCalledWith(
+          CANCEL_RP_DETAILS.page,
+          CANCEL_RP_DETAILS.uri,
+          expect.any(Function),
+          expect.any(Function),
+          expect.any(Function)
+        )
+      })
+    })
+  })
+
+  it('calls addLanguageCodeToUri with request object', async () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+    })
+    const [[, , , completion]] = pageRoute.mock.calls
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+    })
+    const [[, , , completion]] = pageRoute.mock.calls
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_CONFIRM.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+    })
+    const [[, , , completion]] = pageRoute.mock.calls
+    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  })
+
+  const getSampleCatalog = () => ({
+    rp_cancel_details_licence_holder: 'Licence holder',
+    rp_cancel_details_licence_type: 'Licence type',
+    rp_cancel_details_payment_card: 'Payment card',
+    rp_cancel_details_last_purchased: 'Last purchased',
+    rp_cancel_details_licence_valid_until: 'Valid until'
+  })
+
+  const getSamplePermission = () => ({
+    permission: {
+      licensee: {
+        firstName: 'John',
+        lastName: 'Smith'
+      },
+      permit: {
+        description: 'Salmon and sea trout'
+      },
+      endDate: '01-01-2026',
+      referenceNumber: 'abc123'
+    },
+    recurringPayment: {
+      lastDigitsCardNumbers: 1234
+    }
+  })
+
+  const createMockRequest = ({ currentPermission = getSamplePermission(), catalog = getSampleCatalog() } = {}) => ({
+    cache: () => ({
+      helpers: {
+        transaction: {
+          getCurrentPermission: jest.fn().mockResolvedValue(currentPermission)
+        }
+      }
+    }),
+    i18n: {
+      getCatalog: () => catalog
+    }
+  })
+
+  describe('getData', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it('returns request.i18n.getCatalog()', async () => {
+      const mssgs = getSampleCatalog()
+      const mockRequest = createMockRequest({ catalog: mssgs })
+
+      const result = await getData(mockRequest)
+
+      expect(result.mssgs).toEqual(mssgs)
+    })
+
+    it('returns summaryTable with expected data', async () => {
+      const mssgs = getSampleCatalog()
+      const mockRequest = createMockRequest({ catalog: mssgs })
+
+      const result = await getData(mockRequest)
+
+      expect(result.summaryTable).toEqual([
+        { key: { text: mssgs.rp_cancel_details_licence_holder }, value: { text: 'John Smith' } },
+        { key: { text: mssgs.rp_cancel_details_licence_type }, value: { text: 'Salmon and sea trout' } },
+        { key: { text: mssgs.rp_cancel_details_payment_card }, value: { text: 1234 } },
+        { key: { text: mssgs.rp_cancel_details_last_purchased }, value: { text: 'abc123' } },
+        { key: { text: mssgs.rp_cancel_details_licence_valid_until }, value: { text: '01-01-2026' } }
+      ])
+    })
+  })
+})

package/src/pages/recurring-payments/cancel/details/cancel-rp-details.njk

@@ -2,22 +2,70 @@
 
 {% from "button/macro.njk" import govukButton %}
 {% from "page-title.njk" import pageTitle %}
+{% from "fieldset/macro.njk" import govukFieldset %}
+{% from "summary-list/macro.njk" import govukSummaryList %}
+{% from "details/macro.njk" import govukDetails %}
 
 {% set title = mssgs.rp_cancel_details_title %}
 {% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
 
+{% set licenseDetailsSummary %}
+  {% set legendHtml %}
+    <span class="govuk-caption-l">{{ mssgs.cancel_rp_identify_caption }}</span>
+    {{ title }}
+  {% endset %}
+
+  {% call govukFieldset({
+    legend: {
+      html: legendHtml,
+      classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
+      isPageHeading: true
+    }
+  }) %}
+    {{ govukSummaryList({
+      classes: 'licence-summary-list',
+      rows: data.summaryTable
+    }) }}
+  {% endcall %}
+{% endset -%}
+
+{% set detailsHtml %}
+  <p class="govuk-body">
+    {{ mssgs.refund_bulletpoint_1_2 }}
+  </p>
+  <p class="govuk-body">
+    {{ mssgs.refund_bulletpoint_1_3 }}
+  </p>
+  <p class="govuk-body">
+    {{ mssgs.refund_bulletpoint_1_4 }}
+  </p>
+  <p class="govuk-body govuk-!-margin-bottom-0">
+    <a class="govuk-link" href="https://www.gov.uk/call-charges" target="_blank" rel="noreferrer noopener">
+      {{ mssgs.refund_bulletpoint_1_5 }}
+    </a>
+  </p>
+{% endset %}
+
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <form method="post" class="govuk-!-margin-bottom-6">
-          {{ govukButton({
-            attributes: { id: 'continue' },
-            preventDoubleClick: true,
-            name: "continue",
-            text: mssgs.continue,
-            classes: "govuk-!-margin-top-1"
-          }) }}
-          {{ csrf() }}
+        <form method="post">
+            {{ licenseDetailsSummary | trim | safe }}
+
+            {{ govukButton({
+                attributes: { id: 'continue' },
+                preventDoubleClick: true,
+                name: "continue",
+                text: mssgs.confirm_continue,
+                classes: "govuk-!-margin-top-5"
+            }) }}
+
+            {{ govukDetails({
+              summaryText: mssgs.rp_cancel_details_summary_title,
+              html: detailsHtml
+            }) }}
+
+            {{ csrf() }}
         </form>
     </div>
 </div>

package/src/pages/recurring-payments/cancel/details/route.js

@@ -2,10 +2,31 @@ import pageRoute from '../../../../routes/page-route.js'
 import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
+const getLicenseeDetailsSummaryRows = (currentPermission, mssgs) => [
+  {
+    key: { text: mssgs.rp_cancel_details_licence_holder },
+    value: { text: `${currentPermission.permission.licensee.firstName} ${currentPermission.permission.licensee.lastName}` }
+  },
+  { key: { text: mssgs.rp_cancel_details_licence_type }, value: { text: currentPermission.permission.permit.description } },
+  { key: { text: mssgs.rp_cancel_details_payment_card }, value: { text: currentPermission.recurringPayment.lastDigitsCardNumbers } },
+  { key: { text: mssgs.rp_cancel_details_last_purchased }, value: { text: currentPermission.permission.referenceNumber } },
+  { key: { text: mssgs.rp_cancel_details_licence_valid_until }, value: { text: currentPermission.permission.endDate } }
+]
+
+export const getData = async request => {
+  const currentPermission = await request.cache().helpers.transaction.getCurrentPermission()
+  const mssgs = request.i18n.getCatalog()
+
+  return {
+    mssgs,
+    summaryTable: getLicenseeDetailsSummaryRows(currentPermission, mssgs)
+  }
+}
+
 export default pageRoute(
   CANCEL_RP_DETAILS.page,
   CANCEL_RP_DETAILS.uri,
   () => {},
   request => addLanguageCodeToUri(request, CANCEL_RP_CONFIRM.uri),
-  () => {}
+  getData
 )

package/src/routes/journey-definition.js

@@ -447,7 +447,8 @@ export default [
       [CommonResults.OK]: {
         page: CANCEL_RP_CONFIRM
       }
-    }
+    },
+    backLink: CANCEL_RP_IDENTIFY.uri
   },
   {
     current: CANCEL_RP_CONFIRM,

package/src/pages/recurring-payments/cancel/details/__tests__/route.test.js

@@ -1,106 +0,0 @@
-import pageRoute from '../../../../../routes/page-route.js'
-import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../../uri.js'
-import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
-
-require('../route.js')
-// eslint-disable-next-line no-unused-vars
-const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
-
-jest.mock('../../../../../routes/page-route.js')
-jest.mock('../../../../../uri.js', () => ({
-  ...jest.requireActual('../../../../../uri.js'),
-  CANCEL_RP_DETAILS: { page: Symbol('cancel-rp-details-page'), uri: Symbol('cancel-rp-details-uri') },
-  CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
-}))
-jest.mock('../../../../../processors/uri-helper.js')
-
-describe('pageRoute receives expected arguments', () => {
-  it('passes CANCEL_RP_DETAILS.page as the view name', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        CANCEL_RP_DETAILS.page,
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes CANCEL_RP_DETAILS.uri as the path', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        CANCEL_RP_DETAILS.uri,
-        expect.anything(),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function as the validator', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function to generate redirect location on completion', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function to get the page data', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function)
-      )
-    })
-  })
-})
-
-describe('completion function', () => {
-  beforeEach(jest.clearAllMocks)
-
-  it('calls addLanguageCodeToUri with request object', () => {
-    const sampleRequest = Symbol('sample request')
-    completion(sampleRequest)
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
-  })
-
-  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
-    completion({})
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_CONFIRM.uri)
-  })
-
-  it('returns the value of addLanguageCodeToUri', () => {
-    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
-    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
-
-    const completionRedirect = completion({})
-
-    expect(completionRedirect).toBe(expectedCompletionRedirect)
-  })
-})