@mojaloop/central-ledger 16.3.1-snapshot.0 → 16.3.2

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.
 
+### [16.3.2](https://github.com/mojaloop/central-ledger/compare/v16.3.1...v16.3.2) (2022-11-24)
+
+
+### Bug Fixes
+
+* **mojaloop/#3020:** add checks for when mongodb is disabled  ([#927](https://github.com/mojaloop/central-ledger/issues/927)) ([7461d9b](https://github.com/mojaloop/central-ledger/commit/7461d9bcd4341fbb37f32f42684108acef9ba0f4)), closes [mojaloop/#3020](https://github.com/mojaloop/project/issues/3020)
+
+### [16.3.1](https://github.com/mojaloop/central-ledger/compare/v16.3.0...v16.3.1) (2022-11-21)
+
+
+### Bug Fixes
+
+* **mojaloop/#3024:** post /bulkTransfers from Switch to PayeeFSP to use Switch as fspiop-source ([#926](https://github.com/mojaloop/central-ledger/issues/926)) ([bce2a23](https://github.com/mojaloop/central-ledger/commit/bce2a23b0e130f3ae3037ae5a31379237468fd23)), closes [mojaloop/#3024](https://github.com/mojaloop/project/issues/3024)
+
 ## [16.3.0](https://github.com/mojaloop/central-ledger/compare/v16.2.0...v16.3.0) (2022-09-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-ledger",
-  "version": "16.3.1-snapshot.0",
+  "version": "16.3.2",
   "description": "Central ledger hosted by a scheme to record and settle transfers",
   "license": "Apache-2.0",
   "author": "ModusBox",
@@ -83,7 +83,7 @@
     "@mojaloop/central-services-database": "10.7.0",
     "@mojaloop/central-services-error-handling": "12.0.5",
     "@mojaloop/central-services-health": "14.0.1",
-    "@mojaloop/central-services-logger": "11.1.0",
+    "@mojaloop/central-services-logger": "11.2.0",
     "@mojaloop/central-services-metrics": "12.0.5",
     "@mojaloop/central-services-shared": "17.3.1",
     "@mojaloop/central-services-stream": "11.0.0",
@@ -124,7 +124,7 @@
     "jsdoc": "4.0.0",
     "jsonpath": "1.1.1",
     "nodemon": "2.0.20",
-    "npm-check-updates": "16.4.1",
+    "npm-check-updates": "16.4.3",
     "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",

package/src/handlers/bulk/fulfil/handler.js

