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

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

@@ -32,64 +32,82 @@ const BasePartiesService = require('./BasePartiesService')
 const { RestMethods } = BasePartiesService.enums()
 
 class PutPartiesService extends BasePartiesService {
-  // async handleRequest () {
-  //   // todo: add impl.
-  // }
-
-  async validateSourceParticipant ({ source, proxy }) {
-    this.deps.stepState.inProgress('validateSourceParticipant-1')
-    const requesterParticipant = await super.validateParticipant(source)
-
-    if (!requesterParticipant) {
-      if (!this.proxyEnabled || !proxy) {
-        const errMessage = ERROR_MESSAGES.sourceFspNotFound
-        this.log.warn(`${errMessage} and no proxy`, { source })
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+  async handleRequest () {
+    const { destination, source, proxy } = this.state
+    this.log.info('handleRequest start', { destination, source, proxy })
+
+    await this.validateSourceParticipant()
+    if (proxy) {
+      await this.checkProxySuccessResponse()
+    }
+    await this.identifyDestinationForSuccessCallback()
+    await this.sendSuccessCallback()
+  }
+
+  async validateSourceParticipant () {
+    const { source, proxy, proxyEnabled } = this.state
+    const log = this.log.child({ source, proxy, method: 'validateSourceParticipant' })
+    this.stepInProgress('validateSourceParticipant-1')
+
+    const schemeParticipant = await super.validateParticipant(source)
+    if (!schemeParticipant) {
+      if (!proxyEnabled || !proxy) {
+        throw super.createFspiopIdNotFoundError(ERROR_MESSAGES.sourceFspNotFound, log)
       }
+
       const isCached = await this.deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
       if (!isCached) {
-        const errMessage = 'failed to addDfspIdToProxyMapping'
-        this.log.warn(errMessage, { source, proxy })
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+        throw super.createFspiopIdNotFoundError('failed to addDfspIdToProxyMapping', log)
       }
 
-      this.log.info('addDfspIdToProxyMapping is done', { source, proxy })
+      log.info('addDfspIdToProxyMapping is done', { source, proxy })
     }
   }
 
-  async checkProxySuccessResponse ({ destination, source, headers, params }) {
-    if (this.proxyEnabled) {
-      this.deps.stepState.inProgress('checkProxySuccessResponse-2')
+  async checkProxySuccessResponse () {
+    if (this.state.proxyEnabled) {
+      this.stepInProgress('checkProxySuccessResponse')
+      const { headers, params } = this.inputs
+      const { destination, source } = this.state
       const alsReq = this.deps.partiesUtils.alsRequestDto(destination, params)
 
       const isExists = await this.deps.proxyCache.receivedSuccessResponse(alsReq)
-      if (isExists) {
-        await this.#updateOracleWithParticipantMapping({ source, headers, params })
+      if (!isExists) {
+        this.log.verbose('NOT inter-scheme receivedSuccessResponse case')
+        await this.removeProxyGetPartiesTimeout(alsReq)
         return
       }
-      this.log.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
-      // todo: think, if we need to throw an error here
+
+      const schemeParticipant = await super.validateParticipant(destination)
+      if (schemeParticipant) {
+        await this.#updateOracleWithParticipantMapping({ source, headers, params })
+      }
     }
   }
 
-  async identifyDestinationForSuccessCallback (destination) {
-    this.deps.stepState.inProgress('validateDestinationParticipant-4')
+  async identifyDestinationForSuccessCallback () {
+    const { destination } = this.state
+    this.stepInProgress('identifyDestinationForSuccessCallback')
     const destinationParticipant = await super.validateParticipant(destination)
     if (destinationParticipant) {
-      return destinationParticipant.name
+      this.state.requester = destinationParticipant.name
+      return
     }
 
-    const proxyName = this.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
+    const proxyName = this.state.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
     if (!proxyName) {
       const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
       this.log.warn(`${errMessage} and no proxy`, { destination })
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
     }
-    return proxyName
+
+    this.state.requester = proxyName
   }
 
-  async sendSuccessCallback ({ sendTo, headers, params, dataUri }) {
-    this.deps.stepState.inProgress('#sendSuccessCallback-6')
+  async sendSuccessCallback () {
+    const { headers, params, dataUri } = this.inputs
+    const sendTo = this.state.requester
+    this.stepInProgress('sendSuccessCallback')
     const payload = PutPartiesService.decodeDataUriPayload(dataUri)
     const callbackEndpointType = this.deps.partiesUtils.putPartyCbType(params.SubId)
     const options = this.deps.partiesUtils.partiesRequestOptionsDto(params)
@@ -97,11 +115,11 @@ class PutPartiesService extends BasePartiesService {
     await this.deps.participant.sendRequest(
       headers, sendTo, callbackEndpointType, RestMethods.PUT, payload, options
     )
-    this.log.verbose('sendSuccessCallback is done', { sendTo, payload })
+    this.log.verbose('sendSuccessCallback is sent', { sendTo, payload })
   }
 
   async #updateOracleWithParticipantMapping ({ source, headers, params }) {
-    this.deps.stepState.inProgress('#updateOracleWithParticipantMapping-3')
+    this.stepInProgress('#updateOracleWithParticipantMapping-3')
     const mappingPayload = {
       fspId: source
     }

package/src/domain/timeout/index.js

@@ -52,6 +52,10 @@ const timeoutInterschemePartiesLookups = async ({ proxyCache, batchSize }) => {
   return proxyCache.processExpiredAlsKeys(sendTimeoutCallback, batchSize)
 }
 
+const timeoutProxyGetPartiesLookups = async ({ proxyCache, batchSize }) => {
+  return proxyCache.processExpiredProxyGetPartiesKeys(sendTimeoutCallback, batchSize)
+}
+
 const sendTimeoutCallback = async (cacheKey) => {
   const histTimerEnd = Metrics.getHistogram(
     'eg_timeoutInterschemePartiesLookups',
@@ -59,7 +63,7 @@ const sendTimeoutCallback = async (cacheKey) => {
     ['success']
   ).startTimer()
   let step
-  const [, destination, partyType, partyId] = cacheKey.split(':')
+  const [destination, partyType, partyId] = parseCacheKey(cacheKey)
   const { errorInformation, params, headers, endpointType, span } = await timeoutCallbackDto({ destination, partyId, partyType })
   logger.debug('sendTimeoutCallback details:', { destination, partyType, partyId, cacheKey })
 
@@ -103,7 +107,13 @@ const finishSpan = async (span, err) => {
   }
 }
 
+const parseCacheKey = (cacheKey) => {
+  const [destination, partyType, partyId] = cacheKey.split(':').slice(-3)
+  return [destination, partyType, partyId]
+}
+
 module.exports = {
   timeoutInterschemePartiesLookups,
+  timeoutProxyGetPartiesLookups,
   sendTimeoutCallback // Exposed for testing
 }

package/src/handlers/TimeoutHandler.js

@@ -41,13 +41,13 @@ let isRunning
 
 const timeout = async (options) => {
   if (isRunning) return
-
   const { logger } = options
 
   try {
     isRunning = true
-    logger.debug('Timeout handler triggered')
     await TimeoutService.timeoutInterschemePartiesLookups(options)
+    await TimeoutService.timeoutProxyGetPartiesLookups(options)
+    logger.verbose('ALS timeout handler is done')
   } catch (err) {
     logger.error('error in timeout: ', err)
   } finally {

package/src/lib/util.js

@@ -29,10 +29,11 @@ const util = require('node:util')
 const Path = require('node:path')
 const EventSdk = require('@mojaloop/event-sdk')
 const Enum = require('@mojaloop/central-services-shared').Enum
-const { HeaderValidation, Hapi } = require('@mojaloop/central-services-shared').Util
+const { HeaderValidation } = require('@mojaloop/central-services-shared').Util
 const rethrow = require('@mojaloop/central-services-shared').Util.rethrow.with('ALS')
 
 const Config = require('../lib/config')
+const { API_TYPES } = require('../constants')
 const { logger } = require('./index')
 
 const getSpanTags = ({ headers }, transactionType, transactionAction) => {
@@ -69,7 +70,7 @@ const pathForInterface = ({ isAdmin, isMockInterface }) => {
     if (isMockInterface) {
       apiFile = 'api_swagger.json'
     } else {
-      apiFile = Config.API_TYPE === Hapi.API_TYPES.iso20022
+      apiFile = Config.API_TYPE === API_TYPES.iso20022
         ? 'api-swagger-iso20022-parties.yaml'
         : 'api-swagger.yaml'
     }
@@ -100,7 +101,14 @@ const countFspiopError = (error, options) => {
   rethrow.countFspiopError(error, options)
 }
 
-// todo: think better name
+/**
+ *  An immutable object representing the step state
+ * @typedef {Object} StepState
+ * @property {string} step - The current step value (read-only getter property)
+ * @property {(string) => void} inProgress - Method to update the current step
+ */
+
+/** @returns {StepState} */
 const initStepState = (initStep = 'start') => {
   let step = initStep
   return Object.freeze({

package/test/fixtures/index.js

@@ -1,3 +1,30 @@
+/*****
+ 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 { randomUUID } = require('node:crypto')
 const { Enum } = require('@mojaloop/central-services-shared')
 const isoFixtures = require('./iso')
@@ -20,6 +47,16 @@ const headersDto = ({
   'content-type': contentType || accept
 })
 
+const partiesParamsDto = ({
+  Type = 'MSISDN',
+  ID = String(Date.now()),
+  SubId
+} = {}) => ({
+  Type,
+  ID,
+  ...(SubId && { SubId })
+})
+
 const protocolVersionsDto = () => ({
   CONTENT: {
     DEFAULT: '2.1',
@@ -142,6 +179,7 @@ const mockHapiRequestDto = ({ // https://hapi.dev/api/?v=21.3.3#request-properti
 module.exports = {
   ...isoFixtures,
   partiesCallHeadersDto,
+  partiesParamsDto,
   participantsCallHeadersDto,
   oracleRequestResponseDto,
   putPartiesSuccessResponseDto,

package/test/unit/domain/participants/participants.test.js

@@ -1369,7 +1369,7 @@ describe('participant Tests', () => {
 
       // Assert
       expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
-      expect(logStub.getCall(3).lastArg).toEqual(cbError)
+      expect(logStub.getCall(2).lastArg).toEqual(cbError)
     })
 
     it('handles error when `oracleBatchRequest` returns no result', async () => {

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()}`
@@ -479,7 +481,7 @@ describe('Parties Tests', () => {
       })
       sandbox.stub(oracle, 'oracleRequest').resolves(oracleResponse)
       participant.validateParticipant = sandbox.stub()
-        .onFirstCall().resolves({}) // source
+        .onFirstCall().resolves(null) // source
         .onSecondCall().resolves(null) // oracle dfsp
       participant.sendRequest = sandbox.stub().resolves()
       participant.sendErrorToParticipant = sandbox.stub().resolves()
@@ -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, proxy: 'proxy' })
       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/partiesUtils.test.js

@@ -0,0 +1,51 @@
+/*****
+ 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 ErrorHandler = require('@mojaloop/central-services-error-handling')
+const partiesUtils = require('#src/domain/parties/partiesUtils')
+const config = require('#src/lib/config')
+const { API_TYPES } = require('#src/constants')
+const fixtures = require('#test/fixtures/index')
+
+describe('partiesUtils Tests -->', () => {
+  describe('makePutPartiesErrorPayload Tests', () => {
+    const error = ErrorHandler.Factory.reformatFSPIOPError(new Error('Test Error'))
+    const ERR_CODE = '2001'
+    const headers = fixtures.partiesCallHeadersDto()
+    const params = fixtures.partiesParamsDto()
+
+    test('should make putParties error payload in FSPIOP format', async () => {
+      const fspiopConfig = { ...config, API_TYPE: API_TYPES.fspiop }
+      const payload = await partiesUtils.makePutPartiesErrorPayload(fspiopConfig, error, headers, params)
+      expect(payload.errorInformation.errorCode).toBe(ERR_CODE)
+    })
+
+    test('should make putParties error payload in ISO20022 format', async () => {
+      const fspiopConfig = { ...config, API_TYPE: API_TYPES.iso20022 }
+      const payload = await partiesUtils.makePutPartiesErrorPayload(fspiopConfig, error, headers, params)
+      expect(payload.Rpt.Rsn.Cd).toBe(ERR_CODE)
+    })
+  })
+})

package/test/unit/domain/parties/{utils.test.js → services/BasePartiesService.test.js}

@@ -3,7 +3,9 @@
  --------------
  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
@@ -13,46 +15,43 @@
  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
+ 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
- - Name Surname <name.surname@mojaloop.io>
 
+ * Mojaloop Foundation
  * 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)
+ --------------
+ ******/
+
+const { createMockDeps, participantMock } = require('./deps')
+// should be first require to mock external deps
+const BasePartiesService = require('#src/domain/parties/services/BasePartiesService')
+const config = require('#src/lib/config')
+const { API_TYPES } = require('#src/constants')
+const fixtures = require('#test/fixtures/index')
+
+describe('BasePartiesService Tests -->', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
 
-    expect(mockSendRequest).toHaveBeenCalledTimes(1)
-    const { payload } = mockSendRequest.mock.calls[0][0]
+  test('should send error party callback in ISO20022 format', async () => {
+    const deps = {
+      ...createMockDeps(),
+      config: { ...config, API_TYPE: API_TYPES.iso20022 }
+    }
+    const source = 'sourceFsp'
+    const headers = fixtures.partiesCallHeadersDto({ source })
+    const params = fixtures.partiesParamsDto()
+    const service = new BasePartiesService(deps, { headers, params })
+
+    await service.handleError(new Error('test error'))
+    expect(participantMock.sendErrorToParticipant.mock.calls.length).toBe(1)
+    // eslint-disable-next-line no-unused-vars
+    const [sentTo, _, payload] = participantMock.sendErrorToParticipant.mock.lastCall
+    expect(sentTo).toBe(source)
     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)