@defra-fish/pocl-job 1.64.0-rc.2 → 1.64.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/pocl-job",
-  "version": "1.64.0-rc.2",
+  "version": "1.64.0-rc.3",
   "description": "Post Office Counter Licence sales processor",
   "type": "module",
   "engines": {
@@ -35,8 +35,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.64.0-rc.2",
-    "@defra-fish/connectors-lib": "1.64.0-rc.2",
+    "@defra-fish/business-rules-lib": "1.64.0-rc.3",
+    "@defra-fish/connectors-lib": "1.64.0-rc.3",
     "commander": "^7.2.0",
     "debug": "^4.3.3",
     "filesize": "^6.4.0",
@@ -45,5 +45,5 @@
     "moment-timezone": "^0.5.34",
     "sax-stream": "^1.3.0"
   },
-  "gitHead": "b901cb67affda78c747af57f88753b8039bd2172"
+  "gitHead": "709cc3d3ded64bf33d0c68bfd7484c829a226ab2"
 }

package/src/__mocks__/test-2-records.xml

@@ -54,7 +54,7 @@
     <START_TIME>15:00</START_TIME>
     <CHANNEL_ID>67236X</CHANNEL_ID>
     <SERIAL_NO>SERIAL 1</SERIAL_NO>
-    <AMOUNT>54</AMOUNT>
+    <AMOUNT>60.2</AMOUNT>
     <MOPEX>2</MOPEX>
     <SYSTEM_DATE>01/01/2020</SYSTEM_DATE>
     <SYSTEM_TIME>13:00:00</SYSTEM_TIME>
@@ -108,7 +108,7 @@
     <START_TIME>15:00</START_TIME>
     <CHANNEL_ID>21995X</CHANNEL_ID>
     <SERIAL_NO>SERIAL 2</SERIAL_NO>
-    <AMOUNT>82</AMOUNT>
+    <AMOUNT>90.4</AMOUNT>
     <MOPEX>3</MOPEX>
     <SYSTEM_DATE>01/07/2020</SYSTEM_DATE>
     <SYSTEM_TIME>13:00:00</SYSTEM_TIME>

package/src/staging/__tests__/__snapshots__/create-transactions.spec.js.snap

@@ -36,7 +36,7 @@ Object {
   },
   "finaliseTransactionPayload": Object {
     "payment": Object {
-      "amount": 82,
+      "amount": 90.4,
       "channelId": "21995X",
       "method": "Stamps",
       "source": "Post Office Sales",

package/src/transport/__tests__/s3-to-local.spec.js

@@ -1,15 +1,13 @@
 import { s3ToLocal } from '../s3-to-local.js'
-import stream from 'stream'
+import { Readable } from 'stream'
 import { AWS } from '@defra-fish/connectors-lib'
 import fs from 'fs'
-const { s3 } = AWS.mock.results[0].value
 
 const MOCK_TMP = '/tmp/local/mock'
-jest.mock('stream')
+
 jest.mock('../../io/file.js', () => ({
   getTempDir: jest.fn((...subfolders) => `${MOCK_TMP}/${subfolders.join('/')}`)
 }))
-
 jest.mock('../../config.js', () => ({
   s3: {
     bucket: 'testbucket'
@@ -19,35 +17,51 @@ jest.mock('../../config.js', () => ({
 jest.mock('@defra-fish/connectors-lib', () => ({
   AWS: jest.fn(() => ({
     s3: {
-      getObject: jest.fn(() => ({
-        createReadStream: jest.fn(() => ({}))
-      }))
-    }
+      send: jest.fn()
+    },
+    GetObjectCommand: jest.fn(params => ({ ...params }))
   }))
 }))
 
+jest.mock('util', () => {
+  const actualUtil = jest.requireActual('util')
+  return {
+    ...actualUtil,
+    promisify: jest.fn(() => {
+      return jest.fn(() => Promise.resolve())
+    })
+  }
+})
+
 describe('s3-to-local', () => {
+  const { s3 } = AWS.mock.results[0].value
+
   beforeEach(() => {
     jest.clearAllMocks()
   })
 
   it('retrieves a file from s3 for a given key', async () => {
-    jest.spyOn(fs, 'createWriteStream').mockReturnValueOnce({})
-    stream.pipeline.mockImplementation(
-      jest.fn((streams, callback) => {
-        callback()
-      })
-    )
+    const mockStream = new Readable({
+      read () {
+        this.push('test data')
+        this.push(null)
+      }
+    })
+
+    s3.send.mockResolvedValue({ Body: mockStream })
+
+    jest.spyOn(fs, 'createWriteStream').mockReturnValue({})
 
-    const result = await s3ToLocal('/example/testS3Key.xml')
-    const { createReadStream } = s3.getObject.mock.results[0].value
+    const s3Key = '/example/testS3Key.xml'
+    const result = await s3ToLocal(s3Key)
 
     expect(result).toBe(`${MOCK_TMP}/example/testS3Key.xml`)
-    expect(createReadStream).toHaveBeenCalled()
-    expect(stream.pipeline).toHaveBeenCalled()
-    expect(s3.getObject).toHaveBeenCalledWith({
-      Bucket: 'testbucket',
-      Key: '/example/testS3Key.xml'
-    })
+    expect(fs.createWriteStream).toHaveBeenCalledWith(`${MOCK_TMP}/example/testS3Key.xml`)
+    expect(s3.send).toHaveBeenCalledWith(
+      expect.objectContaining({
+        Bucket: 'testbucket',
+        Key: s3Key
+      })
+    )
   })
 })

package/src/transport/s3-to-local.js

@@ -6,15 +6,21 @@ import db from 'debug'
 import config from '../config.js'
 import { getTempDir } from '../io/file.js'
 import { AWS } from '@defra-fish/connectors-lib'
+
 const pipeline = util.promisify(stream.pipeline)
-const { s3 } = AWS()
+const { s3, GetObjectCommand } = AWS()
 const debug = db('pocl:transport')
 
 export async function s3ToLocal (s3Key) {
   debug('Transferring %s to the local storage', s3Key)
   const localPath = Path.join(getTempDir(Path.dirname(s3Key)), Path.basename(s3Key))
   const localWriteStream = fs.createWriteStream(localPath)
-  const s3ReadStream = s3.getObject({ Bucket: config.s3.bucket, Key: s3Key }).createReadStream()
-  await pipeline([s3ReadStream, localWriteStream])
+  const { Body } = await s3.send(
+    new GetObjectCommand({
+      Bucket: config.s3.bucket,
+      Key: s3Key
+    })
+  )
+  await pipeline(Body, localWriteStream)
   return localPath
 }