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

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.20",
   "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.1",
+    "@mojaloop/central-services-shared": "18.13.0",
     "@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/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.0",
     "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/participants/participants.js

@@ -28,7 +28,6 @@
 
 const Enums = require('@mojaloop/central-services-shared').Enum
 const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
-const Logger = require('@mojaloop/central-services-logger')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const EventSdk = require('@mojaloop/event-sdk')
 const Metrics = require('@mojaloop/central-services-metrics')
@@ -36,6 +35,10 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const Config = require('../../lib/config')
+const { logger } = require('../../lib')
+const { ERROR_MESSAGES } = require('../../constants')
+
+const { FSPIOPErrorCodes } = ErrorHandler.Enums
 
 /**
  * @function getParticipantsByTypeAndID
@@ -55,57 +58,85 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
     'Get participants by ID',
     ['success']
   ).startTimer()
+  const log = logger.child('getParticipantsByTypeAndID')
   const type = params.Type
-  const partySubIdOrType = params.SubId || undefined
-  const requesterName = headers[Enums.Http.Headers.FSPIOP.SOURCE]
-  const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
-  const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+  const partySubIdOrType = params.SubId
+  const source = headers[Enums.Http.Headers.FSPIOP.SOURCE]
+  const callbackEndpointType = partySubIdOrType
+    ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT
+    : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
+  const errorCallbackEndpointType = params.SubId
+    ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
+    : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+
   let fspiopError
+
   try {
-    Logger.isInfoEnabled && Logger.info('getParticipantsByTypeAndID::begin')
-    const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], childSpan)
-    if (requesterParticipantModel) {
-      const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
-      if (response && response.data && Array.isArray(response.data.partyList) && response.data.partyList.length > 0) {
-        let options = {
-          partyIdType: type,
-          partyIdentifier: params.ID
-        }
-        options = partySubIdOrType ? { ...options, partySubIdOrType } : options
-        const payload = {
-          fspId: response.data.partyList[0].fspId
-        }
-        const clonedHeaders = { ...headers }
-        if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
-          clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
-        }
-        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
-        await participant.sendRequest(clonedHeaders, requesterName, callbackEndpointType, Enums.Http.RestMethods.PUT, payload, options, childSpan)
-      } else {
-        await participant.sendErrorToParticipant(requesterName, errorCallbackEndpointType,
-          ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND).toApiErrorObject(Config.ERROR_HANDLING), headers, params, childSpan)
+    log.info('processing started...', { source, params })
+    const requesterParticipantModel = await participant.validateParticipant(source)
+
+    if (!requesterParticipantModel) {
+      const errMessage = ERROR_MESSAGES.sourceFspNotFound
+      logger.warn(errMessage, { requesterName: source })
+      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+    }
+
+    const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
+    if (response?.data && Array.isArray(response.data.partyList) && response.data.partyList.length > 0) {
+      const options = {
+        partyIdType: type,
+        partyIdentifier: params.ID,
+        ...(partySubIdOrType && { partySubIdOrType })
+      }
+      const payload = {
+        fspId: response.data.partyList[0].fspId
       }
-      Logger.isInfoEnabled && Logger.info('getParticipantsByTypeAndID::end')
+      const clonedHeaders = { ...headers }
+      if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
+        clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
+      }
+      clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+      await participant.sendRequest(
+        clonedHeaders,
+        source,
+        callbackEndpointType,
+        Enums.Http.RestMethods.PUT,
+        payload,
+        options,
+        childSpan
+      )
     } else {
-      Logger.isErrorEnabled && Logger.error('Requester FSP not found')
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'Requester FSP not found')
+      await participant.sendErrorToParticipant(
+        source,
+        errorCallbackEndpointType,
+        ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND).toApiErrorObject(Config.ERROR_HANDLING),
+        headers,
+        params,
+        childSpan
+      )
     }
+    log.info('processing finished', { source, params })
+
     if (childSpan && !childSpan.isFinished) {
       await childSpan.finish()
     }
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(err)
+    log.warn('error in getParticipantsByTypeAndID', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
     try {
-      const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(
-        headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
-        fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params, childSpan)
+        headers[Enums.Http.Headers.FSPIOP.SOURCE],
+        errorCallbackEndpointType,
+        fspiopError.toApiErrorObject(Config.ERROR_HANDLING),
+        headers,
+        params,
+        childSpan
+      )
     } catch (exc) {
       fspiopError = ErrorHandler.Factory.reformatFSPIOPError(exc)
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(exc)
+      log.error('error in final participant.sendErrorToParticipant', exc)
     }
   } finally {
     if (childSpan && !childSpan.isFinished && fspiopError) {
@@ -138,7 +169,7 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     ['success']
   ).startTimer()
   try {
-    Logger.isInfoEnabled && Logger.info('putParticipantsByTypeAndID::begin')
+    logger.info('putParticipantsByTypeAndID::begin')
     const type = params.Type
     const partySubIdOrType = params.SubId || undefined
     const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
@@ -177,17 +208,17 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
             ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
         }
       } else {
-        Logger.isErrorEnabled && Logger.error('Requester FSP not found')
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'Requester FSP not found')
+        logger.warn(ERROR_MESSAGES.sourceFspNotFound)
+        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.sourceFspNotFound)
       }
     } else {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
     }
-    Logger.isInfoEnabled && Logger.info('putParticipantsByTypeAndID::end')
+    logger.info('putParticipantsByTypeAndID::end')
     histTimerEnd({ success: true })
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(err)
+    logger.error('error in putParticipantsByTypeAndID:', err)
     try {
       const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
@@ -195,7 +226,7 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(exc)
+      logger.error('error in participant.sendErrorToParticipant:', exc)
     }
     histTimerEnd({ success: false })
   }
@@ -222,7 +253,9 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
   ).startTimer()
   try {
     const partySubIdOrType = params.SubId || undefined
-    const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+    const callbackEndpointType = partySubIdOrType
+      ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
+      : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     const destinationParticipant = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.DESTINATION])
     if (destinationParticipant) {
       const decodedPayload = decodePayload(dataUri, { asParsed: false })
@@ -231,7 +264,8 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         callbackEndpointType,
         decodedPayload.body.toString(),
         headers,
-        params)
+        params
+      )
     } else {
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -239,19 +273,27 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR).toApiErrorObject(),
         headers,
         params,
-        payload)
+        payload
+      )
     }
     histTimerEnd({ success: true })
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(err)
+    logger.error('error in putParticipantsErrorByTypeAndID:', err)
     try {
-      const callbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
-      await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], callbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err).toApiErrorObject(), headers, params)
+      const callbackEndpointType = params.SubId
+        ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
+        : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+      await participant.sendErrorToParticipant(
+        headers[Enums.Http.Headers.FSPIOP.SOURCE],
+        callbackEndpointType,
+        ErrorHandler.Factory.reformatFSPIOPError(err).toApiErrorObject(),
+        headers,
+        params
+      )
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(exc)
+      logger.error('error in participant.sendErrorToParticipant:', exc)
     }
     histTimerEnd({ success: false })
   }
@@ -277,7 +319,7 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
   const childSpan = span ? span.getChild('postParticipants') : undefined
   let fspiopError
   try {
-    Logger.isInfoEnabled && Logger.info('postParticipants::begin')
+    logger.info('postParticipants::begin')
     const type = params.Type
     const partySubIdOrType = params.SubId
     const callbackEndpointType = partySubIdOrType
@@ -325,8 +367,9 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
             fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params, childSpan)
         }
       } else {
-        fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'Requester FSP not found')
-        Logger.isErrorEnabled && Logger.error('Requester FSP not found')
+        const errMessage = ERROR_MESSAGES.sourceFspNotFound
+        logger.error(errMessage)
+        fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
         throw fspiopError
       }
     } else {
@@ -334,10 +377,10 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params, childSpan)
     }
-    Logger.isInfoEnabled && Logger.info('postParticipants::end')
+    logger.info('postParticipants::end')
     histTimerEnd({ success: true })
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(`error in postParticipants: ${err?.message}`)
+    logger.error('error in postParticipants:', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
     try {
       const errorCallbackEndpointType = params.SubId
@@ -348,7 +391,7 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(`failed to handle exception in postParticipants due to error: ${exc?.stack}`)
+      logger.error('failed to handle exception in postParticipants:', exc)
     }
     histTimerEnd({ success: false })
   } finally {
@@ -376,92 +419,90 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
     'Post participants batch',
     ['success']
   ).startTimer()
+  const requestId = requestPayload.requestId
+  const log = logger.child({ context: 'postParticipantsBatch', requestId })
   const childSpan = span ? span.getChild('postParticipantsBatch') : undefined
   let fspiopError
+
   try {
-    Logger.isInfoEnabled && Logger.info('postParticipantsBatch::begin')
+    log.info('postParticipantsBatch::begin', { headers, requestPayload })
     const typeMap = new Map()
     const overallReturnList = []
-    const requestId = requestPayload.requestId
+    const pushPartyError = (party, errCode) => {
+      log.debug('party error details:', { party, errCode })
+      overallReturnList.push({
+        partyId: party,
+        ...ErrorHandler.Factory.createFSPIOPError(errCode, undefined, undefined, undefined, [{
+          key: party.partyIdType,
+          value: party.partyIdentifier
+        }]).toApiErrorObject(Config.ERROR_HANDLING)
+      })
+    }
+
     const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], childSpan)
-    if (requesterParticipantModel) {
-      for (const party of requestPayload.partyList) {
-        if (Object.values(Enums.Accounts.PartyAccountTypes).includes(party.partyIdType)) {
-          party.currency = requestPayload.currency
-          if (party.fspId === headers[Enums.Http.Headers.FSPIOP.SOURCE]) {
-            if (typeMap.get(party.partyIdType)) {
-              const partyList = typeMap.get(party.partyIdType)
-              partyList.push(party)
-              typeMap.set(party.partyIdType, partyList)
-            } else {
-              typeMap.set(party.partyIdType, [party])
-            }
-          } else {
-            overallReturnList.push(ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, undefined, undefined, undefined, [{
-              key: party.partyIdType,
-              value: party.partyIdentifier
-            }]).toApiErrorObject(Config.ERROR_HANDLING))
-          }
-        } else {
-          overallReturnList.push(ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
-            key: party.partyIdType,
-            value: party.partyIdentifier
-          }]).toApiErrorObject(Config.ERROR_HANDLING))
-        }
-      }
+    if (!requesterParticipantModel) {
+      const errMessage = ERROR_MESSAGES.sourceFspNotFound
+      log.error(errMessage)
+      fspiopError = ErrorHandler.Factory.createFSPIOPError(FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+      throw fspiopError
+    }
 
-      for (const [key, value] of typeMap) {
-        const payload = {
-          requestId,
-          partyList: value
-        }
-        Logger.isInfoEnabled && Logger.info(`postParticipantsBatch::oracleBatchRequest::type=${key}`)
-        const response = await oracle.oracleBatchRequest(headers, method, requestPayload, key, payload)
-        if (response && (response.data !== null || response.data !== undefined)) {
-          if (Array.isArray(response.data.partyList) && response.data.partyList.length > 0) {
-            for (const party of response.data.partyList) {
-              party.partyId.currency = undefined
-              overallReturnList.push(party)
-            }
+    for (const party of requestPayload.partyList) {
+      if (Object.values(Enums.Accounts.PartyAccountTypes).includes(party.partyIdType)) {
+        party.currency = requestPayload.currency
+        if (party.fspId === headers[Enums.Http.Headers.FSPIOP.SOURCE]) {
+          if (typeMap.get(party.partyIdType)) {
+            const partyList = typeMap.get(party.partyIdType)
+            partyList.push(party)
+            typeMap.set(party.partyIdType, partyList)
           } else {
-            for (const party of value) {
-              overallReturnList.push(ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
-                key: party.partyIdType,
-                value: party.partyIdentifier
-              }]).toApiErrorObject(Config.ERROR_HANDLING))
-            }
+            typeMap.set(party.partyIdType, [party])
           }
         } else {
-          for (const party of value) {
-            overallReturnList.push(ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
-              key: party.partyIdType,
-              value: party.partyIdentifier
-            }]).toApiErrorObject(Config.ERROR_HANDLING))
-          }
+          pushPartyError(party, FSPIOPErrorCodes.PARTY_NOT_FOUND)
         }
+      } else {
+        pushPartyError(party, FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
       }
+    }
+
+    for (const [key, value] of typeMap) {
       const payload = {
-        partyList: overallReturnList,
-        currency: requestPayload.currency
-      }
-      const clonedHeaders = { ...headers }
-      if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
-        clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.partyList[0].partyId.fspId
-        clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+        requestId,
+        partyList: value
       }
-      await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT, Enums.Http.RestMethods.PUT, payload, { requestId }, childSpan)
-      if (childSpan && !childSpan.isFinished) {
-        await childSpan.finish()
+      log.info(`postParticipantsBatch::oracleBatchRequest::type=${key}`, { payload })
+      const response = await oracle.oracleBatchRequest(headers, method, requestPayload, key, payload)
+      if (Array.isArray(response?.data?.partyList) && response.data.partyList.length > 0) {
+        for (const party of response.data.partyList) {
+          party.partyId.currency = undefined
+          overallReturnList.push(party)
+        }
+      } else {
+        for (const party of value) {
+          pushPartyError(party, FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
+        }
       }
-      Logger.isInfoEnabled && Logger.info('postParticipantsBatch::end')
-    } else {
-      Logger.isErrorEnabled && Logger.error('Requester FSP not found')
-      fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'Requester FSP not found')
-      throw fspiopError
     }
+
+    const payload = {
+      partyList: overallReturnList,
+      currency: requestPayload.currency
+    }
+    const clonedHeaders = { ...headers }
+    if (!clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] || clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] === '') {
+      clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = headers[Enums.Http.Headers.FSPIOP.SOURCE]
+      clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+    }
+    await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT, Enums.Http.RestMethods.PUT, payload, { requestId }, childSpan)
+    if (childSpan && !childSpan.isFinished) {
+      await childSpan.finish()
+    }
+    log.info('postParticipantsBatch::end')
+
     histTimerEnd({ success: true })
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(err)
+    log.error('error in postParticipantsBatch', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
     try {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR,
@@ -469,7 +510,7 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(exc)
+      log.error('error in participant.sendErrorToParticipant', exc)
     }
     histTimerEnd({ success: false })
   } finally {
@@ -498,8 +539,9 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     'Delete participants',
     ['success']
   ).startTimer()
+  const log = logger.child('deleteParticipants')
   try {
-    Logger.isInfoEnabled && Logger.info('deleteParticipants::begin')
+    log.debug('deleteParticipants::begin', { headers, params })
     const type = params.Type
     const partySubIdOrType = params.SubId || undefined
     const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
@@ -526,17 +568,18 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
             ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
         }
       } else {
-        Logger.isErrorEnabled && Logger.error('Requester FSP not found')
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'Requester FSP not found')
+        const errMessage = ERROR_MESSAGES.sourceFspNotFound
+        log.error(errMessage)
+        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
     } else {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
     }
-    Logger.isInfoEnabled && Logger.info('deleteParticipants::end')
+    log.info('deleteParticipants::end')
     histTimerEnd({ success: true })
   } catch (err) {
-    Logger.isErrorEnabled && Logger.error(err)
+    log.error('error in deleteParticipants', err)
     try {
       const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
@@ -544,7 +587,7 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
-      Logger.isErrorEnabled && Logger.error(exc)
+      log.error('error in participant.sendErrorToParticipant', exc)
     }
     histTimerEnd({ success: false })
   }