@defra-fish/recurring-payments-job 1.63.0-rc.11 → 1.63.0-rc.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/recurring-payments-job",
-  "version": "1.63.0-rc.11",
+  "version": "1.63.0-rc.13",
   "description": "Rod Licensing Recurring Payments Job",
   "type": "module",
   "engines": {
@@ -36,11 +36,11 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.63.0-rc.11",
-    "@defra-fish/connectors-lib": "1.63.0-rc.11",
+    "@defra-fish/business-rules-lib": "1.63.0-rc.13",
+    "@defra-fish/connectors-lib": "1.63.0-rc.13",
     "commander": "^7.2.0",
     "debug": "^4.3.3",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "7d0e5dab76d8aebb0dbaecb857c3d44fdc6f79f9"
+  "gitHead": "d3579f75016512c92605e0f8824200d33a83f589"
 }

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

@@ -1,34 +1,107 @@
 import commander from 'commander'
+import { airbrake } from '@defra-fish/connectors-lib'
 import { processRecurringPayments } from '../recurring-payments-processor.js'
 import fs from 'fs'
 
 jest.useFakeTimers()
 
-jest.mock('../recurring-payments-processor.js', () => {
-  if (!global.processRecurringPayments) {
-    global.processRecurringPayments = jest.fn()
+jest.mock('../recurring-payments-processor.js')
+jest.mock('@defra-fish/connectors-lib', () => ({
+  airbrake: {
+    initialise: jest.fn(),
+    flush: jest.fn()
   }
-  return { processRecurringPayments: global.processRecurringPayments }
-})
-
-jest.mock('commander', () => {
-  if (!global.commander) {
-    global.commander = jest.requireActual('commander')
-  }
-  return global.commander
-})
+}))
 
 jest.mock('fs')
-
 describe('recurring-payments-job', () => {
+  beforeAll(() => {
+    fs.readFileSync.mockReturnValue(JSON.stringify({ name: 'recurring-payments-test', version: '1.0.0' }))
+  })
+
   beforeEach(() => {
     jest.clearAllMocks()
     commander.args = ['test']
   })
 
+  it('initialises airbrake', () => {
+    jest.isolateModules(() => {
+      require('../recurring-payments-job.js')
+      expect(airbrake.initialise).toHaveBeenCalled()
+    })
+  })
+
+  it('flushes airbrake before script ends', () => {
+    jest.isolateModules(() => {
+      require('../recurring-payments-job.js')
+      expect(airbrake.flush).toHaveBeenCalled()
+    })
+  })
+
+  it("doesn't flush airbrake before processRecurringPayments has been called", () => {
+    jest.isolateModules(() => {
+      processRecurringPayments.mockImplementationOnce(() => {
+        expect(airbrake.flush).not.toHaveBeenCalled()
+      })
+      require('../recurring-payments-job.js')
+    })
+  })
+
+  it.each([
+    ['SIGINT', 130],
+    ['SIGTERM', 137]
+  ])('flushes airbrake on %s signal', (signal, code) => {
+    jest.isolateModules(() => {
+      // setup a delay so script doesn't call processRecurringPayments and exit naturally
+      process.env.RECURRING_PAYMENTS_LOCAL_DELAY = '1'
+      const signalCallbacks = {}
+      jest.spyOn(process, 'on')
+      jest.spyOn(process, 'exit')
+      process.on.mockImplementation((signalToken, callback) => {
+        signalCallbacks[signalToken] = callback
+      })
+      process.exit.mockImplementation(() => {
+        // so we don't crash out of the tests!
+      })
+
+      require('../recurring-payments-job.js')
+      signalCallbacks[signal]()
+
+      expect(airbrake.flush).toHaveBeenCalled()
+      process.on.mockRestore()
+      process.exit.mockRestore()
+    })
+  })
+
+  it.each([
+    ['SIGINT', 130],
+    ['SIGTERM', 137]
+  ])('calls process.exit on %s signal with %i code', (signal, code) => {
+    jest.isolateModules(() => {
+      // setup a delay so script doesn't call processRecurringPayments and exit naturally
+      process.env.RECURRING_PAYMENTS_LOCAL_DELAY = '1'
+      const signalCallbacks = {}
+      jest.spyOn(process, 'on')
+      jest.spyOn(process, 'exit')
+      process.on.mockImplementation((signalToken, callback) => {
+        signalCallbacks[signalToken] = callback
+      })
+      process.exit.mockImplementation(() => {
+        // so we don't crash out of the tests!
+      })
+
+      require('../recurring-payments-job.js')
+      signalCallbacks[signal]()
+
+      expect(process.exit).toHaveBeenCalledWith(code)
+      process.on.mockRestore()
+      process.exit.mockRestore()
+    })
+  })
+
   it('logs startup details including name and version', () => {
     const mockPkg = { name: 'recurring-payments-test', version: '1.2.3' }
-    fs.readFileSync.mockReturnValue(JSON.stringify(mockPkg))
+    fs.readFileSync.mockReturnValueOnce(JSON.stringify(mockPkg))
 
     jest.isolateModules(() => {
       const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {})
@@ -39,11 +112,13 @@ describe('recurring-payments-job', () => {
         mockPkg.name,
         mockPkg.version
       )
+      logSpy.mockRestore()
     })
   })
 
   it('calls processRecurringPayments when no delay', () => {
     jest.isolateModules(() => {
+      process.env.RECURRING_PAYMENTS_LOCAL_DELAY = '0'
       require('../recurring-payments-job.js')
       expect(processRecurringPayments).toHaveBeenCalled()
     })
@@ -51,6 +126,7 @@ describe('recurring-payments-job', () => {
 
   it('doesnt call setTimeout when no correct delay', () => {
     jest.isolateModules(() => {
+      process.env.RECURRING_PAYMENTS_LOCAL_DELAY = 'invalid-delay'
       const setTimeoutSpy = jest.spyOn(global, 'setTimeout')
       require('../recurring-payments-job.js')
       expect(setTimeoutSpy).not.toHaveBeenCalled()

package/src/recurring-payments-job.js

@@ -1,13 +1,17 @@
 'use strict'
 import recurringPaymentsJob from 'commander'
 import { processRecurringPayments } from './recurring-payments-processor.js'
+import { airbrake } from '@defra-fish/connectors-lib'
 import path from 'path'
 import fs from 'fs'
 
+const SIGINT_CODE = 130
+const SIGTERM_CODE = 137
 const pkgPath = path.join(process.cwd(), 'package.json')
 const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
 
 console.log('Recurring payments job starting at %s. name: %s. version: %s', new Date().toISOString(), pkg.name, pkg.version)
+airbrake.initialise()
 
 const delay = parseInt(process.env.RECURRING_PAYMENTS_LOCAL_DELAY || '0', 10)
 if (delay > 0) {
@@ -20,6 +24,15 @@ if (delay > 0) {
 
 function executeRecurringPaymentsJob () {
   recurringPaymentsJob.action(processRecurringPayments())
+  airbrake.flush()
 }
 
+const shutdown = code => {
+  airbrake.flush()
+  process.exit(code)
+}
+
+process.on('SIGINT', () => shutdown(SIGINT_CODE))
+process.on('SIGTERM', () => shutdown(SIGTERM_CODE))
+
 export default recurringPaymentsJob

package/src/recurring-payments-processor.js

@@ -166,6 +166,5 @@ const processRecurringPaymentStatus = async payment => {
     } else {
       debug(`Unexpected error fetching payment status for ${payment.paymentId}.`)
     }
-    await salesApi.cancelRecurringPayment(payment.transaction.recurringPayment.id)
   }
 }