account-lookup-service 17.6.0 → 17.7.0-snapshot.0

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

@@ -56,7 +56,7 @@ const fixtures = require('../../../fixtures')
 const { type: proxyCacheType, proxyConfig: proxyCacheConfig } = Config.PROXY_CACHE_CONFIG
 
 const { encodePayload } = Util.StreamingProtocol
-const { RestMethods } = Enum.Http
+const { RestMethods, Headers } = Enum.Http
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -192,24 +192,26 @@ describe('Parties Tests', () => {
       expect(cached).toBe(proxy)
     })
 
-    it('should send error callback if destination is not in the scheme, and not in proxyCache', async () => {
+    it('should cleanup oracle and trigger discovery flow, if destination is not in scheme and no dfsp-to-proxy mapping', async () => {
+      Config.PROXY_CACHE_CONFIG.enabled = true
       participant.validateParticipant = sandbox.stub()
         .onFirstCall().resolves({}) // source
         .onSecondCall().resolves(null) // destination
       participant.sendRequest = sandbox.stub().resolves()
       participant.sendErrorToParticipant = sandbox.stub().resolves()
       sandbox.stub(oracle, 'oracleRequest')
+      const proxy = 'some-proxy'
+      Util.proxies.getAllProxiesNames = sandbox.stub().resolves([proxy])
       const headers = fixtures.partiesCallHeadersDto()
 
       await partiesDomain.getPartiesByTypeAndID(headers, Helper.getByTypeIdRequest.params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query, Helper.mockSpan(), null, proxyCache)
 
-      expect(participant.sendRequest.callCount).toBe(0)
-      expect(oracle.oracleRequest.callCount).toBe(0)
-      expect(participant.sendErrorToParticipant.callCount).toBe(1)
-
-      const { errorInformation } = participant.sendErrorToParticipant.getCall(0).args[2]
-      expect(errorInformation.errorCode).toBe('3200')
-      expect(errorInformation.errorDescription).toContain(ERROR_MESSAGES.partyDestinationFspNotFound)
+      expect(oracle.oracleRequest.lastCall.args[1]).toBe(RestMethods.DELETE)
+      expect(participant.sendErrorToParticipant.callCount).toBe(0)
+      expect(participant.sendRequest.callCount).toBe(1)
+      // eslint-disable-next-line no-unused-vars
+      const [_, sendTo] = participant.sendRequest.lastCall.args
+      expect(sendTo).toBe(proxy)
     })
 
     it('should send request to proxy, if destination is not in the scheme, but has proxyMapping', async () => {
@@ -246,7 +248,7 @@ describe('Parties Tests', () => {
       await partiesDomain.getPartiesByTypeAndID(Helper.getByTypeIdRequest.headers, Helper.getByTypeIdRequest.params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query)
 
       // Assert
-      expect(loggerStub.callCount).toBe(2)
+      expect(loggerStub.callCount).toBe(1)
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
 
       const { errorInformation } = participant.sendErrorToParticipant.getCall(0).args[2]
@@ -470,7 +472,7 @@ describe('Parties Tests', () => {
       expect(firstCallArgs[2]).toBe(expectedCallbackEnpointType)
     })
 
-    it('should send request to proxy if oracle returns dfsp NOT from the scheme', async () => {
+    it('should send errorCallback if oracle returns external dfsp, and source is external', async () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
       const proxyName = `proxy-${Date.now()}`
       const fspId = `dfspNotFromScheme-${Date.now()}`
@@ -487,15 +489,20 @@ describe('Parties Tests', () => {
       const isAdded = await proxyCache.addDfspIdToProxyMapping(fspId, proxyName)
       expect(isAdded).toBe(true)
 
-      const headers = fixtures.partiesCallHeadersDto({ destination: '' })
+      const source = `fromDfsp-${Date.now()}`
+      const headers = fixtures.partiesCallHeadersDto({ destination: '', source })
       const { params, method, query } = Helper.getByTypeIdRequest
 
       await partiesDomain.getPartiesByTypeAndID(headers, params, method, query, null, null, proxyCache)
 
-      expect(participant.sendErrorToParticipant.callCount).toBe(0)
-      expect(participant.sendRequest.callCount).toBe(1)
-      const calledProxy = participant.sendRequest.getCall(0).args[1]
-      expect(calledProxy).toBe(proxyName)
+      expect(participant.sendRequest.callCount).toBe(0)
+      expect(participant.sendErrorToParticipant.callCount).toBe(1)
+      // eslint-disable-next-line no-unused-vars
+      const [sentTo, _, payload, sentHeaders] = participant.sendErrorToParticipant.lastCall.args
+      expect(sentTo).toBe(source)
+      expect(payload.errorInformation.errorCode).toBe('3200')
+      expect(sentHeaders[Headers.FSPIOP.SOURCE]).toBe(Config.HUB_NAME)
+      expect(sentHeaders[Headers.FSPIOP.DESTINATION]).toBe(headers[Headers.FSPIOP.SOURCE])
     })
 
     it('handles error when `oracleRequest` returns no result', async () => {
@@ -554,13 +561,14 @@ describe('Parties Tests', () => {
       participant.sendRequest = sandbox.stub().rejects(new Error('Some network issue'))
       participant.sendErrorToParticipant = sandbox.stub().resolves()
       const headers = fixtures.partiesCallHeadersDto({ destination: '' })
+      const params = fixtures.partiesParamsDto()
 
-      await partiesDomain.getPartiesByTypeAndID(headers, Helper.getByTypeIdRequest.params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query, Helper.mockSpan(), null, proxyCache)
+      await partiesDomain.getPartiesByTypeAndID(headers, params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query, Helper.mockSpan(), null, proxyCache)
 
       expect(participant.sendRequest.callCount).toBe(proxyNames.length)
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
 
-      const { errorInformation } = participant.sendErrorToParticipant.getCall(0).args[2]
+      const { errorInformation } = participant.sendErrorToParticipant.lastCall.args[2]
       expect(errorInformation.errorCode).toBe('3200')
       expect(errorInformation.errorDescription).toContain(ERROR_MESSAGES.proxyConnectionError)
     })
@@ -893,7 +901,7 @@ describe('Parties Tests', () => {
 
       // Assert
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
-      expect(loggerStub.callCount).toBe(2)
+      expect(loggerStub.callCount).toBe(1)
       const sendErrorCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(sendErrorCallArgs[1]).toBe(expectedCallbackEnpointType)
     })
@@ -914,7 +922,7 @@ describe('Parties Tests', () => {
 
       // Assert
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
-      expect(loggerStub.callCount).toBe(2)
+      expect(loggerStub.callCount).toBe(1)
       const sendErrorCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(sendErrorCallArgs[1]).toBe(expectedCallbackEnpointType)
     })

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

@@ -0,0 +1,142 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+jest.mock('#src/models/oracle/facade')
+jest.mock('#src/models/participantEndpoint/facade')
+
+const { GetPartiesService } = require('#src/domain/parties/services/index')
+const { ERROR_MESSAGES } = require('#src/constants')
+const oracle = require('#src/models/oracle/facade')
+const participant = require('#src/models/participantEndpoint/facade')
+const fixtures = require('#test/fixtures/index')
+const { createMockDeps, createProxyCacheMock } = require('./deps')
+
+const { RestMethods, Headers } = GetPartiesService.enums()
+
+describe('GetPartiesService Tests -->', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  describe('forwardRequestToDestination method', () => {
+    test('should delete party info from oracle, if no destination DFSP in proxy mapping', async () => {
+      participant.validateParticipant = jest.fn().mockResolvedValueOnce(false)
+      const proxyCache = createProxyCacheMock({
+        lookupProxyByDfspId: jest.fn().mockResolvedValueOnce(null)
+      })
+      const deps = createMockDeps({ proxyCache })
+
+      const destination = 'dfsp'
+      const headers = fixtures.partiesCallHeadersDto({ destination, proxy: 'proxy' })
+      const params = fixtures.partiesParamsDto()
+      const service = new GetPartiesService(deps, { headers, params })
+      service.triggerInterSchemeDiscoveryFlow = jest.fn()
+
+      await service.forwardRequestToDestination()
+
+      expect(oracle.oracleRequest.mock.calls.length).toBe(1)
+      const [sentHeaders, method, sentParams] = oracle.oracleRequest.mock.lastCall
+      expect(method).toBe(RestMethods.DELETE)
+      expect(sentHeaders).toEqual(headers)
+      expect(sentParams).toEqual(params)
+
+      expect(service.triggerInterSchemeDiscoveryFlow.mock.calls.length).toBe(1)
+      expect(service.triggerInterSchemeDiscoveryFlow.mock.lastCall[0]).toEqual({
+        ...headers,
+        [Headers.FSPIOP.DESTINATION]: undefined
+      })
+    })
+  })
+
+  describe('processOraclePartyList for external participants', () => {
+    const EXTERNAL_DFSP_ID = 'externalFsp'
+    const PROXY_ID = 'externalProxy'
+    let deps
+    let proxyCache
+
+    beforeEach(async () => {
+      oracle.oracleRequest = jest.fn().mockResolvedValueOnce(
+        fixtures.oracleRequestResponseDto({ partyList: [{ fspId: EXTERNAL_DFSP_ID }] })
+      )
+      participant.validateParticipant = jest.fn()
+        .mockResolvedValueOnce(null) // source
+        .mockResolvedValueOnce({}) // proxy
+
+      proxyCache = createProxyCacheMock({
+        addDfspIdToProxyMapping: jest.fn().mockResolvedValueOnce(true),
+        lookupProxyByDfspId: jest.fn().mockResolvedValueOnce(PROXY_ID)
+      })
+      deps = createMockDeps({ proxyCache })
+    })
+
+    test('should throw ID_NOT_FOUND error and cleanup oracle, if no proxyMapping for external dfsp', async () => {
+      expect.hasAssertions()
+      proxyCache.lookupProxyByDfspId = jest.fn().mockResolvedValueOnce(null)
+      const headers = fixtures.partiesCallHeadersDto({
+        destination: '', proxy: 'proxyA'
+      })
+      const params = fixtures.partiesParamsDto()
+      const service = new GetPartiesService(deps, { headers, params })
+
+      await service.handleRequest()
+        .catch((err) => {
+          expect(err).toEqual(service.createFspiopIdNotFoundError(ERROR_MESSAGES.noDiscoveryRequestsForwarded))
+        })
+      expect(oracle.oracleRequest.mock.calls.length).toBe(2) // GET + DELETE
+      expect(oracle.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
+    })
+
+    test('should throw ID_NOT_FOUND error, if source is external', async () => {
+      expect.hasAssertions()
+      const headers = fixtures.partiesCallHeadersDto({
+        destination: '', proxy: 'proxyA'
+      })
+      const params = fixtures.partiesParamsDto()
+      const service = new GetPartiesService(deps, { headers, params })
+
+      await service.handleRequest()
+        .catch((err) => {
+          expect(err).toEqual(service.createFspiopIdNotFoundError(ERROR_MESSAGES.noDiscoveryRequestsForwarded))
+        })
+    })
+
+    test('should forward request, if source is in scheme', async () => {
+      participant.validateParticipant = jest.fn(async (fsp) => (fsp === EXTERNAL_DFSP_ID ? null : {}))
+      const headers = fixtures.partiesCallHeadersDto({
+        destination: '', proxy: 'proxyA'
+      })
+      const params = fixtures.partiesParamsDto()
+      const service = new GetPartiesService(deps, { headers, params })
+
+      await service.handleRequest()
+      expect(participant.sendRequest.mock.calls.length).toBe(1)
+      const [sentHeaders, sendTo] = participant.sendRequest.mock.lastCall
+      expect(sendTo).toEqual(PROXY_ID)
+      expect(sentHeaders[Headers.FSPIOP.DESTINATION]).toBe(EXTERNAL_DFSP_ID)
+    })
+  })
+})

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

@@ -0,0 +1,53 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+jest.mock('#src/models/oracle/facade')
+jest.mock('#src/models/participantEndpoint/facade')
+
+const { PutPartiesErrorService } = require('#src/domain/parties/services/index')
+const oracle = require('#src/models/oracle/facade')
+const fixtures = require('#test/fixtures/index')
+const { createMockDeps } = require('./deps')
+
+const { RestMethods } = PutPartiesErrorService.enums()
+
+describe('PutPartiesErrorService Tests -->', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  test('should cleanup oracle and trigger discovery flow for party from external dfsp', async () => {
+    const headers = fixtures.partiesCallHeadersDto({ proxy: 'proxyA' })
+    const params = fixtures.partiesParamsDto()
+    const service = new PutPartiesErrorService(createMockDeps(), { headers, params })
+
+    const needDiscovery = await service.handleRequest()
+    expect(needDiscovery).toBe(true)
+    expect(oracle.oracleRequest.mock.calls.length).toBe(1)
+    expect(oracle.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
+  })
+})

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

@@ -0,0 +1,40 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const { createDeps } = require('#src/domain/parties/deps')
+const { logger } = require('#src/lib/index')
+const { createProxyCacheMock } = require('#test/util/mockDeps')
+
+const createMockDeps = ({
+  proxyCache = createProxyCacheMock(),
+  log = logger.child({ test: true })
+} = {}) => createDeps({ proxyCache, log })
+
+module.exports = {
+  createMockDeps,
+  createProxyCacheMock
+}

package/test/util/index.js

@@ -1,11 +1,10 @@
+const { AlsApiClient, ProxyApiClient } = require('./apiClients')
+const mockDeps = require('./mockDeps')
 const onboarding = require('./onboarding')
-const {
-  AlsApiClient,
-  ProxyApiClient
-} = require('./apiClients')
 
 module.exports = {
-  onboarding,
   AlsApiClient,
-  ProxyApiClient
+  ProxyApiClient,
+  mockDeps,
+  onboarding
 }

package/test/util/mockDeps.js

@@ -0,0 +1,48 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const createProxyCacheMock = ({
+  addDfspIdToProxyMapping = jest.fn(async () => true),
+  isPendingCallback = jest.fn(async () => false),
+  lookupProxyByDfspId = jest.fn(async () => null),
+  receivedErrorResponse = jest.fn(async () => false),
+  receivedSuccessResponse = jest.fn(async () => true),
+  removeDfspIdFromProxyMapping = jest.fn(async () => true),
+  setSendToProxiesList = jest.fn(async () => true)
+} = {}) => ({
+  addDfspIdToProxyMapping,
+  isPendingCallback,
+  lookupProxyByDfspId,
+  receivedErrorResponse,
+  receivedSuccessResponse,
+  removeDfspIdFromProxyMapping,
+  setSendToProxiesList
+})
+
+module.exports = {
+  createProxyCacheMock
+}