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

package/src/lib/config.js

@@ -167,7 +167,7 @@ const config = {
   INSTRUMENTATION_METRICS_LABELS: RC.INSTRUMENTATION.METRICS.labels,
   INSTRUMENTATION_METRICS_CONFIG: RC.INSTRUMENTATION.METRICS.config,
   JWS_SIGN: RC.ENDPOINT_SECURITY.JWS.JWS_SIGN,
-  FSPIOP_SOURCE_TO_SIGN: RC.HUB_NAME,
+  FSPIOP_SOURCE_TO_SIGN: RC.HUB_PARTICIPANT.NAME,
   JWS_SIGNING_KEY_PATH: RC.ENDPOINT_SECURITY.JWS.JWS_SIGNING_KEY_PATH,
   API_DOC_ENDPOINTS_ENABLED: RC.API_DOC_ENDPOINTS_ENABLED || false,
   FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE: RC.FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE || false,

package/src/lib/index.js

@@ -1,4 +1,4 @@
-const { loggerFactory, asyncStorage } = require('@mojaloop/central-services-logger/src/contextLogger')
+const { loggerFactory } = require('@mojaloop/central-services-logger/src/contextLogger')
 const { TransformFacades } = require('@mojaloop/ml-schema-transformer-lib')
 
 const logger = loggerFactory('ALS') // global logger without context
@@ -6,6 +6,5 @@ const logger = loggerFactory('ALS') // global logger without context
 module.exports = {
   logger,
   loggerFactory,
-  asyncStorage,
   TransformFacades
 }

package/src/models/currency/currency.js

@@ -39,7 +39,16 @@ const getCurrencyById = async (currencyId) => {
   try {
     return Db.from('currency').findOne({ currencyId, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/endpointType/endpointType.js

@@ -39,7 +39,16 @@ const getEndpointTypeByType = async (type) => {
   try {
     return Db.from('endpointType').findOne({ type, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/facade.js

@@ -123,6 +123,10 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
       throw err
     }
   } catch (err) {
+    const extensions = [{
+      key: 'system',
+      value: '["@hapi/catbox-memory","http"]'
+    }]
     Logger.isErrorEnabled && Logger.error(`error in oracleRequest: ${err?.stack}`)
     // If the error was a 400 from the Oracle, we'll modify the error to generate a response to the
     // initiator of the request.
@@ -131,15 +135,32 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
       err.apiErrorCode.code === ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_COMMUNICATION_ERROR.code
     ) {
       if (err.extensions.some(ext => (ext.key === 'status' && ext.value === Enums.Http.ReturnCodes.BADREQUEST.CODE))) {
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
+        throw ErrorHandler.Factory.createFSPIOPError(
+          ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND,
+          undefined,
+          undefined,
+          undefined,
+          extensions
+        )
         // Added error 404 to cover a special case of the Mowali implementation
         // which uses mojaloop/als-oracle-pathfinder and currently returns 404
         // and in which case the Mowali implementation expects back `DESTINATION_FSP_ERROR`.
       } else if (err.extensions.some(ext => (ext.key === 'status' && ext.value === Enums.Http.ReturnCodes.NOTFOUND.CODE))) {
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR)
+        throw ErrorHandler.Factory.createFSPIOPError(
+          ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR,
+          undefined,
+          undefined,
+          undefined,
+          extensions
+        )
       }
     }
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/oracleEndpoint.js

@@ -27,6 +27,10 @@
 
 const Db = require('../../lib/db')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const extensions = [{
+  key: 'system',
+  value: '["db"]'
+}]
 
 const getOracleEndpointByType = async (type) => {
   try {
@@ -43,7 +47,12 @@ const getOracleEndpointByType = async (type) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -64,7 +73,12 @@ const getOracleEndpointByTypeAndCurrency = async (type, currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -84,7 +98,12 @@ const getOracleEndpointByCurrency = async (currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -104,7 +123,12 @@ const getOracleEndpointById = async (oracleEndpointId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -122,7 +146,12 @@ const getAllOracleEndpoint = async () => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -142,7 +171,12 @@ const getAllOracleEndpointsByMatchCondition = async (oracleEndpointModel, partyI
           'oracleEndpoint.isActive', 'oracleEndpoint.partyIdTypeId', 'oracleEndpoint.endpointTypeId', 'oracleEndpoint.currencyId')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -150,7 +184,12 @@ const createOracleEndpoint = async (oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').insert(oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -158,7 +197,12 @@ const updateOracleEndpointById = async (id, oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId: id }, oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -166,7 +210,12 @@ const setIsActiveOracleEndpoint = async (oracleType, isActive) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleType }, { isActive })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -174,7 +223,12 @@ const destroyOracleEndpointById = async (oracleEndpointId) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId }, { isActive: false })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/oracleEndpointCached.js

@@ -31,6 +31,10 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const OracleEndpointUncached = require('./oracleEndpoint')
 
 let cacheClient
+const extensions = [{
+  key: 'system',
+  value: '["db","@hapi/catbox-memory"]'
+}]
 
 const getCacheKey = (params) => {
   return cacheClient.createKey(`${Object.values(params).join('__')}`)
@@ -87,7 +91,12 @@ exports.getOracleEndpointByTypeAndCurrency = async (partyIdType, currency) => {
   try {
     return await getOracleEndpointCached({ partyIdType, currency })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -95,7 +104,12 @@ exports.getOracleEndpointByType = async (partyIdType) => {
   try {
     return await getOracleEndpointCached({ partyIdType })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -103,6 +117,11 @@ exports.getOracleEndpointByCurrency = async (currency) => {
   try {
     return await getOracleEndpointCached({ currency })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }

package/src/models/participantEndpoint/facade.js

@@ -33,7 +33,9 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const JwsSigner = require('@mojaloop/sdk-standard-components').Jws.signer
 const Metrics = require('@mojaloop/central-services-metrics')
 const Config = require('../../lib/config')
+const { logger } = require('../../lib')
 const { hubNameRegex } = require('../../lib/util').hubNameConfig
+
 const uriRegex = /(?:^.*)(\/(participants|parties|quotes|transfers)(\/.*)*)$/
 
 /**
@@ -47,7 +49,7 @@ const defineJwsSigner = (config, headers, requestedEndpoint) => {
     // We need below 2 headers for JWS
     headers[Enums.Http.Headers.FSPIOP.HTTP_METHOD] = headers[Enums.Http.Headers.FSPIOP.HTTP_METHOD] || Enums.Http.RestMethods.PUT
     headers[Enums.Http.Headers.FSPIOP.URI] = headers[Enums.Http.Headers.FSPIOP.URI] || uriRegex.exec(requestedEndpoint)[1]
-    Logger.isDebugEnabled && Logger.debug('JWS is enabled, getting JwsSigner')
+    logger.debug('JWS is enabled, getting JwsSigner')
     jwsSigner = new JwsSigner({
       logger: Logger,
       signingKey: config.JWS_SIGNING_KEY
@@ -83,10 +85,10 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
   try {
     requestedEndpoint = await Util.Endpoints.getEndpoint(Config.SWITCH_ENDPOINT, requestedParticipant, endpointType, options || undefined)
     histTimerEndGetParticipantEndpoint({ success: true, endpointType, participantName: requestedParticipant })
-    Logger.isDebugEnabled && Logger.debug(`participant endpoint url: ${requestedEndpoint} for endpoint type ${endpointType}`)
+    logger.debug('participant requestedEndpoint and endpointType: ', { requestedEndpoint, endpointType })
   } catch (err) {
     histTimerEndGetParticipantEndpoint({ success: false, endpointType, participantName: requestedParticipant })
-    Logger.isErrorEnabled && Logger.error(`error in getEndpoint: ${err?.stack}`)
+    logger.warn('error in getEndpoint: ', err)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 
@@ -102,9 +104,7 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       content: Config.PROTOCOL_VERSIONS.CONTENT.DEFAULT.toString(),
       accept: Config.PROTOCOL_VERSIONS.ACCEPT.DEFAULT.toString()
     }
-    const jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
-
-    const resp = await Util.Request.sendRequest({
+    const params = {
       url: requestedEndpoint,
       headers,
       source: headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -113,18 +113,29 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       payload,
       responseType: Enums.Http.ResponseTypes.JSON,
       span,
-      jwsSigner,
       protocolVersions,
       hubNameRegex,
       apiType: Config.API_TYPE
-    })
+    }
+    logger.debug('participant - sendRequest params:', { params })
+    params.jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
+
+    const resp = await Util.Request.sendRequest(params)
     histTimerEndSendRequestToParticipant({ success: true, endpointType, participantName: requestedParticipant })
     return resp
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName: requestedParticipant })
-    Logger.isErrorEnabled && Logger.error(`error in sendRequest: ${err?.stack}`)
-
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    logger.warn('error in sendRequest: ', err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -148,8 +159,17 @@ exports.validateParticipant = async (fsp) => {
     return resp
   } catch (err) {
     histTimerEnd({ success: false })
-    Logger.isErrorEnabled && Logger.error(`error in validateParticipant: ${err?.stack}`)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    logger.warn('error in validateParticipant: ', err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -188,8 +208,17 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
     histTimerEndGetParticipantEndpoint({ success: true, endpointType, participantName })
   } catch (err) {
     histTimerEndGetParticipantEndpoint({ success: false, endpointType, participantName })
-    Logger.isWarnEnabled && Logger.warn(`error in getEndpoint: ${err?.message}`)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    logger.warn('error in getEndpoint: ', err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 
   // Send error to participant
@@ -212,10 +241,7 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
     }
 
-    Logger.isDebugEnabled && Logger.debug(`participant endpoint url: ${requesterErrorEndpoint} for endpoint type ${endpointType}`)
-    const jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)
-
-    await Util.Request.sendRequest({
+    const params = {
       url: requesterErrorEndpoint,
       headers: clonedHeaders,
       source: clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -225,14 +251,26 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       responseType: Enums.Http.ResponseTypes.JSON,
       hubNameRegex,
       span,
-      jwsSigner,
       protocolVersions,
       apiType: Config.API_TYPE
-    })
+    }
+    logger.debug('participant - sendErrorToParticipant params: ', { params })
+    params.jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)
+
+    await Util.Request.sendRequest(params)
     histTimerEndSendRequestToParticipant({ success: true, endpointType, participantName })
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName })
-    Logger.isWarnEnabled && Logger.warn(`error in sendErrorToParticipant: ${err?.message}`)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    logger.warn('error in sendErrorToParticipant: ', err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }

package/src/models/partyIdType/partyIdType.js

@@ -32,7 +32,16 @@ const getPartyIdTypeByName = async (name) => {
   try {
     return Db.from('partyIdType').findOne({ name, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/plugins.js

@@ -24,16 +24,22 @@
  ******/
 'use strict'
 
-const Config = require('./lib/config')
 const Inert = require('@hapi/inert')
 const Vision = require('@hapi/vision')
 const Blipp = require('blipp')
 const ErrorHandling = require('@mojaloop/central-services-error-handling')
-const CentralServices = require('@mojaloop/central-services-shared')
-const RawPayloadToDataUri = require('@mojaloop/central-services-shared').Util.Hapi.HapiRawPayload
-const OpenapiBackendValidator = require('@mojaloop/central-services-shared').Util.Hapi.OpenapiBackendValidator
-const APIDocumentation = require('@mojaloop/central-services-shared').Util.Hapi.APIDocumentation
-const MetricsPlugin = require('./metrics/plugin')
+const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
+const {
+  APIDocumentation,
+  FSPIOPHeaderValidation,
+  HapiEventPlugin,
+  HapiRawPayload,
+  OpenapiBackendValidator,
+  loggingPlugin
+} = require('@mojaloop/central-services-shared').Util.Hapi
+
+const { logger } = require('./lib')
+const Config = require('./lib/config')
 
 const registerPlugins = async (server, openAPIBackend) => {
   await server.register(OpenapiBackendValidator)
@@ -121,10 +127,10 @@ const registerPlugins = async (server, openAPIBackend) => {
     Inert,
     Vision,
     ErrorHandling,
-    RawPayloadToDataUri,
-    CentralServices.Util.Hapi.HapiEventPlugin,
+    HapiRawPayload,
+    HapiEventPlugin,
     {
-      plugin: CentralServices.Util.Hapi.FSPIOPHeaderValidation.plugin,
+      plugin: FSPIOPHeaderValidation.plugin,
       options: getOptionsForFSPIOPHeaderValidation()
     }
   ])
@@ -132,6 +138,11 @@ const registerPlugins = async (server, openAPIBackend) => {
   if (Config.DISPLAY_ROUTES === true) {
     await server.register([Blipp])
   }
+
+  await server.register({
+    plugin: loggingPlugin,
+    options: { log: logger }
+  })
 }
 
 module.exports = {

package/src/server.js

@@ -23,7 +23,6 @@
  ******/
 'use strict'
 
-const { randomUUID } = require('node:crypto')
 const Hapi = require('@hapi/hapi')
 const Boom = require('@hapi/boom')
 
@@ -37,7 +36,6 @@ const { name, version } = require('../package.json')
 const Db = require('./lib/db')
 const Util = require('./lib/util')
 const Plugins = require('./plugins')
-const RequestLogger = require('./lib/requestLogger')
 const Migrator = require('./lib/migrator')
 const APIHandlers = require('./api')
 const Routes = require('./api/routes')
@@ -104,26 +102,17 @@ const createServer = async (port, api, routes, isAdmin, proxyCacheConfig, proxyM
     }
   }
 
-  await server.ext([
-    {
-      type: 'onPreHandler',
-      method: (request, h) => {
-        request.headers.traceid = request.headers.traceid || randomUUID()
-        RequestLogger.logRequest(request)
-        return h.continue
-      }
-    },
-    {
-      type: 'onPreResponse',
-      method: (request, h) => {
-        RequestLogger.logResponse(request)
-        return h.continue
-      }
-    }
-  ])
   await Plugins.registerPlugins(server, api, isAdmin)
 
   server.route(routes)
+
+  // Initialize the error count metric
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   // TODO: follow instructions https://github.com/anttiviljami/openapi-backend/blob/master/DOCS.md#postresponsehandler-handler
   await server.start()
 
@@ -148,6 +137,9 @@ const initializeApi = async (appConfig) => {
   } = appConfig
 
   if (!INSTRUMENTATION_METRICS_DISABLED) {
+    if (INSTRUMENTATION_METRICS_CONFIG.defaultLabels) {
+      INSTRUMENTATION_METRICS_CONFIG.defaultLabels.serviceVersion = version
+    }
     initializeInstrumentation(INSTRUMENTATION_METRICS_CONFIG)
   }
   await connectDatabase(DATABASE)

package/test/fixtures/index.js

@@ -9,14 +9,15 @@ const headersDto = ({
   destination = 'toDfsp',
   proxy = '',
   date = '2024-05-24 08:52:19',
-  accept
+  accept,
+  contentType
 } = {}) => Object.freeze({
   [Headers.FSPIOP.SOURCE]: source,
   ...(destination && { [Headers.FSPIOP.DESTINATION]: destination }),
   ...(proxy && { [Headers.FSPIOP.PROXY]: proxy }),
   date,
   accept,
-  'content-type': accept
+  'content-type': contentType || accept
 })
 
 const protocolVersionsDto = () => ({
@@ -40,22 +41,29 @@ const partiesCallHeadersDto = ({
   destination,
   proxy,
   date,
-  accept: 'application/vnd.interoperability.parties+json;version=1.1'
+  accept: interopHeader('parties', '1'),
+  contentType: interopHeader('parties', '1.1')
 })
 
 const participantsCallHeadersDto = ({
   source,
   destination,
   proxy,
-  date
+  date,
+  acceptVersion = '1',
+  contentTypeVersion = '1.1'
 } = {}) => headersDto({
   source,
   destination,
   proxy,
   date,
-  accept: 'application/vnd.interoperability.participants+json;version=1'
+  accept: interopHeader('participants', acceptVersion),
+  contentType: interopHeader('participants', contentTypeVersion)
 })
 
+// todo: add ISO mode support
+const interopHeader = (resource, version = '1') => `application/vnd.interoperability.${resource}+json;version=${version}`
+
 const oracleRequestResponseDto = ({
   partyList = [{ fspId: 'dfspFromOracle' }]
 } = {}) => ({
@@ -83,6 +91,20 @@ const putPartiesSuccessResponseDto = ({
   }
 })
 
+const postParticipantsPayloadDto = ({
+  requestId = randomUUID(), // '01JE8SG3F4WNHY8B9876THQ344',
+  partyList = [{
+    partyIdType: 'MSISDN',
+    partyIdentifier: '123456',
+    fspId: 'fspId123'
+  }],
+  currency = 'XXX'
+} = {}) => Object.freeze({
+  requestId,
+  partyList,
+  ...(currency && { currency })
+})
+
 const errorCallbackResponseDto = ({
   errorCode = '1234',
   errorDescription = 'Error description',
@@ -124,8 +146,10 @@ module.exports = {
   participantsCallHeadersDto,
   oracleRequestResponseDto,
   putPartiesSuccessResponseDto,
+  postParticipantsPayloadDto,
   errorCallbackResponseDto,
   mockAlsRequestDto,
   protocolVersionsDto,
-  mockHapiRequestDto
+  mockHapiRequestDto,
+  interopHeader
 }