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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.75.0-rc.8",
+  "version": "1.75.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.75.0-rc.8",
-    "@defra-fish/connectors-lib": "1.75.0-rc.8",
+    "@defra-fish/business-rules-lib": "1.75.0",
+    "@defra-fish/connectors-lib": "1.75.0",
     "@defra/hapi-gapi": "2.0.0",
     "@hapi/boom": "9.1.2",
     "@hapi/catbox-redis": "6.0.2",
@@ -72,12 +72,12 @@
     "gulp-minify": "3.1.0",
     "gulp-sass": "5.1.0",
     "gulp-sourcemaps": "3.0.0",
-    "sass": "1.102.0"
+    "sass": "1.69.3"
   },
   "jest": {
     "setupFilesAfterEnv": [
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "0d112029a9843bf54baa5f719d5ea8d32ef33f43"
+  "gitHead": "0fec5ec015fb288eabf13f366319bcb9214e81c0"
 }

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

@@ -1,6 +1,7 @@
 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 { licenceTypeDisplay } from '../../../../../processors/licence-type-display.js'
 import { getData } from '../route.js'
 import moment from 'moment-timezone'
 import { cacheDateFormat, dateDisplayFormat } from '../../../../../processors/date-and-time-display.js'
@@ -12,6 +13,7 @@ jest.mock('../../../../../uri.js', () => ({
   CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
 }))
 jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('../../../../../processors/licence-type-display.js')
 jest.mock('moment-timezone', () =>
   jest.fn(() => ({
     format: jest.fn()
@@ -77,7 +79,10 @@ describe('route', () => {
     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'
+    rp_cancel_details_licence_valid_until: 'Valid until',
+    licence_type_radio_salmon_payment_summary: 'Salmon and sea trout',
+    licence_type_radio_trout_two_rod_payment_summary: 'Trout and coarse (up to 2 rods)',
+    licence_type_radio_trout_three_rod_payment_summary: 'Trout and coarse (up to 3 rods)'
   })
 
   const getSamplePermission = () => ({
@@ -87,7 +92,9 @@ describe('route', () => {
         lastName: 'Smith'
       },
       permit: {
-        description: 'Salmon and sea trout'
+        description: 'Salmon and sea trout',
+        permitSubtype: { label: 'Salmon and sea trout' },
+        numberOfRods: 2
       },
       endDate: '01-01-2026',
       referenceNumber: 'abc123'
@@ -134,7 +141,9 @@ describe('route', () => {
             lastName: 'Pysgotwr'
           },
           permit: {
-            description: 'Wellies and old shopping trollies'
+            description: 'Wellies and old shopping trollies',
+            permitSubtype: { label: 'Trout and coarse' },
+            numberOfRods: 2
           },
           endDate: '21-03-2026',
           referenceNumber: 'aaa-111-bbb-222'
@@ -144,10 +153,12 @@ describe('route', () => {
         }
       }
       const sampleFormattedDate = Symbol('formatted-end-date')
+      const sampleLicenceTypeDisplayResult = Symbol('licence-type-display-result')
       const mockRequest = createMockRequest({ catalog: mssgs, currentPermission: sampleData })
       moment.mockReturnValueOnce({
         format: () => sampleFormattedDate
       })
+      licenceTypeDisplay.mockReturnValueOnce(sampleLicenceTypeDisplayResult)
 
       const result = await getData(mockRequest)
 
@@ -156,7 +167,7 @@ describe('route', () => {
           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_licence_type }, value: { text: sampleLicenceTypeDisplayResult } },
         {
           key: { text: mssgs.rp_cancel_details_payment_card },
           value: { text: `**** **** **** ${sampleData.recurringPayment.lastDigitsCardNumbers}` }
@@ -166,6 +177,54 @@ describe('route', () => {
       ])
     })
 
+    describe('licence type summary row', () => {
+      it.each([['Salmon and sea trout'], ['Trout and coarse']])(
+        'calls licenceTypeDisplay with licenceType set to permitSubtype.label of %s',
+        async label => {
+          const sampleData = getSamplePermission()
+          sampleData.permission.permit.permitSubtype = { label }
+          const mockRequest = createMockRequest({ currentPermission: sampleData })
+
+          await getData(mockRequest)
+
+          expect(licenceTypeDisplay).toHaveBeenCalledWith({ licenceType: label, numberOfRods: '2' }, expect.anything())
+        }
+      )
+
+      it('calls licenceTypeDisplay with numberOfRods converted to a string', async () => {
+        const sampleData = getSamplePermission()
+        sampleData.permission.permit.numberOfRods = 3
+        const mockRequest = createMockRequest({ currentPermission: sampleData })
+
+        await getData(mockRequest)
+
+        expect(licenceTypeDisplay).toHaveBeenCalledWith({ licenceType: 'Salmon and sea trout', numberOfRods: '3' }, expect.anything())
+      })
+
+      it('calls licenceTypeDisplay with request.i18n.getCatalog() result as the second argument', async () => {
+        const mssgs = getSampleCatalog()
+        const mockRequest = createMockRequest({ catalog: mssgs })
+
+        await getData(mockRequest)
+
+        expect(licenceTypeDisplay).toHaveBeenCalledWith(expect.anything(), mssgs)
+      })
+
+      it('returns licence type row with licenceTypeDisplay return value as the value text', async () => {
+        const mssgs = getSampleCatalog()
+        const sampleLicenceTypeDisplayResult = Symbol('licence-type-display-result')
+        licenceTypeDisplay.mockReturnValueOnce(sampleLicenceTypeDisplayResult)
+        const mockRequest = createMockRequest({ catalog: mssgs })
+
+        const result = await getData(mockRequest)
+
+        expect(result.summaryTable[1]).toEqual({
+          key: { text: mssgs.rp_cancel_details_licence_type },
+          value: { text: sampleLicenceTypeDisplayResult }
+        })
+      })
+    })
+
     it('passes cache date format and request locale to moment', async () => {
       const data = getSamplePermission()
       data.permission.endDate = Symbol('end-date')

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

@@ -3,13 +3,25 @@ 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'
+import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
 
 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_licence_type },
+    value: {
+      text: licenceTypeDisplay(
+        {
+          licenceType: currentPermission.permission.permit.permitSubtype.label,
+          numberOfRods: String(currentPermission.permission.permit.numberOfRods)
+        },
+        mssgs
+      )
+    }
+  },
   {
     key: { text: mssgs.rp_cancel_details_payment_card },
     value: { text: `**** **** **** ${currentPermission.recurringPayment.lastDigitsCardNumbers}` }

package/src/processors/__tests__/recurring-payments-write-cache.spec.js

@@ -10,7 +10,11 @@ describe('setUpCancelRecurringPaymentCacheFromAuthenticationResult', () => {
         lastName: 'Pysgotwr',
         preferredMethodOfConfirmation: { id: 910400000, label: 'Email', description: 'Email' }
       },
-      permit: { description: 'Coarse 6 month 15 Rod Licence (Half)' },
+      permit: {
+        description: 'Coarse 12 month 3 Rod Licence (Full)',
+        permitSubtype: { label: 'Trout and coarse' },
+        numberOfRods: 3
+      },
       recurringPayment: { lastDigitsCardNumbers: '5678' }
     }
 
@@ -48,8 +52,15 @@ describe('setUpCancelRecurringPaymentCacheFromAuthenticationResult', () => {
     it.each([
       ['referenceNumber', '23270624-2WC3FSD-ABNCY4'],
       ['endDate', '2024-12-31'],
-      ['permit', { description: 'Coarse 12 month 2 Rod Licence (Full)' }]
-    ])("Adds permission %s, value '%s', to transaction cache", async (fieldName, fieldValue) => {
+      [
+        'permit',
+        {
+          description: 'Coarse 12 month 3 Rod Licence (Full)',
+          permitSubtype: { label: 'Trout and coarse' },
+          numberOfRods: 3
+        }
+      ]
+    ])('adds permission %s to transaction cache', async (fieldName, fieldValue) => {
       const setCurrentPermission = jest.fn()
       const mockRequest = getSampleRequest(setCurrentPermission)
       const authResult = getSampleAuthResult({ [fieldName]: fieldValue })
@@ -65,7 +76,7 @@ describe('setUpCancelRecurringPaymentCacheFromAuthenticationResult', () => {
       )
     })
 
-    it('Adds licensee firstName, lastName and preferredMethodOfConfirmation label to transaction cache', async () => {
+    it('adds licensee firstName, lastName and preferredMethodOfConfirmation label to transaction cache', async () => {
       const setCurrentPermission = jest.fn()
       const mockRequest = getSampleRequest(setCurrentPermission)
       const authResult = getSampleAuthResult({
@@ -90,7 +101,7 @@ describe('setUpCancelRecurringPaymentCacheFromAuthenticationResult', () => {
     it.each([
       ['licensee', { anotherProperty: 'Should not be there' }],
       ['permit', { altProp: 'Should not be here' }]
-    ])('Omits extraneous properties from permission %s', async (fieldName, fieldValue) => {
+    ])('omits extraneous properties from permission %s', async (fieldName, fieldValue) => {
       const setCurrentPermission = jest.fn()
       const mockRequest = getSampleRequest(setCurrentPermission)
 
@@ -100,8 +111,8 @@ describe('setUpCancelRecurringPaymentCacheFromAuthenticationResult', () => {
 
       expect(setCurrentPermission).toHaveBeenCalledWith(
         expect.objectContaining({
-          permission: expect.not.objectContaining({
-            [fieldName]: fieldValue
+          permission: expect.objectContaining({
+            [fieldName]: expect.not.objectContaining(fieldValue)
           })
         })
       )

package/src/processors/recurring-payments-write-cache.js

@@ -11,7 +11,11 @@ export const setupCancelRecurringPaymentCacheFromAuthResult = async (request, au
         lastName: licensee.lastName,
         preferredMethodOfConfirmation: licensee.preferredMethodOfConfirmation?.label
       },
-      permit: { description: permit.description }
+      permit: {
+        description: permit.description,
+        permitSubtype: permit.permitSubtype,
+        numberOfRods: permit.numberOfRods
+      }
     },
     recurringPayment: {
       id: recurringPayment.id,