@defra-fish/gafl-webapp-service 1.21.0 → 1.22.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.21.0",
+  "version": "1.22.0-rc.3",
   "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.21.0",
-    "@defra-fish/connectors-lib": "1.21.0",
+    "@defra-fish/business-rules-lib": "1.22.0-rc.3",
+    "@defra-fish/connectors-lib": "1.22.0-rc.3",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -75,5 +75,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.0"
   },
-  "gitHead": "4c2c180096ef2223a1973f48249607a217331e49"
+  "gitHead": "6870c58b973649f21cd7edc8088d86ed1fad789d"
 }

package/src/handlers/__tests__/error-handler.spec.js

@@ -0,0 +1,53 @@
+import { errorHandler } from '../error-handler.js'
+import { CLIENT_ERROR } from '../../uri.js'
+
+const mockView = jest.fn(() => ({
+  code: jest.fn()
+}))
+const h = {
+  view: mockView
+}
+
+describe('error-handler', () => {
+  describe('errorHandler', () => {
+    it('should pass the referer to the view if it is present', async () => {
+      const request = {
+        headers: {
+          referer: 'http://example.com'
+        },
+        response: {
+          isBoom: true,
+          output: {
+            statusCode: 400
+          }
+        }
+      }
+      await errorHandler(request, h)
+      expect(mockView).toBeCalledWith(
+        CLIENT_ERROR.page,
+        expect.objectContaining({
+          referer: 'http://example.com'
+        })
+      )
+    })
+
+    it('should not pass the referer to the view if it is not present', async () => {
+      const request = {
+        headers: {},
+        response: {
+          isBoom: true,
+          output: {
+            statusCode: 400
+          }
+        }
+      }
+      await errorHandler(request, h)
+      expect(mockView).toBeCalledWith(
+        CLIENT_ERROR.page,
+        expect.not.objectContaining({
+          referer: 'http://example.com'
+        })
+      )
+    })
+  })
+})

package/src/handlers/agreed-handler.js

@@ -18,7 +18,6 @@ import { preparePayment } from '../processors/payment.js'
 import { COMPLETION_STATUS } from '../constants.js'
 import { ORDER_COMPLETE, PAYMENT_CANCELLED, PAYMENT_FAILED } from '../uri.js'
 import { PAYMENT_JOURNAL_STATUS_CODES, GOVUK_PAY_ERROR_STATUS_CODES } from '@defra-fish/business-rules-lib'
