@defra-fish/gafl-webapp-service 1.65.0-rc.7 → 1.65.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.7",
+  "version": "1.65.0-rc.9",
   "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.65.0-rc.7",
-    "@defra-fish/connectors-lib": "1.65.0-rc.7",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.9",
+    "@defra-fish/connectors-lib": "1.65.0-rc.9",
     "@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": "721154c38cb9bfb554f3a3ff428ccd18cc7351c3"
+  "gitHead": "52a2c512cac3348e094ea6e420d76f159b767f53"
 }

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

@@ -2,6 +2,7 @@ import pageRoute from '../../../../../routes/page-route.js'
 import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
 import moment from 'moment-timezone'
+import { dateDisplayFormat } from '../../../../../processors/date-and-time-display.js'
 
 require('../route.js')
 
@@ -17,6 +18,10 @@ jest.mock('../../../../../uri.js', () => ({
 }))
 jest.mock('../../../../../processors/uri-helper.js')
 jest.mock('moment-timezone')
+jest.mock('../../../../../processors/date-and-time-display.js', () => ({
+  cacheDateFormat: Symbol('cache date format'),
+  dateDisplayFormat: Symbol('date display format')
+}))
 
 describe('pageRoute receives expected arguments', () => {
   it('passes expected arguments to pageRoute', () => {
@@ -64,7 +69,7 @@ describe('getData function', () => {
   })
 
   const mockRequest = () => {
-    const getCurrentPermission = jest.fn(() => ({ recurringPayment: { endDate: '2025-02-15' } }))
+    const getCurrentPermission = jest.fn(() => ({ permission: { endDate: '2025-02-15' } }))
 
     return {
       locale: 'en',
@@ -109,4 +114,9 @@ describe('getData function', () => {
 
     expect(data.licenceExpiry).toEqual('19th November, 2025')
   })
+
+  it('uses expected date format', async () => {
+    await getData(mockRequest())
+    expect(moment.mock.results[0].value.format).toHaveBeenCalledWith(dateDisplayFormat)
+  })
 })

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

@@ -21,21 +21,23 @@
     }
   }) %}
 
-  <p class="govuk-body-m">{{ mssgs.rp_cancel_confirm_body }}</p>
+  <p class="govuk-body-m">{{ mssgs.rp_cancel_confirm_body }}{{ data.licenceExpiry }}</p>
 
   <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.rp_cancel_confirm_accept,
-            classes: "govuk-!-margin-top-1"
-          }) }}
-          {{ csrf() }}
+          <div class="govuk-button-group">
+            {{ govukButton({
+              attributes: { id: 'continue' },
+              preventDoubleClick: true,
+              name: "continue",
+              text: mssgs.rp_cancel_confirm_accept,
+              classes: "govuk-!-margin-top-1"
+            }) }}
+            {{ csrf() }}
+            <p class="govuk-body no-print"><a class="govuk-link" href="{{ data.uri.cancelRpIdentify }}">{{ mssgs.rp_cancel_confirm_reject }}</a></p>
+          </div>
         </form>
-        <p class="govuk-body no-print"><a class="govuk-link" href="{{ data.uri.cancelRpIdentify }}">{{ mssgs.rp_cancel_confirm_reject }}</a></p>
     </div>
   </div>
 

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

