account-lookup-service 17.12.4 → 17.12.5

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

@@ -42,7 +42,7 @@ class PutPartiesErrorService extends BasePartiesService {
         }
       } else {
         const schemeParticipant = await this.validateParticipant(this.state.destination)
-        if (schemeParticipant) {
+        if (!schemeParticipant) {
           this.log.info('Need to cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error')
           await this.cleanupOracle()
           await this.removeProxyGetPartiesTimeoutCache(alsReq)
@@ -86,6 +86,7 @@ class PutPartiesErrorService extends BasePartiesService {
     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,

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

@@ -951,9 +951,10 @@ describe('Parties Tests', () => {
       const proxy = `proxy-${Date.now()}`
       const headers = fixtures.partiesCallHeadersDto({ destination, proxy })
       const { params } = Helper.putByTypeIdRequest
-      participant.validateParticipant = sandbox.stub().resolves({})
+      participant.validateParticipant = sandbox.stub().resolves(null) // external participant
       participant.sendRequest = sandbox.stub().resolves()
       participant.sendErrorToParticipant = sandbox.stub().resolves()
+      proxyCache.lookupProxyByDfspId = sandbox.stub().resolves(proxy)
       oracleEndpointCached.getOracleEndpointByType = sandbox.stub().resolves([
         { value: 'http://oracle.endpoint' }
       ])
@@ -966,8 +967,9 @@ describe('Parties Tests', () => {
       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)
+      const [sentTo, _, data, cbHeaders] = participant.sendErrorToParticipant.lastCall.args
+      expect(sentTo).toBe(proxy)
+      expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
       expect(data.errorInformation.errorCode).toBe('2003')
     })
   })

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

@@ -30,7 +30,7 @@ const { createMockDeps, oracleMock, participantMock } = require('./deps')
 const { PutPartiesErrorService } = require('#src/domain/parties/services/index')
 const fixtures = require('#test/fixtures/index')
 
-const { RestMethods } = PutPartiesErrorService.enums()
+const { RestMethods, Headers } = PutPartiesErrorService.enums()
 
 describe('PutPartiesErrorService Tests -->', () => {
   beforeEach(() => {
@@ -38,33 +38,34 @@ describe('PutPartiesErrorService Tests -->', () => {
   })
 
   test('should cleanup oracle and forward SERVICE_CURRENTLY_UNAVAILABLE error for party from external dfsp', async () => {
-    participantMock.validateParticipant = jest.fn().mockResolvedValue({})
-    const destination = 'destFsp'
+    participantMock.validateParticipant = jest.fn().mockRejectedValue(new Error('No participant found')) // external participant
+    const destination = 'externalDfsp'
+    const proxyDest = 'proxyDest'
+    const deps = createMockDeps()
+    deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValue(proxyDest)
+
     const headers = fixtures.partiesCallHeadersDto({ destination, proxy: 'proxyA' })
     const params = fixtures.partiesParamsDto()
     const dataUri = fixtures.dataUriDto()
-    const service = new PutPartiesErrorService(createMockDeps(), { headers, params, dataUri })
+    const service = new PutPartiesErrorService(deps, { headers, params, dataUri })
 
     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)
+    const [sentTo, _, payload, cbHeaders] = participantMock.sendErrorToParticipant.mock.lastCall
+    expect(sentTo).toBe(proxyDest)
+    expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(destination)
     expect(payload.errorInformation.errorCode).toBe('2003')
   })
 
-  test('should NOT cleanup oracle if destination is external', async () => {
-    const destination = 'externalDfsp'
-    const proxyDest = 'proxyDest'
+  test('should NOT cleanup oracle if destination is local', async () => {
+    const destination = 'localDfsp'
     const deps = createMockDeps()
-    deps.participant.validateParticipant = jest.fn().mockResolvedValue(null)
-    deps.proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValue(proxyDest)
+    deps.participant.validateParticipant = jest.fn().mockResolvedValue({})
 
-    const headers = fixtures.partiesCallHeadersDto({
-      destination, proxy: 'proxyA'
-    })
+    const headers = fixtures.partiesCallHeadersDto({ destination })
     const params = fixtures.partiesParamsDto()
     const dataUri = fixtures.dataUriDto()
     const service = new PutPartiesErrorService(deps, { headers, params, dataUri })
@@ -72,6 +73,6 @@ describe('PutPartiesErrorService Tests -->', () => {
     await service.handleRequest()
     expect(oracleMock.oracleRequest).not.toHaveBeenCalled()
     expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
-    expect(participantMock.sendErrorToParticipant.mock.lastCall[0]).toBe(proxyDest)
+    expect(participantMock.sendErrorToParticipant.mock.lastCall[0]).toBe(destination)
   })
 })

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

@@ -27,12 +27,11 @@
 
 const { createMockDeps, participantMock } = require('./deps')
 // ↑ should be first require to mock external deps ↑
-const { Enum } = require('@mojaloop/central-services-shared')
 const { PutPartiesService } = require('#src/domain/parties/services/index')
 const config = require('#src/lib/config')
 const fixtures = require('#test/fixtures/index')
 
-const { Headers } = Enum.Http
+const { Headers } = PutPartiesService.enums()
 
 describe('PutPartiesService Tests -->', () => {
   beforeEach(() => {
@@ -97,4 +96,22 @@ describe('PutPartiesService Tests -->', () => {
     expect(cbHeaders[Headers.FSPIOP.SOURCE]).toBe(config.HUB_NAME)
     expect(cbHeaders[Headers.FSPIOP.DESTINATION]).toBe(source)
   })
+
+  test('should just log error in case handleError failed', async () => {
+    const headers = fixtures.partiesCallHeadersDto()
+    const params = fixtures.partiesParamsDto()
+    const dataUri = fixtures.dataUriDto()
+    const service = new PutPartiesService(createMockDeps(), { headers, params, dataUri })
+
+    service.handleRequest = jest.fn().mockRejectedValue(new Error('handleRequest failed'))
+    service.identifyDestinationForCallback = jest.fn()
+    service.sendErrorCallback = jest.fn().mockRejectedValue(new Error('sendErrorCallback failed'))
+    const logSpy = jest.spyOn(service.log.mlLogger, 'error')
+
+    const result = await service.handleRequest()
+      .catch(err => service.handleError(err))
+
+    expect(result).toBeUndefined()
+    expect(logSpy.mock.lastCall[0]).toBe('failed to handleError. No further processing! ')
+  })
 })