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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.7",
+  "version": "1.65.0-rc.8",
   "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.8",
+    "@defra-fish/connectors-lib": "1.65.0-rc.8",
     "@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": "41bf97520a8285345a098fc58be3410f53d968d7"
 }

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)
   }
 }