@@ -1,14 +1,14 @@
 import pageRoute from '../../../../routes/page-route.js'
 import { CANCEL_RP_COMPLETE, CANCEL_RP_CONFIRM, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
-import { cacheDateFormat } from '../../../../processors/date-and-time-display.js'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../processors/date-and-time-display.js'
 import moment from 'moment-timezone'
 
 const getData = async request => {
-  const permission = await request.cache().helpers.transaction.getCurrentPermission()
+  const { permission } = await request.cache().helpers.transaction.getCurrentPermission()
 
   return {
-    licenceExpiry: moment(permission.recurringPayment.endDate, cacheDateFormat, request.locale).format('Do MMMM, YYYY'),
+    licenceExpiry: moment(permission.endDate, cacheDateFormat, request.locale).format(dateDisplayFormat),
     uri: {
       cancelRpIdentify: addLanguageCodeToUri(request, CANCEL_RP_IDENTIFY.uri)
     }

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

@@ -2,6 +2,8 @@ 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'
+import moment from 'moment-timezone'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../../processors/date-and-time-display.js'
 
 jest.mock('../../../../../routes/page-route.js')
 jest.mock('../../../../../uri.js', () => ({
@@ -10,6 +12,15 @@ jest.mock('../../../../../uri.js', () => ({
   CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
 }))
 jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('moment-timezone', () =>
+  jest.fn(() => ({
+    format: jest.fn()
+  }))
+)
+jest.mock('../../../../../processors/date-and-time-display.js', () => ({
+  cacheDateFormat: Symbol('cache-date-format'),
+  dateDisplayFormat: Symbol('date-display-format')
+}))
 
 describe('route', () => {
   beforeEach(jest.clearAllMocks)
@@ -82,7 +93,7 @@ describe('route', () => {
       referenceNumber: 'abc123'
     },
     recurringPayment: {
-      lastDigitsCardNumbers: 1234
+      lastDigitsCardNumbers: '1234'
     }
   })
 
@@ -96,7 +107,8 @@ describe('route', () => {
     }),
     i18n: {
       getCatalog: () => catalog
-    }
+    },
+    locale: Symbol('en-GB')
   })
 
   describe('getData', () => {
@@ -115,17 +127,67 @@ describe('route', () => {
 
     it('returns summaryTable with expected data', async () => {
       const mssgs = getSampleCatalog()
-      const mockRequest = createMockRequest({ catalog: mssgs })
+      const sampleData = {
+        permission: {
+          licensee: {
+            firstName: 'Brenin',
+            lastName: 'Pysgotwr'
+          },
+          permit: {
+            description: 'Wellies and old shopping trollies'
+          },
+          endDate: '21-03-2026',
+          referenceNumber: 'aaa-111-bbb-222'
+        },
+        recurringPayment: {
+          lastDigitsCardNumbers: '9999'
+        }
+      }
+      const sampleFormattedDate = Symbol('formatted-end-date')
+      const mockRequest = createMockRequest({ catalog: mssgs, currentPermission: sampleData })
+      moment.mockReturnValueOnce({
+        format: () => sampleFormattedDate
+      })
 
       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' } }
+        {
+          key: { text: mssgs.rp_cancel_details_licence_holder },
+          value: { text: `${sampleData.permission.licensee.firstName} ${sampleData.permission.licensee.lastName}` }
+        },
+        { key: { text: mssgs.rp_cancel_details_licence_type }, value: { text: sampleData.permission.permit.description } },
+        {
+          key: { text: mssgs.rp_cancel_details_payment_card },
+          value: { text: `**** **** **** ${sampleData.recurringPayment.lastDigitsCardNumbers}` }
+        },
+        { key: { text: mssgs.rp_cancel_details_last_purchased }, value: { text: sampleData.permission.referenceNumber } },
+        { key: { text: mssgs.rp_cancel_details_licence_valid_until }, value: { text: sampleFormattedDate } }
       ])
     })
+
+    it('passes cache date format and request locale to moment', async () => {
+      const data = getSamplePermission()
+      data.permission.endDate = Symbol('end-date')
+      const mockRequest = createMockRequest({ currentPermission: data })
+
+      await getData(mockRequest)
+
+      expect(moment).toHaveBeenCalledWith(data.permission.endDate, cacheDateFormat, mockRequest.locale)
+    })
+
+    it('requests correct date format', async () => {
+      const data = getSamplePermission()
+      data.permission.endDate = Symbol('end-date')
+      const mockRequest = createMockRequest({ currentPermission: data })
+      const format = jest.fn()
+      moment.mockReturnValueOnce({
+        format
+      })
+
+      await getData(mockRequest)
+
+      expect(format).toHaveBeenCalledWith(dateDisplayFormat)
+    })
   })
 })

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

@@ -1,16 +1,24 @@
 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 moment from 'moment-timezone'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../processors/date-and-time-display.js'
 
-const getLicenseeDetailsSummaryRows = (currentPermission, mssgs) => [
+const getLicenseeDetailsSummaryRows = (currentPermission, mssgs, locale) => [
   {
     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_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 } }
+  {
+    key: { text: mssgs.rp_cancel_details_licence_valid_until },
+    value: { text: moment(currentPermission.permission.endDate, cacheDateFormat, locale).format(dateDisplayFormat) }
+  }
 ]
 
 export const getData = async request => {
@@ -19,7 +27,7 @@ export const getData = async request => {
 
   return {
     mssgs,
-    summaryTable: getLicenseeDetailsSummaryRows(currentPermission, mssgs)
+    summaryTable: getLicenseeDetailsSummaryRows(currentPermission, mssgs, request.locale)
   }
 }
 

package/src/routes/journey-definition.js

@@ -503,9 +503,9 @@ export default [
     next: {
       [CommonResults.OK]: {
         page: CANCEL_RP_COMPLETE
-      },
-      backLink: CANCEL_RP_DETAILS.uri
-    }
+      }
+    },
+    backLink: CANCEL_RP_DETAILS.uri
   },
   {
     current: CANCEL_RP_AGREEMENT_NOT_FOUND,