@defra-fish/gafl-webapp-service 1.57.0-rc.4 → 1.57.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.57.0-rc.4",
+  "version": "1.57.0-rc.5",
   "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.57.0-rc.4",
-    "@defra-fish/connectors-lib": "1.57.0-rc.4",
+    "@defra-fish/business-rules-lib": "1.57.0-rc.5",
+    "@defra-fish/connectors-lib": "1.57.0-rc.5",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -80,5 +80,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "54475774a2f320e8ba0ed1e6baa624e23f14decc"
+  "gitHead": "2487056384121a43e87b2328d1f42147d4b4aac3"
 }

package/src/pages/summary/licence-summary/__tests__/__snapshots__/route.spec.js.snap

@@ -1128,18 +1128,6 @@ Array [
     },
   },
   Object {
-    "actions": Object {
-      "items": Array [
-        Object {
-          "attributes": Object {
-            "id": "change-licence-length",
-          },
-          "href": "/buy/licence-length",
-          "text": "contact_summary_change",
-          "visuallyHiddenText": "licence_summary_length",
-        },
-      ],
-    },
     "key": Object {
       "text": "licence_summary_length",
     },

package/src/pages/summary/licence-summary/__tests__/route.spec.js

@@ -7,7 +7,11 @@ import { licenceTypeDisplay } from '../../../../processors/licence-type-display.
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 import mappingConstants from '../../../../processors/mapping-constants.js'
 import { displayPermissionPrice } from '../../../../processors/price-display.js'
+import { hasJunior } from '../../../../processors/concession-helper.js'
 
+jest.mock('../../../../processors/concession-helper.js', () => ({
+  hasJunior: jest.fn(() => false)
+}))
 jest.mock('../../../../processors/licence-type-display.js', () => ({
   licenceTypeDisplay: jest.fn(() => 'Special Canal Licence, Shopping Trollies and Old Wellies')
 }))
@@ -370,20 +374,30 @@ describe('licence-summary > route', () => {
     )
   })
 
+  it('calls hasJunior with permission', async () => {
+    const currentPermission = getMockNewPermission()
+    const mockRequest = getMockRequest({ currentPermission })
+
+    await getData(mockRequest)
+
+    expect(hasJunior).toHaveBeenCalledWith(currentPermission)
+  })
+
   describe('licence summary rows', () => {
     it.each`
-      desc                               | currentPermission
-      ${'1 year renewal'}                | ${getMockPermission()}
-      ${'1 year new licence'}            | ${getMockNewPermission()}
-      ${'1 year senior renewal'}         | ${getMockSeniorPermission()}
-      ${'8 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '8D' }}
-      ${'1 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '1D' }}
-      ${'Junior licence'}                | ${getMockJuniorPermission()}
-      ${'Blue badge concession'}         | ${getMockBlueBadgePermission()}
-      ${'Continuing permission'}         | ${getMockContinuingPermission()}
-      ${'Another date permission'}       | ${{ ...getMockPermission(), licenceToStart: 'another-date' }}
-      ${'1 year new three rod licence '} | ${{ ...getMockNewPermission(), numberOfRods: '3' }}
-    `('creates licence summary name rows for $desc', async ({ currentPermission }) => {
+      desc                               | currentPermission                                             | junior
+      ${'1 year renewal'}                | ${getMockPermission()}                                        | ${false}
+      ${'1 year new licence'}            | ${getMockNewPermission()}                                     | ${false}
+      ${'1 year senior renewal'}         | ${getMockSeniorPermission()}                                  | ${false}
+      ${'8 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '8D' }}         | ${false}
+      ${'1 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '1D' }}         | ${false}
+      ${'Junior licence'}                | ${getMockJuniorPermission()}                                  | ${true}
+      ${'Blue badge concession'}         | ${getMockBlueBadgePermission()}                               | ${false}
+      ${'Continuing permission'}         | ${getMockContinuingPermission()}                              | ${false}
+      ${'Another date permission'}       | ${{ ...getMockPermission(), licenceToStart: 'another-date' }} | ${false}
+      ${'1 year new three rod licence '} | ${{ ...getMockNewPermission(), numberOfRods: '3' }}           | ${false}
+    `('creates licence summary name rows for $desc', async ({ currentPermission, junior }) => {
+      hasJunior.mockReturnValueOnce(junior)
       const mockRequest = getMockRequest({ currentPermission })
       const data = await getData(mockRequest)
       expect(data.licenceSummaryRows).toMatchSnapshot()

package/src/pages/summary/licence-summary/route.js

@@ -22,6 +22,7 @@ import { CONCESSION, CONCESSION_PROOF } from '../../../processors/mapping-consta
 import { nextPage } from '../../../routes/next-page.js'
 import { addLanguageCodeToUri } from '../../../processors/uri-helper.js'
 import { displayPermissionPrice } from '../../../processors/price-display.js'
+import { hasJunior } from '../../../processors/concession-helper.js'
 import db from 'debug'
 const debug = db('webapp:licence-summary')
 
@@ -115,7 +116,7 @@ class RowGenerator {
   generateLicenceLengthRow () {
     const args = ['licence_summary_length', this.labels[`licence_type_${this.permission.licenceLength.toLowerCase()}`]]
 
-    if (this.permission.numberOfRods !== '3') {
+    if (this.permission.numberOfRods !== '3' && !hasJunior(this.permission)) {
       args.push(LICENCE_LENGTH.uri, 'change-licence-length')
     }