account-lookup-service 15.6.0-iso.2 → 15.6.0-iso.21

package/test/fixtures/iso.js

@@ -74,7 +74,7 @@ const party40ChoiceDto = ({
 
 const assgnmtDto = () => ({
   MsgId: '123',
-  CreDtTm: '2020-01-01T00:00:00Z',
+  CreDtTm: '2024-10-29T16:25:11.916Z',
   Assgnr: party40ChoiceDto(),
   Assgne: party40ChoiceDto()
 })

package/test/unit/api/health.test.js

@@ -38,6 +38,7 @@ const Sinon = require('sinon')
 const MigrationLockModel = require('../../../src/models/misc/migrationLock')
 const Logger = require('@mojaloop/central-services-logger')
 const Config = require('../../../src/lib/config')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -51,6 +52,7 @@ describe('/health', () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
     Config.API_PORT = await getPort()
+    Metrics.getDefaultRegister().clear()
     server = await initServer(Config)
   })
 
@@ -117,6 +119,7 @@ describe('/health', () => {
     Config.proxyMap = { proxied: 'proxy' }
     let serverWithProxy
     try {
+      Metrics.getDefaultRegister().clear()
       serverWithProxy = await initServer(Config)
       sandbox.stub(MigrationLockModel, 'getIsMigrationLocked').resolves(false)
       const mock = await Helper.generateMockRequest('/health', 'get')

package/test/unit/api/participants/participants.test.js

@@ -35,16 +35,12 @@ const Helper = require('../../../util/helper')
 const participants = require('../../../../src/domain/participants')
 const initServer = require('../../../../src/server').initializeApi
 const getPort = require('get-port')
-const Logger = require('@mojaloop/central-services-logger')
 const Config = require('../../../../src/lib/config')
 
-Logger.isDebugEnabled = jest.fn(() => true)
-Logger.isErrorEnabled = jest.fn(() => true)
-Logger.isInfoEnabled = jest.fn(() => true)
-let server
-let sandbox
-
 describe('/participants', () => {
+  let server
+  let sandbox
+
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
@@ -56,6 +52,7 @@ describe('/participants', () => {
     await server.stop()
     sandbox.restore()
   })
+
   const mock = {
     requestId: '3ede3c17-36aa-42f4-b6db-b0df2e42f31e',
     partyList: [{
@@ -79,6 +76,7 @@ describe('/participants', () => {
     ],
     currency: 'EUR'
   }
+
   it('postParticipantsBatch success', async () => {
     // Arrange
     const options = {

package/test/unit/api/participants/{Type}/{ID}/{SubId}.test.js

@@ -35,7 +35,6 @@ const Db = require('../../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../../src/domain/participants')
-const requestLogger = require('../../../../../../src/lib/requestLogger')
 const Helper = require('../../../../../util/helper')
 const initServer = require('../../../../../../src/server').initializeApi
 const Logger = require('@mojaloop/central-services-logger')
@@ -51,8 +50,6 @@ describe('/participants/{Type}/{ID}/{SubId}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
   })

package/test/unit/api/participants/{Type}/{ID}.test.js

@@ -40,7 +40,6 @@ const Db = require('../../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../../src/models/oracle/oracleEndpointCached')
 const participant = require('../../../../../src/models/participantEndpoint/facade')
 const participants = require('../../../../../src/domain/participants')
-const requestLogger = require('../../../../../src/lib/requestLogger')
 const Helper = require('../../../../util/helper')
 const initServer = require('../../../../../src/server').initializeApi
 const Config = require('../../../../../src/lib/config')
@@ -55,8 +54,6 @@ describe('/participants/{Type}/{ID}', () => {
   beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
-    sandbox.stub(requestLogger, 'logRequest').returns({})
-    sandbox.stub(requestLogger, 'logResponse').returns({})
     Config.API_PORT = await getPort()
     server = await initServer(Config)
     sandbox.stub(Logger)

package/test/unit/api/participants.test.js

@@ -36,6 +36,7 @@ const initServer = require('../../../src/server').initializeApi
 const Helper = require('../../util/helper')
 const Db = require('../../../src/lib/db')
 const Config = require('../../../src/lib/config')
+const fixtures = require('../../fixtures')
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -44,14 +45,14 @@ let sandbox
 let server
 
 describe('/participants', () => {
-  beforeEach(async () => {
+  beforeAll(async () => {
     sandbox = Sinon.createSandbox()
     sandbox.stub(Db, 'connect').returns(Promise.resolve({}))
     Config.API_PORT = await getPort()
     server = await initServer(Config)
   })
 
-  afterEach(async () => {
+  afterAll(async () => {
     await server.stop()
     sandbox.restore()
   })
@@ -103,6 +104,38 @@ describe('/participants', () => {
 
     // Assert
     expect(response.statusCode).toBe(400)
-    await server.stop()
+  })
+
+  it('should validate requestId in UUID format', async () => {
+    const reqOptions = {
+      method: 'post',
+      url: '/participants',
+      headers: fixtures.participantsCallHeadersDto(),
+      payload: fixtures.postParticipantsPayloadDto()
+    }
+    const response = await server.inject(reqOptions)
+    expect(response.statusCode).toBe(200)
+  })
+
+  it('should validate requestId in ULID format', async () => {
+    const reqOptions = {
+      method: 'post',
+      url: '/participants',
+      headers: fixtures.participantsCallHeadersDto(),
+      payload: fixtures.postParticipantsPayloadDto({ requestId: '01JE8SG3F4WNHY8B9876THQ344' })
+    }
+    const response = await server.inject(reqOptions)
+    expect(response.statusCode).toBe(200)
+  })
+
+  it('should fail requestId validation', async () => {
+    const reqOptions = {
+      method: 'post',
+      url: '/participants',
+      headers: fixtures.participantsCallHeadersDto(),
+      payload: fixtures.postParticipantsPayloadDto({ requestId: 'wrong format' })
+    }
+    const response = await server.inject(reqOptions)
+    expect(response.statusCode).toBe(400)
   })
 })

package/test/unit/domain/oracle/oracle.test.js

@@ -37,6 +37,7 @@ const partyIdType = require('../../../../src/models/partyIdType')
 const Db = require('../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../src/models/oracle/oracleEndpointCached')
 const Logger = require('@mojaloop/central-services-logger')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -90,6 +91,13 @@ let sandbox
 let SpanStub
 
 describe('Oracle tests', () => {
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(() => {
     sandbox = Sinon.createSandbox()
     Db.partyIdType = {

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

@@ -34,20 +34,28 @@ const Sinon = require('sinon')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Logger = require('@mojaloop/central-services-logger')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 const participantsDomain = require('../../../../src/domain/participants/participants')
 const participant = require('../../../../src/models/participantEndpoint/facade')
 const oracle = require('../../../../src/models/oracle/facade')
-const Helper = require('../../../util/helper')
 const Config = require('../../../../src/lib/config')
+const { logger } = require('../../../../src/lib')
+const { ERROR_MESSAGES } = require('../../../../src/constants')
+const Helper = require('../../../util/helper')
+const fixtures = require('../../../fixtures')
 
-Logger.isDebugEnabled = jest.fn(() => true)
-Logger.isErrorEnabled = jest.fn(() => true)
-Logger.isInfoEnabled = jest.fn(() => true)
+const { Headers } = Enums.Http
 
 describe('participant Tests', () => {
   describe('getParticipantsByTypeAndID', () => {
     let sandbox
+    // Initialize Metrics for testing
+    Metrics.getCounter(
+      'errorCount',
+      'Error count',
+      ['code', 'system', 'operation', 'step']
+    )
 
     beforeEach(() => {
       sandbox = Sinon.createSandbox()
@@ -185,7 +193,7 @@ describe('participant Tests', () => {
       expect.hasAssertions()
       // Arrange
       participant.validateParticipant = sandbox.stub().resolves(null)
-      const logErrorStub = sandbox.stub(Logger, 'error')
+      const logStub = sandbox.stub(logger.constructor.prototype, 'warn')
 
       participant.sendRequest = sandbox.stub()
       const args = [
@@ -199,8 +207,8 @@ describe('participant Tests', () => {
       await participantsDomain.getParticipantsByTypeAndID(...args)
 
       // Assert
-      const firstCallArgs = logErrorStub.getCall(0).args
-      expect(firstCallArgs[0]).toBe('Requester FSP not found')
+      const firstCallArgs = logStub.getCall(0).args
+      expect(firstCallArgs[0]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('fails when `oracleRequest` response is empty', async () => {
@@ -485,9 +493,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -510,8 +517,7 @@ describe('participant Tests', () => {
       await participantsDomain.putParticipantsByTypeAndID(headers, params, method, payload)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).args[1].message).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {
@@ -739,9 +745,6 @@ describe('participant Tests', () => {
     it('handles PUT /error when SubId supplied but validateParticipant throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation failed'))
       oracle.oracleRequest = sandbox.stub().resolves(null)
       participant.sendErrorToParticipant = sandbox.stub()
@@ -771,15 +774,11 @@ describe('participant Tests', () => {
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
       const firstCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
-      expect(Logger.error.callCount).toBe(1)
     })
 
     it('handles PUT /error when `sendErrorToParticipant` throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendErrorToParticipant = sandbox.stub().throws(new Error('sendErrorToParticipant failed'))
       const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
@@ -809,15 +808,11 @@ describe('participant Tests', () => {
       const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
       expect(secondCallArgs[0]).toBe(Config.HUB_NAME)
-      expect(Logger.error.callCount).toBe(2)
     })
 
     it('handles PUT /error when SubId is supplied and `sendErrorToParticipant` throws error', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.info = sandbox.stub()
-      Logger.error = sandbox.stub()
       participant.validateParticipant = sandbox.stub().resolves({})
       participant.sendErrorToParticipant = sandbox.stub().throws(new Error('sendErrorToParticipant failed'))
       const expectedCallbackEndpointType = Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
@@ -848,7 +843,6 @@ describe('participant Tests', () => {
       const secondCallArgs = participant.sendErrorToParticipant.getCall(1).args
       expect(firstCallArgs[1]).toBe(expectedCallbackEndpointType)
       expect(secondCallArgs[0]).toBe(Config.HUB_NAME)
-      expect(Logger.error.callCount).toBe(2)
     })
   })
 
@@ -1048,9 +1042,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1072,8 +1065,7 @@ describe('participant Tests', () => {
       await participantsDomain.postParticipants(headers, 'get', params, payload)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).args[0]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {
@@ -1202,7 +1194,7 @@ describe('participant Tests', () => {
 
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
-        'fspiop-destination': Config.HUB_NAME,
+        // 'fspiop-destination': Config.HUB_NAME,
         'content-type': 'application/vnd.interoperability.participants+json;version=1.1',
         date: '2019-05-24 08:52:19',
         'fspiop-source': 'fsp1'
@@ -1318,15 +1310,23 @@ describe('participant Tests', () => {
       const expected = {
         currency: 'USD',
         partyList: [
-          ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, undefined, undefined, undefined, [{
-            key: Enums.Accounts.PartyAccountTypes.MSISDN,
-            value: undefined
-          }]).toApiErrorObject(Config.ERROR_HANDLING),
-          ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
-            key: 'NOT_A_VALID_PARTY_ID',
-            value: undefined
-          }]).toApiErrorObject(Config.ERROR_HANDLING),
-          { partyId: { currency: undefined } }
+          {
+            ...ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND, undefined, undefined, undefined, [{
+              key: Enums.Accounts.PartyAccountTypes.MSISDN,
+              value: undefined
+            }]).toApiErrorObject(Config.ERROR_HANDLING),
+            partyId: payload.partyList[1]
+          },
+          {
+            ...ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, undefined, undefined, undefined, [{
+              key: 'NOT_A_VALID_PARTY_ID',
+              value: undefined
+            }]).toApiErrorObject(Config.ERROR_HANDLING),
+            partyId: payload.partyList[2]
+          },
+          {
+            partyId: { currency: undefined }
+          }
         ]
       }
 
@@ -1342,10 +1342,10 @@ describe('participant Tests', () => {
     it('handles error when `validateParticipant` fails and `sendErrorToParticipant` throws', async () => {
       expect.hasAssertions()
       // Arrange
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      participant.sendErrorToParticipant = sandbox.stub().throws(new Error('unknown error'))
+      const cbError = new Error('unknown error')
+      participant.sendErrorToParticipant = sandbox.stub().throws(cbError)
 
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1368,10 +1368,8 @@ describe('participant Tests', () => {
       await participantsDomain.postParticipantsBatch(headers, 'get', payload, Helper.mockSpan())
 
       // Assert
-      const firstCallArgs = Logger.error.getCall(0).args
-      const thirdCallArgs = Logger.error.getCall(2).args
-      expect(firstCallArgs[0]).toBe('Requester FSP not found')
-      expect(thirdCallArgs[0].message).toBe('unknown error')
+      expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
+      expect(logStub.getCall(2).lastArg).toEqual(cbError)
     })
 
     it('handles error when `oracleBatchRequest` returns no result', async () => {
@@ -1447,6 +1445,44 @@ describe('participant Tests', () => {
       expect(firstCallArgs[4].partyList[1].errorInformation).toBeDefined()
       expect(firstCallArgs[4].partyList[2].errorInformation).toBeDefined()
     })
+
+    it('should not call oracle if source-header and fspId in payload are different, and no destination [CSI-938]', async () => {
+      const headers = fixtures.participantsCallHeadersDto({ destination: '' })
+      const payload = {
+        requestId: '0e21b07e-3117-46ca-ae22-6ee370895697',
+        currency: 'MWK',
+        partyList: [
+          {
+            fspId: 'test-mwk-dfsp',
+            partyIdType: 'MSISDN',
+            partyIdentifier: '16665551002'
+          }
+        ]
+      }
+      expect(headers.source).not.toBe(payload.partyList[0].fspId)
+      expect(headers.destination).toBeUndefined()
+
+      participant.validateParticipant = sandbox.stub().resolves({})
+      participant.sendRequest = sandbox.stub()
+      participant.sendErrorToParticipant = sandbox.stub().resolves({})
+      oracle.oracleBatchRequest = sandbox.stub().resolves({})
+
+      await participantsDomain.postParticipantsBatch(headers, 'put', payload, Helper.mockSpan())
+
+      expect(oracle.oracleBatchRequest.callCount).toBe(0)
+      expect(participant.sendErrorToParticipant.callCount).toBe(0)
+      expect(participant.sendRequest.callCount).toBe(1)
+
+      const { args } = participant.sendRequest.getCall(0)
+      expect(args[0][Headers.FSPIOP.DESTINATION]).toBe(headers[Headers.FSPIOP.SOURCE])
+      expect(args[0][Headers.FSPIOP.SOURCE]).toBe(Config.HUB_NAME)
+      expect(args[1]).toBe(headers[Headers.FSPIOP.SOURCE])
+
+      const { partyList } = args[4]
+      expect(partyList.length).toBe(1)
+      expect(partyList[0].errorInformation).toBeDefined()
+      expect(partyList[0].partyId).toBe(payload.partyList[0])
+    })
   })
 
   describe('deleteParticipants', () => {
@@ -1602,9 +1638,8 @@ describe('participant Tests', () => {
     it('handles the case where `validateParticipant` returns null', async () => {
       expect.hasAssertions()
       // Arrange
+      const logStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().resolves(null)
-      sandbox.stub(Logger)
-      Logger.error = sandbox.stub()
       participant.sendErrorToParticipant = sandbox.stub()
       const headers = {
         accept: 'application/vnd.interoperability.participants+json;version=1',
@@ -1625,8 +1660,8 @@ describe('participant Tests', () => {
       await participantsDomain.deleteParticipants(headers, params, method, query)
 
       // Assert
-      const loggerFirstCallArgs = Logger.error.getCall(0).args
-      expect(loggerFirstCallArgs[0]).toBe('Requester FSP not found')
+      expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
+      // expect(logStub.getCall()]).toBe(ERROR_MESSAGES.sourceFspNotFound)
     })
 
     it('handles case where type is not in `PartyAccountTypes`', async () => {

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

@@ -37,6 +37,7 @@ const { createProxyCache } = require('@mojaloop/inter-scheme-proxy-cache-lib')
 const { Enum, Util } = require('@mojaloop/central-services-shared')
 const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
 const Logger = require('@mojaloop/central-services-logger')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 const Config = require('../../../../src/lib/config')
 const Db = require('../../../../src/lib/db')
@@ -65,6 +66,13 @@ let sandbox
 describe('Parties Tests', () => {
   let proxyCache
 
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(async () => {
     await Util.Endpoints.initializeCache(Config.CENTRAL_SHARED_ENDPOINT_CACHE_CONFIG, libUtil.hubNameConfig)
     sandbox = Sinon.createSandbox()
@@ -613,7 +621,7 @@ describe('Parties Tests', () => {
     it('handles error when `participant.validateParticipant()` returns no participant', async () => {
       expect.hasAssertions()
       // Arrange
-      const loggerStub = sandbox.stub(logger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.sendErrorToParticipant = sandbox.stub().resolves()
 
       const payload = JSON.stringify({ testPayload: true })
@@ -874,7 +882,7 @@ describe('Parties Tests', () => {
     it('handles error when `validateParticipant()` fails', async () => {
       expect.hasAssertions()
       // Arrange)
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })
@@ -894,7 +902,7 @@ describe('Parties Tests', () => {
       expect.hasAssertions()
       // Arrange
 
-      const loggerStub = sandbox.stub(logger.mlLogger, 'error')
+      const loggerStub = sandbox.stub(logger.constructor.prototype, 'error')
       participant.validateParticipant = sandbox.stub().throws(new Error('Validation fails'))
       participant.sendErrorToParticipant = sandbox.stub().resolves({})
       const payload = JSON.stringify({ errorPayload: true })

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

@@ -0,0 +1,60 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates 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
+ Gates 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>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * 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 utils = require('../../../../src/domain/parties/utils')
+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 = utils.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

@@ -9,8 +9,7 @@ describe('timeoutCallbackDto Tests -->', () => {
     config.API_TYPE = realApiType
   })
 
-  // todo: unskip after fixing transformLib SubId issue for parties.putError
-  test.skip('should produce ISO payload', async () => {
+  test('should produce ISO payload', async () => {
     config.API_TYPE = API_TYPES.iso20022
     const destination = 'D1'
     const partyId = 'P1'

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

@@ -33,8 +33,16 @@
 
 const Participant = require('../../../../src/models/participantEndpoint/facade')
 const TimeoutDomain = require('../../../../src/domain/timeout')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 describe('Timeout Domain', () => {
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(() => {
     jest.clearAllMocks()
     jest.spyOn(Participant, 'validateParticipant').mockResolvedValue({})

package/test/unit/lib/TransformFacades.test.js

@@ -5,10 +5,11 @@ describe('TransformFacades Tests -->', () => {
   test('should transform PUT /parties error callback payload to ISO format', async () => {
     const body = errorCallbackResponseDto()
     const headers = partiesCallHeadersDto()
+    TransformFacades.FSPIOP.configure({ isTestingMode: true })
     const isoPayload = await TransformFacades.FSPIOP.parties.putError({
       body,
       headers,
-      params: { IdPath: '123456789' }
+      params: { Type: 'MSISDN', ID: '123456789' }
     })
     expect(isoPayload.body).toBeTruthy()
     expect(isoPayload.body.Assgnmt).toBeTruthy()

package/test/unit/lib/config.test.js

@@ -105,4 +105,11 @@ describe('Config tests', () => {
     expect(isSuccess).toBe(false)
     expect(error.message).toBe('File doesn\'t exist')
   })
+
+  it('should have FSPIOP_SOURCE_TO_SIGN config defined', () => {
+    process.env.ALS_ENDPOINT_SECURITY__JWS__JWS_SIGN = 'false' // to avoid error in config getFileContent()
+    const config = require(configImport)
+    expect(config.FSPIOP_SOURCE_TO_SIGN).toBeDefined()
+    expect(config.FSPIOP_SOURCE_TO_SIGN).toBe(config.HUB_NAME)
+  })
 })