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

package/package.json

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

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

@@ -1,5 +1,11 @@
 import handler from '../cancel-recurring-payment-authentication-handler'
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_ALREADY_CANCELLED } from '../../uri.js'
+import {
+  CANCEL_RP_IDENTIFY,
+  CANCEL_RP_DETAILS,
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
+} from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
@@ -20,7 +26,8 @@ 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_ALREADY_CANCELLED: { uri: Symbol('cancel-rp-already-cancelled-uri ') }
+  CANCEL_RP_ALREADY_CANCELLED: { uri: Symbol('cancel-rp-already-cancelled-uri ') },
+  CANCEL_RP_LICENCE_NOT_FOUND: { uri: Symbol('cancel-rp-licence-not-found-uri') }
 }))
 jest.mock('../../processors/recurring-payments-write-cache.js')
 
@@ -100,9 +107,9 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - no match', () => {
-    it('redirects to the CANCEL_RP_IDENTIFY.uri', async () => {
+    it('redirects to the CANCEL_RP_LICENCE_NOT_FOUND.uri', async () => {
       const { h } = await invokeHandlerWithMocks({ salesApiResponse: null })
-      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.uri)
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_LICENCE_NOT_FOUND.uri)
     })
 
     it('returns value of redirect', async () => {
@@ -122,7 +129,7 @@ describe('Cancel RP Authentication Handler', () => {
         CANCEL_RP_IDENTIFY.page,
         expect.objectContaining({
           payload: expect.any(Object),
-          error: { referenceNumber: 'not-found' }
+          errorRedirect: true
         })
       )
     })

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

@@ -1,4 +1,10 @@
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_ALREADY_CANCELLED } from '../../src/uri.js'
+import {
+  CANCEL_RP_IDENTIFY,
+  CANCEL_RP_DETAILS,
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
+} 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'
@@ -32,7 +38,8 @@ const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
   }
 
   if (!authenticationResult) {
-    context.pageData.error = { referenceNumber: 'not-found' }
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_LICENCE_NOT_FOUND.uri
   } else if (!authenticationResult.recurringPayment) {
     context.pageData.errorRedirect = true
     context.redirectUri = CANCEL_RP_AGREEMENT_NOT_FOUND.uri

package/src/locales/cy.json

@@ -440,6 +440,10 @@
   "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
   "licence_not_found_body_3": " neu ffonio 03708 506 506 (8am - 6pm o ddydd Llun i ddydd Gwener, ac eithrio gwyliau cyhoeddus). ",
   "licence_not_found_body_call_charges_link": "Gallwch weld costau’r galwadau yma (yn agor mewn tab newydd)",
+  "licence_not_found_rp_body_1": "If you keep seeing this page you can cancel your recurring card payment by:",
+  "licence_not_found_rp_bullet_point_1": "emailing ",
+  "licence_not_found_rp_bullet_point_1_2": " up to 15 days before your payment date",
+  "licence_not_found_rp_bullet_point_2": "calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays) up to the day before your payment date.",
   "licence_start_days": " diwrnod nesaf",
   "licence_start_enter_todays_date": "Rhowch ddyddiad heddiw os ydych chi am i’r drwydded 1 diwrnod neu 8 diwrnod ddechrau yn hwyrach heddiw.",
   "licence_start_error_date_real": "Mae’n rhaid i ddyddiad dechrau’r drwydded fod yn ddyddiad dilys",

package/src/locales/en.json

@@ -439,6 +439,10 @@
   "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
   "licence_not_found_body_3": " or calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
   "licence_not_found_body_call_charges_link": "View call charges (opens in new tab)",
+  "licence_not_found_rp_body_1": "If you keep seeing this page you can cancel your recurring card payment by:",
+  "licence_not_found_rp_bullet_point_1": "emailing ",
+  "licence_not_found_rp_bullet_point_1_2": " up to 15 days before your payment date",
+  "licence_not_found_rp_bullet_point_2": "calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays) up to the day before your payment date.",
   "licence_num": "Licence number",
   "licence_start_days": " days",
   "licence_start_enter_todays_date": "Enter today’s date if you want the 1-day or 8-day licence to start later today.",

package/src/pages/recurring-payments/cancel/licence-not-found/__tests__/route.spec.js

@@ -0,0 +1,21 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_LICENCE_NOT_FOUND } from '../../../../../uri.js'
+import '../route.js'
+
+jest.mock('../../../../../routes/page-route.js', () => jest.fn())
+jest.mock('../../../../../uri.js', () => ({
+  CANCEL_RP_LICENCE_NOT_FOUND: {
+    page: Symbol('licence-not-found page'),
+    uri: Symbol('licence-not-found uri')
+  }
+}))
+
+describe('CANCEL_RP_LICENCE_NOT_FOUND route', () => {
+  it('passes CANCEL_RP_LICENCE_NOT_FOUND.page as the first argument to pageRoute', () => {
+    expect(pageRoute).toHaveBeenCalledWith(CANCEL_RP_LICENCE_NOT_FOUND.page, expect.anything())
+  })
+
+  it('passes CANCEL_RP_LICENCE_NOT_FOUND.uri as the second argument to pageRoute', () => {
+    expect(pageRoute).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_LICENCE_NOT_FOUND.uri)
+  })
+})

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

