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

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -32,21 +32,22 @@ const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { createCallbackHeaders } = require('../../lib/headers')
 const { ERROR_MESSAGES } = require('../../constants')
-const { loggerFactory } = require('../../lib')
+const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods } = Enum.Http
 
-const logger = loggerFactory('domain:get-parties')
+const log = logger.child('domain:get-parties')
+const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, log)
 
 const proxyCacheTtlSec = 40 // todo: make configurable
 
 const validateRequester = async ({ source, proxy, proxyCache }) => {
   const sourceParticipant = await participant.validateParticipant(source)
   if (sourceParticipant) {
-    logger.debug('source is in scheme', { source })
+    log.debug('source is in scheme', { source })
     return source
   }
 
@@ -63,7 +64,7 @@ const validateRequester = async ({ source, proxy, proxyCache }) => {
 
   const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
   // think, what if isCached !== true?
-  logger.info('source is added to proxyMapping cache:', { source, proxy, isCached })
+  log.info('source is added to proxyMapping cache:', { source, proxy, isCached })
   return proxy
 }
 
@@ -94,7 +95,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
   const callbackEndpointType = utils.getPartyCbType(partySubId)
 
   const childSpan = span ? span.getChild('getPartiesByTypeAndID') : undefined
-  logger.info('parties::getPartiesByTypeAndID::begin', { source, proxy, params })
+  log.info('parties::getPartiesByTypeAndID::begin', { source, proxy, params })
 
   let requester
   let fspiopError
@@ -127,7 +128,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
       await participant.sendRequest(headers, destination, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
 
       histTimerEnd({ success: true })
-      logger.info('discovery getPartiesByTypeAndID request was sent to destination', { destination })
+      log.info('discovery getPartiesByTypeAndID request was sent to destination', { destination })
       return
     }
 
@@ -161,7 +162,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         const schemeParticipant = await participant.validateParticipant(fspId)
         if (schemeParticipant) {
           sentCount++
-          logger.debug('participant is in scheme', { fspId })
+          log.debug('participant is in scheme', { fspId })
           return participant.sendRequest(clonedHeaders, party.fspId, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
         }
 
@@ -170,20 +171,20 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         if (proxyEnabled) {
           const proxyName = await proxyCache.lookupProxyByDfspId(fspId)
           if (!proxyName) {
-            logger.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
+            log.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
             // todo: delete reference in oracle
           } else {
             sentCount++
-            logger.debug('participant NOT is in scheme, use proxy name', { fspId, proxyName })
+            log.debug('participant NOT is in scheme, use proxy name', { fspId, proxyName })
             return participant.sendRequest(clonedHeaders, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
           }
         }
       })
       await Promise.all(sending)
-      logger.info('participant.sendRequests to filtered oracle partyList are done', { sentCount })
+      log.info('participant.sendRequests to filtered oracle partyList are done', { sentCount })
       // todo: think what if sentCount === 0 here
     } else {
-      logger.info('empty partyList form oracle, getting proxies list...', { proxyEnabled, params })
+      log.info('empty partyList form oracle, getting proxies list...', { proxyEnabled, params })
       let filteredProxyNames = []
 
       if (proxyEnabled) {
@@ -206,7 +207,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
           fspiopError.toApiErrorObject(config.ERROR_HANDLING), callbackHeaders, params, childSpan)
       } else {
         const alsReq = utils.alsRequestDto(source, params)
-        logger.info('starting setSendToProxiesList flow: ', { filteredProxyNames, alsReq, proxyCacheTtlSec })
+        log.info('starting setSendToProxiesList flow: ', { filteredProxyNames, alsReq, proxyCacheTtlSec })
         const isCached = await proxyCache.setSendToProxiesList(alsReq, filteredProxyNames, proxyCacheTtlSec)
         if (!isCached) {
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
@@ -221,7 +222,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         // 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)
-        logger.info('setSendToProxiesList flow is done:', { isOk, results, filteredProxyNames, alsReq })
+        log.info('setSendToProxiesList flow is done:', { isOk, results, filteredProxyNames, alsReq })
         if (!isOk) {
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
         }
@@ -229,7 +230,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     }
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await utils.handleErrorOnSendingCallback(err, headers, params, requester)
+    fspiopError = await handleErrorOnSendingCallback(err, headers, params, requester)
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/parties/parties.js

@@ -38,12 +38,13 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { ERROR_MESSAGES } = require('../../constants')
-const { loggerFactory } = require('../../lib')
+const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
 const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
 
-const logger = loggerFactory('domain:put-parties')
+const log = logger.child('domain:put-parties')
+const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, log)
 
 /**
  * @function putPartiesByTypeAndID
@@ -70,7 +71,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const proxy = headers[Headers.FSPIOP.PROXY]
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
-  logger.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
+  log.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
 
   let sendTo
   try {
@@ -82,21 +83,21 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
       }
       const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
       // think,if we should throw error if isCached === false?
-      logger.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
+      log.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
     }
 
     if (proxyEnabled && proxy) {
       const alsReq = utils.alsRequestDto(destination, params) // or source?
       const isExists = await proxyCache.receivedSuccessResponse(alsReq)
       if (!isExists) {
-        logger.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
+        log.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
         // think, if we need to throw an error here
       } else {
         const mappingPayload = {
           fspId: source
         }
         await oracle.oracleRequest(headers, RestMethods.POST, params, null, mappingPayload, cache)
-        logger.info('oracle was updated with mappingPayload', { mappingPayload, params })
+        log.info('oracle was updated with mappingPayload', { mappingPayload, params })
       }
     }
 
@@ -121,10 +122,10 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     }
     await participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.PUT, decodedPayload.body.toString(), options)
 
-    logger.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
+    log.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
     histTimerEnd({ success: true })
   } catch (err) {
-    await utils.handleErrorOnSendingCallback(err, headers, params, sendTo)
+    await handleErrorOnSendingCallback(err, headers, params, sendTo)
     histTimerEnd({ success: false })
   }
 }
@@ -167,14 +168,14 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
         getPartiesByTypeAndID(swappedHeaders, params, RestMethods.GET, {}, span, cache, proxyCache)
         // todo: - think if we need to send errorCallback?
         //       - or sentCallback after getPartiesByTypeAndID is done
-        logger.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID:', { proxy, params, payload })
+        log.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID:', { proxy, params, payload })
         return
       }
 
       const alsReq = utils.alsRequestDto(destination, params) // or source?
       const isLast = await proxyCache.receivedErrorResponse(alsReq, proxy)
       if (!isLast) {
-        logger.info('got NOT last error callback from proxy:', { proxy, alsReq })
+        log.info('got NOT last error callback from proxy:', { proxy, alsReq })
         return
       }
     }
@@ -194,10 +195,10 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     const decodedPayload = decodePayload(dataUri, { asParsed: false })
     await participant.sendErrorToParticipant(sendTo, callbackEndpointType, decodedPayload.body.toString(), headers, params, childSpan)
 
-    logger.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
+    log.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
     histTimerEnd({ success: true })
   } catch (err) {
-    fspiopError = await utils.handleErrorOnSendingCallback(err, headers, params, sendTo)
+    fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/parties/utils.js

@@ -1,10 +1,9 @@
-const { Enum } = require('@mojaloop/central-services-shared')
+const { Enum, Util: { Hapi } } = require('@mojaloop/central-services-shared')
 const EventSdk = require('@mojaloop/event-sdk')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const participant = require('../../models/participantEndpoint/facade')
-const Config = require('../../lib/config')
-const { logger } = require('../../lib')
+const { TransformFacades } = require('../../lib')
 
 const { FspEndpointTypes } = Enum.EndPoints
 const { Headers } = Enum.Http
@@ -33,6 +32,13 @@ const finishSpanWithError = async (childSpan, fspiopError) => {
   }
 }
 
+const makePutPartiesErrorPayload = async (config, fspiopError, headers, params) => {
+  const body = fspiopError.toApiErrorObject(config.ERROR_HANDLING)
+  return config.API_TYPE === Hapi.API_TYPES.iso20022
+    ? (await TransformFacades.FSPIOP.parties.putError({ body, headers, params })).body
+    : body
+}
+
 const alsRequestDto = (sourceId, params) => ({
   sourceId,
   type: params.Type,
@@ -54,13 +60,13 @@ const swapSourceDestinationHeaders = (headers) => {
 }
 
 // change signature to accept object
-const handleErrorOnSendingCallback = async (err, headers, params, requester) => {
+const createErrorHandlerOnSendingCallback = (config, logger) => async (err, headers, params, requester) => {
   try {
     logger.error('error in sending parties callback', err)
     const sendTo = requester || headers[Headers.FSPIOP.SOURCE]
     const errorCallbackEndpointType = errorPartyCbType(params.SubId)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const errInfo = fspiopError.toApiErrorObject(Config.ERROR_HANDLING)
+    const errInfo = await makePutPartiesErrorPayload(config, fspiopError, headers, params)
 
     await participant.sendErrorToParticipant(sendTo, errorCallbackEndpointType, errInfo, headers, params)
 
@@ -77,8 +83,9 @@ module.exports = {
   getPartyCbType,
   putPartyCbType,
   errorPartyCbType,
+  makePutPartiesErrorPayload,
   finishSpanWithError,
-  handleErrorOnSendingCallback,
+  createErrorHandlerOnSendingCallback,
   alsRequestDto,
   swapSourceDestinationHeaders
 }

package/src/domain/timeout/dto.js

@@ -8,18 +8,10 @@ const {
   EndPoints: { FspEndpointTypes }
 } = require('@mojaloop/central-services-shared').Enum
 const { Tracer } = require('@mojaloop/event-sdk')
-const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
 
-const { TransformFacades } = require('../../lib')
 const LibUtil = require('../../lib/util')
 const Config = require('../../lib/config')
-
-const makeErrorPayload = async (headers, params) => {
-  const body = createFSPIOPError(FSPIOPErrorCodes.EXPIRED_ERROR).toApiErrorObject(Config.ERROR_HANDLING)
-  return Config.API_TYPE === API_TYPES.iso20022
-    ? (await TransformFacades.FSPIOP.parties.putError({ body, headers, params })).body
-    : body
-}
+const partiesUtils = require('../parties/utils')
 
 const timeoutCallbackDto = async ({ destination, partyId, partyType }) => {
   const headers = {
@@ -30,8 +22,10 @@ const timeoutCallbackDto = async ({ destination, partyId, partyType }) => {
     ID: partyId,
     Type: partyType
   }
+  const error = createFSPIOPError(FSPIOPErrorCodes.EXPIRED_ERROR)
+
   const dto = {
-    errorInformation: await makeErrorPayload(headers, params),
+    errorInformation: await partiesUtils.makePutPartiesErrorPayload(Config, error, headers, params),
     headers,
     params,
     endpointType: FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR

package/src/handlers/index.js

@@ -35,7 +35,7 @@ const Package = require('../../package.json')
 const Server = require('../server')
 const { HANDLER_TYPES } = require('../constants')
 const Config = require('../lib/config')
-const logger = require('../lib').loggerFactory('ALS-timeout-handler')
+const log = require('../lib').logger.child('ALS-timeout-handler')
 
 const Program = new Command()
 
@@ -51,16 +51,16 @@ Program.command('handlers')
     const handlers = []
 
     if (args.timeout) {
-      logger.debug('CLI: Executing --timeout')
+      log.debug('CLI: Executing --timeout')
       handlers.push(HANDLER_TYPES.TIMEOUT)
     }
 
     if (handlers.length === 0) {
-      logger.debug('CLI: No handlers specified')
+      log.debug('CLI: No handlers specified')
       return
     }
 
-    module.exports = await Server.initializeHandlers(handlers, Config, logger)
+    module.exports = await Server.initializeHandlers(handlers, Config, log)
   })
 
 if (Array.isArray(process.argv) && process.argv.length > 2) {

package/src/handlers/monitoring/index.js

@@ -18,7 +18,7 @@
 const Hapi = require('@hapi/hapi')
 const Metrics = require('@mojaloop/central-services-metrics')
 const { plugin: HealthPlugin } = require('./plugins/health')
-const { plugin: MetricsPlugin } = require('./plugins/metrics')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
 const { logger } = require('../../lib')
 
 let server

package/src/interface/api-swagger-iso20022-parties.yaml

@@ -890,13 +890,14 @@ components:
   schemas:
     CorrelationId:
       title: CorrelationId
-      pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$
       type: string
-      description: Identifier that correlates all messages of the same sequence. The
-        API data type UUID (Universally Unique Identifier) is a JSON String in canonical
-        format, conforming to RFC 4122, that is restricted by a regular expression
-        for interoperability reasons. An UUID is always 36 characters long, 32 hexadecimal
-        symbols and 4 dashes (‘-‘).
+      pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$|^[0-9A-HJKMNP-TV-Z]{26}$
+      description: >-
+        Identifier that correlates all messages of the same sequence.
+        The supported identifiers formats are for
+        lowercase [UUID](https://datatracker.ietf.org/doc/html/rfc9562) and
+        uppercase [ULID](https://github.com/ulid/spec)
+      example: 'b51ec534-ee48-4575-b6a9-ead2955b8069'
     Currency:
       title: CurrencyEnum
       maxLength: 3

package/src/interface/api-swagger.yaml

@@ -889,13 +889,14 @@ components:
   schemas:
     CorrelationId:
       title: CorrelationId
-      pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$
       type: string
-      description: Identifier that correlates all messages of the same sequence. The
-        API data type UUID (Universally Unique Identifier) is a JSON String in canonical
-        format, conforming to RFC 4122, that is restricted by a regular expression
-        for interoperability reasons. An UUID is always 36 characters long, 32 hexadecimal
-        symbols and 4 dashes (‘-‘).
+      pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$|^[0-9A-HJKMNP-TV-Z]{26}$
+      description: >-
+        Identifier that correlates all messages of the same sequence.
+        The supported identifiers formats are for
+        lowercase [UUID](https://datatracker.ietf.org/doc/html/rfc9562) and
+        uppercase [ULID](https://github.com/ulid/spec)
+      example: 'b51ec534-ee48-4575-b6a9-ead2955b8069'
     Currency:
       title: CurrencyEnum
       maxLength: 3