-import { logStartDateError } from '../processors/permission-helper.js'
 const debug = db('webapp:agreed-handler')
 
 /**
@@ -195,7 +194,6 @@ const finaliseTransaction = async (request, transaction, status) => {
     transaction.permissions[i].endDate = response.permissions[i].endDate
     debug(`Setting obfuscated dob: ${response.permissions[i].licensee.obfuscatedDob}`)
     transaction.permissions[i].licensee.obfuscatedDob = response.permissions[i].licensee.obfuscatedDob
-    logStartDateError(response.permissions[i], request)
   }
   status[COMPLETION_STATUS.finalised] = true
   await request.cache().helpers.status.set(status)

package/src/handlers/error-handler.js

@@ -18,6 +18,7 @@ export const errorHandler = async (request, h) => {
      */
     return h
       .view(CLIENT_ERROR.page, {
+        referer: request?.headers?.referer,
         clientError: request.response.output.payload,
         path: request.path,
         uri: { new: NEW_TRANSACTION.uri, controller: CONTROLLER.uri, agreed: AGREED.uri }

package/src/pages/contact/contact/contact.njk

@@ -3,7 +3,7 @@
 {% from "input/macro.njk" import govukInput %}
 {% from "warning-text/macro.njk" import govukWarningText %}
 
-{% set title = 'How should we contact you?' %}
+{% set title = 'How should we contact the licence holder about reminders and important changes?' if data.isPhysical else 'How should we contact you?' %}
 {% set errorMsg = 'Choose how you would like to be contacted' %}
 {% set emailError = 'Enter your email address in the correct format, like name@example.com' %}
 {% set mobileError = "Enter your UK mobile number like '07700 900 900'" %}
@@ -138,7 +138,8 @@
 
 {% block pageContent %}
     {% if data.isPhysical %}
-        <p class="govuk-body-m">This is where we will send important updates and renewal reminders when your licence is expiring.</p>
+        <p class="govuk-body-m">This is where we will send renewal reminders when your licence is ending.</p>
+        <p class="govuk-body-m">We will also send important information like byelaw updates.</p>
     {% else %}
         {% if data.isJunior %}
             <p class="govuk-body-m">We don't provide physical cards for junior licences.</p>

package/src/pages/errors/client-error.njk

@@ -2,8 +2,6 @@
 {% from "fieldset/macro.njk" import govukFieldset %}
 {% from "button/macro.njk" import govukButton %}
 
-{% block pageTitle %}A problem has occurred{% endblock %}
-
 {% set title = '' %}
 {% if clientError.statusCode === 400 %}
     {% set title = 'Bad request' %}
@@ -15,33 +13,25 @@
     {% set title = 'Page not found' %}
 {% endif %}
 
+{% block pageTitle %}Sorry, there is a problem with the service - {{title}}{% endblock %}
+
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
             {% call govukFieldset({
               legend: {
-                text: "A problem has occurred",
+                text: "Sorry, there is a problem with the service",
                 classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-6",
                 isPageHeading: true
               }
             }) %}
-            {% if title|length %}
-                <h2 class="govuk-heading-m">{{ title }}</h2>
-            {% endif %}
-            <p class="govuk-body-m">An unexpected error occurred. Use only the buttons and links to navigate the service and do not use the back button from the payment pages.</p>
-            {% if path !== uri.agreed %}
-                {{ govukButton({
-                    attributes: { id: "try-again" },
-                    preventDoubleClick: true,
-                    name: "try-again",
-                    text: "Try again",
-                    href: uri.controller,
-                    classes: "govuk-!-margin-top-5"
-                }) }}
-            {% endif %}
-
+            <p class="govuk-body-m">
+                You can <a class="govuk-link" href="{{referer if referer else 'javascript:history.back()'}}">try to get back to your application</a>.
+            </p>
+            <p class="govuk-body">
+                If that does not work, you will have to <a class="govuk-link" href="{{ uri.new }}">start again</a>. Sorry.
+            </p>
             {% endcall %}
-            <p class="govuk-body-m"><a class="govuk-link" href="{{ uri.new }}">Start again</a></p>
      </div>
 </div>
 {% endblock %}

package/src/pages/terms-and-conditions/terms-and-conditions.njk

@@ -13,7 +13,7 @@
 {%
     set errorMap = {
         'agree': {
-            'any.required': { ref: '#agree', text: 'You have not agreed to the terms and conditions' }
+            'any.required': { ref: '#agree', text: 'You have not agreed to the licence conditions' }
         }
     }
 %}
@@ -58,11 +58,11 @@
                 {{ govukCheckboxes({
                   idPrefix: "agree",
                   name: "agree",
-                  errorMessage: { text: 'You must agree to the terms and conditions to continue' } if error,
+                  errorMessage: { text: 'You must agree to the licence conditions to continue' } if error,
                   items: [
                     {
                       value: "yes",
-                      text: "I agree to the terms and conditions"
+                      text: "I agree to the licence conditions"
                     }
                   ]
                 }) }}

package/src/processors/api-transaction.js

@@ -6,7 +6,6 @@ import * as concessionHelper from '../processors/concession-helper.js'
 import { countries } from './refdata-helper.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 import { licenceToStart } from '../pages/licence-details/licence-to-start/update-transaction.js'
-import { logStartDateError } from './permission-helper.js'
 
 export const prepareApiTransactionPayload = async request => {
   const transactionCache = await request.cache().helpers.transaction.get()
@@ -30,8 +29,6 @@ export const prepareApiTransactionPayload = async request => {
         })
       }
 
-      logStartDateError(permission, request)
-
       // Calculate the concession (proof entry) - disabled takes precedence
       if (concessionHelper.hasDisabled(p)) {
         permission.concessions = [

package/src/processors/__tests__/permission-helper.spec.js

@@ -1,81 +0,0 @@
-import moment from 'moment'
-import { logStartDateError } from '../permission-helper.js'
-
-const consoleError = console.error
-
-describe('logStartDateError', () => {
-  beforeAll(() => {
-    console.error = jest.fn()
-  })
-
-  beforeEach(jest.clearAllMocks)
-
-  afterAll(() => {
-    console.error = consoleError
-  })
-
-  it('logs if start date is before issue date', async () => {
-    const samplePermission = {
-      startDate: '2021-08-10T04:05:54Z',
-      issueDate: '2021-08-10T14:05:54Z'
-    }
-    await logStartDateError(samplePermission, getFakeRequest())
-    expect(console.error).toHaveBeenCalledWith('permission start date before issue date: ', samplePermission)
-  })
-
-  it('logs if start date is before current time, if no issue date is provided', async () => {
-    const samplePermission = {
-      startDate: moment()
-        .subtract(5, 'hours')
-        .toISOString()
-    }
-    await logStartDateError(samplePermission, getFakeRequest())
-    expect(console.error).toHaveBeenCalledWith('permission start date before current time: ', samplePermission)
-  })
-
-  it("doesn't log if start date is after issue date", async () => {
-    const samplePermission = {
-      startDate: '2021-08-10T14:35:54Z',
-      issueDate: '2021-08-10T14:05:54Z'
-    }
-    await logStartDateError(samplePermission, getFakeRequest())
-    expect(console.error).not.toHaveBeenCalled()
-  })
-
-  it("doesn't log if start date is after current date", async () => {
-    const samplePermission = {
-      startDate: moment()
-        .add(30, 'minutes')
-        .toISOString()
-    }
-    await logStartDateError(samplePermission, getFakeRequest())
-    expect(console.error).not.toHaveBeenCalled()
-  })
-
-  it("doesn't log if it's a POCL import", async () => {
-    const samplePermission = {
-      startDate: moment()
-        .subtract(5, 'hours')
-        .toISOString(),
-      dataSource: { id: 910400000 }
-    }
-    await logStartDateError(samplePermission, getFakeRequest())
-    expect(console.error).not.toHaveBeenCalled()
-  })
-
-  const getFakeRequest = () => ({
-    cache: jest.fn(() => ({
-      helpers: {
-        transaction: {
-          get: jest.fn(() => ({}))
-        },
-        page: {
-          get: jest.fn(() => ({}))
-        },
-        status: {
-          get: jest.fn(() => ({}))
-        }
-      }
-    }))
-  })
-})

package/src/processors/permission-helper.js

@@ -1,14 +0,0 @@
-import moment from 'moment'
-const POCL_DATA_SOURCE_ID = 910400000
-
-export const logStartDateError = async (permission, request) => {
-  const { startDate, issueDate } = permission
-  const startDateBeforeTargetDate = moment(startDate).isBefore(issueDate || undefined)
-  const isPOCLImport = permission?.dataSource?.id === POCL_DATA_SOURCE_ID
-  if (startDateBeforeTargetDate && !isPOCLImport) {
-    console.error(`permission start date before ${issueDate ? 'issue date' : 'current time'}: `, permission)
-    console.log('page cache', JSON.stringify(await request.cache().helpers.page.get()))
-    console.log('transaction cache', JSON.stringify(await request.cache().helpers.transaction.get()))
-    console.log('status cache', JSON.stringify(await request.cache().helpers.status.get()))
-  }
-}