@defra-fish/gafl-webapp-service 1.63.0-rc.1 → 1.63.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.63.0-rc.1",
+  "version": "1.63.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.63.0-rc.1",
-    "@defra-fish/connectors-lib": "1.63.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.63.0-rc.3",
+    "@defra-fish/connectors-lib": "1.63.0-rc.3",
     "@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": "93c7097feecf01ce2d207cafe43227f7aaa77376"
+  "gitHead": "326d589e6fa640bf0a4e895c7dd280699c1cde87"
 }

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

@@ -66,7 +66,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -131,7 +131,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -196,7 +196,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -261,7 +261,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -326,7 +326,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -392,7 +392,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -458,7 +458,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -563,7 +563,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -648,7 +648,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -753,7 +753,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -838,7 +838,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -944,7 +944,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1030,7 +1030,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1136,7 +1136,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1222,7 +1222,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1327,7 +1327,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1432,7 +1432,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1537,7 +1537,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1642,7 +1642,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1748,7 +1748,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1854,7 +1854,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -1960,7 +1960,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2046,7 +2046,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2152,7 +2152,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2238,7 +2238,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2345,7 +2345,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2432,7 +2432,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2539,7 +2539,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {
@@ -2626,7 +2626,7 @@ Array [
       "text": Symbol(contact-summary-row-address),
     },
     "value": Object {
-      "text": "14 Howecroft Court, Eastmead Lane, Bristol, BS9 1HJ, GB",
+      "text": "14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB",
     },
   },
   Object {

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

@@ -124,6 +124,18 @@ const getRequestMock = ({
 })
 
 describe('contact-summary > route', () => {
+  it('omits undefined address fields from the output string', () => {
+    const permission = getMockPermission({
+      locality: undefined
+    })
+
+    const request = getRequestMock({ permission })
+    const rowGenerator = new route.RowGenerator(request, permission)
+    const row = rowGenerator.generateAddressRow('GB')
+
+    expect(row.value.text).toBe('14 howecroft court, eastmead lane, bristol, BS9 1HJ, GB')
+  })
+
   it('should set status.fromSummary to seen', async () => {
     const mockPermission = jest.fn()
     const mockRequest = getRequestMock({ setStatusPermission: mockPermission })

package/src/pages/summary/contact-summary/contact-summary.njk

@@ -15,7 +15,9 @@
         isPageHeading: true
       }
     }) %}
-        {{ govukSummaryList({ rows: data.summaryTable }) }}
+        <div class="address_list">
+            {{ govukSummaryList({ rows: data.summaryTable }) }}
+        </div>
     {% endcall %}
 {% endset -%}
 

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

@@ -112,7 +112,15 @@ export class RowGenerator {
 
   generateAddressRow (countryName) {
     const { licensee } = this.permission
-    const text = [licensee.premises, licensee.street, licensee.locality, licensee.town, licensee.postcode, countryName?.toUpperCase()]
+
+    const text = [
+      licensee.premises?.toLowerCase(),
+      licensee.street?.toLowerCase(),
+      licensee.locality?.toLowerCase(),
+      licensee.town?.toLowerCase(),
+      licensee.postcode?.toUpperCase(),
+      countryName?.toUpperCase()
+    ]
       .filter(Boolean)
       .join(', ')
 

package/src/services/payment/__test__/govuk-pay-service.spec.js

@@ -214,15 +214,17 @@ describe('The govuk-pay-service', () => {
     })
 
     it('should log debug message when response.ok is true', async () => {
+      const expectedLoggedOutput = { success: true, paymentId: 'abc123', bar: Symbol('bar'), baz: Symbol('baz') }
+      const resBody = { card_details: { foo: Symbol('foo') }, card_brand: Symbol('foobarbaz'), ...expectedLoggedOutput }
       const mockResponse = {
         ok: true,
-        json: jest.fn().mockResolvedValue({ success: true, paymentId: 'abc123' })
+        json: jest.fn().mockResolvedValue(resBody)
       }
       govUkPayApi.createPayment.mockResolvedValue(mockResponse)
 
       await sendPayment(preparedPayment)
 
-      expect(debug).toHaveBeenCalledWith('Successful payment creation response: %o', { success: true, paymentId: 'abc123' })
+      expect(debug).toHaveBeenCalledWith('Successful payment creation response: %o', expectedLoggedOutput)
     })
 
     it('should log error message when response.ok is false', async () => {
@@ -334,15 +336,17 @@ describe('The govuk-pay-service', () => {
     })
 
     it('should log debug message when response.ok is true', async () => {
+      const expectedLoggedOutput = { success: true, paymentId: 'abc123', bar: Symbol('bar'), baz: Symbol('baz') }
+      const resBody = { card_details: { foo: Symbol('foo') }, card_brand: Symbol('foobarbaz'), ...expectedLoggedOutput }
       const mockResponse = {
         ok: true,
-        json: jest.fn().mockResolvedValue({ success: true, paymentId: 'abc123' })
+        json: jest.fn().mockResolvedValue(resBody)
       }
       govUkPayApi.createRecurringPaymentAgreement.mockResolvedValue(mockResponse)
 
       await sendRecurringPayment(preparedPayment)
 
-      expect(debug).toHaveBeenCalledWith('Successful agreement creation response: %o', { success: true, paymentId: 'abc123' })
+      expect(debug).toHaveBeenCalledWith('Successful agreement creation response: %o', expectedLoggedOutput)
     })
 
     it('should log error message  when response.ok is false', async () => {

package/src/services/payment/govuk-pay-service.js

@@ -60,7 +60,7 @@ export const sendPayment = async (preparedPayment, recurring = false) => {
 
   if (response.ok) {
     const resBody = await response.json()
-    debug('Successful payment creation response: %o', resBody)
+    debug('Successful payment creation response: %o', loggableBody(resBody))
     return resBody
   } else {
     const errMsg = await getTransactionErrorMessage(preparedPayment.id, preparedPayment, response)
@@ -93,9 +93,7 @@ export const getPaymentStatus = async (paymentId, recurring = false) => {
 
   if (response.ok) {
     const resBody = await response.json()
-    // eslint-disable-next-line camelcase
-    const { card_brand, card_details, ...loggableBody } = resBody
-    debug('Payment status response: %o', loggableBody)
+    debug('Payment status response: %o', loggableBody(resBody))
     return resBody
   } else {
     const mes = {
@@ -123,12 +121,18 @@ const createRecurringPaymentAgreement = async preparedPayment => {
   }
 }
 
+const loggableBody = resBody => {
+  // eslint-disable-next-line camelcase
+  const { card_brand, card_details, ...filteredBody } = resBody
+  return filteredBody
+}
+
 export const sendRecurringPayment = async preparedPayment => {
   const response = await createRecurringPaymentAgreement(preparedPayment)
 
   if (response.ok) {
     const resBody = await response.json()
-    debug('Successful agreement creation response: %o', resBody)
+    debug('Successful agreement creation response: %o', loggableBody(resBody))
     return resBody
   } else {
     const errMsg = await getTransactionErrorMessage(preparedPayment.reference, preparedPayment, response)