account-lookup-service 15.6.0-snapshot.2 → 16.1.0-iso.0

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,97 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
     'Get participants by ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  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
+  let step
+
   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 })
+    step = 'validateParticipant-1'
+    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)
+    }
+    step = 'oracleRequest-2'
+    const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache, true)
+    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
+      }
+      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]
       }
-      Logger.isInfoEnabled && Logger.info('getParticipantsByTypeAndID::end')
+      clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+      step = 'sendRequest-3'
+      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')
+      step = 'sendErrorToParticipant-4'
+      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)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode?.code,
+      system,
+      operation: 'getParticipantsByTypeAndID',
+      step
+    })
     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) {
@@ -137,15 +180,19 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     'Put participants by type and ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   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
     const errorCallbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE])
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, undefined, payload, cache)
         if (response && response.data) {
           const responsePayload = {
@@ -171,32 +218,45 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
             clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
+          step = 'sendErrorToParticipant-4'
           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)
         }
       } 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 {
+      step = 'sendErrorToParticipant-5'
       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)
+    let fspiopError
     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
+      fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+        fspiopError.toApiErrorObject(Config.ERROR_HANDLING), 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)
     }
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode?.code,
+      system,
+      operation: 'putParticipantsByTypeAndID',
+      step
+    })
     histTimerEnd({ success: false })
   }
 }
@@ -220,14 +280,18 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
     'Put participants error by type and ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   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
+    step = 'validateParticipant-1'
     const destinationParticipant = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.DESTINATION])
     if (destinationParticipant) {
       const decodedPayload = decodePayload(dataUri, { asParsed: false })
+      step = 'sendErrorToParticipant-2'
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.DESTINATION],
         callbackEndpointType,
@@ -236,6 +300,7 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         params
       )
     } else {
+      step = 'sendErrorToParticipant-3'
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
         callbackEndpointType,
@@ -247,20 +312,31 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
     }
     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
+      const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+      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(),
+        fspiopError.toApiErrorObject(),
         headers,
         params
       )
+      const extensions = err.extensions || []
+      const system = extensions.find((element) => element.key === 'system')?.value || ''
+      errorCounter.inc({
+        code: fspiopError?.apiErrorCode?.code,
+        system,
+        operation: 'putParticipantsErrorByTypeAndID',
+        step
+      })
     } 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 })
   }
@@ -283,10 +359,12 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
     'Post participants',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const childSpan = span ? span.getChild('postParticipants') : undefined
   let fspiopError
+  let step
   try {
-    Logger.isInfoEnabled && Logger.info('postParticipants::begin')
+    logger.info('postParticipants::begin')
     const type = params.Type
     const partySubIdOrType = params.SubId
     const callbackEndpointType = partySubIdOrType
@@ -297,8 +375,10 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
       : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
 
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], childSpan)
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, undefined, payload, cache)
         if (response && response.status === Enums.Http.ReturnCodes.CREATED.CODE) {
           const responsePayload = {
@@ -324,18 +404,21 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
             clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options, childSpan)
           if (childSpan && !childSpan.isFinished) {
             await childSpan.finish()
           }
         } else {
           fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
+          step = 'sendErrorToParticipant-4'
           await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
             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 {
@@ -343,11 +426,19 @@ 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)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode?.code,
+      system,
+      operation: 'postParticipants',
+      step
+    })
     try {
       const errorCallbackEndpointType = params.SubId
         ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
@@ -357,7 +448,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 {
@@ -385,100 +476,108 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
     'Post participants batch',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  const requestId = requestPayload.requestId
+  const log = logger.child({ context: 'postParticipantsBatch', requestId })
   const childSpan = span ? span.getChild('postParticipantsBatch') : undefined
   let fspiopError
+  let step
   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)
+      })
+    }
+    step = 'validateParticipant-1'
     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
+        requestId,
+        partyList: value
       }
-      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
-      }
-      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 })
+      step = 'oracleBatchRequest-2'
+      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)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode?.code,
+      system,
+      operation: 'postParticipantsBatch',
+      step
+    })
     try {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR,
         fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, undefined, requestPayload)
     } 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 {
@@ -507,15 +606,20 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     'Delete participants',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  const log = logger.child('deleteParticipants')
+  let step
   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
     const errorCallbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE])
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
         if (response) {
           const responsePayload = {
@@ -529,31 +633,44 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
           const clonedHeaders = { ...headers }
           clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = headers[Enums.Http.Headers.FSPIOP.SOURCE]
           clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
+          step = 'sendErrorToParticipant-4'
           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)
         }
       } 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 {
+      step = 'sendErrorToParticipant-5'
       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 fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR)
       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,
-        ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+        fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+      const extensions = err.extensions || []
+      const system = extensions.find((element) => element.key === 'system')?.value || ''
+      errorCounter.inc({
+        code: fspiopError?.apiErrorCode?.code,
+        system,
+        operation: 'deleteParticipants',
+        step
+      })
     } 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 })
   }