account-lookup-service 17.8.0-snapshot.12 → 17.8.0-snapshot.13

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.8.0-snapshot.12",
+  "version": "17.8.0-snapshot.13",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -99,7 +99,7 @@
     "@mojaloop/database-lib": "11.1.4",
     "@mojaloop/event-sdk": "14.4.0",
     "@mojaloop/inter-scheme-proxy-cache-lib": "2.4.0",
-    "@mojaloop/ml-schema-transformer-lib": "2.7.0",
+    "@mojaloop/ml-schema-transformer-lib": "2.7.1",
     "@mojaloop/sdk-standard-components": "19.11.3-snapshot.0",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",

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

@@ -30,6 +30,7 @@ const { Enum } = require('@mojaloop/central-services-shared')
 const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
 const { initStepState } = require('../../../lib/util')
 const { createCallbackHeaders } = require('../../../lib/headers')
+const { ERROR_MESSAGES } = require('../../../constants')
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods } = Enum.Http
@@ -127,6 +128,27 @@ class BasePartiesService {
     return this.deps.participant.validateParticipant(participantId)
   }
 
+  async identifyDestinationForCallback () {
+    this.stepInProgress('identifyDestinationForCallback')
+    const { destination } = this.state
+
+    const schemeParticipant = await this.validateParticipant(destination)
+    if (schemeParticipant) {
+      this.state.requester = destination
+      return
+    }
+
+    const proxyName = this.state.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
+    if (proxyName) {
+      this.state.requester = proxyName
+      return
+    }
+
+    const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
+    this.log.warn(`${errMessage} and no proxy`, { destination })
+    throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
+  }
+
   async sendErrorCallback ({ errorInfo, headers, params }) {
     this.stepInProgress('sendErrorCallback')
     const sendTo = this.state.requester || this.state.source

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

@@ -25,8 +25,6 @@
  --------------
  ******/
 
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const { ERROR_MESSAGES } = require('../../../constants')
 const BasePartiesService = require('./BasePartiesService')
 
 class PutPartiesErrorService extends BasePartiesService {
@@ -51,7 +49,7 @@ class PutPartiesErrorService extends BasePartiesService {
       }
     }
 
-    await this.identifyDestinationForErrorCallback()
+    await this.identifyDestinationForCallback()
     await this.sendErrorCallbackToParticipant()
     this.log.info('putPartiesByTypeAndID is done')
   }
@@ -72,27 +70,6 @@ class PutPartiesErrorService extends BasePartiesService {
     return isLast
   }
 
-  async identifyDestinationForErrorCallback () {
-    this.stepInProgress('identifyDestinationForErrorCallback')
-    const { destination } = this.state
-    const schemeParticipant = await super.validateParticipant(destination)
-    if (schemeParticipant) {
-      this.state.requester = destination
-      return
-    }
-
-    this.stepInProgress('lookupProxyDestination-4')
-    const proxyName = this.state.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
-    if (proxyName) {
-      this.state.requester = proxyName
-      return
-    }
-
-    const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
-    this.log.warn(errMessage, { destination })
-    throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
-  }
-
   async sendErrorCallbackToParticipant () {
     const { headers, params, dataUri } = this.inputs
     const errorInfo = PutPartiesErrorService.decodeDataUriPayload(dataUri)

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

@@ -25,7 +25,6 @@
  --------------
  ******/
 
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const { ERROR_MESSAGES } = require('../../../constants')
 const BasePartiesService = require('./BasePartiesService')
 
@@ -40,7 +39,7 @@ class PutPartiesService extends BasePartiesService {
     if (proxy) {
       await this.checkProxySuccessResponse()
     }
-    await this.identifyDestinationForSuccessCallback()
+    await this.identifyDestinationForCallback()
     await this.sendSuccessCallback()
   }
 
@@ -85,25 +84,6 @@ class PutPartiesService extends BasePartiesService {
     }
   }
 
-  async identifyDestinationForSuccessCallback () {
-    const { destination } = this.state
-    this.stepInProgress('identifyDestinationForSuccessCallback')
-    const destinationParticipant = await super.validateParticipant(destination)
-    if (destinationParticipant) {
-      this.state.requester = destinationParticipant.name
-      return
-    }
-
-    const proxyName = this.state.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
-    if (!proxyName) {
-      const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
-      this.log.warn(`${errMessage} and no proxy`, { destination })
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
-    }
-
-    this.state.requester = proxyName
-  }
-
   async sendSuccessCallback () {
     const { headers, params, dataUri } = this.inputs
     const sendTo = this.state.requester

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

@@ -52,7 +52,7 @@ class TimeoutPartiesService extends PutPartiesErrorService {
     const { errorInfo, headers, params } = await this.prepareErrorInformation()
     this.#spanAuditStart(errorInfo)
 
-    await this.identifyDestinationForErrorCallback()
+    await this.identifyDestinationForCallback()
     return super.sendErrorCallback({ errorInfo, headers, params })
   }
 

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

@@ -587,20 +587,20 @@ describe('Parties Tests', () => {
     it('successfully sends the callback to the participant', async () => {
       expect.hasAssertions()
       // Arrange
-      participant.validateParticipant = sandbox.stub().resolves({
-        name: 'fsp1'
-      })
+      participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendRequest = sandbox.stub().resolves()
       const payload = JSON.stringify({ testPayload: true })
       const dataUri = encodePayload(payload, 'application/json')
+      const destination = 'destFsp'
+      const headers = fixtures.partiesCallHeadersDto({ destination })
 
       // Act
-      await partiesDomain.putPartiesByTypeAndID(Helper.putByTypeIdRequest.headers, Helper.putByTypeIdRequest.params, 'put', payload, dataUri, null, proxyCache)
+      await partiesDomain.putPartiesByTypeAndID(headers, Helper.putByTypeIdRequest.params, 'put', payload, dataUri, null, proxyCache)
 
       // Assert
       expect(participant.sendRequest.callCount).toBe(1)
       const sendRequestCallArgs = participant.sendRequest.getCall(0).args
-      expect(sendRequestCallArgs[1]).toStrictEqual('fsp1')
+      expect(sendRequestCallArgs[1]).toBe(destination)
       participant.sendRequest.reset()
     })