@defra-fish/recurring-payments-job 1.58.0-rc.8 → 1.58.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/recurring-payments-job",
-  "version": "1.58.0-rc.8",
+  "version": "1.58.0",
   "description": "Rod Licensing Recurring Payments Job",
   "type": "module",
   "engines": {
@@ -36,10 +36,10 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.58.0-rc.8",
-    "@defra-fish/connectors-lib": "1.58.0-rc.8",
+    "@defra-fish/business-rules-lib": "1.58.0",
+    "@defra-fish/connectors-lib": "1.58.0",
     "commander": "^7.2.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "1b648b8fc1b410b68039adfc312453046e7f70ee"
+  "gitHead": "4d2c2ef1bf3016fa38140a1bd78bf26ba5adb68d"
 }

package/src/__tests__/recurring-payments-processor.spec.js

@@ -1,5 +1,6 @@
 import { salesApi } from '@defra-fish/connectors-lib'
 import { processRecurringPayments } from '../recurring-payments-processor.js'
+import { sendPayment } from '../services/govuk-pay-service.js'
 
 jest.mock('@defra-fish/business-rules-lib')
 jest.mock('@defra-fish/connectors-lib', () => ({
@@ -8,9 +9,14 @@ jest.mock('@defra-fish/connectors-lib', () => ({
     preparePermissionDataForRenewal: jest.fn(() => ({
       licensee: { countryCode: 'GB-ENG' }
     })),
-    createTransaction: jest.fn()
+    createTransaction: jest.fn(() => ({
+      cost: 30
+    }))
   }
 }))
+jest.mock('../services/govuk-pay-service.js', () => ({
+  sendPayment: jest.fn()
+}))
 
 describe('recurring-payments-processor', () => {
   beforeEach(() => {
@@ -53,7 +59,9 @@ describe('recurring-payments-processor', () => {
 
   it('prepares the data for found recurring payments', async () => {
     const referenceNumber = Symbol('reference')
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment(referenceNumber)])
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
 
     await processRecurringPayments()
 
@@ -61,7 +69,7 @@ describe('recurring-payments-processor', () => {
   })
 
   it('creates a transaction with the correct data', async () => {
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber: '1' } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment()])
 
     const isLicenceForYou = Symbol('isLicenceForYou')
     const isRenewal = Symbol('isRenewal')
@@ -102,13 +110,16 @@ describe('recurring-payments-processor', () => {
       ]
     }
 
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
+
     await processRecurringPayments()
 
     expect(salesApi.createTransaction).toHaveBeenCalledWith(expectedData)
   })
 
   it('strips the concession name returned by preparePermissionDataForRenewal before passing to createTransaction', async () => {
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber: '1' } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment()])
 
     salesApi.preparePermissionDataForRenewal.mockReturnValueOnce({
       licensee: {
@@ -123,6 +134,9 @@ describe('recurring-payments-processor', () => {
       ]
     })
 
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
+
     await processRecurringPayments()
 
     expect(salesApi.createTransaction).toHaveBeenCalledWith(
@@ -141,7 +155,7 @@ describe('recurring-payments-processor', () => {
   })
 
   it('assigns the correct startDate when licenceStartTime is present', async () => {
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber: '1' } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment()])
 
     salesApi.preparePermissionDataForRenewal.mockReturnValueOnce({
       licensee: { countryCode: 'GB-ENG' },
@@ -149,6 +163,9 @@ describe('recurring-payments-processor', () => {
       licenceStartTime: 15
     })
 
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
+
     await processRecurringPayments()
 
     expect(salesApi.createTransaction).toHaveBeenCalledWith(
@@ -159,13 +176,16 @@ describe('recurring-payments-processor', () => {
   })
 
   it('assigns the correct startDate when licenceStartTime is not present', async () => {
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber: '1' } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment()])
 
     salesApi.preparePermissionDataForRenewal.mockReturnValueOnce({
       licensee: { countryCode: 'GB-ENG' },
       licenceStartDate: '2020-03-14'
     })
 
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
+
     await processRecurringPayments()
 
     expect(salesApi.createTransaction).toHaveBeenCalledWith(
@@ -176,7 +196,7 @@ describe('recurring-payments-processor', () => {
   })
 
   it('raises an error if createTransaction fails', async () => {
-    salesApi.getDueRecurringPayments.mockReturnValueOnce([{ expanded: { activePermission: { entity: { referenceNumber: '1' } } } }])
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment()])
     const error = 'Wuh-oh!'
     salesApi.createTransaction.mockImplementationOnce(() => {
       throw new Error(error)
@@ -185,6 +205,37 @@ describe('recurring-payments-processor', () => {
     await expect(processRecurringPayments()).rejects.toThrowError(error)
   })
 
+  it('prepares and sends the payment request', async () => {
+    const agreementId = Symbol('agreementId')
+    const transactionId = Symbol('transactionId')
+
+    salesApi.getDueRecurringPayments.mockReturnValueOnce([getMockDueRecurringPayment('foo', agreementId)])
+
+    salesApi.preparePermissionDataForRenewal.mockReturnValueOnce({
+      licensee: { countryCode: 'GB-ENG' }
+    })
+
+    salesApi.createTransaction.mockReturnValueOnce({
+      cost: 50,
+      id: transactionId
+    })
+
+    const mockPaymentResponse = { payment_id: 'test-payment-id' }
+    sendPayment.mockResolvedValueOnce(mockPaymentResponse)
+
+    const expectedData = {
+      amount: 5000,
+      description: 'The recurring card payment for your rod fishing licence',
+      reference: transactionId,
+      authorisation_mode: 'agreement',
+      agreement_id: agreementId
+    }
+
+    await processRecurringPayments()
+
+    expect(sendPayment).toHaveBeenCalledWith(expectedData)
+  })
+
   describe.each([2, 3, 10])('if there are %d recurring payments', count => {
     it('prepares the data for each one', async () => {
       const references = []
@@ -194,9 +245,11 @@ describe('recurring-payments-processor', () => {
 
       const mockGetDueRecurringPayments = []
       references.forEach(reference => {
-        mockGetDueRecurringPayments.push({ expanded: { activePermission: { entity: { referenceNumber: reference } } } })
+        mockGetDueRecurringPayments.push(getMockDueRecurringPayment(reference))
       })
       salesApi.getDueRecurringPayments.mockReturnValueOnce(mockGetDueRecurringPayments)
+      const mockPaymentResponse = { payment_id: 'test-payment-id' }
+      sendPayment.mockResolvedValue(mockPaymentResponse)
 
       const expectedData = []
       references.forEach(reference => {
@@ -211,7 +264,7 @@ describe('recurring-payments-processor', () => {
     it('creates a transaction for each one', async () => {
       const mockGetDueRecurringPayments = []
       for (let i = 0; i < count; i++) {
-        mockGetDueRecurringPayments.push({ expanded: { activePermission: { entity: { referenceNumber: i } } } })
+        mockGetDueRecurringPayments.push(getMockDueRecurringPayment(i))
       }
       salesApi.getDueRecurringPayments.mockReturnValueOnce(mockGetDueRecurringPayments)
 
@@ -241,5 +294,53 @@ describe('recurring-payments-processor', () => {
 
       expect(salesApi.createTransaction.mock.calls).toEqual(expectedData)
     })
+
+    it('sends a payment for each one', async () => {
+      const mockGetDueRecurringPayments = []
+      const agreementIds = []
+      for (let i = 0; i < count; i++) {
+        const agreementId = Symbol(`agreementId${1}`)
+        agreementIds.push(agreementId)
+        mockGetDueRecurringPayments.push(getMockDueRecurringPayment(i, agreementId))
+      }
+      salesApi.getDueRecurringPayments.mockReturnValueOnce(mockGetDueRecurringPayments)
+
+      const permits = []
+      for (let i = 0; i < count; i++) {
+        permits.push(Symbol(`permit${i}`))
+      }
+
+      permits.forEach((permit, i) => {
+        salesApi.preparePermissionDataForRenewal.mockReturnValueOnce({
+          licensee: { countryCode: 'GB-ENG' }
+        })
+
+        salesApi.createTransaction.mockReturnValueOnce({
+          cost: i,
+          id: permit
+        })
+      })
+
+      const expectedData = []
+      permits.forEach((permit, i) => {
+        expectedData.push([
+          {
+            amount: i * 100,
+            description: 'The recurring card payment for your rod fishing licence',
+            reference: permit,
+            authorisation_mode: 'agreement',
+            agreement_id: agreementIds[i]
+          }
+        ])
+      })
+
+      await processRecurringPayments()
+      expect(sendPayment.mock.calls).toEqual(expectedData)
+    })
   })
 })
+
+const getMockDueRecurringPayment = (referenceNumber = '123', agreementId = '456') => ({
+  entity: { agreementId },
+  expanded: { activePermission: { entity: { referenceNumber } } }
+})

package/src/recurring-payments-processor.js

@@ -1,6 +1,9 @@
 import moment from 'moment-timezone'
 import { SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import { salesApi } from '@defra-fish/connectors-lib'
+import { sendPayment } from './services/govuk-pay-service.js'
+
+const payments = []
 
 export const processRecurringPayments = async () => {
   if (process.env.RUN_RECURRING_PAYMENTS?.toLowerCase() === 'true') {
@@ -9,6 +12,7 @@ export const processRecurringPayments = async () => {
     const response = await salesApi.getDueRecurringPayments(date)
     console.log('Recurring Payments found: ', response)
     await Promise.all(response.map(record => processRecurringPayment(record)))
+    console.log('Recurring Payments processed:', payments)
   } else {
     console.log('Recurring Payments job disabled')
   }
@@ -16,17 +20,34 @@ export const processRecurringPayments = async () => {
 
 const processRecurringPayment = async record => {
   const referenceNumber = record.expanded.activePermission.entity.referenceNumber
+  const agreementId = record.entity.agreementId
+  const transaction = await createNewTransaction(referenceNumber)
+  await takeRecurringPayment(agreementId, transaction)
+}
+
+const createNewTransaction = async referenceNumber => {
   const transactionData = await processPermissionData(referenceNumber)
   console.log('Creating new transaction based on', referenceNumber)
   try {
     const response = await salesApi.createTransaction(transactionData)
     console.log('New transaction created:', response)
+    return response
   } catch (e) {
     console.log('Error creating transaction', JSON.stringify(transactionData))
     throw e
   }
 }
 
+const takeRecurringPayment = async (agreementId, transaction) => {
+  const preparedPayment = preparePayment(agreementId, transaction)
+  console.log('Requesting payment:', preparedPayment)
+  const payment = await sendPayment(preparedPayment)
+  payments.push({
+    agreementId,
+    paymentId: payment.payment_id
+  })
+}
+
 const processPermissionData = async referenceNumber => {
   console.log('Preparing data based on', referenceNumber)
   const data = await salesApi.preparePermissionDataForRenewal(referenceNumber)
@@ -56,3 +77,15 @@ const prepareStartDate = permission => {
     .utc()
     .toISOString()
 }
+
+const preparePayment = (agreementId, transaction) => {
+  const result = {
+    amount: Math.round(transaction.cost * 100),
+    description: 'The recurring card payment for your rod fishing licence',
+    reference: transaction.id,
+    authorisation_mode: 'agreement',
+    agreement_id: agreementId
+  }
+
+  return result
+}

package/src/services/__tests__/govuk-pay-service.spec.js

@@ -0,0 +1,64 @@
+import { sendPayment } from '../govuk-pay-service.js'
+import { govUkPayApi } from '@defra-fish/connectors-lib'
+
+jest.mock('@defra-fish/connectors-lib')
+
+describe('govuk-pay-service', () => {
+  describe('sendPayment', () => {
+    const preparedPayment = { id: '1234' }
+
+    it('sendPayment should return response from createPayment in json format', async () => {
+      const mockPreparedPayment = { id: 'test-payment-id' }
+      const mockResponse = { status: 'success', paymentId: 'abc123' }
+
+      const mockFetchResponse = {
+        json: jest.fn().mockResolvedValue(mockResponse)
+      }
+      govUkPayApi.createPayment.mockResolvedValue(mockFetchResponse)
+
+      const result = await sendPayment(mockPreparedPayment)
+
+      expect(result).toEqual(mockResponse)
+    })
+
+    it('should send provided payload data to Gov.UK Pay', async () => {
+      govUkPayApi.createPayment.mockResolvedValue({
+        ok: true,
+        json: jest.fn().mockResolvedValue({ success: true, paymentId: 'abc123' })
+      })
+      const unique = Symbol('payload')
+      const payload = {
+        amount: '100',
+        description: 'The recurring card payment for your rod fishing licence',
+        reference: unique
+      }
+      await sendPayment(payload)
+      expect(govUkPayApi.createPayment).toHaveBeenCalledWith(payload, true)
+    })
+
+    it('should throw an error when the GOV.UK Pay connector raises an error', async () => {
+      govUkPayApi.createPayment.mockImplementationOnce(() => {
+        throw new Error('Oops!')
+      })
+
+      try {
+        await sendPayment(preparedPayment)
+      } catch (e) {
+        expect(e.message).toBe('Oops!')
+      }
+    })
+
+    it('should log error message when the GOV.UK Pay API raises an error', async () => {
+      const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {})
+      govUkPayApi.createPayment.mockImplementationOnce(() => {
+        throw new Error()
+      })
+
+      try {
+        await sendPayment(preparedPayment)
+      } catch (error) {
+        expect(consoleSpy).toHaveBeenCalledWith('Error creating payment', preparedPayment.id)
+      }
+    })
+  })
+})

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

@@ -0,0 +1,11 @@
+import { govUkPayApi } from '@defra-fish/connectors-lib'
+
+export const sendPayment = async preparedPayment => {
+  try {
+    const response = await govUkPayApi.createPayment(preparedPayment, true)
+    return await response.json()
+  } catch (e) {
+    console.error('Error creating payment', preparedPayment.id)
+    throw e
+  }
+}