account-lookup-service 17.8.0-snapshot.17 → 17.8.0-snapshot.19

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.17",
+  "version": "17.8.0-snapshot.19",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

package/src/constants.js

@@ -29,6 +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
   failedToCacheSendToProxiesList: 'Failed to cache sendToProxiesList',
   noDiscoveryRequestsForwarded: 'No discovery requests forwarded to participants',
   sourceFspNotFound: 'Requester FSP not found',

package/src/domain/parties/putParties.js

@@ -97,15 +97,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
   let fspiopError
 
   try {
-    const needDiscovery = await service.handleRequest()
-    if (needDiscovery) {
-      const getPartiesService = new services.GetPartiesService(deps, inputs)
-      await getPartiesService.triggerInterSchemeDiscoveryFlow(
-        services.GetPartiesService.headersWithoutDestination(headers)
-      )
-      // think, if we need to start the whole processing with getPartiesService.handleRequest() ?
-    }
-
+    await service.handleRequest()
     logger.info('putPartiesErrorByTypeAndID is done')
     histTimerEnd({ success: true })
   } catch (error) {

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

@@ -156,7 +156,7 @@ class BasePartiesService {
 
   async sendErrorCallback ({ errorInfo, headers, params }) {
     this.stepInProgress('sendErrorCallback')
-    const sendTo = this.state.requester || this.state.source
+    const sendTo = this.state.requester || headers[Headers.FSPIOP.DESTINATION] /* || this.state.source */
     const endpointType = this.deps.partiesUtils.errorPartyCbType(params.SubId)
 
     await this.deps.participant.sendErrorToParticipant(
@@ -171,6 +171,7 @@ class BasePartiesService {
   }
 
   async removeProxyGetPartiesTimeoutCache (alsReq) {
+    this.stepInProgress('removeProxyGetPartiesTimeoutCache')
     const isRemoved = await this.deps.proxyCache.removeProxyGetPartiesTimeout(alsReq, this.state.proxy)
     this.log.debug('removeProxyGetPartiesTimeoutCache is done', { isRemoved, alsReq })
     return isRemoved
@@ -186,6 +187,11 @@ class BasePartiesService {
     return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, errMessage)
   }
 
+  createFspiopServiceUnavailableError (errMessage, log = this.log) {
+    log.warn(errMessage)
+    return ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.SERVICE_CURRENTLY_UNAVAILABLE, errMessage)
+  }
+
   stepInProgress (stepName) {
     this.log.debug('step is in progress', { stepName })
     this.state.stepState?.inProgress(stepName)
@@ -225,8 +231,8 @@ class BasePartiesService {
     }
   }
 
-  static createErrorCallbackHeaders (headers, params) {
-    return createCallbackHeaders({
+  static createErrorCallbackHeaders (headers, params, overrideDestination = '') {
+    const cbHeaders = createCallbackHeaders({
       requestHeaders: headers,
       partyIdType: params.Type,
       partyIdentifier: params.ID,
@@ -234,6 +240,10 @@ class BasePartiesService {
         ? FspEndpointTemplates.PARTIES_SUB_ID_PUT_ERROR
         : FspEndpointTemplates.PARTIES_PUT_ERROR
     })
+    if (overrideDestination) {
+      cbHeaders[Headers.FSPIOP.DESTINATION] = overrideDestination
+    }
+    return cbHeaders
   }
 
   static createHubErrorCallbackHeaders (hubName, destination) {

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

@@ -26,9 +26,9 @@
  ******/
 
 const BasePartiesService = require('./BasePartiesService')
+const { ERROR_MESSAGES } = require('../../../constants')
 
 class PutPartiesErrorService extends BasePartiesService {
-  /** @returns {Promise<true | undefined>} - If true, need to trigger inter-scheme discovery. */
   async handleRequest () {
     if (this.state.proxyEnabled && this.state.proxy) {
       const alsReq = this.deps.partiesUtils.alsRequestDto(this.state.destination, this.inputs.params) // or source?
@@ -37,23 +37,24 @@ class PutPartiesErrorService extends BasePartiesService {
       if (isInterSchemeDiscoveryCase) {
         const isLast = await this.checkLastProxyCallback(alsReq)
         if (!isLast) {
-          this.log.verbose('putPartiesErrorByTypeAndID proxy callback was processed')
+          this.log.verbose('proxy error callback was processed (not last)')
           return
         }
       } else {
         const schemeParticipant = await this.validateParticipant(this.state.destination)
         if (schemeParticipant) {
-          this.log.warn('Need to cleanup oracle and trigger new inter-scheme discovery flow')
+          this.log.info('Need to cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
-          return true // need to trigger inter-scheme discovery
+          await this.forwardServiceUnavailableErrorCallback()
+          return
         }
       }
     }
 
-    await this.identifyDestinationForCallback()
+    await super.identifyDestinationForCallback()
     await this.sendErrorCallbackToParticipant()
-    this.log.info('putPartiesByTypeAndID is done')
+    this.log.info('handleRequest is done')
   }
 
   async cleanupOracle () {
@@ -77,6 +78,21 @@ class PutPartiesErrorService extends BasePartiesService {
     const errorInfo = PutPartiesErrorService.decodeDataUriPayload(dataUri)
     return super.sendErrorCallback({ errorInfo, headers, params })
   }
+
+  async forwardServiceUnavailableErrorCallback () {
+    this.stepInProgress('forwardServiceUnavailableErrorCallback')
+    const { headers, params } = this.inputs
+    const error = super.createFspiopServiceUnavailableError(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 super.sendErrorCallback({
+      errorInfo,
+      headers: callbackHeaders,
+      params
+    })
+    this.log.verbose('#forwardServiceUnavailableErrorCallback is done', { callbackHeaders, errorInfo })
+  }
 }
 
 module.exports = PutPartiesErrorService

package/src/handlers/index.js

@@ -38,12 +38,12 @@ const { HANDLER_TYPES } = require('../constants')
 const Config = require('../lib/config')
 const log = require('../lib').logger.child('ALS-timeout-handler')
 
-process.on('uncaughtExceptionMonitor', (err) => {
-  log.error(`uncaughtException: ${err?.message}`, err)
+process.on('uncaughtException', (err, origin) => {
+  log.error(`uncaughtException event [origin: ${origin}]: `, err)
   process.exit(2)
 })
 process.on('unhandledRejection', (err) => {
-  log.error(`unhandledRejection: ${err?.message}`, err)
+  log.error('unhandledRejection event: ', err)
   process.exit(3)
 })
 

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

@@ -927,13 +927,13 @@ describe('Parties Tests', () => {
       expect(sendErrorCallArgs[1]).toBe(expectedCallbackEnpointType)
     })
 
-    it('should handle notValidPayeeIdentifier case, and delete partyId from oracle', async () => {
+    it('should handle external party error callback, and delete partyId from oracle', async () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
       const errorCode = MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
       const payload = fixtures.errorCallbackResponseDto({ errorCode })
-      const source = `source-${Date.now()}`
+      const destination = `dest-${Date.now()}`
       const proxy = `proxy-${Date.now()}`
-      const headers = fixtures.partiesCallHeadersDto({ source, proxy })
+      const headers = fixtures.partiesCallHeadersDto({ destination, proxy })
       const { params } = Helper.putByTypeIdRequest
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendRequest = sandbox.stub().resolves()
@@ -945,11 +945,14 @@ describe('Parties Tests', () => {
 
       await partiesDomain.putPartiesErrorByTypeAndID(headers, params, payload, '', null, null, proxyCache)
 
-      expect(participant.sendRequest.callCount).toBe(0)
       expect(oracle.oracleRequest.callCount).toBe(1)
-      const [, method] = oracle.oracleRequest.getCall(0).args
-      expect(method).toBe(RestMethods.DELETE)
-      expect(Util.proxies.getAllProxiesNames.callCount).toBe(1) // inter-scheme discovery flow was triggered
+      expect(oracle.oracleRequest.lastCall.args[1]).toBe(RestMethods.DELETE)
+      expect(participant.sendRequest.callCount).toBe(0)
+      expect(participant.sendErrorToParticipant.callCount).toBe(1)
+      // eslint-disable-next-line no-unused-vars
+      const [sentTo, _, data] = participant.sendErrorToParticipant.lastCall.args
+      expect(sentTo).toBe(destination)
+      expect(data.errorInformation.errorCode).toBe('2003')
     })
   })
 })

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

@@ -37,16 +37,22 @@ describe('PutPartiesErrorService Tests -->', () => {
     jest.clearAllMocks()
   })
 
-  test('should cleanup oracle and trigger discovery flow for party from external dfsp', async () => {
+  test('should cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error for party from external dfsp', async () => {
     participantMock.validateParticipant = jest.fn().mockResolvedValue({})
-    const headers = fixtures.partiesCallHeadersDto({ proxy: 'proxyA' })
+    const destination = 'destFsp'
+    const headers = fixtures.partiesCallHeadersDto({ destination, proxy: 'proxyA' })
     const params = fixtures.partiesParamsDto()
-    const service = new PutPartiesErrorService(createMockDeps(), { headers, params })
+    const dataUri = fixtures.dataUriDto()
+    const service = new PutPartiesErrorService(createMockDeps(), { headers, params, dataUri })
 
-    const needDiscovery = await service.handleRequest()
-    expect(needDiscovery).toBe(true)
+    await service.handleRequest()
     expect(oracleMock.oracleRequest).toHaveBeenCalledTimes(1)
     expect(oracleMock.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
+    expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
+    // eslint-disable-next-line no-unused-vars
+    const [sentTo, _, payload] = participantMock.sendErrorToParticipant.mock.lastCall
+    expect(sentTo).toBe(destination)
+    expect(payload.errorInformation.errorCode).toBe('2003')
   })
 
   test('should NOT cleanup oracle if destination is external', async () => {
@@ -63,8 +69,7 @@ describe('PutPartiesErrorService Tests -->', () => {
     const dataUri = fixtures.dataUriDto()
     const service = new PutPartiesErrorService(deps, { headers, params, dataUri })
 
-    const needDiscovery = await service.handleRequest()
-    expect(needDiscovery).toBeUndefined()
+    await service.handleRequest()
     expect(oracleMock.oracleRequest).not.toHaveBeenCalled()
     expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
     expect(participantMock.sendErrorToParticipant.mock.lastCall[0]).toBe(proxyDest)