@defra-fish/pocl-job 1.22.0-rc.7 → 1.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/pocl-job",
-  "version": "1.22.0-rc.7",
+  "version": "1.22.0",
   "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.22.0-rc.7",
-    "@defra-fish/connectors-lib": "1.22.0-rc.7",
+    "@defra-fish/business-rules-lib": "1.22.0",
+    "@defra-fish/connectors-lib": "1.22.0",
     "commander": "^7.2.0",
     "debug": "^4.3.1",
     "filesize": "^6.3.0",
@@ -45,6 +45,5 @@
     "moment-timezone": "^0.5.33",
     "sax-stream": "^1.3.0",
     "ssh2-sftp-client": "^6.0.1"
-  },
-  "gitHead": "4840a94a046213c95478ea8ce84c086a81d5b2fb"
+  }
 }

package/src/transform/bindings/pocl/transaction/__tests__/transaction.bindings.spec.js

@@ -130,6 +130,28 @@ describe('transaction transforms', () => {
       })
     )
   })
+
+  it('ignores journal id if it\'s not provided', async () => {
+    const { createTransactionPayload } = await Transaction.transform(generateInputJSON())
+
+    expect(Object.keys(createTransactionPayload).includes('journalId')).toBeFalsy()
+  })
+
+  it.each([
+    ['123456'],
+    ['654321'],
+    ['A6B7C9']
+  ])('transforms a DDE record - includes DD_ID %s', async DD_ID => {
+    const { createTransactionPayload: { journalId } } = await Transaction.transform(
+      generateInputJSON({
+        DATA_SOURCE: { value: DIRECT_DEBIT_DATASOURCE },
+        MOPEX: { value: '6' },
+        DD_ID: { value: DD_ID }
+      })
+    )
+
+    expect(journalId).toBe(DD_ID)
+  })
 })
 
 const generateInputJSON = (overrides = {}) => ({

package/src/transform/bindings/pocl/transaction/transaction.bindings.js

@@ -55,10 +55,11 @@ export const MethodOfPayment = new Binding({
   transform: context => paymentMethods[Binding.TransformTextOnly(context)] || 'Other'
 })
 
-export const dataSourceBinding = new Binding({ element: 'DATA_SOURCE', transform: Binding.TransformTextOnly })
+export const DataSourceBinding = new Binding({ element: 'DATA_SOURCE', transform: Binding.TransformTextOnly })
+export const DDIDBinding = new Binding({ element: 'DD_ID', transform: Binding.TransformTextOnly })
 
 const getDataSource = children => {
-  if (children[dataSourceBinding.element] && children[dataSourceBinding.element].value === DIRECT_DEBIT_DATASOURCE) {
+  if (children[DataSourceBinding.element] && children[DataSourceBinding.element] === DIRECT_DEBIT_DATASOURCE) {
     return DIRECT_DEBIT_DATASOURCE
   }
   return POST_OFFICE_DATASOURCE
@@ -78,7 +79,9 @@ export const Transaction = new Binding({
     MethodOfPayment,
     AmountPaid,
     TransactionDate,
-    TransactionTime
+    TransactionTime,
+    DataSourceBinding,
+    DDIDBinding
   ],
   element: 'REC',
   transform: ({ children }) => {
@@ -104,11 +107,13 @@ export const Transaction = new Binding({
     const paymentSource = dataSource === DIRECT_DEBIT_DATASOURCE ? DIRECT_DEBIT_PAYMENTSOURCE : POST_OFFICE_DATASOURCE
     const serialNumber = children[SerialNumber.element]
     const permit = children[licenceBindings.Permit.element]
+    const journalId = children[DDIDBinding.element]
 
     return {
       id: serialNumber,
       createTransactionPayload: {
         dataSource,
+        ...(journalId && { journalId }),
         serialNumber,
         permissions: [
           {