@@ -307,6 +307,11 @@ const sendIndividualTransfer = async (message, messageId, kafkaTopic, headers, p
  */
 const registerBulkFulfilHandler = async () => {
   try {
+    if (Config.MONGODB_DISABLED) {
+      throw ErrorHandler.Factory.createFSPIOPError(
+        ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR,
+        'Cannot register BulkFulfilHandler as Mongo Database is disabled in configuration')
+    }
     const bulkFulfilHandler = {
       command: bulkFulfil,
       topicName: Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, Enum.Events.Event.Type.BULK, Enum.Events.Event.Action.FULFIL),
@@ -317,7 +322,7 @@ const registerBulkFulfilHandler = async () => {
     return true
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(err)
-    throw err
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
@@ -335,7 +340,7 @@ const registerAllHandlers = async () => {
     return true
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(err)
-    throw err
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 

package/src/handlers/bulk/get/handler.js

@@ -37,10 +37,10 @@ const Consumer = require('@mojaloop/central-services-stream').Util.Consumer
 const Enum = require('@mojaloop/central-services-shared').Enum
 const Metrics = require('@mojaloop/central-services-metrics')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const Config = require('../../../lib/config')
 const BulkTransferService = require('../../../domain/bulkTransfer')
 const BulkTransferModel = require('../../../models/bulkTransfer/bulkTransfer')
 const Validator = require('../shared/validator')
-const Config = require('../../../lib/config')
 const { ERROR_HANDLING } = require('../../../lib/config')
 
 const location = { module: 'BulkGetHandler', method: '', path: '' }
@@ -160,6 +160,11 @@ const getBulkTransfer = async (error, messages) => {
  */
 const registerGetBulkTransferHandler = async () => {
   try {
+    if (Config.MONGODB_DISABLED) {
+      throw ErrorHandler.Factory.createFSPIOPError(
+        ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR,
+        'Cannot register GetBulkTransferHandler as Mongo Database is disabled in configuration')
+    }
     const bulkGetHandler = {
       command: getBulkTransfer,
       topicName: Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, Enum.Events.Event.Type.BULK, Enum.Events.Event.Action.GET),

package/src/handlers/bulk/prepare/handler.js

@@ -287,6 +287,11 @@ const bulkPrepare = async (error, messages) => {
  */
 const registerBulkPrepareHandler = async () => {
   try {
+    if (Config.MONGODB_DISABLED) {
+      throw ErrorHandler.Factory.createFSPIOPError(
+        ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR,
+        'Cannot register BulkPrepareHandler as Mongo Database is disabled in configuration')
+    }
     const bulkPrepareHandler = {
       command: bulkPrepare,
       topicName: Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, Enum.Events.Event.Type.BULK, Enum.Events.Event.Action.PREPARE),
@@ -297,7 +302,7 @@ const registerBulkPrepareHandler = async () => {
     return true
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(err)
-    throw err
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
@@ -315,7 +320,7 @@ const registerAllHandlers = async () => {
     return true
   } catch (err) {
     Logger.isErrorEnabled && Logger.error(err)
-    throw err
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 

package/src/handlers/bulk/processing/handler.js

@@ -390,6 +390,11 @@ const bulkProcessing = async (error, messages) => {
  */
 const registerBulkProcessingHandler = async () => {
   try {
+    if (Config.MONGODB_DISABLED) {
+      throw ErrorHandler.Factory.createFSPIOPError(
+        ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR,
+        'Cannot register BulkProcessingHandler as Mongo Database is disabled in configuration')
+    }
     const bulkProcessingHandler = {
       command: bulkProcessing,
       topicName: Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, Enum.Events.Event.Type.BULK, Enum.Events.Event.Action.PROCESSING),

package/src/handlers/bulk/shared/validator.js

@@ -93,8 +93,8 @@ const validateFspiopSourceAndDestination = async (payload, headers) => {
       // The following was added for fix(mojaloop/##3024): [core bulk] POST /bulkTransfers from Switch --> PayeeFSP to use Switch as fspiop-source - https://github.com/mojaloop/project/issues/3024
       // Notes:
       //  Due to the Bulk [Design Considerations](https://docs.mojaloop.io/technical/central-bulk-transfers/#_2-design-considerations),
-      //  it is possible that the Switch may send a POST Request to the Payer with the Destination Header containing "Switch",
-      //  and the Payee thus responding with a PUT Callback Destination containing the same value.
+      //  it is possible that the Switch may send a POST Request to the Payee FSP with the Source Header containing "Switch",
+      //  and the Payee FSP thus responding with a PUT Callback and destination header containing the same value (Switch).
       (headers[Enum.Http.Headers.FSPIOP.DESTINATION] === Enum.Http.Headers.FSPIOP.SWITCH.value)
     )
   )

package/src/lib/config.js

@@ -6,7 +6,7 @@ module.exports = {
   MAX_FULFIL_TIMEOUT_DURATION_SECONDS: RC.MAX_FULFIL_TIMEOUT_DURATION_SECONDS || 300,
   MONGODB_URI: RC.MONGODB.URI,
   MONGODB_DEBUG: (RC.MONGODB.DEBUG === true || RC.MONGODB.DEBUG === 'true'),
-  MONGODB_DISABLED: RC.MONGODB.DISABLED,
+  MONGODB_DISABLED: (RC.MONGODB.DISABLED === true || RC.MONGODB.DISABLED === 'true'),
   AMOUNT: RC.AMOUNT,
   EXPIRES_TIMEOUT: RC.EXPIRES_TIMEOUT,
   ERROR_HANDLING: RC.ERROR_HANDLING,

package/src/shared/setup.js

@@ -70,7 +70,7 @@ const connectMongoose = async () => {
         Logger.isWarnEnabled && Logger.warn('Enabling debug for Mongoose...')
         ObjStoreDb.Mongoose.set('debug', Config.MONGODB_DEBUG) // enable debug
       }
-      return ObjStoreDb.connect(Config.MONGODB_URI)
+      return await ObjStoreDb.connect(Config.MONGODB_URI)
     } catch (err) {
       throw ErrorHandler.Factory.reformatFSPIOPError(err)
       // TODO: review as code is being changed from returning null to returning a FSPIOPError