account-lookup-service 15.6.0-iso.2 → 15.6.0-iso.21

package/.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.25
+  build: mojaloop/build@1.0.27
 workflows:
   setup:
     jobs:

package/.ncurc.yaml

@@ -1,6 +1,5 @@
 ## Add a TODO comment indicating the reason for each rejected dependency upgrade added to this list, and what should be done to resolve it (i.e. handle it through a story, etc).
 reject: [
   # TODO: v6+ (ref: https://github.com/sindresorhus/get-port/releases/tag/v6.0.0) is an ESM library and thus not compatible with CommonJS. Future story needed to resolve.
-  "get-port",
-  "@mojaloop/central-services-shared" ## need to remove before merging proxyCache functionality to main
+  "get-port"
 ]

package/audit-ci.jsonc

@@ -27,6 +27,8 @@
     "GHSA-7fh5-64p2-3v2j",
     "GHSA-rm97-x556-q36h", // https://github.com/advisories/GHSA-rm97-x556-q36h
     "GHSA-rv95-896h-c2vc", // https://github.com/advisories/GHSA-rv95-896h-c2vc
-    "GHSA-952p-6rrq-rcjv" // https://github.com/advisories/GHSA-952p-6rrq-rcjv
+    "GHSA-952p-6rrq-rcjv", // https://github.com/advisories/GHSA-952p-6rrq-rcjv
+    "GHSA-3xgq-45jj-v275", // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-rhx6-c78j-4q9w" // https://github.com/advisories/GHSA-rhx6-c78j-4q9w
   ]
 }

package/jest.config.js

