account-lookup-service 17.9.0-snapshot.0 → 17.9.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [17.9.0](https://github.com/mojaloop/account-lookup-service/compare/v17.8.1...v17.9.0) (2025-04-08)
+
+
+### Features
+
+* **csi-1350:** refactored oracleRequest ([#546](https://github.com/mojaloop/account-lookup-service/issues/546)) ([3f76ef7](https://github.com/mojaloop/account-lookup-service/commit/3f76ef7f712590e82bcb5bf7e49a643b2aae63f3))
+
+### [17.8.1](https://github.com/mojaloop/account-lookup-service/compare/v17.8.0...v17.8.1) (2025-04-07)
+
+
+### Bug Fixes
+
+* **csi-1386:** delete participant audit ([#547](https://github.com/mojaloop/account-lookup-service/issues/547)) ([5ecf562](https://github.com/mojaloop/account-lookup-service/commit/5ecf562db8f48cf688f1ee19e901d46671d16ce9))
+
 ## [17.8.0](https://github.com/mojaloop/account-lookup-service/compare/v17.7.1...v17.8.0) (2025-04-03)
 
 

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.9.0-snapshot.0",
+  "version": "17.9.0",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

package/src/api/participants/{Type}/{ID}.js

@@ -175,7 +175,7 @@ module.exports = {
       ['success']
     ).startTimer()
 
-    const { headers, payload, method, path, params, span } = request
+    const { headers, method, path, params, span } = request
     const spanTags = LibUtil.getSpanTags(request, Enum.Events.Event.Type.PARTICIPANT, Enum.Events.Event.Action.DELETE)
     span.setTags(spanTags)
     const queryTags = EventFrameworkUtil.Tags.getQueryTags(
@@ -193,7 +193,7 @@ module.exports = {
     span.setTags(queryTags)
     await span.audit({
       headers,
-      payload
+      payload: undefined
     }, EventSdk.AuditEventAction.start)
 
     const metadata = `${request.method} ${request.path}`

package/src/models/oracle/facade.js

@@ -40,6 +40,12 @@ const oracleEndpointCached = require('../oracle/oracleEndpointCached')
 
 const { Headers, RestMethods, ReturnCodes } = Enums.Http
 
+const sendHttpRequest = ({ method, ...restArgs }) => request.sendRequest({
+  ...restArgs,
+  method: method.toUpperCase(),
+  hubNameRegex
+})
+
 /**
  * Sends a request to the oracles that are registered to the ALS
  *
@@ -67,7 +73,6 @@ const oracleRequest = async (headers, method, params = {}, query = {}, payload =
     const url = await determineOracleEndpoint({
       method, params, query, payload, assertPendingAcquire
     })
-    log.verbose(`Oracle endpoint: ${url}`)
 
     if (method.toUpperCase() === RestMethods.GET) {
       step = 'sendOracleGetRequest'
@@ -80,20 +85,17 @@ const oracleRequest = async (headers, method, params = {}, query = {}, payload =
 
     if (method.toUpperCase() === RestMethods.DELETE && Config.DELETE_PARTICIPANT_VALIDATION_ENABLED) {
       step = 'validatePartyDeletion'
-      await validatePartyDeletion({
-        url, source, destination, headers, method, params, payload
-      })
+      await validatePartyDeletion({ url, source, destination, headers, params })
     }
 
-    step = 'sendRequest'
-    return await request.sendRequest({
+    step = 'sendHttpRequest'
+    return await sendHttpRequest({
       url,
       headers,
       source,
       destination,
       method,
-      payload,
-      hubNameRegex
+      payload
     })
   } catch (err) {
     log.error('error in oracleRequest: ', err)
@@ -120,6 +122,8 @@ const determineOracleEndpoint = async ({
   } else {
     url = await _getOracleEndpointByType(partyIdType, partyIdentifier, assertPendingAcquire)
   }
+
+  logger.verbose(`Oracle endpoint: ${url}`, { currency, params, partySubIdOrType, url })
   return url
 }
 
@@ -138,13 +142,12 @@ const sendOracleGetRequest = async ({
     cachedOracleFspResponse = cache && cache.get(cache.createKey(`oracleSendRequest_${url}`))
 
     if (!cachedOracleFspResponse) {
-      cachedOracleFspResponse = await request.sendRequest({
+      cachedOracleFspResponse = await sendHttpRequest({
         url,
         headers,
         source,
         destination,
-        method,
-        hubNameRegex
+        method
       })
       // Trying to cache the whole response object will fail because it contains circular references
       // so we'll just cache the data property of the response.
@@ -204,19 +207,15 @@ const sendOracleGetRequest = async ({
   }
 }
 
-const validatePartyDeletion = async ({
-  url, source, destination, headers, method, params, payload
-}) => {
+const validatePartyDeletion = async ({ url, source, destination, headers, params }) => {
   const log = logger.child({ component: 'validatePartyDeletion', params })
   // If the request is a DELETE request, we need to ensure that the participant belongs to the requesting FSP
-  const getParticipantResponse = await request.sendRequest({
+  const getParticipantResponse = await sendHttpRequest({
     url,
     headers,
     source,
     destination,
-    method,
-    payload,
-    hubNameRegex
+    method: RestMethods.GET
   })
 
   if (getParticipantResponse.status !== ReturnCodes.OK.CODE) {
@@ -274,7 +273,7 @@ const _getOracleEndpointByTypeAndCurrency = async (partyIdType, partyIdentifier,
     }
   } else {
     const errMessage = `Oracle type:${partyIdType} and currency:${currency} not found`
-    logger.error(errMessage)
+    logger.warn(errMessage)
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, errMessage)
       .toApiErrorObject(Config.ERROR_HANDLING)
   }
@@ -312,7 +311,7 @@ const _getOracleEndpointByType = async (partyIdType, partyIdentifier, assertPend
     }
   } else {
     const errMessage = `Oracle type:${partyIdType} not found`
-    logger.error(errMessage)
+    logger.warn(errMessage)
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, errMessage)
   }
   return url
@@ -350,7 +349,7 @@ const _getOracleEndpointByTypeAndSubId = async (partyIdType, partyIdentifier, pa
     }
   } else {
     const errMessage = `Oracle type: ${partyIdType} and subId: ${partySubIdOrType} not found`
-    logger.error(errMessage)
+    logger.warn(errMessage)
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, errMessage)
       .toApiErrorObject(Config.ERROR_HANDLING)
   }
@@ -390,7 +389,7 @@ const _getOracleEndpointByTypeCurrencyAndSubId = async (partyIdType, partyIdenti
     }
   } else {
     const errMessage = `Oracle type: ${partyIdType}, currency: ${currency} and subId: ${partySubIdOrType} not found`
-    logger.error(errMessage)
+    logger.warn(errMessage)
     throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, errMessage)
       .toApiErrorObject(Config.ERROR_HANDLING)
   }
@@ -409,6 +408,7 @@ const _getOracleEndpointByTypeCurrencyAndSubId = async (partyIdType, partyIdenti
  * @returns {object} - response from the oracle
  */
 const oracleBatchRequest = async (headers, method, requestPayload, type, payload) => {
+  let step = 'getOracleEndpoint'
   try {
     let oracleEndpointModel
     let url
@@ -417,34 +417,37 @@ const oracleBatchRequest = async (headers, method, requestPayload, type, payload
     } else {
       oracleEndpointModel = await oracleEndpointCached.getOracleEndpointByType(type)
     }
-    if (oracleEndpointModel.length > 0) {
-      if (oracleEndpointModel.length > 1) {
-        for (const record of oracleEndpointModel) {
-          if (record.isDefault) {
-            url = record.value + Enums.EndPoints.FspEndpointTemplates.ORACLE_PARTICIPANTS_BATCH
-            break
-          }
+
+    if (!Array.isArray(oracleEndpointModel) || oracleEndpointModel.length === 0) {
+      const errMessage = `Oracle type:${type} not found`
+      logger.warn(errMessage)
+      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, errMessage)
+    }
+
+    if (oracleEndpointModel.length > 1) {
+      for (const record of oracleEndpointModel) {
+        if (record.isDefault) {
+          url = record.value + Enums.EndPoints.FspEndpointTemplates.ORACLE_PARTICIPANTS_BATCH
+          break
         }
-      } else {
-        url = oracleEndpointModel[0].value + Enums.EndPoints.FspEndpointTemplates.ORACLE_PARTICIPANTS_BATCH
       }
-      logger.debug(`Oracle endpoints: ${url}`)
-      return await request.sendRequest({
-        url,
-        headers,
-        source: headers[Headers.FSPIOP.SOURCE],
-        destination: headers[Headers.FSPIOP.DESTINATION] || Config.HUB_NAME,
-        method,
-        payload,
-        hubNameRegex
-      })
     } else {
-      logger.error(`Oracle type:${type} not found`)
-      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, `Oracle type:${type} not found`)
+      url = oracleEndpointModel[0].value + Enums.EndPoints.FspEndpointTemplates.ORACLE_PARTICIPANTS_BATCH
     }
+    logger.verbose(`Oracle endpoint: ${url}`)
+
+    step = 'sendHttpRequest'
+    return await sendHttpRequest({
+      url,
+      headers,
+      source: headers[Headers.FSPIOP.SOURCE],
+      destination: headers[Headers.FSPIOP.DESTINATION] || Config.HUB_NAME,
+      method,
+      payload
+    })
   } catch (err) {
     logger.error('error in oracleBatchRequest: ', err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw countFspiopError(err, { operation: 'oracleBatchRequest', step })
   }
 }
 

package/test/unit/models/oracle/facade.test.js

@@ -30,14 +30,15 @@
 const Sinon = require('sinon')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const request = require('@mojaloop/central-services-shared').Util.Request
+const errorHandling = require('@mojaloop/central-services-error-handling')
 
-const OracleFacade = require('../../../../src/models/oracle/facade')
-const oracleEndpointCached = require('../../../../src/models/oracle/oracleEndpointCached')
-const Logger = require('@mojaloop/central-services-logger')
+const OracleFacade = require('#src/models/oracle/facade')
+const oracleEndpointCached = require('#src/models/oracle/oracleEndpointCached')
+const fixtures = require('#test/fixtures/index')
+
+const { createFSPIOPError } = errorHandling.Factory
+const { FSPIOPErrorCodes } = errorHandling.Enums
 
-Logger.isDebugEnabled = jest.fn(() => true)
-Logger.isErrorEnabled = jest.fn(() => true)
-Logger.isInfoEnabled = jest.fn(() => true)
 let sandbox
 
 describe('Oracle Facade', () => {
@@ -443,6 +444,21 @@ describe('Oracle Facade', () => {
       // Assert
       await expect(action()).rejects.toThrowError(/(Oracle type:.*not found)/)
     })
+
+    it('should return proper error on adding existing party [CSI-1352]', async () => {
+      expect.hasAssertions()
+      const ERROR = FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR
+      request.sendRequest = sandbox.stub().rejects(createFSPIOPError(ERROR))
+      sandbox.stub(oracleEndpointCached, 'getOracleEndpointByType').resolves([{}])
+      const method = Enums.Http.RestMethods.POST
+      const headers = fixtures.partiesCallHeadersDto()
+      const params = fixtures.partiesParamsDto()
+
+      await OracleFacade.oracleRequest(headers, method, params)
+        .catch(err => {
+          expect(err.apiErrorCode.code).toBe(ERROR.code)
+        })
+    })
   })
 
   describe('oracleBatchRequest', () => {