account-lookup-service 17.4.1-csi-1300.3 → 17.4.1-csi-1300.5

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.4.1-csi-1300.3",
+  "version": "17.4.1-csi-1300.5",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -26,8 +26,8 @@
 const Metrics = require('@mojaloop/central-services-metrics')
 const libUtil = require('../../lib/util')
 const { logger } = require('../../lib')
-const { GetPartiesService } = require('./services')
 const { createDeps } = require('./deps')
+const { GetPartiesService } = require('./services')
 
 /**
  * @function getPartiesByTypeAndID

package/src/domain/parties/putParties.js

@@ -31,13 +31,10 @@
 
 const { Headers } = require('@mojaloop/central-services-shared').Enum.Http
 const Metrics = require('@mojaloop/central-services-metrics')
-
 const libUtil = require('../../lib/util')
-const Config = require('../../lib/config')
 const { logger } = require('../../lib')
-
-const services = require('./services')
 const { createDeps } = require('./deps')
+const services = require('./services')
 
 /**
  * @function putPartiesByTypeAndID
@@ -71,7 +68,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
   const source = headers[Headers.FSPIOP.SOURCE]
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const proxy = headers[Headers.FSPIOP.PROXY]
-  log.info('parties::putPartiesByTypeAndID start', { source, destination, proxy })
+  log.info('putPartiesByTypeAndID start', { source, destination, proxy })
 
   try {
     await service.validateSourceParticipant({ source, proxy })
@@ -125,12 +122,12 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
   const results = {}
 
   const destination = headers[Headers.FSPIOP.DESTINATION]
-  const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
-  const proxy = proxyEnabled && headers[Headers.FSPIOP.PROXY]
-  log.info('parties::putPartiesErrorByTypeAndID start', { destination, proxy })
+  const proxy = headers[Headers.FSPIOP.PROXY]
+  const proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG.enabled && proxyCache)
+  log.info('putPartiesErrorByTypeAndID start', { destination, proxy, proxyEnabled })
 
   try {
-    if (proxy) {
+    if (proxyEnabled && proxy) {
       const notValid = await service.checkPayee({ headers, params, payload, proxy })
       if (notValid) {
         const getPartiesService = new services.GetPartiesService(deps)

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

@@ -39,9 +39,9 @@ class BasePartiesService {
     this.proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG?.enabled && deps.proxyCache)
   }
 
-  async handleRequest () {
-    throw new Error('handleRequest must be implemented by subclass')
-  }
+  // async handleRequest () {
+  //   throw new Error('handleRequest must be implemented by subclass')
+  // }
 
   async handleError ({ error, requester, headers, params }) {
     const log = this.log.child({ method: 'handleError' })
@@ -67,9 +67,10 @@ class BasePartiesService {
 
   async sendErrorCallback ({ sendTo, errorInfo, headers, params, payload = undefined }) {
     const endpointType = this.deps.partiesUtils.errorPartyCbType(params.SubId)
-    return this.deps.participant.sendErrorToParticipant(
+    await this.deps.participant.sendErrorToParticipant(
       sendTo, endpointType, errorInfo, headers, params, payload, this.deps.childSpan
     )
+    this.log.verbose('sendErrorCallback is done', { sendTo, errorInfo })
   }
 
   async sendDeleteOracleRequest (headers, params) {

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

@@ -75,7 +75,7 @@ class GetPartiesService extends BasePartiesService {
 
   async validateRequester ({ source, proxy }) {
     this.deps.stepState.inProgress('validateRequester-0')
-    const log = this.log.child({ source, method: 'validateRequester' })
+    const log = this.log.child({ source, proxy, method: 'validateRequester' })
 
     const sourceParticipant = await this.validateParticipant(source)
     if (sourceParticipant) {
@@ -92,12 +92,17 @@ class GetPartiesService extends BasePartiesService {
     const proxyParticipant = await this.validateParticipant(proxy)
     if (!proxyParticipant) {
       const errMessage = ERROR_MESSAGES.partyProxyNotFound
-      log.warn(errMessage, { proxy })
+      log.warn(errMessage)
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
     }
 
     const isCached = await this.deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
-    // think, what if isCached !== true?
+    if (!isCached) {
+      const errMessage = 'failed to addDfspIdToProxyMapping'
+      log.warn(errMessage)
+      throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+    }
+
     log.info('source is added to proxyMapping cache:', { proxy, isCached })
     return proxy
   }

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

@@ -30,9 +30,9 @@ const { ERROR_MESSAGES } = require('../../../constants')
 const BasePartiesService = require('./BasePartiesService')
 
 class PutPartiesErrorService extends BasePartiesService {
-  async handleRequest () {
-    // todo: add impl.
-  }
+  // async handleRequest () {
+  //   // todo: add impl.
+  // }
 
   async checkPayee ({ headers, params, payload, proxy }) {
     const notValid = this.deps.partiesUtils.isNotValidPayeeCase(payload)
@@ -70,10 +70,9 @@ class PutPartiesErrorService extends BasePartiesService {
   async sendErrorCallbackToParticipant ({ sendTo, headers, params, dataUri }) {
     this.deps.stepState.inProgress('sendErrorToParticipant-5')
     const errorInfo = PutPartiesErrorService.decodeDataUriPayload(dataUri)
-    await super.sendErrorCallback({
+    return super.sendErrorCallback({
       sendTo, errorInfo, headers, params
     })
-    this.log.verbose('sendErrorCallbackToParticipant is done', { sendTo, errorInfo })
   }
 }
 

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

@@ -32,9 +32,9 @@ const BasePartiesService = require('./BasePartiesService')
 const { RestMethods } = BasePartiesService.enums()
 
 class PutPartiesService extends BasePartiesService {
-  async handleRequest () {
-    // todo: add impl.
-  }
+  // async handleRequest () {
+  //   // todo: add impl.
+  // }
 
   async validateSourceParticipant ({ source, proxy }) {
     this.deps.stepState.inProgress('validateSourceParticipant-1')
@@ -47,8 +47,13 @@ class PutPartiesService extends BasePartiesService {
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
       const isCached = await this.deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
-      // todo: think,if we should throw error if isCached === false?
-      this.log.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
+      if (!isCached) {
+        const errMessage = 'failed to addDfspIdToProxyMapping'
+        this.log.warn(errMessage, { source, proxy })
+        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
+      }
+
+      this.log.info('addDfspIdToProxyMapping is done', { source, proxy })
     }
   }