@defra-fish/gafl-webapp-service 1.65.0-rc.2 → 1.65.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.2",
+  "version": "1.65.0-rc.4",
   "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.2",
-    "@defra-fish/connectors-lib": "1.65.0-rc.2",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.4",
+    "@defra-fish/connectors-lib": "1.65.0-rc.4",
     "@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": "2f8e3ec17ed29caf89f585324d8dd4b725ff4586"
+  "gitHead": "47a57b982b698bea3a6e03473d7bbaa4ec733180"
 }

package/src/handlers/__tests__/cancel-recurring-payment-authentication-handler.spec.js

@@ -1,5 +1,5 @@
 import handler from '../cancel-recurring-payment-authentication-handler'
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND } from '../../uri.js'
+import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_ALREADY_CANCELLED } from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
@@ -19,7 +19,8 @@ jest.mock('@defra-fish/business-rules-lib', () => ({
 jest.mock('../../uri.js', () => ({
   CANCEL_RP_IDENTIFY: { page: 'cancel-rp-identify page', uri: Symbol('cancel-rp-identify-uri') },
   CANCEL_RP_DETAILS: { uri: Symbol('cancel-rp-details-uri') },
-  CANCEL_RP_AGREEMENT_NOT_FOUND: { uri: Symbol('cancel-rp-agreement-not-found-uri') }
+  CANCEL_RP_AGREEMENT_NOT_FOUND: { uri: Symbol('cancel-rp-agreement-not-found-uri') },
+  CANCEL_RP_ALREADY_CANCELLED: { uri: Symbol('cancel-rp-already-cancelled-uri ') }
 }))
 jest.mock('../../processors/recurring-payments-write-cache.js')
 
@@ -165,12 +166,12 @@ describe('Cancel RP Authentication Handler', () => {
     })
   })
 
-  describe('Unsuccessful authentication - RCP cancelled', () => {
-    it('redirects to the CANCEL_RP_IDENTIFY.uri', async () => {
+  describe('Unsuccessful authentication - RCP already cancelled', () => {
+    it('redirects to the CANCEL_RP_ALREADY_CANCELLED.uri', async () => {
       const { h } = await invokeHandlerWithMocks({
         salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
-      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.uri)
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_ALREADY_CANCELLED.uri)
     })
 
     it('returns value of redirect', async () => {
@@ -184,7 +185,7 @@ describe('Cancel RP Authentication Handler', () => {
       expect(result).toBe(redirectResult)
     })
 
-    it('sets page cache error for RCP cancelled', async () => {
+    it('sets page cache for RCP already cancelled', async () => {
       const { request } = await invokeHandlerWithMocks({
         salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
@@ -192,7 +193,7 @@ describe('Cancel RP Authentication Handler', () => {
         CANCEL_RP_IDENTIFY.page,
         expect.objectContaining({
           payload: expect.any(Object),
-          error: { recurringPayment: 'rcp-cancelled' }
+          errorRedirect: true
         })
       )
     })

package/src/handlers/cancel-recurring-payment-authentication-handler.js

@@ -1,7 +1,9 @@
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND } from '../../src/uri.js'
+import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_ALREADY_CANCELLED } from '../../src/uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 import { validation } from '@defra-fish/business-rules-lib'
 import { setupCancelRecurringPaymentCacheFromAuthResult } from '../processors/recurring-payments-write-cache.js'
+import { cacheDateFormat } from '../../src/processors/date-and-time-display.js'
+import moment from 'moment-timezone'
 import Joi from 'joi'
 
 const applyAuthFailure = async (request, h, { pageData, redirectUri, statusData }) => {
@@ -35,7 +37,12 @@ const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
     context.pageData.errorRedirect = true
     context.redirectUri = CANCEL_RP_AGREEMENT_NOT_FOUND.uri
   } else if (authenticationResult.recurringPayment.cancelledDate) {
-    context.pageData.error = { recurringPayment: 'rcp-cancelled' }
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_ALREADY_CANCELLED.uri
+    context.pageData.payload = {
+      ...context.pageData.payload,
+      endDate: moment(authenticationResult.recurringPayment.endDate).format(cacheDateFormat)
+    }
   }
 
   if (context.pageData.error || context.pageData.errorRedirect) {

package/src/locales/cy.json

@@ -786,9 +786,18 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_licence_already_cancelled_heading": "Your recurring card payment agreement is already cancelled",
+  "rp_licence_already_cancelled_body_1": "Licence ending ",
+  "rp_licence_already_cancelled_body_1_1": " expires on ",
+  "rp_licence_already_cancelled_body_1_2": " and will not renew automatically. To continue fishing after this date you need to ",
+  "rp_licence_already_cancelled_body_link": "get a new licence (opens in new tab)",
+  "rp_licence_already_cancelled_body_2_1": "If you need help email ",
+  "rp_licence_already_cancelled_body_2_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays).",
+  "rp_licence_already_cancelled_body_3_1": "Go back",
+  "rp_licence_already_cancelled_body_3_2": " to cancel the recurring card payment for a different licence.",
+  "rp_licence_already_cancelled_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_already_cancelled_title": "Already cancelled - Cancel your recurring card payment ",
   "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_identify_title": "Cancel your recurring card payment agreement - identify",
   "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
   "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",

package/src/locales/en.json

@@ -786,9 +786,18 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_licence_already_cancelled_heading": "Your recurring card payment agreement is already cancelled",
+  "rp_licence_already_cancelled_body_1": "Licence ending ",
+  "rp_licence_already_cancelled_body_1_1": " expires on ",
+  "rp_licence_already_cancelled_body_1_2": " and will not renew automatically. To continue fishing after this date you need to ",
+  "rp_licence_already_cancelled_body_link": "get a new licence (opens in new tab)",
+  "rp_licence_already_cancelled_body_2_1": "If you need help email ",
+  "rp_licence_already_cancelled_body_2_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays).",
+  "rp_licence_already_cancelled_body_3_1": "Go back",
+  "rp_licence_already_cancelled_body_3_2": " to cancel the recurring card payment for a different licence.",
+  "rp_licence_already_cancelled_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_already_cancelled_title": "Already cancelled - Cancel your recurring card payment ",
   "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_identify_title": "Cancel your recurring card payment agreement - identify",
   "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
   "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",

package/src/pages/recurring-payments/cancel/agreement-not-found/cancel-rp-agreement-not-found.njk

@@ -12,4 +12,4 @@
         <p class="govuk-body">{{ mssgs.rp_cancel_no_agreement_found_need_help_1 }}<a class="govuk-link" href="mailto:{{ data.links.contactUs }}">{{ mssgs.rp_cancel_no_agreement_found_need_help_email }}</a>{{ mssgs.rp_cancel_no_agreement_found_need_help_2 }}<a class="govuk-link" href="{{ data.links.callCharges }}" target="_blank">{{ mssgs.rp_cancel_no_agreement_found_call_charges_link }}</a></p>
     </div>
 </div>
-{% endblock %}
+{% endblock %}

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

@@ -0,0 +1,115 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_ALREADY_CANCELLED } from '../../../../../uri.js'
+
+require('../route.js')
+
+// eslint-disable-next-line no-unused-vars
+const getData = pageRoute.mock.calls[0][4]
+
+jest.mock('../../../../../routes/page-route.js', () => jest.fn())
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_ALREADY_CANCELLED: {
+    page: Symbol('cancel-rp-already-cancelled page'),
+    uri: Symbol('cancel-rp-already-cancelled uri')
+  }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+const getSampleRequest = referenceNumber => ({
+  cache: jest.fn(() => ({
+    helpers: {
+      page: {
+        getCurrentPermission: jest.fn(() => ({ payload: { referenceNumber, endDate: '2025:10:03:03:33:33' } }))
+      }
+    }
+  }))
+})
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_ALREADY_CANCELLED.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_ALREADY_CANCELLED.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_ALREADY_CANCELLED.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_ALREADY_CANCELLED.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 getData to pageRoute', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('getData', () => {
+  it('returns reference number from payload', async () => {
+    const referenceNumber = 'RP0310'
+    expect(await getData(getSampleRequest(referenceNumber))).toEqual(
+      expect.objectContaining({
+        referenceNumber
+      })
+    )
+  })
+
+  it('transforms end date to display format', async () => {
+    const endDate = '2025-10-03T03:33:33.000Z'
+    const request = getSampleRequest()
+    request.cache().helpers.page.getCurrentPermission.mockResolvedValueOnce({
+      payload: { referenceNumber: 'RP0310', endDate }
+    })
+    const data = await getData(request)
+    expect(data.endDate).toEqual('3 October 2025')
+  })
+})

package/src/pages/recurring-payments/cancel/already-cancelled/already-cancelled.njk

@@ -0,0 +1,28 @@
+{% extends "layout.njk" %}
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_already_cancelled_title %}
+{% block pageTitle %}{{ pageTitle(title, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{ mssgs.rp_licence_already_cancelled_heading }}</h1>
+    <p class="govuk-body">
+      {{ mssgs.rp_licence_already_cancelled_body_1 }}{{ data.referenceNumber }}{{ mssgs.rp_licence_already_cancelled_body_1_1 }}{{ data.endDate }}{{ mssgs.rp_licence_already_cancelled_body_1_2 }}
+      <a href="/" class="govuk-link" target="_blank" rel="noopener"> {{ mssgs.rp_licence_already_cancelled_body_link }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      {{ mssgs.rp_licence_already_cancelled_body_2_1 }}
+      <a href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.rp_licence_already_cancelled_body_ea_link }}</a>
+      {{ mssgs.rp_licence_already_cancelled_body_2_2 }}
+      <a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_body_call_charges_link }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      <a class="govuk-link" href="/buy/cancel-recurring-payment/identify"> {{ mssgs.rp_licence_already_cancelled_body_3_1 }}
+        </a>{{ mssgs.rp_licence_already_cancelled_body_3_2 }}
+    </p>
+    
+  </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/already-cancelled/route.js

@@ -0,0 +1,25 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
+import { CANCEL_RP_ALREADY_CANCELLED, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../processors/date-and-time-display.js'
+import moment from 'moment-timezone'
+
+const getData = async request => {
+  const {
+    payload: { referenceNumber, endDate }
+  } = await request.cache().helpers.page.getCurrentPermission(CANCEL_RP_IDENTIFY.page)
+  const endDateString = moment(endDate, cacheDateFormat).tz(SERVICE_LOCAL_TIME).format(dateDisplayFormat)
+
+  return {
+    referenceNumber,
+    endDate: endDateString
+  }
+}
+
+export default pageRoute(
+  CANCEL_RP_ALREADY_CANCELLED.page,
+  CANCEL_RP_ALREADY_CANCELLED.uri,
+  () => {},
+  () => {},
+  getData
+)

package/src/routes/__tests__/__snapshots__/telesales-routes.spec.js.snap

@@ -116,6 +116,22 @@ Object {
       },
       "path": "/buy/cancel-recurring-payment/agreement-not-found",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/already-cancelled",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/already-cancelled",
+    },
   ],
 }
 `;

package/src/routes/journey-definition.js

@@ -34,7 +34,8 @@ import {
   CANCEL_RP_DETAILS,
   CANCEL_RP_CONFIRM,
   CANCEL_RP_COMPLETE,
-  CANCEL_RP_AGREEMENT_NOT_FOUND
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  CANCEL_RP_ALREADY_CANCELLED
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -463,5 +464,9 @@ export default [
   {
     current: CANCEL_RP_AGREEMENT_NOT_FOUND,
     backLink: CANCEL_RP_IDENTIFY.uri
+  },
+  {
+    current: CANCEL_RP_ALREADY_CANCELLED,
+    backLink: CANCEL_RP_IDENTIFY.uri
   }
 ]

package/src/routes/telesales-routes.js

@@ -5,6 +5,7 @@ import cancelRPDetails from '../pages/recurring-payments/cancel/details/route.js
 import cancelRPConfirm from '../pages/recurring-payments/cancel/confirm/route.js'
 import cancelRPComplete from '../pages/recurring-payments/cancel/complete/route.js'
 import cancelRPAgreementNotFound from '../pages/recurring-payments/cancel/agreement-not-found/route.js'
+import cancelRPAlreadyCancelled from '../pages/recurring-payments/cancel/already-cancelled/route.js'
 
 const telesalesRoutes = [
   {
@@ -33,6 +34,13 @@ const telesalesRoutes = [
 ]
 
 if (process.env.SHOW_CANCELLATION_JOURNEY === 'true') {
-  telesalesRoutes.push(...cancelRPIdentify, ...cancelRPDetails, ...cancelRPConfirm, ...cancelRPComplete, ...cancelRPAgreementNotFound)
+  telesalesRoutes.push(
+    ...cancelRPIdentify,
+    ...cancelRPDetails,
+    ...cancelRPConfirm,
+    ...cancelRPComplete,
+    ...cancelRPAgreementNotFound,
+    ...cancelRPAlreadyCancelled
+  )
 }
 export default telesalesRoutes

package/src/uri.js

@@ -62,6 +62,9 @@ export const ERROR_TESTING = { uri: '/buy/throw-error' }
 export const CHOOSE_PAYMENT = { uri: '/buy/choose-payment', page: 'choose-payment' }
 export const SET_UP_PAYMENT = { uri: '/buy/set-up-recurring-card-payment', page: 'set-up-payment' }
 
+/**
+ * Recurring payments cancellation pages
+ */
 export const CANCEL_RP_IDENTIFY = { uri: '/buy/cancel-recurring-payment/identify', page: 'cancel-rp-identify' }
 export const CANCEL_RP_AUTHENTICATE = { uri: '/buy/cancel-recurring-payment/authenticate' }
 export const CANCEL_RP_DETAILS = { uri: '/buy/cancel-recurring-payment/details', page: 'cancel-rp-details' }
@@ -71,6 +74,7 @@ export const CANCEL_RP_AGREEMENT_NOT_FOUND = {
   uri: '/buy/cancel-recurring-payment/agreement-not-found',
   page: 'cancel-rp-agreement-not-found'
 }
+export const CANCEL_RP_ALREADY_CANCELLED = { uri: '/buy/cancel-recurring-payment/already-cancelled', page: 'already-cancelled' }
 
 /**
  * These are informational static pages