account-lookup-service 17.8.0-snapshot.6 → 17.8.0-snapshot.7

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.6",
+  "version": "17.8.0-snapshot.7",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -99,8 +99,8 @@
     "@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.6.0",
-    "@mojaloop/sdk-standard-components": "19.11.1",
+    "@mojaloop/ml-schema-transformer-lib": "2.7.0",
+    "@mojaloop/sdk-standard-components": "19.11.2",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",

package/src/domain/parties/deps.js

@@ -25,7 +25,7 @@
  --------------
  ******/
 
-const { proxies } = require('@mojaloop/central-services-shared').Util
+const { Util } = require('@mojaloop/central-services-shared')
 const { logger } = require('../../lib')
 const config = require('../../lib/config')
 const oracle = require('../../models/oracle/facade')
@@ -33,7 +33,13 @@ const participant = require('../../models/participantEndpoint/facade')
 const partiesUtils = require('./partiesUtils')
 
 /** @returns {PartiesDeps} */
-const createDeps = ({ cache, proxyCache, childSpan, log = logger }) => Object.freeze({
+const createDeps = ({
+  cache,
+  proxyCache,
+  proxies = Util.proxies,
+  childSpan = null,
+  log = logger
+}) => Object.freeze({
   cache,
   proxyCache,
   childSpan,

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

@@ -162,6 +162,7 @@ class GetPartiesService extends BasePartiesService {
     const isOk = results.some(result => result.status === 'fulfilled')
     // If, at least, one request is sent to proxy, we treat the whole flow as successful.
     // Failed requests should be handled by TTL expired/timeout handler
+    // todo: If forwarding request to proxy failed, remove the proxy from setSendToProxiesList
     log.info('triggerInterSchemeDiscoveryFlow is done:', { isOk, results, proxyNames, alsReq })
     this.stepInProgress('allSent-12')
 
@@ -245,11 +246,15 @@ class GetPartiesService extends BasePartiesService {
 
   async #sendPartyNotFoundErrorCallback (headers) {
     const { params } = this.inputs
+    const callbackHeaders = GetPartiesService.createErrorCallbackHeaders(headers, params)
     const fspiopError = super.createFspiopIdNotFoundError('No proxy found to start inter-scheme discovery flow')
+    const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(
+      this.deps.config, fspiopError, callbackHeaders, params
+    )
 
     await this.sendErrorCallback({
-      errorInfo: fspiopError.toApiErrorObject(this.deps.config.ERROR_HANDLING),
-      headers: GetPartiesService.createErrorCallbackHeaders(headers, params),
+      errorInfo,
+      headers: callbackHeaders,
       params
     })
     return fspiopError

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

@@ -30,6 +30,7 @@ const { ERROR_MESSAGES } = require('../../../constants')
 const BasePartiesService = require('./BasePartiesService')
 
 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?

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

@@ -48,7 +48,7 @@ describe('BasePartiesService Tests -->', () => {
     const service = new BasePartiesService(deps, { headers, params })
 
     await service.handleError(new Error('test error'))
-    expect(participantMock.sendErrorToParticipant.mock.calls.length).toBe(1)
+    expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
     // eslint-disable-next-line no-unused-vars
     const [sentTo, _, payload] = participantMock.sendErrorToParticipant.mock.lastCall
     expect(sentTo).toBe(source)

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

@@ -28,11 +28,14 @@
 const { createMockDeps, createProxyCacheMock, oracleMock, participantMock } = require('./deps')
 // ↑ should be first require to mock external deps ↑
 const { GetPartiesService } = require('#src/domain/parties/services/index')
+const { API_TYPES } = require('#src/constants')
 const fixtures = require('#test/fixtures/index')
 
 const { RestMethods, Headers } = GetPartiesService.enums()
 
 describe('GetPartiesService Tests -->', () => {
+  const { config } = createMockDeps()
+
   beforeEach(() => {
     jest.clearAllMocks()
   })
@@ -221,4 +224,22 @@ describe('GetPartiesService Tests -->', () => {
       expect(participantMock.sendRequest).toHaveBeenCalledTimes(1)
     })
   })
+
+  test('should send partyNotFound callback in ISO20022 format', async () => {
+    participantMock.validateParticipant = jest.fn().mockResolvedValue({})
+    oracleMock.oracleRequest = jest.fn()
+    const deps = {
+      ...createMockDeps(),
+      config: { ...config, API_TYPE: API_TYPES.iso20022 }
+    }
+    const headers = fixtures.partiesCallHeadersDto({ destination: '' })
+    const params = fixtures.partiesParamsDto()
+    const service = new GetPartiesService(deps, { headers, params })
+
+    await service.handleRequest()
+    expect(participantMock.sendErrorToParticipant).toHaveBeenCalledTimes(1)
+    const isoPayload = participantMock.sendErrorToParticipant.mock.lastCall[2]
+    expect(isoPayload.Assgnmt).toBeDefined()
+    expect(isoPayload.Rpt).toBeDefined()
+  })
 })

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

@@ -32,18 +32,20 @@ const oracleMock = require('#src/models/oracle/facade')
 const participantMock = require('#src/models/participantEndpoint/facade')
 const { createDeps } = require('#src/domain/parties/deps')
 const { logger } = require('#src/lib/index')
-const { createProxyCacheMock } = require('#test/util/mockDeps')
+const { createProxyCacheMock, createProxiesUtilMock } = require('#test/util/mockDeps')
 
 /** @returns {PartiesDeps} */
 const createMockDeps = ({
   proxyCache = createProxyCacheMock(),
+  proxies = createProxiesUtilMock(),
   log = logger.child({ test: true }),
   cache
-} = {}) => createDeps({ cache, proxyCache, log })
+} = {}) => createDeps({ cache, proxyCache, proxies, log })
 
 module.exports = {
   createMockDeps,
   createProxyCacheMock,
+  createProxiesUtilMock,
   oracleMock,
   participantMock
 }

package/test/util/mockDeps.js

@@ -56,6 +56,17 @@ const createProxyCacheMock = ({
   setSendToProxiesList
 })
 
+// @mojaloop/central-services-shared/Util/proxies
+/** @returns {Proxies} */
+const createProxiesUtilMock = ({
+  getAllProxiesNames = jest.fn().mockResolvedValue([]),
+  invalidateProxiesCache = jest.fn()
+} = {}) => ({
+  getAllProxiesNames,
+  invalidateProxiesCache
+})
+
 module.exports = {
-  createProxyCacheMock
+  createProxyCacheMock,
+  createProxiesUtilMock
 }