@defra-fish/gafl-webapp-service 1.63.0 → 1.64.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.63.0",
+  "version": "1.64.0-rc.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.63.0",
-    "@defra-fish/connectors-lib": "1.63.0",
+    "@defra-fish/business-rules-lib": "1.64.0-rc.0",
+    "@defra-fish/connectors-lib": "1.64.0-rc.0",
     "@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": "7cfb8ef668002fc340b755dd3aaa4572063e115c"
+  "gitHead": "53e28e0083ecb2c50138497dd15a0570a342eca2"
 }

package/src/locales/cy.json

@@ -350,6 +350,7 @@
   "identify_title": "Adnewyddu eich trwydded bysgota?",
   "important_info_contact_content_salmon": "Byddwn yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon nodyn atgoffa i anfon adroddiad daliad. Mae’n bosibl y byddwn hefyd yn anfon gwybodaeth bwysig arall, megis newidiadau sy’n effeithio ar y drwydded neu is-ddeddfau pysgota.",
   "important_info_contact_content_not_salmon": "Mae’n bosibl y byddwn hefyd yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon gwybodaeth bwysig, megis newidiadau sy’n effeithio ar y drwydded neu’r is-ddeddfau pysgota.",
+  "important_info_contact_content_junior_12_months": "Byddwn hefyd yn defnyddio’r cyfeiriad e-bost neu’r rhif symudol hwn i anfon nodyn atgoffa am adnewyddu neu ddiweddariadau pwysig eraill, fel newidiadau i is-ddeddfau pysgota.",
   "important_info_contact_error_choose_short": "Dewiswch i ble y dylem anfon y drwydded bysgota",
   "important_info_contact_error_choose": "Dewiswch sut y dylem gysylltu â deiliad y drwydded",
   "important_info_contact_error_email": "Rhowch gyfeiriad e-bost yn y fformat cywir",

package/src/locales/en.json

@@ -350,6 +350,7 @@
   "identify_title": "Renew your rod fishing licence?",
   "important_info_contact_content_salmon": "We will use this email or mobile number to send a reminder to report a catch return. We may also send other important information, such as changes affecting the licence or the fishing byelaws.",
   "important_info_contact_content_not_salmon": "We may also use this email or mobile number to send important information, such as changes affecting the licence or the fishing byelaws.",
+  "important_info_contact_content_junior_12_months": "We will also use this email or mobile number to send renewal reminders and other important updates, like changes to rod fishing byelaws.",
   "important_info_contact_error_choose_short": "Choose where we should send the fishing licence",
   "important_info_contact_error_choose": "Choose how we should contact the licence holder",
   "important_info_contact_error_email": "Enter an email address in the correct format",

package/src/pages/contact/contact/__tests__/route.spec.js

@@ -56,7 +56,8 @@ describe('name > route', () => {
     important_info_contact_content_salmon: 'Salmon content',
     important_info_contact_content_not_salmon: 'Not salmon content',
     licence_confirm_method_where_title_you: 'Where send you',
-    licence_confirm_method_where_title_other: 'Where send other'
+    licence_confirm_method_where_title_other: 'Where send other',
+    important_info_contact_content_junior_12_months: 'Junior content'
   })
 
   describe('getData', () => {
@@ -149,10 +150,10 @@ describe('name > route', () => {
       [true, 'Trout and coarse', '8D', false, 'Not salmon content'],
       [false, 'Salmon and sea trout', '1D', false, 'Salmon content'],
       [false, 'Trout and coarse', '1D', false, 'Not salmon content'],
-      [true, 'Salmon and sea trout', '12M', true, 'Salmon content'],
-      [true, 'Trout and coarse', '12M', true, 'Not salmon content'],
-      [false, 'Salmon and sea trout', '12M', true, 'Salmon content'],
-      [false, 'Trout and coarse', '12M', true, 'Not salmon content']
+      [true, 'Salmon and sea trout', '12M', true, 'Junior content'],
+      [true, 'Trout and coarse', '12M', true, 'Junior content'],
+      [false, 'Salmon and sea trout', '12M', true, 'Junior content'],
+      [false, 'Trout and coarse', '12M', true, 'Junior content']
     ])(
       'content has correct value depending on isLicenceForYou is %s, licenceType is %s, licenceLength is %s and junior is %s',
       async (isLicenceForYou, licenceType, licenceLength, junior, expected) => {

package/src/pages/contact/contact/route.js

@@ -13,8 +13,7 @@ export const getData = async request => {
   const permission = await request.cache().helpers.transaction.getCurrentPermission()
   const mssgs = request.i18n.getCatalog()
 
-  // We need to have set the licence length, dob and start date here to determining the contact
-  // messaging
+  // We need to have set the licence length, dob and start date here to determine the contact messaging
   if (!permission.licensee.birthDate) {
     throw new GetDataRedirect(DATE_OF_BIRTH.uri)
   }
@@ -29,11 +28,12 @@ export const getData = async request => {
 
   const junior = hasJunior(permission)
   const twelveMonthNonJuniorLicence = !junior && permission.licenceLength === '12M'
+  const twelveMonthJuniorLicence = junior && permission.licenceLength === '12M'
 
   return {
     title: getTitle(permission, mssgs, twelveMonthNonJuniorLicence),
     postHint: getPostHint(permission, mssgs),
-    content: getContent(permission, mssgs, twelveMonthNonJuniorLicence),
+    content: getContent(permission, mssgs, twelveMonthNonJuniorLicence, twelveMonthJuniorLicence),
     emailConfirmation: permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email,
     emailText: getEmailText(permission, mssgs, twelveMonthNonJuniorLicence),
     mobileConfirmation: permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.text,
@@ -41,7 +41,8 @@ export const getData = async request => {
     licensee: permission.licensee,
     isPhysical: isPhysical(permission),
     errorMessage: getErrorText(mssgs, twelveMonthNonJuniorLicence),
-    twelveMonthNonJuniorLicence
+    twelveMonthNonJuniorLicence,
+    twelveMonthJuniorLicence
   }
 }
 
@@ -55,8 +56,9 @@ const getTitle = (permission, messages, twelveMonthNonJuniorLicence) => {
 const getPostHint = (permission, messages) =>
   permission.isLicenceForYou ? messages.important_info_contact_post_hint_you : messages.important_info_contact_post_hint_other
 
-const getContent = (permission, messages, twelveMonthNonJuniorLicence) => {
+const getContent = (permission, messages, twelveMonthNonJuniorLicence, twelveMonthJuniorLicence) => {
   const isSalmonLicense = permission.licenceType === 'Salmon and sea trout'
+
   if (twelveMonthNonJuniorLicence) {
     if (isSalmonLicense) {
       return permission.isLicenceForYou
@@ -67,6 +69,11 @@ const getContent = (permission, messages, twelveMonthNonJuniorLicence) => {
       ? messages.important_info_contact_post_not_salmon_you
       : messages.important_info_contact_post_not_salmon_other
   }
+
+  if (twelveMonthJuniorLicence) {
+    return messages.important_info_contact_content_junior_12_months
+  }
+
   return isSalmonLicense ? messages.important_info_contact_content_salmon : messages.important_info_contact_content_not_salmon
 }