@@ -1,5 +1,7 @@
 module.exports = {
   verbose: true,
+  clearMocks: true,
+
   collectCoverageFrom: [
     '**/src/**/**/*.js'
   ],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-iso.2",
+  "version": "15.6.0-iso.21",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -54,7 +54,7 @@
     "test:coverage-check": "npm test -- --coverage",
     "test:junit": "npm test -- --reporters=default --reporters=jest-junit",
     "test:xunit": "npm run test:junit",
-    "test:functional": "sh ./scripts/test-functional.sh",
+    "test:functional": "bash ./scripts/test-functional.sh",
     "test:int": "npm run migrate  &&  npm run onboarding  &&  jest --config=./jest-int.config.js --runInBand",
     "test:integration": "npm run dc:up && npm run wait-4-docker && npm run test:int | tee ./test/results/test-int.log",
     "test:integration-runner": "TEST_MODE=rm ./test/integration-runner.sh",
@@ -87,27 +87,26 @@
     "@hapi/boom": "10.0.1",
     "@hapi/catbox-memory": "6.0.2",
     "@hapi/good": "9.0.1",
-    "@hapi/hapi": "21.3.10",
+    "@hapi/hapi": "21.3.12",
     "@hapi/inert": "7.1.0",
-    "@hapi/joi": "17.1.1",
     "@hapi/vision": "7.0.3",
-    "@mojaloop/central-services-error-handling": "13.0.1",
+    "@mojaloop/central-services-error-handling": "13.0.2",
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
-    "@mojaloop/central-services-metrics": "12.0.8",
-    "@mojaloop/central-services-shared": "18.10.0-snapshot.4",
+    "@mojaloop/central-services-metrics": "12.4.2",
+    "@mojaloop/central-services-shared": "18.14.1",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",
-    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
-    "@mojaloop/ml-schema-transformer-lib": "1.1.1",
-    "@mojaloop/sdk-standard-components": "19.0.0",
+    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1",
+    "@mojaloop/ml-schema-transformer-lib": "2.4.1",
+    "@mojaloop/sdk-standard-components": "19.6.2",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "12.1.0",
-    "cron": "3.1.7",
+    "cron": "3.3.1",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",
@@ -147,22 +146,21 @@
     "jsonpointer": "5.0.0"
   },
   "devDependencies": {
-    "@types/jest": "29.5.13",
+    "@types/jest": "29.5.14",
     "audit-ci": "^7.1.0",
-    "axios": "1.7.7",
+    "axios": "1.7.9",
     "axios-retry": "^4.5.0",
     "docdash": "2.0.2",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.7",
     "get-port": "5.1.1",
     "ioredis-mock": "^8.9.0",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
-    "jsdoc": "4.0.3",
+    "jsdoc": "4.0.4",
     "nodemon": "3.1.7",
-    "npm-check-updates": "17.1.4",
+    "npm-check-updates": "17.1.11",
     "nyc": "17.1.0",
     "pre-commit": "1.2.2",
-    "proxyquire": "2.1.3",
     "replace": "^1.2.2",
     "sinon": "19.0.2",
     "standard": "17.1.2",

package/src/constants.js

@@ -1,5 +1,6 @@
 const ERROR_MESSAGES = Object.freeze({
-  partySourceFspNotFound: 'Requester FSP not found',
+  sourceFspNotFound: 'Requester FSP not found',
+  partySourceFspNotFound: 'Requester FSP not found', // todo: use sourceFspNotFound
   partyDestinationFspNotFound: 'Destination FSP not found',
   partyProxyNotFound: 'Proxy not found',
   proxyConnectionError: 'Proxy connection error',

package/src/domain/oracle/oracle.js

@@ -49,9 +49,15 @@ exports.createOracle = async (payload) => {
     'Create Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
+
   try {
+    step = 'getPartyIdTypeByName-1'
     const partyIdTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
+    step = 'getEndpointTypeByType-2'
     const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
+    step = 'getAllOracleEndpointsByMatchCondition-3'
     const existingActiveOracle = await oracleEndpoint.getAllOracleEndpointsByMatchCondition(
       payload,
       partyIdTypeModel.partyIdTypeId,
@@ -77,13 +83,23 @@ exports.createOracle = async (payload) => {
     oracleEntity.createdBy = 'Admin'
     oracleEntity.partyIdTypeId = partyIdTypeModel.partyIdTypeId
     oracleEntity.endpointTypeId = endpointTypeModel.endpointTypeId
+    step = 'createOracleEndpoint-4'
     await oracleEndpoint.createOracleEndpoint(oracleEntity)
     histTimerEnd({ success: true })
     return true
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'createOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -100,6 +116,8 @@ exports.getOracle = async (query) => {
     'Get Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
     let oracleEndpointModelList
     let isCurrency; let isType = false
@@ -111,12 +129,16 @@ exports.getOracle = async (query) => {
       isType = true
     }
     if (isCurrency && isType) {
+      step = 'getOracleEndpointByTypeAndCurrency-1'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByTypeAndCurrency(query.type, query.currency)
     } else if (isCurrency && !isType) {
+      step = 'getOracleEndpointByCurrency-2'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByCurrency(query.currency)
     } else if (isType && !isCurrency) {
+      step = 'getOracleEndpointByType-3'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByType(query.type)
     } else {
+      step = 'getAllOracleEndpoint-4'
       oracleEndpointModelList = await oracleEndpoint.getAllOracleEndpoint()
     }
     for (const oracleEndpointModel of oracleEndpointModelList) {
@@ -137,7 +159,16 @@ exports.getOracle = async (query) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'getOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -155,11 +186,17 @@ exports.updateOracle = async (params, payload) => {
     'Update Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
+    step = 'getOracleEndpointById-1'
     const currentOracleEndpointList = await oracleEndpoint.getOracleEndpointById(params.ID)
     if (currentOracleEndpointList.length > 0) {
+      step = 'getPartyIdTypeByName-2'
       const partyIdTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
+      step = 'getEndpointTypeByType-3'
       const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
+      step = 'getAllOracleEndpointsByMatchCondition-4'
       const existingActiveOracle = await oracleEndpoint.getAllOracleEndpointsByMatchCondition(
         payload,
         partyIdTypeModel.partyIdTypeId,
@@ -175,6 +212,7 @@ exports.updateOracle = async (params, payload) => {
       const currentOracleEndpoint = currentOracleEndpointList[0]
       const newOracleEntry = {}
       if (payload.oracleIdType && payload.oracleIdType !== currentOracleEndpoint.idType) {
+        step = 'getPartyIdTypeByName-5'
         const partyTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
         newOracleEntry.partyIdTypeId = partyTypeModel.partyIdTypeId
       }
@@ -182,10 +220,12 @@ exports.updateOracle = async (params, payload) => {
         newOracleEntry.value = payload.endpoint.value
       }
       if (payload.endpoint && payload.endpoint.endpointType && payload.endpoint.endpointType !== currentOracleEndpoint.endpointType) {
+        step = 'getEndpointTypeByType-6'
         const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
         newOracleEntry.endpointTypeId = endpointTypeModel.endpointTypeId
       }
       if (payload.currency && payload.currency !== currentOracleEndpoint.currency) {
+        step = 'getCurrencyById-7'
         const currencyModel = await currency.getCurrencyById(payload.currency)
         if (currencyModel) {
           newOracleEntry.currencyId = payload.currency
@@ -196,6 +236,7 @@ exports.updateOracle = async (params, payload) => {
       if (payload.isDefault && payload.isDefault !== currentOracleEndpoint.isDefault) {
         newOracleEntry.isDefault = payload.isDefault
       }
+      step = 'updateOracleEndpointById-8'
       await oracleEndpoint.updateOracleEndpointById(params.ID, newOracleEntry)
       histTimerEnd({ success: true })
       return true
@@ -205,7 +246,16 @@ exports.updateOracle = async (params, payload) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'updateOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -222,6 +272,7 @@ exports.deleteOracle = async (params) => {
     'Delete Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   try {
     await oracleEndpoint.destroyOracleEndpointById(params.ID)
     histTimerEnd({ success: true })
@@ -229,6 +280,14 @@ exports.deleteOracle = async (params) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'deleteOracle'
+    })
+    throw fspiopError
   }
 }