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

package/test/unit/domain/timeout/index.test.js

@@ -31,11 +31,13 @@
 
 'use strict'
 
-const Participant = require('../../../../src/models/participantEndpoint/facade')
-const TimeoutDomain = require('../../../../src/domain/timeout')
 const Metrics = require('@mojaloop/central-services-metrics')
+const Participant = require('#src/models/participantEndpoint/facade')
+const TimeoutDomain = require('#src/domain/timeout/index')
+const { mockDeps } = require('#test/util/index')
 
 describe('Timeout Domain', () => {
+  const proxyCache = mockDeps.createProxyCacheMock()
   // Initialize Metrics for testing
   Metrics.getCounter(
     'errorCount',
@@ -56,24 +58,25 @@ describe('Timeout Domain', () => {
   describe('timeoutInterschemePartiesLookups', () => {
     describe('timeoutInterschemePartiesLookups', () => {
       it('should process expired ALS keys', async () => {
-        const mockCache = { processExpiredAlsKeys: jest.fn() }
-        await TimeoutDomain.timeoutInterschemePartiesLookups({ proxyCache: mockCache, batchSize: 10 })
-        expect(mockCache.processExpiredAlsKeys).toHaveBeenCalledWith(TimeoutDomain.sendTimeoutCallback, 10)
+        const batchSize = 10
+        await TimeoutDomain.timeoutInterschemePartiesLookups({ proxyCache, batchSize })
+        expect(proxyCache.processExpiredAlsKeys).toHaveBeenCalledWith(expect.any(Function), batchSize)
+        expect(Participant.sendErrorToParticipant).toHaveBeenCalled()
       })
     })
 
     describe('sendTimeoutCallback', () => {
       it('should send error to participant', async () => {
-        jest.spyOn(Participant, 'validateParticipant').mockResolvedValue({ fspId: 'sourceId' })
+        const SOURCE_ID = 'sourceId'
+        jest.spyOn(Participant, 'validateParticipant').mockResolvedValue({ fspId: SOURCE_ID })
 
-        const cacheKey = 'als:sourceId:2:3:expiresAt'
-        const [, destination] = cacheKey.split(':')
+        const cacheKey = `als:${SOURCE_ID}:2:3` // ':expiresAt' part is removed inside proxyCache.processExpiryKey()
 
-        await TimeoutDomain.sendTimeoutCallback(cacheKey)
+        await TimeoutDomain.sendTimeoutCallback(cacheKey, proxyCache)
 
-        expect(Participant.validateParticipant).toHaveBeenCalledWith('sourceId')
+        expect(Participant.validateParticipant).toHaveBeenCalledWith(SOURCE_ID)
         expect(Participant.sendErrorToParticipant).toHaveBeenCalledWith(
-          destination,
+          SOURCE_ID,
           'FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR',
           { errorInformation: { errorCode: '3300', errorDescription: 'Generic expired error' } },
           expect.any(Object), expect.any(Object), undefined, expect.any(Object)
@@ -82,7 +85,9 @@ describe('Timeout Domain', () => {
 
       it('should throw error if participant validation fails', async () => {
         Participant.validateParticipant.mockResolvedValue(null)
-        await expect(TimeoutDomain.sendTimeoutCallback('als:sourceId:2:3:expiresAt')).rejects.toThrow()
+        await expect(
+          TimeoutDomain.sendTimeoutCallback('als:sourceId:2:3:expiresAt', proxyCache)
+        ).rejects.toThrow()
       })
     })
   })

package/test/util/apiClients/BasicApiClient.js

@@ -1,16 +1,43 @@
+/*****
+ 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 axiosLib = require('axios')
-const lib = require('../../../src/lib')
-const fixtures = require('../../fixtures')
+const { logger } = require('#src/lib/index')
+const fixtures = require('#test/fixtures/index')
 
 class BasicApiClient {
   constructor ({
     baseURL,
     axios = axiosLib.create({ baseURL }),
-    logger = lib.logger.child(this.constructor.name)
+    log = logger.child({ component: this.constructor.name })
   } = {}) {
     this.baseURL = baseURL
     this.axios = axios
-    this.logger = logger
+    this.log = log
     this.fixtures = fixtures
   }
 
@@ -22,10 +49,10 @@ class BasicApiClient {
         headers,
         data: body
       })
-      this.logger.info('sendRequest is done:', { method, url, body, headers, response: { status, data } })
+      this.log.info(`sendRequest is done [${method} ${url}]:`, { method, url, body, headers, response: { status, data } })
       return { data, status }
     } catch (err) {
-      this.logger.error('error in sendRequest: ', err)
+      this.log.error('error in sendRequest: ', err)
       throw err
     }
   }

package/test/util/apiClients/ProxyApiClient.js

@@ -1,4 +1,32 @@
-const { PROXY_PORT } = require('../../integration/constants')
+/*****
+ 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 { setTimeout: sleep } = require('node:timers/promises')
+const { PROXY_PORT } = require('#test/integration/constants')
 const BasicApiClient = require('./BasicApiClient')
 
 const baseURL = `http://localhost:${PROXY_PORT}`
@@ -10,6 +38,7 @@ class ProxyApiClient extends BasicApiClient {
 
   async getHistory () {
     const { data } = await this.sendRequest({ url: '/history' })
+    this.log.verbose('getHistory response data: ', { data })
     return data.history
   }
 
@@ -20,6 +49,22 @@ class ProxyApiClient extends BasicApiClient {
     })
     return data.history
   }
+
+  async waitForNHistoryCalls (N, retryMaxCount = 20, retryIntervalSec = 2) {
+    // check that the callbacks are sent and received at the FSP
+    // for test resilience, we will retry the history check a few times
+    let retryCount = 0
+    let history = []
+
+    while (history.length < N && retryCount < retryMaxCount) {
+      await sleep(retryIntervalSec * 1000)
+      history = await this.getHistory()
+      retryCount++
+    }
+    this.log.info('waitForNHistoryCalls is done: ', { history })
+
+    return history
+  }
 }
 
 module.exports = ProxyApiClient

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,61 @@
+/*****
+ 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 fixtures = require('../fixtures')
+
+// eslint-disable-next-line n/no-callback-literal
+const processExpierdKeysFn = async (cb) => cb(fixtures.expiredCacheKeyDto())
+
+const createProxyCacheMock = ({
+  addDfspIdToProxyMapping = jest.fn(async () => true),
+  isPendingCallback = jest.fn(async () => false),
+  lookupProxyByDfspId = jest.fn(async () => null),
+  processExpiredAlsKeys = jest.fn(processExpierdKeysFn),
+  processExpiredProxyGetPartiesKeys = jest.fn(processExpierdKeysFn),
+  receivedErrorResponse = jest.fn(async () => false),
+  receivedSuccessResponse = jest.fn(async () => true),
+  removeDfspIdFromProxyMapping = jest.fn(async () => true),
+  removeProxyGetPartiesTimeout = jest.fn(async () => true),
+  setProxyGetPartiesTimeout = jest.fn(async () => true),
+  setSendToProxiesList = jest.fn(async () => true)
+} = {}) => ({
+  addDfspIdToProxyMapping,
+  isPendingCallback,
+  lookupProxyByDfspId,
+  processExpiredAlsKeys,
+  processExpiredProxyGetPartiesKeys,
+  receivedErrorResponse,
+  receivedSuccessResponse,
+  removeDfspIdFromProxyMapping,
+  removeProxyGetPartiesTimeout,
+  setProxyGetPartiesTimeout,
+  setSendToProxiesList
+})
+
+module.exports = {
+  createProxyCacheMock
+}

package/src/domain/timeout/dto.js

@@ -1,54 +0,0 @@
-const {
-  Factory: { createFSPIOPError },
-  Enums: { FSPIOPErrorCodes }
-} = require('@mojaloop/central-services-error-handling')
-const {
-  Http: { Headers: { FSPIOP: FSPIOPHeaders } },
-  Events: { Event: { Type: EventType, Action: EventAction } },
-  EndPoints: { FspEndpointTypes },
-  Tags: { QueryTags: QueryTagsEnum }
-} = require('@mojaloop/central-services-shared').Enum
-const { Tracer } = require('@mojaloop/event-sdk')
-const EventFrameworkUtil = require('@mojaloop/central-services-shared').Util.EventFramework
-
-const LibUtil = require('../../lib/util')
-const Config = require('../../lib/config')
-const partiesUtils = require('../parties/partiesUtils')
-
-const timeoutCallbackDto = async ({ destination, partyId, partyType }) => {
-  const headers = {
-    [FSPIOPHeaders.SOURCE]: Config.HUB_NAME,
-    [FSPIOPHeaders.DESTINATION]: destination
-  }
-  const params = {
-    ID: partyId,
-    Type: partyType
-  }
-  const error = createFSPIOPError(FSPIOPErrorCodes.EXPIRED_ERROR)
-
-  const dto = {
-    errorInformation: await partiesUtils.makePutPartiesErrorPayload(Config, error, headers, params),
-    headers,
-    params,
-    endpointType: FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR
-  }
-  const span = Tracer.createSpan('timeoutInterschemePartiesLookups', { headers: dto.headers })
-  const spanTags = LibUtil.getSpanTags({ headers: dto.headers }, EventType.PARTY, EventAction.PUT)
-  span.setTags(spanTags)
-  const queryTags = EventFrameworkUtil.Tags.getQueryTags(
-    QueryTagsEnum.serviceName.accountLookupService,
-    QueryTagsEnum.auditType.transactionFlow,
-    QueryTagsEnum.contentType.httpRequest,
-    QueryTagsEnum.operation.timeoutInterschemePartiesLookups,
-    {
-      partyIdType: params.Type,
-      partyIdentifier: params.ID
-    }
-  )
-  span.setTags(queryTags)
-  return { ...dto, span }
-}
-
-module.exports = {
-  timeoutCallbackDto
-}

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

@@ -1,60 +0,0 @@
-/*****
- 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 organization 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
- - Name Surname <name.surname@mojaloop.io>
-
- * Eugen Klymniuk <eugen.klymniuk@infitx.com>
- --------------
- **********/
-
-const mockSendRequest = jest.fn()
-
-jest.mock('@mojaloop/central-services-shared', () => ({
-  ...jest.requireActual('@mojaloop/central-services-shared'),
-  Util: {
-    ...jest.requireActual('@mojaloop/central-services-shared').Util,
-    Endpoints: { getEndpoint: jest.fn() },
-    Request: { sendRequest: mockSendRequest }
-  }
-}))
-
-const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
-const { logger } = require('../../../../src/lib')
-const partiesUtils = require('../../../../src/domain/parties/partiesUtils')
-const config = require('../../../../src/lib/config')
-const fixtures = require('../../../fixtures')
-
-describe('parties utils Tests -->', () => {
-  test('should send error party callback in ISO format', async () => {
-    const isoConfig = { ...config, API_TYPE: API_TYPES.iso20022 }
-    const err = new Error('test error')
-    const source = 'dfsp1'
-    const headers = fixtures.partiesCallHeadersDto({ source })
-    const params = { ID: '1234', Type: 'MSISDN' }
-
-    const handleError = partiesUtils.createErrorHandlerOnSendingCallback(isoConfig, logger)
-    await handleError(err, headers, params, source)
-
-    expect(mockSendRequest).toHaveBeenCalledTimes(1)
-    const { payload } = mockSendRequest.mock.calls[0][0]
-    expect(payload.Rpt.Rsn.Cd).toBe('2001')
-    expect(payload.Rpt.OrgnlId).toBe(`${params.Type}/${params.ID}`)
-    expect(payload.Assgnmt.Assgnr.Agt.FinInstnId.Othr.Id).toBe(source)
-  })
-})

package/test/unit/domain/timeout/dto.test.js

@@ -1,24 +0,0 @@
-const { API_TYPES } = require('@mojaloop/central-services-shared').Util.Hapi
-const { timeoutCallbackDto } = require('../../../../src/domain/timeout/dto')
-const config = require('../../../../src/lib/config')
-
-const realApiType = config.API_TYPE
-
-describe('timeoutCallbackDto Tests -->', () => {
-  afterAll(() => {
-    config.API_TYPE = realApiType
-  })
-
-  test('should produce ISO payload', async () => {
-    config.API_TYPE = API_TYPES.iso20022
-    const destination = 'D1'
-    const partyId = 'P1'
-    const partyType = 'XXX'
-    const dto = await timeoutCallbackDto({ destination, partyId, partyType })
-    expect(dto.errorInformation).toBeTruthy()
-
-    const { Assgnr, Assgne } = dto.errorInformation.Assgnmt
-    expect(Assgnr.Agt.FinInstnId.Othr.Id).toBe(config.HUB_NAME)
-    expect(Assgne.Agt.FinInstnId.Othr.Id).toBe(destination)
-  })
-})