account-lookup-service 17.13.0-snapshot.4 → 17.13.0-snapshot.6

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.13.0-snapshot.4",
+  "version": "17.13.0-snapshot.6",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

package/src/constants.js

@@ -29,7 +29,7 @@ const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
 
 const ERROR_MESSAGES = Object.freeze({
   emptyFilteredPartyList: 'Empty oracle partyList, filtered based on callbackEndpointType',
-  externalPartyError: 'External party error', // todo: think better message
+  externalPartyError: 'External party resolution error',
   failedToCacheSendToProxiesList: 'Failed to cache sendToProxiesList',
   noDiscoveryRequestsForwarded: 'No discovery requests forwarded to participants',
   sourceFspNotFound: 'Requester FSP not found',

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

@@ -26,12 +26,10 @@
  ******/
 
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const { Enum } = require('@mojaloop/central-services-shared')
-const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
+const { Enum, Util } = require('@mojaloop/central-services-shared')
 const { initStepState } = require('../../../lib/util')
 const { createCallbackHeaders } = require('../../../lib/headers')
 const { ERROR_MESSAGES } = require('../../../constants')
-const { makeAcceptContentTypeHeader } = require('@mojaloop/central-services-shared').Util.Headers
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods, HeaderResources } = Enum.Http
@@ -178,7 +176,7 @@ class BasePartiesService {
     const { headers, params, query } = this.inputs
 
     const response = await this.deps.oracle.oracleRequest(headers, RestMethods.GET, params, query, undefined, this.deps.cache)
-    this.log.debug('oracle discovery raw response:', { response })
+    this.log.verbose('oracle discovery raw response:', { response })
 
     let { partyList } = response?.data || {}
     if (!Array.isArray(partyList)) {
@@ -204,6 +202,22 @@ class BasePartiesService {
     return isRemoved
   }
 
+  async sendPartyResolutionErrorCallback () {
+    this.stepInProgress('sendPartyResolutionErrorCallback')
+    const { headers, params } = this.inputs
+    const error = this.createFspiopPartyResolutionError(ERROR_MESSAGES.externalPartyError)
+    const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params, this.state.destination)
+    const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, error, callbackHeaders, params)
+
+    await this.identifyDestinationForCallback()
+    await this.sendErrorCallback({
+      errorInfo,
+      headers: callbackHeaders,
+      params
+    })
+    this.log.verbose('sendPartyResolutionErrorCallback is done', { callbackHeaders, errorInfo })
+  }
+
   createFspiopIdNotFoundError (errMessage, log = this.log) {
     log.warn(errMessage)
     return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
@@ -242,7 +256,7 @@ class BasePartiesService {
   }
 
   static decodeDataUriPayload (dataUri) {
-    const decoded = decodePayload(dataUri, { asParsed: false })
+    const decoded = Util.StreamingProtocol.decodePayload(dataUri, { asParsed: false })
     return decoded.body.toString()
   }
 
@@ -277,7 +291,7 @@ class BasePartiesService {
     return {
       [Headers.FSPIOP.SOURCE]: hubName,
       [Headers.FSPIOP.DESTINATION]: destination,
-      [Headers.GENERAL.CONTENT_TYPE.value]: makeAcceptContentTypeHeader(
+      [Headers.GENERAL.CONTENT_TYPE.value]: Util.Headers.makeAcceptContentTypeHeader(
         HeaderResources.PARTIES,
         config.PROTOCOL_VERSIONS.CONTENT.DEFAULT.toString(),
         config.API_TYPE

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

@@ -108,7 +108,7 @@ class GetPartiesService extends BasePartiesService {
       const isValid = await this.#validateLocalDestinationForExternalSource()
       if (!isValid) {
         log.warn('incorrect destination from external source', { destination })
-        await this.#sendPartyNotFoundErrorCallback(headers)
+        await this.sendPartyResolutionErrorCallback()
         return
       }
     }
@@ -181,6 +181,7 @@ class GetPartiesService extends BasePartiesService {
     if (!filteredPartyList.length) {
       throw super.createFspiopIdNotFoundError(ERROR_MESSAGES.emptyFilteredPartyList)
     }
+    this.log.verbose('#filterOraclePartyList is done:', { filteredPartyList })
 
     return filteredPartyList
   }

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

@@ -26,7 +26,6 @@
  ******/
 
 const BasePartiesService = require('./BasePartiesService')
-const { ERROR_MESSAGES } = require('../../../constants')
 
 class PutPartiesErrorService extends BasePartiesService {
   async handleRequest () {
@@ -46,7 +45,7 @@ class PutPartiesErrorService extends BasePartiesService {
           this.log.info('Need to cleanup oracle and forward PARTY_RESOLUTION_FAILURE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
-          await this.#sendPartyResolutionErrorCallback()
+          await this.sendPartyResolutionErrorCallback()
           return
         }
       }
@@ -92,22 +91,6 @@ class PutPartiesErrorService extends BasePartiesService {
 
     return isExternal
   }
-
-  async #sendPartyResolutionErrorCallback () {
-    this.stepInProgress('#sendPartyResolutionErrorCallback')
-    const { headers, params } = this.inputs
-    const error = super.createFspiopPartyResolutionError(ERROR_MESSAGES.externalPartyError)
-    const callbackHeaders = BasePartiesService.createErrorCallbackHeaders(headers, params, this.state.destination)
-    const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, error, callbackHeaders, params)
-
-    await this.identifyDestinationForCallback()
-    await super.sendErrorCallback({
-      errorInfo,
-      headers: callbackHeaders,
-      params
-    })
-    this.log.verbose('#sendPartyResolutionErrorCallback is done', { callbackHeaders, errorInfo })
-  }
 }
 
 module.exports = PutPartiesErrorService

package/test/unit/domain/parties/services/GetPartiesService.test.js

@@ -422,6 +422,7 @@ describe('GetPartiesService Tests -->', () => {
           partyList: [{ fspId: ORACLE_DFSP_DIFFERENT }]
         })
       )
+      proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(PROXY_ID)
 
       const service = new GetPartiesService(deps, { headers, params })
       await service.handleRequest()