account-lookup-service 17.4.1-csi-1300.0 → 17.4.1-csi-1300.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "17.4.1-csi-1300.0",
+  "version": "17.4.1-csi-1300.2",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -97,7 +97,7 @@
     "@mojaloop/central-services-metrics": "12.4.5",
     "@mojaloop/central-services-shared": "18.22.4-snapshot.0",
     "@mojaloop/central-services-stream": "11.5.1",
-    "@mojaloop/database-lib": "11.1.3",
+    "@mojaloop/database-lib": "11.1.4",
     "@mojaloop/event-sdk": "14.3.2",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.7",
     "@mojaloop/ml-schema-transformer-lib": "2.5.8",

package/src/domain/parties/deps.js

@@ -0,0 +1,49 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const { proxies } = require('@mojaloop/central-services-shared').Util
+const oracle = require('../../models/oracle/facade')
+const participant = require('../../models/participantEndpoint/facade')
+const config = require('../../lib/config')
+const partiesUtils = require('./partiesUtils')
+
+const createDeps = ({ cache, proxyCache, childSpan, log, stepState }) => Object.freeze({
+  cache,
+  proxyCache,
+  childSpan,
+  log,
+  stepState,
+  config,
+  oracle,
+  participant,
+  proxies,
+  partiesUtils
+})
+
+module.exports = {
+  createDeps
+}

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -23,38 +23,11 @@
  --------------
  **********/
 
-const { Enum, Util } = require('@mojaloop/central-services-shared')
-// const ErrorHandler = require('@mojaloop/central-services-error-handling')
 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 libUtil = require('../../lib/util')
 const { logger } = require('../../lib')
-// const { createCallbackHeaders } = require('../../lib/headers')
-// const { ERROR_MESSAGES } = require('../../constants')
 const { GetPartiesService } = require('./services')
