Merge pull request #784 from davesag/feature/775/includeTotals-in-get…

…Transactions #775 add includeTotals param to getTransactions
davesag · Jun 4, 2024 · b530a6e · b530a6e
2 parents c83f8bb + d36a406
commit b530a6e
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 25 deletions.
diff --git a/src/api/private/getTransactions.js b/src/api/private/getTransactions.js
@@ -4,11 +4,13 @@ const { defaultParams } = require('../../defaults')
 const { validateFields } = require('../../validation')
 const isPositiveNumber = require('../../validation/isPositiveNumber')
 const isTime = require('../../validation/isTime')
+const isOneOf = require('../../validation/isOneOf')
 
 const validation = {
   accountGuid: ['isRequired', 'isGuid'],
   pageIndex: ['isPositiveNumber'],
-  pageSize: [isPositiveNumber(5000)]
+  pageSize: [isPositiveNumber(5000)],
+  includeTotals: [isOneOf(['true', 'false'])]
 }
 
 // https://www.independentreserve.com/products/api#GetTransactions
@@ -21,15 +23,17 @@ const getTransactions = (apiKey, apiSecret) => {
     toTimestampUtc,
     txTypes,
     pageIndex = defaultParams.pageIndex,
-    pageSize = defaultParams.pageSize
+    pageSize = defaultParams.pageSize,
+    includeTotals = 'true'
   }) => {
     const payload = {
       accountGuid,
       fromTimestampUtc,
       toTimestampUtc,
       txTypes,
       pageIndex,
-      pageSize
+      pageSize,
+      includeTotals
     }
     // eslint-disable-next-line fp/no-unused-expression
     validateFields(payload, {

diff --git a/src/utils/fixKeys.js b/src/utils/fixKeys.js
@@ -5,11 +5,11 @@ const fixKeys = input =>
     ? Array.isArray(input)
       ? input.map(fixKeys)
       : typeof input === 'object'
-      ? Object.keys(input).reduce(
-          (acc, elem) => ({ ...acc, [downcase(elem)]: fixKeys(input[elem]) }),
-          {}
-        )
-      : input
+        ? Object.keys(input).reduce(
+            (acc, elem) => ({ ...acc, [downcase(elem)]: fixKeys(input[elem]) }),
+            {}
+          )
+        : input
     : input
 
 module.exports = fixKeys
diff --git a/src/utils/payloadBuilder.js b/src/utils/payloadBuilder.js
@@ -24,8 +24,8 @@ const payloadBuilder =
           elem === 'signature'
             ? acc
             : Array.isArray(data[elem])
-            ? [...acc, `${elem}=${data[elem].join(',')}`]
-            : [...acc, `${elem}=${data[elem]}`],
+              ? [...acc, `${elem}=${data[elem].join(',')}`]
+              : [...acc, `${elem}=${data[elem]}`],
         [url]
       )
       .join(',')

diff --git a/src/validation/isArrayOf.js b/src/validation/isArrayOf.js
@@ -12,7 +12,7 @@ const isArrayOf =
       (allowed.length === 0 || (allowed.length !== 0 && value.every(val => allowed.includes(val)))))
       ? null
       : allowed.length === 0
-      ? 'Expected an array'
-      : `Expected an array containing ${allowed.join(',')}`
+        ? 'Expected an array'
+        : `Expected an array containing ${allowed.join(',')}`
 
 module.exports = isArrayOf
diff --git a/src/validation/isPositiveNumber.js b/src/validation/isPositiveNumber.js
@@ -6,7 +6,7 @@ const isPositiveNumber = max => value =>
   (typeof value === 'number' && (isNaN(value) || (value > 0 && (!max || (max && !(value > max))))))
     ? null
     : max
-    ? `Expected a positive number no greater than ${max}`
-    : 'Expected a positive number'
+      ? `Expected a positive number no greater than ${max}`
+      : 'Expected a positive number'
 
 module.exports = isPositiveNumber
diff --git a/src/validation/isRequired.js b/src/validation/isRequired.js
@@ -3,10 +3,10 @@ const checkRequired = value =>
   typeof value === 'number'
     ? !isNaN(value)
     : Array.isArray(value) || typeof value === 'string'
-    ? value.length !== 0
-    : value === undefined || value === null
-    ? false
-    : typeof value === 'object' && Object.keys(value).length !== 0
+      ? value.length !== 0
+      : value === undefined || value === null
+        ? false
+        : typeof value === 'object' && Object.keys(value).length !== 0
 
 const isRequired = value => (checkRequired(value) ? null : 'Field is required')
 

diff --git a/src/validation/isString.js b/src/validation/isString.js
@@ -4,7 +4,7 @@ const isString = max => value =>
   !value || (typeof value === 'string' && (!max || (max && !(value.length > max))))
     ? null
     : max
-    ? `Expected a string no longer than ${max} characters`
-    : 'Expected a string'
+      ? `Expected a string no longer than ${max} characters`
+      : 'Expected a string'
 
 module.exports = isString
diff --git a/test/helpers/privateHandlerTest.js b/test/helpers/privateHandlerTest.js
@@ -69,8 +69,8 @@ const doTest = ({ handler, params, useDefaults, validation }) => {
           }
         : params
       : useDefaults
-      ? defaultParams
-      : undefined
+        ? defaultParams
+        : undefined
 
     let result
 

diff --git a/test/unit/api/private/getTransactions.test.js b/test/unit/api/private/getTransactions.test.js
@@ -1,11 +1,12 @@
 const doTest = require('../../../helpers/privateHandlerTest')
 const isPositiveNumber = require('../../../../src/validation/isPositiveNumber')
 const isTime = require('../../../../src/validation/isTime')
+const isOneOf = require('../../../../src/validation/isOneOf')
 
 const fromTimestampUtc = '2014-08-01T08:00:00Z'
 const toTimestampUtc = '2016-08-01T08:00:00Z'
 
-const config = {
+const config1 = {
   handler: 'getTransactions',
   params: {
     accountGuid: 'dd015a29-8f73-4469-a5fa-ea91544dfcda',
@@ -19,8 +20,19 @@ const config = {
     fromTimestampUtc: ['isRequired', isTime({ before: toTimestampUtc })],
     toTimestampUtc: ['isRequired', isTime({ after: fromTimestampUtc })],
     pageIndex: ['isPositiveNumber'],
-    pageSize: [isPositiveNumber(5000)]
+    pageSize: [isPositiveNumber(5000)],
+    includeTotals: [isOneOf(['true', 'false'])]
   }
 }
 
-doTest(config)
+doTest(config1)
+
+const config2 = {
+  ...config1,
+  params: {
+    ...config1.params,
+    includeTotals: 'false'
+  }
+}
+
+doTest(config2)