account-lookup-service 15.6.0-snapshot.2 → 15.6.0-snapshot.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-snapshot.2",
+  "version": "15.6.0-snapshot.4",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -94,7 +94,7 @@
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
     "@mojaloop/central-services-metrics": "12.1.0",
-    "@mojaloop/central-services-shared": "18.11.1",
+    "@mojaloop/central-services-shared": "18.11.2",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",

package/src/domain/parties/parties.js

@@ -38,13 +38,13 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const oracle = require('../../models/oracle/facade')
 const participant = require('../../models/participantEndpoint/facade')
 const { ERROR_MESSAGES } = require('../../constants')
-const { loggerFactory } = require('../../lib')
+const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
 const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
 
-const logger = loggerFactory('domain:put-parties')
-const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, logger)
+const log = logger.child('domain:put-parties')
+const handleErrorOnSendingCallback = utils.createErrorHandlerOnSendingCallback(Config, log)
 
 /**
  * @function putPartiesByTypeAndID
@@ -71,7 +71,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const proxy = headers[Headers.FSPIOP.PROXY]
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
-  logger.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
+  log.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
 
   let sendTo
   try {
@@ -83,21 +83,21 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
       }
       const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
       // think,if we should throw error if isCached === false?
-      logger.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
+      log.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
     }
 
     if (proxyEnabled && proxy) {
       const alsReq = utils.alsRequestDto(destination, params) // or source?
       const isExists = await proxyCache.receivedSuccessResponse(alsReq)
       if (!isExists) {
-        logger.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
+        log.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
         // think, if we need to throw an error here
       } else {
         const mappingPayload = {
           fspId: source
         }
         await oracle.oracleRequest(headers, RestMethods.POST, params, null, mappingPayload, cache)
-        logger.info('oracle was updated with mappingPayload', { mappingPayload, params })
+        log.info('oracle was updated with mappingPayload', { mappingPayload, params })
       }
     }
 
@@ -122,7 +122,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     }
     await participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.PUT, decodedPayload.body.toString(), options)
 
-    logger.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
+    log.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
     histTimerEnd({ success: true })
   } catch (err) {
     await handleErrorOnSendingCallback(err, headers, params, sendTo)
@@ -168,14 +168,14 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
         getPartiesByTypeAndID(swappedHeaders, params, RestMethods.GET, {}, span, cache, proxyCache)
         // todo: - think if we need to send errorCallback?
         //       - or sentCallback after getPartiesByTypeAndID is done
-        logger.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID:', { proxy, params, payload })
+        log.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID:', { proxy, params, payload })
         return
       }
 
       const alsReq = utils.alsRequestDto(destination, params) // or source?
       const isLast = await proxyCache.receivedErrorResponse(alsReq, proxy)
       if (!isLast) {
-        logger.info('got NOT last error callback from proxy:', { proxy, alsReq })
+        log.info('got NOT last error callback from proxy:', { proxy, alsReq })
         return
       }
     }
@@ -195,7 +195,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     const decodedPayload = decodePayload(dataUri, { asParsed: false })
     await participant.sendErrorToParticipant(sendTo, callbackEndpointType, decodedPayload.body.toString(), headers, params, childSpan)
 
-    logger.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
+    log.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
     histTimerEnd({ success: true })
   } catch (err) {
     fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)

package/src/handlers/index.js

@@ -35,7 +35,7 @@ const Package = require('../../package.json')
 const Server = require('../server')
 const { HANDLER_TYPES } = require('../constants')
 const Config = require('../lib/config')
-const logger = require('../lib').loggerFactory('ALS-timeout-handler')
+const log = require('../lib').logger.child('ALS-timeout-handler')
 
 const Program = new Command()
 
@@ -51,16 +51,16 @@ Program.command('handlers')
     const handlers = []
 
     if (args.timeout) {
-      logger.debug('CLI: Executing --timeout')
+      log.debug('CLI: Executing --timeout')
       handlers.push(HANDLER_TYPES.TIMEOUT)
     }
 
     if (handlers.length === 0) {
-      logger.debug('CLI: No handlers specified')
+      log.debug('CLI: No handlers specified')
       return
     }
 
-    module.exports = await Server.initializeHandlers(handlers, Config, logger)
+    module.exports = await Server.initializeHandlers(handlers, Config, log)
   })
 
 if (Array.isArray(process.argv) && process.argv.length > 2) {

package/test/util/apiClients/BasicApiClient.js

@@ -1,12 +1,12 @@
 const axiosLib = require('axios')
-const { loggerFactory } = require('../../../src/lib')
+const lib = require('../../../src/lib')
 const fixtures = require('../../fixtures')
 
 class BasicApiClient {
   constructor ({
     baseURL,
     axios = axiosLib.create({ baseURL }),
-    logger = loggerFactory(this.constructor.name)
+    logger = lib.logger.child(this.constructor.name)
   } = {}) {
     this.baseURL = baseURL
     this.axios = axios