@@ -0,0 +1,27 @@
+{% extends "layout.njk" %}
+{% extends "standard-form.njk" %}
+
+{% set title = mssgs.licence_not_found_title %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{ mssgs.licence_not_found_title }}</h1>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_body_1 }}
+      <a class="govuk-link" href="/buy/renew/identify">{{ mssgs.licence_not_found_body_previous_page }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_rp_body_1}}
+      </p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li> {{ mssgs.licence_not_found_rp_bullet_point_1 }} <a href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.licence_not_found_body_ea_link }}
+        </a> {{ mssgs.licence_not_found_rp_bullet_point_1_2 }} </li>
+
+        <li> {{ mssgs.licence_not_found_rp_bullet_point_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 }} </li>
+      </ul>
+    
+  </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/licence-not-found/route.js

@@ -0,0 +1,4 @@
+import { CANCEL_RP_LICENCE_NOT_FOUND } from '../../../../uri.js'
+import pageRoute from '../../../../routes/page-route.js'
+
+export default pageRoute(CANCEL_RP_LICENCE_NOT_FOUND.page, CANCEL_RP_LICENCE_NOT_FOUND.uri)

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

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

package/src/routes/journey-definition.js

@@ -35,7 +35,8 @@ import {
   CANCEL_RP_CONFIRM,
   CANCEL_RP_COMPLETE,
   CANCEL_RP_AGREEMENT_NOT_FOUND,
-  CANCEL_RP_ALREADY_CANCELLED
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -465,8 +466,16 @@ export default [
     current: CANCEL_RP_AGREEMENT_NOT_FOUND,
     backLink: CANCEL_RP_IDENTIFY.uri
   },
+  {
+    current: CANCEL_RP_LICENCE_NOT_FOUND,
+    backLink: CANCEL_RP_IDENTIFY.uri
+  },
   {
     current: CANCEL_RP_ALREADY_CANCELLED,
     backLink: CANCEL_RP_IDENTIFY.uri
+  },
+  {
+    current: CANCEL_RP_LICENCE_NOT_FOUND,
+    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 cancelRPLicenceNotFound from '../pages/recurring-payments/cancel/licence-not-found/route.js'
 import cancelRPAlreadyCancelled from '../pages/recurring-payments/cancel/already-cancelled/route.js'
 
 const telesalesRoutes = [
@@ -40,7 +41,8 @@ if (process.env.SHOW_CANCELLATION_JOURNEY === 'true') {
     ...cancelRPConfirm,
     ...cancelRPComplete,
     ...cancelRPAgreementNotFound,
-    ...cancelRPAlreadyCancelled
+    ...cancelRPAlreadyCancelled,
+    ...cancelRPLicenceNotFound
   )
 }
 export default telesalesRoutes

package/src/uri.js

@@ -74,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_LICENCE_NOT_FOUND = { uri: '/buy/cancel-recurring-payment/licence-not-found', page: 'licence-not-found' }
 export const CANCEL_RP_ALREADY_CANCELLED = { uri: '/buy/cancel-recurring-payment/already-cancelled', page: 'already-cancelled' }
 
 /**