account-lookup-service 17.0.3 → 17.2.0

package/src/api/parties/{Type}/{ID}/{SubId}/error.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- * Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ * Name Surname <name.surname@mojaloop.io>
 
  * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
 
@@ -25,6 +25,8 @@
 'use strict'
 
 const Enum = require('@mojaloop/central-services-shared').Enum
+const EventFrameworkUtil = require('@mojaloop/central-services-shared').Util.EventFramework
+const EventSdk = require('@mojaloop/event-sdk')
 const LibUtil = require('../../../../../lib/util')
 const parties = require('../../../../../domain/parties')
 const Metrics = require('@mojaloop/central-services-metrics')
@@ -40,15 +42,38 @@ module.exports = {
    * produces: application/json
    * responses: 200, 400, 401, 403, 404, 405, 406, 501, 503
    */
-  put: function (context, request, h) {
+  put: async function (context, request, h) {
     const histTimerEnd = Metrics.getHistogram(
       'ing_putPartiesErrorByTypeIDAndSubID',
       'Ingress - Put parties error by Type, ID and SubId',
       ['success']
     ).startTimer()
     const { cache, proxyCache } = request.server.app
+
+    const { headers, payload, method, path, params, span } = request
+    const spanTags = LibUtil.getSpanTags(request, Enum.Events.Event.Type.PARTY, Enum.Events.Event.Action.PUT)
+    span.setTags(spanTags)
+    const queryTags = EventFrameworkUtil.Tags.getQueryTags(
+      Enum.Tags.QueryTags.serviceName.accountLookupService,
+      Enum.Tags.QueryTags.auditType.transactionFlow,
+      Enum.Tags.QueryTags.contentType.httpRequest,
+      Enum.Tags.QueryTags.operation.putPartiesErrorByTypeIDAndSubID,
+      {
+        httpMethod: method,
+        httpPath: path,
+        partyIdType: params.Type,
+        partyIdentifier: params.ID,
+        partySubIdOrType: params.SubId
+      }
+    )
+    span.setTags(queryTags)
+    await span.audit({
+      headers,
+      payload
+    }, EventSdk.AuditEventAction.start)
+
     parties.putPartiesErrorByTypeAndID(request.headers, request.params, request.payload, request.dataUri, request.span, cache, proxyCache).catch(err => {
-      request.server.log(['error'], `ERROR - putPartiesErrorByTypeAndID: ${LibUtil.getStackOrInspect(err)}`)
+      request.server.log(['error'], `ERROR - putPartiesErrorByTypeIDAndSubID: ${LibUtil.getStackOrInspect(err)}`)
     })
     histTimerEnd({ success: true })
     return h.response().code(Enum.Http.ReturnCodes.OK.CODE)

package/src/api/parties/{Type}/{ID}/{SubId}.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- * Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ * Name Surname <name.surname@mojaloop.io>
 
  * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
  * Steven Oderayi <steven.oderayi@modusbox.com>
@@ -26,6 +26,8 @@
 'use strict'
 
 const Enum = require('@mojaloop/central-services-shared').Enum
+const EventFrameworkUtil = require('@mojaloop/central-services-shared').Util.EventFramework
+const EventSdk = require('@mojaloop/event-sdk')
 const LibUtil = require('../../../../lib/util')
 const parties = require('../../../../domain/parties')
 const Metrics = require('@mojaloop/central-services-metrics')
@@ -41,13 +43,36 @@ module.exports = {
    * produces: application/json
    * responses: 202, 400, 401, 403, 404, 405, 406, 501, 503
    */
-  get: function (context, request, h) {
+  get: async function (context, request, h) {
     const histTimerEnd = Metrics.getHistogram(
       'ing_getPartiesByTypeIDAndSubID',
       'Ingress - Get party by Type, ID and SubId',
       ['success']
     ).startTimer()
     const { cache, proxyCache } = request.server.app
+
+    const { headers, payload, method, path, params, span } = request
+    const spanTags = LibUtil.getSpanTags(request, Enum.Events.Event.Type.PARTY, Enum.Events.Event.Action.GET)
+    span.setTags(spanTags)
+    const queryTags = EventFrameworkUtil.Tags.getQueryTags(
+      Enum.Tags.QueryTags.serviceName.accountLookupService,
+      Enum.Tags.QueryTags.auditType.transactionFlow,
+      Enum.Tags.QueryTags.contentType.httpRequest,
+      Enum.Tags.QueryTags.operation.getPartiesByTypeIDAndSubID,
+      {
+        httpMethod: method,
+        httpPath: path,
+        partyIdType: params.Type,
+        partyIdentifier: params.ID,
+        partySubIdOrType: params.SubId
+      }
+    )
+    span.setTags(queryTags)
+    await span.audit({
+      headers,
+      payload
+    }, EventSdk.AuditEventAction.start)
+
     parties.getPartiesByTypeAndID(request.headers, request.params, request.method, request.query, request.span, cache, proxyCache).catch(err => {
       request.server.log(['error'], `ERROR - getPartiesByTypeAndID: ${LibUtil.getStackOrInspect(err)}`)
     })
@@ -61,13 +86,36 @@ module.exports = {
    * produces: application/json
    * responses: 200, 400, 401, 403, 404, 405, 406, 501, 503
    */
-  put: function (context, request, h) {
+  put: async function (context, request, h) {
     const histTimerEnd = Metrics.getHistogram(
       'ing_putPartiesByTypeIDAndSubID',
       'Ingress - Put parties by Type, ID and SubId',
       ['success']
     ).startTimer()
     const { cache, proxyCache } = request.server.app
+
+    const { headers, payload, method, path, params, span } = request
+    const spanTags = LibUtil.getSpanTags(request, Enum.Events.Event.Type.PARTY, Enum.Events.Event.Action.PUT)
+    span.setTags(spanTags)
+    const queryTags = EventFrameworkUtil.Tags.getQueryTags(
+      Enum.Tags.QueryTags.serviceName.accountLookupService,
+      Enum.Tags.QueryTags.auditType.transactionFlow,
+      Enum.Tags.QueryTags.contentType.httpRequest,
+      Enum.Tags.QueryTags.operation.putPartiesByTypeIDAndSubID,
+      {
+        httpMethod: method,
+        httpPath: path,
+        partyIdType: params.Type,
+        partyIdentifier: params.ID,
+        partySubIdOrType: params.SubId
+      }
+    )
+    span.setTags(queryTags)
+    await span.audit({
+      headers,
+      payload
+    }, EventSdk.AuditEventAction.start)
+
     parties.putPartiesByTypeAndID(request.headers, request.params, request.method, request.payload, request.dataUri, cache, proxyCache).catch(err => {
       request.server.log(['error'], `ERROR - putPartiesByTypeAndID: ${LibUtil.getStackOrInspect(err)}`)
     })

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

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- * Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ * Name Surname <name.surname@mojaloop.io>
 
  * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
 
@@ -24,7 +24,8 @@
  ******/
 'use strict'
 
-const { Action, Type } = require('@mojaloop/central-services-shared').Enum.Events.Event
+const Enum = require('@mojaloop/central-services-shared').Enum
+const EventFrameworkUtil = require('@mojaloop/central-services-shared').Util.EventFramework
 const EventSdk = require('@mojaloop/event-sdk')
 const Metrics = require('@mojaloop/central-services-metrics')
 const parties = require('../../../domain/parties')
@@ -47,11 +48,24 @@ module.exports = {
       'Ingress - Get party by Type and Id',
       ['success']
     ).startTimer()
-    const { headers, payload, params, method, query, span } = request
+    const { headers, payload, method, path, params, query, span } = request
     const { cache, proxyCache } = request.server.app
 
-    const spanTags = LibUtil.getSpanTags({ headers }, Type.PARTY, Action.LOOKUP)
+    const spanTags = LibUtil.getSpanTags({ headers }, Enum.Events.Event.Type.PARTY, Enum.Events.Event.Action.LOOKUP)
     span.setTags(spanTags)
+    const queryTags = EventFrameworkUtil.Tags.getQueryTags(
+      Enum.Tags.QueryTags.serviceName.accountLookupService,
+      Enum.Tags.QueryTags.auditType.transactionFlow,
+      Enum.Tags.QueryTags.contentType.httpRequest,
+      Enum.Tags.QueryTags.operation.getPartiesByTypeAndID,
+      {
+        httpMethod: method,
+        httpPath: path,
+        partyIdType: params.Type,
+        partyIdentifier: params.ID
+      }
+    )
+    span.setTags(queryTags)
     await span.audit({
       headers,
       payload
@@ -78,11 +92,24 @@ module.exports = {
       'Ingress - Put party by Type and Id',
       ['success']
     ).startTimer()
-    const { headers, payload, params, method, dataUri, span } = request
+    const { headers, payload, method, path, params, dataUri, span } = request
     const { cache, proxyCache } = request.server.app
 
-    const spanTags = LibUtil.getSpanTags({ headers }, Type.PARTY, Action.PUT)
+    const spanTags = LibUtil.getSpanTags({ headers }, Enum.Events.Event.Type.PARTY, Enum.Events.Event.Action.PUT)
     span.setTags(spanTags)
+    const queryTags = EventFrameworkUtil.Tags.getQueryTags(
+      Enum.Tags.QueryTags.serviceName.accountLookupService,
+      Enum.Tags.QueryTags.auditType.transactionFlow,
+      Enum.Tags.QueryTags.contentType.httpRequest,
+      Enum.Tags.QueryTags.operation.putPartiesByTypeAndID,
+      {
+        httpMethod: method,
+        httpPath: path,
+        partyIdType: params.Type,
+        partyIdentifier: params.ID
+      }
+    )
+    span.setTags(queryTags)
     await span.audit({
       headers,
       payload

package/src/api/routes.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ - Name Surname <name.surname@mojaloop.io>
 
  * ModusBox
  - Steven Oderayi <steven.oderayi@modusbox.com>

package/src/domain/oracle/index.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ - Name Surname <name.surname@mojaloop.io>
 
  - Rajiv Mothilal <rajiv.mothilal@modusbox.com>
 

package/src/domain/oracle/oracle.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,14 +12,14 @@
  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
+ 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>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ - Name Surname <name.surname@mojaloop.io>
 
  - Rajiv Mothilal <rajiv.mothilal@modusbox.com>
- - Name Surname <name.surname@gatesfoundation.com>
+ - Name Surname <name.surname@mojaloop.io>
 
  --------------
  ******/
@@ -35,6 +35,7 @@ const cachedOracleEndpoint = require('../../models/oracle/oracleEndpointCached')
 const partyIdType = require('../../models/partyIdType')
 const endpointType = require('../../models/endpointType')
 const currency = require('../../models/currency')
+const util = require('../../lib/util')
 
 /**
  * @function createOracle
@@ -49,7 +50,6 @@ exports.createOracle = async (payload) => {
     'Create Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
 
   try {
@@ -91,15 +91,7 @@ exports.createOracle = async (payload) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'createOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'createOracle', step })
   }
 }
 
@@ -116,7 +108,6 @@ exports.getOracle = async (query) => {
     'Get Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     let oracleEndpointModelList
@@ -160,15 +151,7 @@ exports.getOracle = async (query) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'getOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'getOracle', step })
   }
 }
 
@@ -186,7 +169,6 @@ exports.updateOracle = async (params, payload) => {
     'Update Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     step = 'getOracleEndpointById-1'
@@ -247,15 +229,7 @@ exports.updateOracle = async (params, payload) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'updateOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'updateOracle', step })
   }
 }
 
@@ -272,7 +246,6 @@ exports.deleteOracle = async (params) => {
     'Delete Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   try {
     await oracleEndpoint.destroyOracleEndpointById(params.ID)
     histTimerEnd({ success: true })
@@ -281,13 +254,6 @@ exports.deleteOracle = async (params) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'deleteOracle'
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'deleteOracle' })
   }
 }

package/src/domain/participants/index.js

@@ -1,8 +1,8 @@
 /*****
  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
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the 2020-2025 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
@@ -12,11 +12,11 @@
  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
+ 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>.
- * Gates Foundation
- - Name Surname <name.surname@gatesfoundation.com>
+ * Mojaloop Foundation
+ - Name Surname <name.surname@mojaloop.io>
 
  - Rajiv Mothilal <rajiv.mothilal@modusbox.com>