-const partiesUtils = require('./partiesUtils')
-
-// const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
-// const { Headers, RestMethods } = Enum.Http
-const { Headers } = Enum.Http
-
-// const proxyCacheTtlSec = 40 // todo: make configurable
-
-const createDeps = ({ cache, proxyCache, childSpan, log, stepState }) => Object.freeze({
-  cache,
-  proxyCache,
-  childSpan,
-  log,
-  stepState,
-  config,
-  oracle,
-  participant,
-  proxies: Util.proxies,
-  partiesUtils
-})
+const { createDeps } = require('./deps')
 
 /**
  * @function getPartiesByTypeAndID
@@ -76,261 +49,28 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     'Get party by Type and Id',
     ['success']
   ).startTimer()
+  const childSpan = span ? span.getChild(component) : undefined
   const log = logger.child({ component, params })
   const stepState = libUtil.initStepState()
-  const childSpan = span ? span.getChild(component) : undefined
 
-  const service = new GetPartiesService(createDeps({
-    cache, proxyCache, childSpan, log, stepState
-  }))
-
-  const proxyEnabled = !!(config.PROXY_CACHE_CONFIG.enabled && proxyCache)
-  const source = headers[Headers.FSPIOP.SOURCE]
-  const proxy = proxyEnabled && headers[Headers.FSPIOP.PROXY]
-  const destination = headers[Headers.FSPIOP.DESTINATION]
-  // see https://github.com/mojaloop/design-authority/issues/79
-  // the requester has specified a destination routing header. We should respect that and forward the request directly to the destination
-  // without consulting any oracles.
-
-  log.info('parties::getPartiesByTypeAndID start', { source, destination, proxy })
-
-  let requester
-  let fspiopError
+  const deps = createDeps({ cache, proxyCache, childSpan, log, stepState })
+  const service = new GetPartiesService(deps)
+  const results = {}
 
   try {
-    requester = await service.validateRequester({ source, proxy })
-
-    if (destination) {
-      await service.forwardRequestToDestination({ destination, headers, params })
-      // await forwardRequestToDestination({
-      //   destination, headers, options, callbackEndpointType, childSpan, proxyEnabled, proxyCache, log, stepState
-      // })
-      histTimerEnd({ success: true })
-      return
-    }
-
-    const response = await service.sendOracleDiscoveryRequest({ headers, params, query })
-
-    if (Array.isArray(response?.data?.partyList) && response.data.partyList.length > 0) {
-      const partyList = service.filterOraclePartyList({ response, params })
-      await service.processOraclePartyList({ partyList, headers, params, destination })
-      // const partyList = filterOraclePartyList({ response, params, log, stepState })
-      // await processOraclePartyList({
-      //   partyList, headers, params, destination, childSpan, proxyEnabled, proxyCache, log, stepState
-      // })
-    } else {
-      log.info('empty partyList form oracle, getting proxies list...', { proxyEnabled, params })
-      const proxyNames = await service.getFilteredProxyList(proxy)
-      // getFilteredProxyList({ config, proxy, proxyEnabled, stepState })
-
-      if (!proxyNames.length) {
-        fspiopError = await service.sendErrorCallback({ requester, headers, params })
-        // sendErrorCallback({
-        //   headers, params, requester, childSpan, stepState
-        // })
-      } else {
-        await service.triggerSendToProxiesFlow({ proxyNames, headers, params, source })
-        // await triggerSendToProxiesFlow({
-        //   proxyNames, headers, params, source, childSpan, proxyCache, log, stepState
-        // })
-      }
-    }
-    log.info('parties::getPartiesByTypeAndID is done')
+    await service.handleRequest({ headers, params, query, results })
+    log.info('getPartiesByTypeAndID is done')
     histTimerEnd({ success: true })
-  } catch (err) {
-    fspiopError = await partiesUtils.createErrorHandlerOnSendingCallback(config, log)(err, headers, params, requester)
+  } catch (error) {
+    const { requester } = results
+    results.fspiopError = await service.handleError({ error, requester, headers, params })
     histTimerEnd({ success: false })
-    if (fspiopError) {
-      libUtil.countFspiopError(fspiopError, { operation: component, step: stepState.step })
+    if (results.fspiopError) {
+      libUtil.countFspiopError(results.fspiopError, { operation: component, step: stepState.step })
     }
   } finally {
-    await libUtil.finishSpanWithError(childSpan, fspiopError)
+    await libUtil.finishSpanWithError(childSpan, results.fspiopError)
   }
 }
 
-// const validateRequester = async ({ source, proxy, proxyCache, stepState }) => {
-//   stepState.inProgress('validateRequester-0')
-//   const log = logger.child({ source, method: 'validateRequester' })
-//   const sourceParticipant = await participant.validateParticipant(source)
-//   if (sourceParticipant) {
-//     log.debug('source is in scheme')
-//     return source
-//   }
-//
-//   if (!proxy) {
-//     const errMessage = ERROR_MESSAGES.sourceFspNotFound
-//     log.warn(errMessage)
-//     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
-//   }
-//
-//   const proxyParticipant = await participant.validateParticipant(proxy)
-//   if (!proxyParticipant) {
-//     const errMessage = ERROR_MESSAGES.partyProxyNotFound
-//     log.warn(errMessage, { proxy })
-//     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
-//   }
-//
-//   const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
-//   // think, what if isCached !== true?
-//   log.info('source is added to proxyMapping cache:', { proxy, isCached })
-//   return proxy
-// }
-
-// const forwardRequestToDestination = async ({
-//   destination, headers, options, callbackEndpointType, childSpan, proxyEnabled, proxyCache, log, stepState
-// }) => {
-//   let sendTo = destination
-//   stepState.inProgress('validateDestination-1')
-//
-//   const destParticipantModel = await participant.validateParticipant(destination)
-//   if (!destParticipantModel) {
-//     stepState.inProgress('lookupProxyDestination-2')
-//     const proxyId = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
-//
-//     if (!proxyId) {
-//       log.warn('no destination participant, and no dfsp-to-proxy mapping', { destination })
-//       const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
-//       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
-//     }
-//     sendTo = proxyId
-//   }
-//   // all ok, go ahead and forward the request
-//   stepState.inProgress('forwardRequest-3')
-//   await participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
-//   log.info('discovery getPartiesByTypeAndID request was sent', { sendTo })
-// }
-
-// const filterOraclePartyList = ({ response, params, log, stepState }) => {
-//   // Oracle's API is a standard rest-style end-point Thus a GET /party on the oracle will return all participant-party records. We must filter the results based on the callbackEndpointType to make sure we remove records containing partySubIdOrType when we are in FSPIOP_CALLBACK_URL_PARTIES_GET mode:
-//   stepState.inProgress('filterOraclePartyList-5')
-//   const callbackEndpointType = partiesUtils.getPartyCbType(params.SubId)
-//   let filteredResponsePartyList
-//
-//   switch (callbackEndpointType) {
-//     case FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTIES_GET:
-//       filteredResponsePartyList = response.data.partyList.filter(party => party.partySubIdOrType == null) // Filter records that DON'T contain a partySubIdOrType
-//       break
-//     case FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_GET:
-//       filteredResponsePartyList = response.data.partyList.filter(party => party.partySubIdOrType === params.SubId) // Filter records that match partySubIdOrType
-//       break
-//     default:
-//       filteredResponsePartyList = response // Fallback to providing the standard list
-//   }
-//
-//   if (!Array.isArray(filteredResponsePartyList) || !filteredResponsePartyList.length) {
-//     const errMessage = 'Requested FSP/Party not found'
-//     log.warn(errMessage)
-//     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
-//   }
-//
-//   return filteredResponsePartyList
-// }
-
-// const processOraclePartyList = async ({
-//   partyList, headers, params, destination, childSpan, proxyEnabled, proxyCache, log, stepState
-// }) => {
-//   const callbackEndpointType = partiesUtils.getPartyCbType(params.SubId)
-//   const options = partiesUtils.partiesRequestOptionsDto(params)
-//
-//   let sentCount = 0 // if sentCount === 0 after sending, should we restart the whole process?
-//   const sending = partyList.map(async party => {
-//     const { fspId } = party
-//     const clonedHeaders = { ...headers }
-//     if (!destination) {
-//       clonedHeaders[Headers.FSPIOP.DESTINATION] = fspId
-//     }
-//     stepState.inProgress('validateParticipant-6')
-//     const schemeParticipant = await participant.validateParticipant(fspId)
-//     if (schemeParticipant) {
-//       sentCount++
-//       log.info('participant is in scheme', { fspId })
-//       return participant.sendRequest(clonedHeaders, fspId, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
-//     }
-//
-//     // If the participant is not in the scheme and proxy routing is enabled,
-//     // we should check if there is a proxy for it and send the request to the proxy
-//     if (proxyEnabled) {
-//       stepState.inProgress('lookupProxyByDfspId-7')
-//       const proxyName = await proxyCache.lookupProxyByDfspId(fspId)
-//       if (!proxyName) {
-//         log.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
-//         // todo: delete reference in oracle
-//       } else {
-//         sentCount++
-//         log.info('participant is NOT in scheme, use proxy name', { fspId, proxyName })
-//         return participant.sendRequest(clonedHeaders, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
-//       }
-//     }
-//   })
-//   await Promise.all(sending)
-//   log.verbose('processOraclePartyList is done', { sentCount })
-//   // todo: think what if sentCount === 0 here
-// }
-
-// const getFilteredProxyList = async ({ config, proxy, proxyEnabled, stepState }) => {
-//   stepState.inProgress('getAllProxies-8')
-//   if (!proxyEnabled) return []
-//
-//   const proxyNames = await Util.proxies.getAllProxiesNames(config.SWITCH_ENDPOINT)
-//   return proxyNames.filter(name => name !== proxy)
-// }
-
-// const sendErrorCallback = async ({
-//   headers, params, requester, childSpan, stepState
-// }) => {
-//   stepState.inProgress('sendErrorToParticipant-9')
-//   const callbackHeaders = createCallbackHeaders({
-//     requestHeaders: headers,
-//     partyIdType: params.Type,
-//     partyIdentifier: params.ID,
-//     endpointTemplate: params.SubId
-//       ? FspEndpointTemplates.PARTIES_SUB_ID_PUT_ERROR
-//       : FspEndpointTemplates.PARTIES_PUT_ERROR
-//   })
-//   const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
-//
-//   await participant.sendErrorToParticipant(
-//     requester,
-//     partiesUtils.errorPartyCbType(params.SubId),
-//     fspiopError.toApiErrorObject(config.ERROR_HANDLING),
-//     callbackHeaders,
-//     params,
-//     childSpan
-//   )
-//   return fspiopError
-// }
-
-// const triggerSendToProxiesFlow = async ({
-//   proxyNames, headers, params, source, childSpan, proxyCache, log, stepState
-// }) => {
-//   stepState.inProgress('setSendToProxiesList-10')
-//   const alsReq = partiesUtils.alsRequestDto(source, params)
-//   log.info('starting setSendToProxiesList flow: ', { proxyNames, alsReq, proxyCacheTtlSec })
-//
-//   const isCached = await proxyCache.setSendToProxiesList(alsReq, proxyNames, proxyCacheTtlSec)
-//   if (!isCached) {
-//     log.warn('failed to setSendToProxiesList')
-//     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
-//   }
-//
-//   const callbackEndpointType = partiesUtils.getPartyCbType(params.SubId)
-//   const options = partiesUtils.partiesRequestOptionsDto(params)
-//   stepState.inProgress('sendingProxyRequests-11')
-//   const sending = proxyNames.map(
-//     proxyName => participant.sendRequest(headers, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
-//       .then(({ status, data } = {}) => ({ status, data }))
-//   )
-//   const results = await Promise.allSettled(sending)
-//   const isOk = results.some(result => result.status === 'fulfilled')
-//   // If, at least, one request is sent to proxy, we treat the whole flow as successful.
-//   // Failed requests should be handled by TTL expired/timeout handler
-//   // todo: - think, if we should handle failed requests here (e.g., by calling receivedErrorResponse)
-//   log.info('triggerSendToProxiesFlow is done:', { isOk, results, proxyNames, alsReq })
-//   stepState.inProgress('allSent-12')
-//   if (!isOk) {
-//     log.warn('no successful requests sent to proxies')
-//     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
-//   }
-// }
-
 module.exports = getPartiesByTypeAndID

package/src/domain/parties/partiesUtils.js

@@ -26,6 +26,8 @@
  ******/
 
 const { Enum, Util: { Hapi } } = require('@mojaloop/central-services-shared')
