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

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

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

@@ -32,20 +32,22 @@ class PutPartiesErrorService extends BasePartiesService {
   async handleRequest () {
     if (this.state.proxyEnabled && this.state.proxy) {
       const alsReq = this.deps.partiesUtils.alsRequestDto(this.state.destination, this.inputs.params) // or source?
-      const isPending = await this.deps.proxyCache.isPendingCallback(alsReq)
+      const isInterSchemeDiscoveryCase = await this.deps.proxyCache.isPendingCallback(alsReq)
 
-      if (!isPending) {
-        // not initial inter-scheme discovery case. Cleanup oracle and trigger inter-scheme discovery
-        this.log.warn('Need to cleanup oracle and trigger new inter-scheme discovery flow')
-        await this.cleanupOracle()
-        await this.removeProxyGetPartiesTimeoutCache(alsReq)
-        return true // need to trigger inter-scheme discovery
-      }
-
-      const isLast = await this.checkLastProxyCallback(alsReq)
-      if (!isLast) {
-        this.log.verbose('putPartiesErrorByTypeAndID proxy callback was processed')
-        return
+      if (isInterSchemeDiscoveryCase) {
+        const isLast = await this.checkLastProxyCallback(alsReq)
+        if (!isLast) {
+          this.log.verbose('putPartiesErrorByTypeAndID proxy callback was processed')
+          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')
+          await this.cleanupOracle()
+          await this.removeProxyGetPartiesTimeoutCache(alsReq)
+          return true // need to trigger inter-scheme discovery
+        }
       }
     }
 

package/test/fixtures/index.js

@@ -26,10 +26,11 @@
  ******/
 
 const { randomUUID } = require('node:crypto')
-const { Enum } = require('@mojaloop/central-services-shared')
+const { Enum, Util } = jest.requireActual('@mojaloop/central-services-shared')
 const isoFixtures = require('./iso')
 
 const { Headers } = Enum.Http
+const { encodePayload } = Util.StreamingProtocol
 
 const headersDto = ({
   source = 'fromDfsp',
@@ -145,6 +146,8 @@ const postParticipantsPayloadDto = ({
   ...(currency && { currency })
 })
 
+const dataUriDto = (payload = {}) => encodePayload(JSON.stringify(payload), 'application/json')
+
 const errorCallbackResponseDto = ({
   errorCode = '1234',
   errorDescription = 'Error description',
@@ -195,6 +198,7 @@ module.exports = {
   oracleRequestResponseDto,
   putPartiesSuccessResponseDto,
   postParticipantsPayloadDto,
+  dataUriDto,
   errorCallbackResponseDto,
   expiredCacheKeyDto,
   mockAlsRequestDto,

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

@@ -935,6 +935,7 @@ describe('Parties Tests', () => {
       const proxy = `proxy-${Date.now()}`
       const headers = fixtures.partiesCallHeadersDto({ source, proxy })
       const { params } = Helper.putByTypeIdRequest
+      participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendRequest = sandbox.stub().resolves()
       participant.sendErrorToParticipant = sandbox.stub().resolves()
       oracleEndpointCached.getOracleEndpointByType = sandbox.stub().resolves([
@@ -948,9 +949,7 @@ describe('Parties Tests', () => {
       expect(oracle.oracleRequest.callCount).toBe(1)
       const [, method] = oracle.oracleRequest.getCall(0).args
       expect(method).toBe(RestMethods.DELETE)
-      // todo: think, how to stub getPartiesByTypeAndID call
-      // expect(partiesDomain.getPartiesByTypeAndID.callCount).toBe(1)
-      // expect(participant.sendErrorToParticipant.callCount).toBe(0)
+      expect(Util.proxies.getAllProxiesNames.callCount).toBe(1) // inter-scheme discovery flow was triggered
     })
   })
 })

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

@@ -25,7 +25,7 @@
  --------------
  ******/
 
-const { createMockDeps, oracleMock } = require('./deps')
+const { createMockDeps, oracleMock, participantMock } = require('./deps')
 // ↑ should be first require to mock external deps ↑
 const { PutPartiesErrorService } = require('#src/domain/parties/services/index')
 const fixtures = require('#test/fixtures/index')
@@ -38,13 +38,35 @@ describe('PutPartiesErrorService Tests -->', () => {
   })
 
   test('should cleanup oracle and trigger discovery flow for party from external dfsp', async () => {
+    participantMock.validateParticipant = jest.fn().mockResolvedValue({})
     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(oracleMock.oracleRequest.mock.calls.length).toBe(1)
+    expect(oracleMock.oracleRequest).toHaveBeenCalledTimes(1)
     expect(oracleMock.oracleRequest.mock.lastCall[1]).toBe(RestMethods.DELETE)
   })
+
+  test('should NOT cleanup oracle if destination is external', async () => {
+    const destination = 'externalDfsp'
+    const proxyDest = 'proxyDest'
+    const deps = createMockDeps()
+    deps.participant.validateParticipant = jest.fn().mockResolvedValue(null)
+    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(deps, { headers, params, dataUri })
+
+    const needDiscovery = await service.handleRequest()
+    expect(needDiscovery).toBeUndefined()
+    expect(oracleMock.oracleRequest).not.toHaveBeenCalled()
+    expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
+    expect(participantMock.sendErrorToParticipant.mock.lastCall[0]).toBe(proxyDest)
+  })
 })