@defra-fish/gafl-webapp-service 1.65.0-rc.1 → 1.65.0-rc.11

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

@@ -36,6 +36,22 @@ Object {
       },
       "path": "/oidc/role-required",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/journey-goal",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/journey-goal",
+    },
     Object {
       "handler": [Function],
       "method": "GET",
@@ -100,6 +116,54 @@ Object {
       },
       "path": "/buy/cancel-recurring-payment/complete",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/agreement-not-found",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "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",
+    },
+    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",
+    },
   ],
 }
 `;
@@ -140,6 +204,22 @@ Object {
       },
       "path": "/oidc/role-required",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/journey-goal",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/journey-goal",
+    },
   ],
 }
 `;
@@ -180,6 +260,22 @@ Object {
       },
       "path": "/oidc/role-required",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/journey-goal",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/journey-goal",
+    },
   ],
 }
 `;

package/src/routes/__tests__/back-links.spec.js

@@ -17,27 +17,64 @@ import {
   CONTACT,
   NEWSLETTER,
   CHOOSE_PAYMENT,
-  TERMS_AND_CONDITIONS
+  TERMS_AND_CONDITIONS,
+  JOURNEY_GOAL
 } from '../../uri.js'
 import { LICENCE_SUMMARY_SEEN, CONTACT_SUMMARY_SEEN } from '../../constants.js'
 import { isPhysical } from '../../processors/licence-type-display.js'
 jest.mock('../../processors/licence-type-display.js')
 
+describe('The journey-goal page', () => {
+  it('has no back-link', () => {
+    jest.isolateModules(() => {
+      process.env.CHANNEL = 'telesales'
+      const isolatedJourneyDefinition = require('../journey-definition.js').default
+      const isolatedJourneyGoal = isolatedJourneyDefinition.find(n => n.current.page === JOURNEY_GOAL.page)
+      expect(isolatedJourneyGoal.backLink({})).not.toBeTruthy()
+      delete process.env.CHANNEL
+    })
+  })
+})
+
 describe('The licence-for page', () => {
   const n = journeyDefinition.find(n => n.current.page === LICENCE_FOR.page)
-  it('has no back-link on initial viewing', () => {
+
+  it('has no back-link on initial viewing in websales journey', () => {
     expect(n.backLink({})).not.toBeTruthy()
   })
+
   it('has a back-link to the license summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
+
+  it('has a back-link to the journey-goal page in telesales journey', () => {
+    jest.isolateModules(() => {
+      process.env.CHANNEL = 'telesales'
+      const isolatedJourneyDefinition = require('../journey-definition.js').default
+      const isolatedJourneyGoal = isolatedJourneyDefinition.find(n => n.current.page === LICENCE_FOR.page)
+      expect(isolatedJourneyGoal.backLink({})).toBe(JOURNEY_GOAL.uri)
+      delete process.env.CHANNEL
+    })
+  })
+
+  it('has a back-link to the licence summary in telesales journey if the summary is seen', () => {
+    jest.isolateModules(() => {
+      process.env.CHANNEL = 'telesales'
+      const isolatedJourneyDefinition = require('../journey-definition.js').default
+      const isolatedJourneyGoal = isolatedJourneyDefinition.find(n => n.current.page === LICENCE_FOR.page)
+      expect(isolatedJourneyGoal.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
+      delete process.env.CHANNEL
+    })
+  })
 })
 
 describe('The date-of-birth page', () => {
   const n = journeyDefinition.find(n => n.current.page === DATE_OF_BIRTH.page)
+
   it('has a back-link to the name page on initial viewing', () => {
     expect(n.backLink({})).toBe(NAME.uri)
   })
+
   it('has a back-link to the licence summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
@@ -45,9 +82,11 @@ describe('The date-of-birth page', () => {
 
 describe('The licence-to-start page', () => {
   const n = journeyDefinition.find(n => n.current.page === LICENCE_TO_START.page)
+
   it('has a back-link to the disability concessions page on initial viewing', () => {
     expect(n.backLink({})).toBe(DISABILITY_CONCESSION.uri)
   })
+
   it('has a back-link to the license summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
@@ -55,9 +94,11 @@ describe('The licence-to-start page', () => {
 
 describe('The disability-concession page', () => {
   const n = journeyDefinition.find(n => n.current.page === DISABILITY_CONCESSION.page)
+
   it('has a back-link to the date-of-birth page on initial viewing', () => {
     expect(n.backLink({})).toBe(DATE_OF_BIRTH.uri)
   })
+
   it('has a back-link to the license summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
@@ -65,9 +106,11 @@ describe('The disability-concession page', () => {
 
 describe('The licence-type page', () => {
   const n = journeyDefinition.find(n => n.current.page === LICENCE_TYPE.page)
+
   it('has a back-link to the disability-concession page on initial viewing', () => {
     expect(n.backLink({})).toBe(LICENCE_TO_START.uri)
   })
+
   it('has a back-link to the license summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
@@ -75,9 +118,11 @@ describe('The licence-type page', () => {
 
 describe('The licence-length page', () => {
   const n = journeyDefinition.find(n => n.current.page === LICENCE_LENGTH.page)
+
   it('has a back-link to the licence-type page on initial viewing', () => {
     expect(n.backLink({})).toBe(LICENCE_TYPE.uri)
   })
+
   it('has a back-link to the license summary if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
@@ -85,9 +130,11 @@ describe('The licence-length page', () => {
 
 describe('The licence-start-time page', () => {
   const n = journeyDefinition.find(n => n.current.page === LICENCE_START_TIME.page)
+
   it('has a back-link to the licence-length page on initial viewing', () => {
     expect(n.backLink({})).toBe(LICENCE_LENGTH.uri)
   })
+
   it('has a back-link to the licence-to-start page if the summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_TO_START.uri)
   })
@@ -95,9 +142,11 @@ describe('The licence-start-time page', () => {
 
 describe('The name page', () => {
   const n = journeyDefinition.find(n => n.current.page === NAME.page)
+
   it('has a back-link to the licence-summary page if the licence-summary is seen', () => {
     expect(n.backLink({ fromSummary: LICENCE_SUMMARY_SEEN })).toBe(LICENCE_SUMMARY.uri)
   })
+
   it('has a back-link to the licence-for page if the contact summary has not been seen', () => {
     expect(n.backLink({})).toBe(LICENCE_FOR.uri)
   })
@@ -105,9 +154,11 @@ describe('The name page', () => {
 
 describe('The address-lookup page', () => {
   const n = journeyDefinition.find(n => n.current.page === ADDRESS_LOOKUP.page)
+
   it('has a back-link to the licence-summary page if the contact summary has not been seen', () => {
     expect(n.backLink({})).toBe(LICENCE_SUMMARY.uri)
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
   })
@@ -115,9 +166,11 @@ describe('The address-lookup page', () => {
 
 describe('The address-entry page', () => {
   const n = journeyDefinition.find(n => n.current.page === ADDRESS_ENTRY.page)
+
   it('has a back-link to the address-lookup page if the contact summary has not been seen', () => {
     expect(n.backLink({})).toBe(ADDRESS_LOOKUP.uri)
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
   })
@@ -128,10 +181,12 @@ describe('The licence-fulfilment page', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_FULFILMENT.page)
     expect(n.backLink({})).toBe(ADDRESS_LOOKUP.uri)
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_FULFILMENT.page)
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
   })
+
   it('has a back-link to the licence-summary page if in renewal', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_FULFILMENT.page)
     expect(n.backLink({}, { isRenewal: true })).toBe(LICENCE_SUMMARY.uri)
@@ -143,14 +198,17 @@ describe('The licence-confirmation page', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_CONFIRMATION_METHOD.page)
     expect(n.backLink({})).toBe(LICENCE_FULFILMENT.uri)
   })
+
   it('has a back-link to the licence-fulfilment page if the contact-summary has been seen and the last sumbitted page is licence-fulfilment', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_CONFIRMATION_METHOD.page)
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN, currentPage: LICENCE_FULFILMENT.page })).toBe(LICENCE_FULFILMENT.uri)
   })
+
   it('has a back-link to the licence-fulfilment page if the contact-summary has been seen and the last sumbitted page is licence-confirmation-method', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_CONFIRMATION_METHOD.page)
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN, currentPage: LICENCE_CONFIRMATION_METHOD.page })).toBe(LICENCE_FULFILMENT.uri)
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     const n = journeyDefinition.find(n => n.current.page === LICENCE_CONFIRMATION_METHOD.page)
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
@@ -159,18 +217,22 @@ describe('The licence-confirmation page', () => {
 
 describe('The contact page', () => {
   const n = journeyDefinition.find(n => n.current.page === CONTACT.page)
+
   it('has a back-link to the address-lookup page if the contact summary has not been seen and is not a physical licence', () => {
     expect(n.backLink({}, {})).toBe(ADDRESS_LOOKUP.uri)
   })
+
   it('has a back-link to the licence confirmation method page if the contact summary has not been seen and is a physical licence', () => {
     isPhysical.mockReturnValueOnce(true)
     expect(n.backLink({}, {})).toBe(LICENCE_CONFIRMATION_METHOD.uri)
   })
+
   it('has a back-link to the licence confirmation method page if the contact summary has been seen and the last submitted page is licence confirmation method', () => {
     expect(n.backLink({ currentPage: LICENCE_CONFIRMATION_METHOD.page, fromSummary: CONTACT_SUMMARY_SEEN })).toBe(
       LICENCE_CONFIRMATION_METHOD.uri
     )
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
   })
@@ -178,9 +240,11 @@ describe('The contact page', () => {
 
 describe('The newsletter page', () => {
   const n = journeyDefinition.find(n => n.current.page === NEWSLETTER.page)
+
   it('has a back-link to the contact page if the contact summary has not been seen', () => {
     expect(n.backLink({})).toBe(CONTACT.uri)
   })
+
   it('has a back-link to the contact-summary page if the contact-summary is seen', () => {
     expect(n.backLink({ fromSummary: CONTACT_SUMMARY_SEEN })).toBe(CONTACT_SUMMARY.uri)
   })
@@ -188,6 +252,7 @@ describe('The newsletter page', () => {
 
 describe('The choose payment page', () => {
   const n = journeyDefinition.find(n => n.current.page === CHOOSE_PAYMENT.page)
+
   it('has a back-link to the terms and conditions page', () => {
     expect(n.backLink).toBe(TERMS_AND_CONDITIONS.uri)
   })

package/src/routes/journey-definition.js

@@ -33,7 +33,11 @@ import {
   CANCEL_RP_IDENTIFY,
   CANCEL_RP_DETAILS,
   CANCEL_RP_CONFIRM,
-  CANCEL_RP_COMPLETE
+  CANCEL_RP_COMPLETE,
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  JOURNEY_GOAL,
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -42,8 +46,34 @@ import { licenceToStartResults } from '../pages/licence-details/licence-to-start
 import { addressLookupResults } from '../pages/contact/address/lookup/result-function.js'
 import { ageConcessionResults } from '../pages/concessions/date-of-birth/result-function.js'
 import { licenceLengthResults } from '../pages/licence-details/licence-length/result-function.js'
+import { journeyGoalResults } from '../pages/journey-goal/result-function.js'
 import { isPhysical } from '../processors/licence-type-display.js'
 
+const getJourneyStart = () => {
+  if (process.env.CHANNEL === 'telesales') {
+    return [
+      {
+        current: { page: 'start' },
+        next: {
+          [CommonResults.OK]: {
+            page: JOURNEY_GOAL
+          }
+        }
+      }
+    ]
+  }
+  return [
+    {
+      current: { page: 'start' },
+      next: {
+        [CommonResults.OK]: {
+          page: LICENCE_FOR
+        }
+      }
+    }
+  ]
+}
+
 /**
  * The structure of each atom is as follows
  * current - the current page
@@ -51,13 +81,22 @@ import { isPhysical } from '../processors/licence-type-display.js'
  * backLink - the location the back link, a uri literal, a function of the current status of a function of the status and transaction
  */
 export default [
+  ...getJourneyStart(),
+
   {
-    current: { page: 'start' },
+    current: JOURNEY_GOAL,
     next: {
-      [CommonResults.OK]: {
+      [journeyGoalResults.CANCEL_RECURRING_PAYMENT]: {
+        page: CANCEL_RP_IDENTIFY
+      },
+      [journeyGoalResults.RENEW_PERMISSION]: {
+        page: IDENTIFY
+      },
+      [journeyGoalResults.PURCHASE_PERMISSION]: {
         page: LICENCE_FOR
       }
-    }
+    },
+    backLink: () => null
   },
 
   {
@@ -70,7 +109,15 @@ export default [
         page: LICENCE_SUMMARY
       }
     },
-    backLink: s => (s.fromSummary ? LICENCE_SUMMARY.uri : null)
+    backLink: s => {
+      if (s.fromSummary) {
+        return LICENCE_SUMMARY.uri
+      }
+      if (process.env.CHANNEL === 'telesales') {
+        return JOURNEY_GOAL.uri
+      }
+      return null
+    }
   },
 
   {
@@ -418,9 +465,9 @@ export default [
       [CommonResults.OK]: {
         page: LICENCE_SUMMARY
       }
-    }
+    },
+    ...(process.env.CHANNEL === 'telesales' ? { backLink: JOURNEY_GOAL.uri } : {})
   },
-
   {
     current: LICENCE_NOT_FOUND,
     backLink: IDENTIFY.uri
@@ -439,7 +486,8 @@ export default [
       [CommonResults.OK]: {
         page: CANCEL_RP_DETAILS
       }
-    }
+    },
+    ...(process.env.CHANNEL === 'telesales' ? { backLink: JOURNEY_GOAL.uri } : {})
   },
   {
     current: CANCEL_RP_DETAILS,
@@ -455,8 +503,20 @@ 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,
+    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
   }
 ]

package/src/routes/telesales-routes.js

@@ -1,9 +1,13 @@
 import { OIDC_SIGNIN, OIDC_ACCOUNT_DISABLED, OIDC_ROLE_REQUIRED, CONTROLLER } from '../uri.js'
 import { signIn } from '../handlers/oidc-handler.js'
+import journeyGoal from '../pages/journey-goal/route.js'
 import cancelRPIdentify from '../pages/recurring-payments/cancel/identify/route.js'
 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 = [
   {
@@ -28,13 +32,19 @@ const telesalesRoutes = [
     path: OIDC_ROLE_REQUIRED.uri,
     handler: async (request, h) => h.view(OIDC_ROLE_REQUIRED.page, { uri: { buy: CONTROLLER.uri } }),
     options: { auth: false }
-  }
+  },
+  ...journeyGoal
 ]
 
 if (process.env.SHOW_CANCELLATION_JOURNEY === 'true') {
-  telesalesRoutes.push(...cancelRPIdentify)
-  telesalesRoutes.push(...cancelRPDetails)
-  telesalesRoutes.push(...cancelRPConfirm)
-  telesalesRoutes.push(...cancelRPComplete)
+  telesalesRoutes.push(
+    ...cancelRPIdentify,
+    ...cancelRPDetails,
+    ...cancelRPConfirm,
+    ...cancelRPComplete,
+    ...cancelRPAgreementNotFound,
+    ...cancelRPAlreadyCancelled,
+    ...cancelRPLicenceNotFound
+  )
 }
 export default telesalesRoutes

package/src/uri.js

@@ -62,11 +62,22 @@ 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' }
 export const CANCEL_RP_CONFIRM = { uri: '/buy/cancel-recurring-payment/confirm', page: 'cancel-rp-confirm' }
 export const CANCEL_RP_COMPLETE = { uri: '/buy/cancel-recurring-payment/complete', page: 'cancel-rp-complete' }
+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' }
+
+export const JOURNEY_GOAL = { uri: '/buy/journey-goal', page: 'journey-goal' }
 
 /**
  * These are informational static pages