+const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
+// todo: check why do we need sdk-standard-components deps here !!!
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const participant = require('../../models/participantEndpoint/facade')
@@ -99,6 +101,10 @@ const createErrorHandlerOnSendingCallback = (config, logger) => async (err, head
   }
 }
 
+function isNotValidPayeeCase (payload) {
+  return payload?.errorInformation?.errorCode === MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
+}
+
 module.exports = {
   getPartyCbType,
   putPartyCbType,
@@ -107,5 +113,6 @@ module.exports = {
   createErrorHandlerOnSendingCallback,
   alsRequestDto,
   partiesRequestOptionsDto,
-  swapSourceDestinationHeaders
+  swapSourceDestinationHeaders,
+  isNotValidPayeeCase
 }

package/src/domain/parties/putParties.js

@@ -31,7 +31,6 @@
 
 const { Headers, RestMethods } = require('@mojaloop/central-services-shared').Enum.Http
 const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
-const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Metrics = require('@mojaloop/central-services-metrics')
 
@@ -43,7 +42,8 @@ const { logger } = require('../../lib')
 const { ERROR_MESSAGES } = require('../../constants')
 
 const partiesUtils = require('./partiesUtils')
-const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
+const services = require('./services')
+const { createDeps } = require('./deps')
 
 /**
  * @function putPartiesByTypeAndID
@@ -158,103 +158,57 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     'Put parties error by type and id',
     ['success']
   ).startTimer()
-  const log = logger.child({ params, component })
+  const childSpan = span ? span.getChild(component) : undefined
+  const log = logger.child({ component, params })
+  const stepState = libUtil.initStepState()
+
+  const deps = createDeps({ cache, proxyCache, childSpan, log, stepState })
+  const service = new services.PutPartiesErrorService(deps)
+  const results = {}
+
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
   const proxy = proxyEnabled && headers[Headers.FSPIOP.PROXY]
-
-  const childSpan = span ? span.getChild(component) : undefined
-  const stepState = libUtil.initStepState()
   log.info('parties::putPartiesErrorByTypeAndID start', { destination, proxy })
 
-  let sendTo
-  let fspiopError
-
   try {
     if (proxy) {
-      const isDone = await processProxyErrorCallback({
-        headers, params, payload, childSpan, cache, proxyCache, log, proxy, destination, stepState
-      })
-      if (isDone) {
+      const notValid = await service.checkPayee({ headers, params, payload, proxy })
+      if (notValid) {
+        const getPartiesService = new services.GetPartiesService(deps)
+        // todo: think, if we need to remove destination header before starting new discovery
+        await getPartiesService.handleRequest({ headers, params, results })
+        log.info('putPartiesErrorByTypeAndID triggered new discovery flow')
+        histTimerEnd({ success: true })
+        return
+      }
+
+      const isLast = await service.checkLastProxyCallback({ destination, proxy, params })
+      if (!isLast) {
         log.info('putPartiesErrorByTypeAndID proxy callback was processed', { proxy })
         histTimerEnd({ success: true })
         return
       }
     }
 
-    sendTo = await identifyDestinationForErrorCallback({
-      destination, proxyCache, proxyEnabled, log, stepState
-    })
-
-    await sendErrorCallbackToParticipant({
-      sendTo, headers, params, dataUri, childSpan, stepState
-    })
+    const sendTo = await service.identifyDestinationForErrorCallback(destination)
+    results.requester = sendTo
+    await service.sendErrorCallbackToParticipant({ sendTo, headers, params, dataUri })
 
     log.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
     histTimerEnd({ success: true })
-  } catch (err) {
-    fspiopError = await partiesUtils.createErrorHandlerOnSendingCallback(Config, log)(err, headers, params, sendTo)
-    if (fspiopError) {
-      libUtil.countFspiopError(fspiopError, { operation: component, step: stepState.step })
+  } catch (error) {
+    const { requester } = results
+    results.fspiopError = await service.handleError({ error, requester, headers, params })
+    if (results.fspiopError) {
+      libUtil.countFspiopError(results.fspiopError, { operation: component, step: stepState.step })
     }
     histTimerEnd({ success: false })
   } finally {
-    await libUtil.finishSpanWithError(childSpan, fspiopError)
+    await libUtil.finishSpanWithError(childSpan, results.fspiopError)
   }
 }
 
-const processProxyErrorCallback = async ({
-  headers, params, payload, childSpan, cache, proxyCache, log, proxy, destination, stepState
-}) => {
-  log.verbose('processProxyErrorCallback...')
-  let isDone // whether or not to continue putPartiesErrorByTypeAndID
-
-  if (isNotValidPayeeCase(payload)) {
-    stepState.inProgress('notValidPayeeCase-1')
-    log.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID', { proxy, payload })
-    const swappedHeaders = partiesUtils.swapSourceDestinationHeaders(headers)
-    await oracle.oracleRequest(swappedHeaders, RestMethods.DELETE, params, null, null, cache)
-    getPartiesByTypeAndID(swappedHeaders, params, RestMethods.GET, {}, childSpan, cache, proxyCache)
-    isDone = true
-  } else {
-    stepState.inProgress('receivedErrorResponse-2')
-    const alsReq = partiesUtils.alsRequestDto(destination, params) // or source?
-    const isLast = await proxyCache.receivedErrorResponse(alsReq, proxy)
-    log.info(`got${isLast ? '' : 'NOT'} last error callback from proxy`, { proxy, alsReq, isLast })
-    isDone = !isLast
-  }
-  return isDone
-}
-
-const identifyDestinationForErrorCallback = async ({
-  destination, proxyCache, proxyEnabled, log, stepState
-}) => {
-  stepState.inProgress('validateParticipant-3')
-  const destinationParticipant = await participant.validateParticipant(destination)
-  if (destinationParticipant) return destination
-
-  stepState.inProgress('lookupProxyDestination-4')
-  const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
-  if (proxyName) return proxyName
-
-  const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
-  log.warn(errMessage)
-  throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
-}
-
-const sendErrorCallbackToParticipant = async ({
-  sendTo, headers, params, dataUri, childSpan, stepState
-}) => {
-  stepState.inProgress('sendErrorToParticipant-5')
-  const decodedPayload = decodePayload(dataUri, { asParsed: false })
-  const callbackEndpointType = partiesUtils.errorPartyCbType(params.SubId)
-  await participant.sendErrorToParticipant(sendTo, callbackEndpointType, decodedPayload.body.toString(), headers, params, childSpan)
-}
-
-function isNotValidPayeeCase (payload) {
-  return payload?.errorInformation?.errorCode === MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
-}
-
 module.exports = {
   putPartiesByTypeAndID,
   putPartiesErrorByTypeAndID

package/src/domain/parties/services/BasePartiesService.js

@@ -0,0 +1,88 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const { Enum } = require('@mojaloop/central-services-shared')
+
+const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
+const { Headers, RestMethods } = Enum.Http
+
+class BasePartiesService {
+  constructor (deps) {
+    this.deps = deps
+    this.log = this.deps.log.child({ component: this.constructor.name })
+    this.proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG?.enabled && deps.proxyCache)
+  }
+
+  async handleRequest () {
+    throw new Error('handleRequest must be implemented by subclass')
+  }
+
+  async handleError ({ error, requester, headers, params }) {
+    const log = this.log.child({ method: 'handleError' })
+    try {
+      log.error('error in processing parties request: ', error)
+      const sendTo = requester || headers[Headers.FSPIOP.SOURCE]
+      const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(error)
+      const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, fspiopError, headers, params)
+
+      await this.sendErrorCallback({ sendTo, errorInfo, headers, params })
+      log.info('handleError in done', { sendTo, errorInfo })
+      return fspiopError
+    } 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.
+      log.error('failed to handleError. No further processing! ', exc)
+    }
+  }
+
+  async validateParticipant (participantId) {
+    return this.deps.participant.validateParticipant(participantId)
+  }
+
+  async sendErrorCallback ({ sendTo, errorInfo, headers, params, payload = undefined }) {
+    const endpointType = this.deps.partiesUtils.errorPartyCbType(params.SubId)
+    return this.deps.participant.sendErrorToParticipant(
+      sendTo, endpointType, errorInfo, headers, params, payload, this.deps.childSpan
+    )
+  }
+
+  async sendDeleteOracleRequest (headers, params) {
+    return this.deps.oracle.oracleRequest(headers, RestMethods.DELETE, params, null, null, this.deps.cache)
+  }
+
+  static enums () {
+    return {
+      FspEndpointTypes,
+      FspEndpointTemplates,
+      Headers,
+      RestMethods
+    }
+  }
+}
+
+module.exports = BasePartiesService

package/src/domain/parties/services/GetPartiesService.js

@@ -26,66 +26,91 @@
  ******/
 
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const { Enum } = require('@mojaloop/central-services-shared')
 const { ERROR_MESSAGES } = require('../../../constants')
 const { createCallbackHeaders } = require('../../../lib/headers')
+const BasePartiesService = require('./BasePartiesService')
 
-const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
-const { Headers, RestMethods } = Enum.Http
+const {
+  FspEndpointTypes, FspEndpointTemplates,
+  Headers, RestMethods
+} = BasePartiesService.enums()
 
 const proxyCacheTtlSec = 40 // todo: make configurable
 
-class GetPartiesService {
-  #deps
+class GetPartiesService extends BasePartiesService {
+  async handleRequest ({ headers, params, query, results }) {
+    const source = headers[Headers.FSPIOP.SOURCE]
+    const proxy = headers[Headers.FSPIOP.PROXY]
+    const destination = headers[Headers.FSPIOP.DESTINATION]
+    // see https://github.com/mojaloop/design-authority/issues/79
+    // the requester has specified a destination routing header. We should respect that and forward the request directly to the destination
+    // without consulting any oracles.
+    this.log.info('handling getParties request', { source, destination, proxy })
+
+    const requester = await this.validateRequester({ source, proxy })
+    results.requester = requester
+
+    if (destination) {
+      await this.forwardRequestToDestination({ destination, headers, params })
+      return
+    }
+    const response = await this.sendOracleDiscoveryRequest({ headers, params, query })
 
-  constructor (deps) {
-    this.#deps = deps
-    this.log = this.#deps.log.child({ component: this.constructor.name })
-    this.proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG?.enabled && deps.proxyCache)
-  }
+    if (Array.isArray(response?.data?.partyList) && response.data.partyList.length > 0) {
+      const partyList = this.filterOraclePartyList({ response, params })
+      await this.processOraclePartyList({ partyList, headers, params, destination })
+      return
+    }
+
+    this.log.info('empty partyList form oracle, getting proxyList...', { params })
+    const proxyNames = await this.getFilteredProxyList(proxy)
+
+    if (proxyNames.length) {
+      await this.triggerSendToProxiesFlow({ proxyNames, headers, params, source })
+      return
+    }
 
-  async handleRequest () {
-    // todo: add logic
+    results.fspiopError = await this.sendPartyNotFoundErrorCallback({ requester, headers, params })
   }
 
   async validateRequester ({ source, proxy }) {
-    this.#deps.stepState.inProgress('validateRequester-0')
+    this.deps.stepState.inProgress('validateRequester-0')
     const log = this.log.child({ source, method: 'validateRequester' })
 
-    const sourceParticipant = await this.#validateParticipant(source)
+    const sourceParticipant = await this.validateParticipant(source)
     if (sourceParticipant) {
       log.debug('source is in scheme')
       return source
     }
 
-    if (!proxy) {
+    if (!this.proxyEnabled || !proxy) {
       const errMessage = ERROR_MESSAGES.sourceFspNotFound
       log.warn(errMessage)
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
     }
 
-    const proxyParticipant = await this.#validateParticipant(proxy)
+    const proxyParticipant = await this.validateParticipant(proxy)
     if (!proxyParticipant) {
       const errMessage = ERROR_MESSAGES.partyProxyNotFound
       log.warn(errMessage, { proxy })
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
     }
 
-    const isCached = await this.#deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
+    const isCached = await this.deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
     // think, what if isCached !== true?
     log.info('source is added to proxyMapping cache:', { proxy, isCached })
     return proxy
   }
 
   async forwardRequestToDestination ({ destination, headers, params }) {
-    this.#deps.stepState.inProgress('validateDestination-1')
+    this.deps.stepState.inProgress('validateDestination-1')
     const log = this.log.child({ method: 'forwardRequestToDestination' })
     let sendTo = destination
 
-    const destParticipantModel = await this.#validateParticipant(destination)
+    const destParticipantModel = await this.validateParticipant(destination)
     if (!destParticipantModel) {
-      this.#deps.stepState.inProgress('lookupProxyDestination-2')
-      const proxyId = this.proxyEnabled && await this.#deps.proxyCache.lookupProxyByDfspId(destination)
+      this.deps.stepState.inProgress('lookupProxyDestination-2')
+      const proxyId = this.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
 
       if (!proxyId) {
         log.warn('no destination participant, and no dfsp-to-proxy mapping', { destination })
@@ -101,8 +126,8 @@ class GetPartiesService {
 
   filterOraclePartyList ({ response, params }) {
     // Oracle's API is a standard rest-style end-point Thus a GET /party on the oracle will return all participant-party records. We must filter the results based on the callbackEndpointType to make sure we remove records containing partySubIdOrType when we are in FSPIOP_CALLBACK_URL_PARTIES_GET mode:
-    this.#deps.stepState.inProgress('filterOraclePartyList-5')
-    const callbackEndpointType = this.#deps.partiesUtils.getPartyCbType(params.SubId)
+    this.deps.stepState.inProgress('filterOraclePartyList-5')
+    const callbackEndpointType = this.deps.partiesUtils.getPartyCbType(params.SubId)
     let filteredResponsePartyList
 
     switch (callbackEndpointType) {
@@ -118,7 +143,7 @@ class GetPartiesService {
 
     if (!Array.isArray(filteredResponsePartyList) || !filteredResponsePartyList.length) {
       const errMessage = 'Requested FSP/Party not found'
-      this.#deps.log.warn(errMessage)
+      this.log.warn(errMessage)
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
     }
 
@@ -135,8 +160,8 @@ class GetPartiesService {
       if (!destination) {
         clonedHeaders[Headers.FSPIOP.DESTINATION] = fspId
       }
-      this.#deps.stepState.inProgress('validateParticipant-6')
-      const schemeParticipant = await this.#validateParticipant(fspId)
+      this.deps.stepState.inProgress('validateParticipant-6')
+      const schemeParticipant = await this.validateParticipant(fspId)
       if (schemeParticipant) {
         sentCount++
         log.info('participant is in scheme', { fspId })
@@ -150,8 +175,8 @@ class GetPartiesService {
       // If the participant is not in the scheme and proxy routing is enabled,
       // we should check if there is a proxy for it and send the request to the proxy
       if (this.proxyEnabled) {
-        this.#deps.stepState.inProgress('lookupProxyByDfspId-7')
-        const proxyName = await this.#deps.proxyCache.lookupProxyByDfspId(fspId)
+        this.deps.stepState.inProgress('lookupProxyByDfspId-7')
+        const proxyName = await this.deps.proxyCache.lookupProxyByDfspId(fspId)
         if (!proxyName) {
           log.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
           // todo: delete reference in oracle
@@ -172,27 +197,30 @@ class GetPartiesService {
   }
 
   async getFilteredProxyList (proxy) {
-    this.#deps.stepState.inProgress('getAllProxies-8')
-    if (!this.proxyEnabled) return []
+    this.deps.stepState.inProgress('getAllProxies-8')
+    if (!this.proxyEnabled) {
+      this.log.warn('proxyCache is not enabled')
+      return []
+    }
 
-    const proxyNames = await this.#deps.proxies.getAllProxiesNames(this.#deps.config.SWITCH_ENDPOINT)
+    const proxyNames = await this.deps.proxies.getAllProxiesNames(this.deps.config.SWITCH_ENDPOINT)
     this.log.debug('getAllProxiesNames is done', { proxyNames })
     return proxyNames.filter(name => name !== proxy)
   }
 
   async triggerSendToProxiesFlow ({ proxyNames, headers, params, source }) {
     const log = this.log.child({ method: 'triggerSendToProxiesFlow' })
-    this.#deps.stepState.inProgress('setSendToProxiesList-10')
-    const alsReq = this.#deps.partiesUtils.alsRequestDto(source, params)
+    this.deps.stepState.inProgress('setSendToProxiesList-10')
+    const alsReq = this.deps.partiesUtils.alsRequestDto(source, params)
     log.info('starting setSendToProxiesList flow: ', { proxyNames, alsReq, proxyCacheTtlSec })
 
-    const isCached = await this.#deps.proxyCache.setSendToProxiesList(alsReq, proxyNames, proxyCacheTtlSec)
+    const isCached = await this.deps.proxyCache.setSendToProxiesList(alsReq, proxyNames, proxyCacheTtlSec)
     if (!isCached) {
       log.warn('failed to setSendToProxiesList')
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
     }
 
-    this.#deps.stepState.inProgress('sendingProxyRequests-11')
+    this.deps.stepState.inProgress('sendingProxyRequests-11')
     const sending = proxyNames.map(
       sendTo => this.#forwardGetPartiesRequest({ sendTo, headers, params })
         .then(({ status, data } = {}) => ({ status, data }))
@@ -203,31 +231,15 @@ class GetPartiesService {
     // Failed requests should be handled by TTL expired/timeout handler
     // todo: - think, if we should handle failed requests here (e.g., by calling receivedErrorResponse)
     log.info('triggerSendToProxiesFlow is done:', { isOk, results, proxyNames, alsReq })
-    this.#deps.stepState.inProgress('allSent-12')
+    this.deps.stepState.inProgress('allSent-12')
     if (!isOk) {
       log.warn('no successful requests sent to proxies')
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
     }
   }
 
-  async #validateParticipant (participantId) {
-    return this.#deps.participant.validateParticipant(participantId)
-  }
-
-  async #forwardGetPartiesRequest ({ sendTo, headers, params }) {
-    this.#deps.stepState.inProgress('forwardRequest-3')
-    const callbackEndpointType = this.#deps.partiesUtils.getPartyCbType(params.SubId)
-    const options = this.#deps.partiesUtils.partiesRequestOptionsDto(params)
-
-    return this.#deps.participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.GET, undefined, options, this.#deps.childSpan)
-  }
-
-  // async sendSuccessCallback ({ headers, sendTo }) {
-  //   return this.#deps.participant.sendRequest(headers, sendTo,)
-  // }
-
-  async sendErrorCallback ({ requester, headers, params }) {
-    this.#deps.stepState.inProgress('sendErrorCallback-9')
+  async sendPartyNotFoundErrorCallback ({ requester, headers, params }) {
+    this.deps.stepState.inProgress('sendErrorCallback-9')
     const callbackHeaders = createCallbackHeaders({
       requestHeaders: headers,
       partyIdType: params.Type,
@@ -238,20 +250,26 @@ class GetPartiesService {
     })
     const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
 
-    await this.#deps.participant.sendErrorToParticipant(
-      requester,
-      this.#deps.partiesUtils.errorPartyCbType(params.SubId),
-      fspiopError.toApiErrorObject(this.#deps.config.ERROR_HANDLING),
-      callbackHeaders,
-      params,
-      this.#deps.childSpan
-    )
+    await this.sendErrorCallback({
+      sendTo: requester,
+      errorInfo: fspiopError.toApiErrorObject(this.deps.config.ERROR_HANDLING),
+      headers: callbackHeaders,
+      params
+    })
     return fspiopError
   }
 
   async sendOracleDiscoveryRequest ({ headers, params, query }) {
-    this.#deps.stepState.inProgress('oracleRequest-4')
-    return this.#deps.oracle.oracleRequest(headers, RestMethods.GET, params, query, undefined, this.#deps.cache)
+    this.deps.stepState.inProgress('oracleRequest-4')
+    return this.deps.oracle.oracleRequest(headers, RestMethods.GET, params, query, undefined, this.deps.cache)
+  }
+
+  async #forwardGetPartiesRequest ({ sendTo, headers, params }) {
+    this.deps.stepState.inProgress('forwardRequest-3')
+    const callbackEndpointType = this.deps.partiesUtils.getPartyCbType(params.SubId)
+    const options = this.deps.partiesUtils.partiesRequestOptionsDto(params)
+
+    return this.deps.participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.GET, undefined, options, this.deps.childSpan)
   }
 }
 

package/src/domain/parties/services/PutPartiesErrorService.js

@@ -0,0 +1,81 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
+const { ERROR_MESSAGES } = require('../../../constants')
+const BasePartiesService = require('./BasePartiesService')
+
+class PutPartiesErrorService extends BasePartiesService {
+  async handleRequest () {
+    // todo: add impl.
+  }
+
+  async checkPayee ({ headers, params, payload, proxy }) {
+    const notValid = this.deps.partiesUtils.isNotValidPayeeCase(payload)
+    if (notValid) {
+      this.deps.stepState.inProgress('notValidPayeeCase-1')
+      this.log.warn('notValidPayee case - deleting Participants and run getPartiesByTypeAndID', { proxy, payload })
+      const swappedHeaders = this.deps.partiesUtils.swapSourceDestinationHeaders(headers)
+      await super.sendDeleteOracleRequest(swappedHeaders, params)
+    }
+    return notValid
+  }
+
+  async checkLastProxyCallback ({ destination, proxy, params }) {
+    this.deps.stepState.inProgress('checkLastProxyCallback-2')
+    const alsReq = this.deps.partiesUtils.alsRequestDto(destination, params) // or source?
+    const isLast = await this.deps.proxyCache.receivedErrorResponse(alsReq, proxy)
+    this.log.info(`got${isLast ? '' : 'NOT'} last error callback from proxy`, { proxy, alsReq, isLast })
+    return isLast
+  }
+
+  async identifyDestinationForErrorCallback (destination) {
+    this.deps.stepState.inProgress('validateParticipant-3')
+    const destinationParticipant = await super.validateParticipant(destination)
+    if (destinationParticipant) return destination
+
+    this.deps.stepState.inProgress('lookupProxyDestination-4')
+    const proxyName = this.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
+    if (proxyName) return proxyName
+
+    const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
+    this.log.warn(errMessage, { destination })
+    throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
+  }
+
+  async sendErrorCallbackToParticipant ({ sendTo, headers, params, dataUri }) {
+    this.deps.stepState.inProgress('sendErrorToParticipant-5')
+    const decodedPayload = decodePayload(dataUri, { asParsed: false })
+    const errorInfo = decodedPayload.body.toString()
+    return super.sendErrorCallback({
+      sendTo, errorInfo, headers, params
+    })
+  }
+}
+
+module.exports = PutPartiesErrorService

package/src/domain/parties/services/index.js

@@ -26,7 +26,9 @@
  ******/
 
 const GetPartiesService = require('./GetPartiesService')
+const PutPartiesErrorService = require('./PutPartiesErrorService')
 
 module.exports = {
-  GetPartiesService
+  GetPartiesService,
+  PutPartiesErrorService
 }