@mojaloop/central-ledger 9.2.2 → 15.1.3-snapshot.2

package/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js

@@ -44,9 +44,9 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
  */
 
 const getBulkTransferFulfilmentDuplicateCheck = async (bulkTransferId) => {
-  Logger.debug(`get BulkTransferFulfilmentDuplicateCheck (bulkTransferId=${bulkTransferId})`)
+  Logger.isDebugEnabled && Logger.debug(`get BulkTransferFulfilmentDuplicateCheck (bulkTransferId=${bulkTransferId})`)
   try {
-    return Db.bulkTransferFulfilmentDuplicateCheck.findOne({ bulkTransferId })
+    return Db.from('bulkTransferFulfilmentDuplicateCheck').findOne({ bulkTransferId })
   } catch (err) {
     throw new Error(err.message)
   }
@@ -65,9 +65,9 @@ const getBulkTransferFulfilmentDuplicateCheck = async (bulkTransferId) => {
  */
 
 const saveBulkTransferFulfilmentDuplicateCheck = async (bulkTransferId, hash) => {
-  Logger.debug(`save BulkTransferFulfilmentDuplicateCheck (bulkTransferId=${bulkTransferId}, hash=${hash})`)
+  Logger.isDebugEnabled && Logger.debug(`save BulkTransferFulfilmentDuplicateCheck (bulkTransferId=${bulkTransferId}, hash=${hash})`)
   try {
-    return Db.bulkTransferFulfilmentDuplicateCheck.insert({ bulkTransferId, hash })
+    return Db.from('bulkTransferFulfilmentDuplicateCheck').insert({ bulkTransferId, hash })
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }

package/src/models/bulkTransfer/bulkTransferStateChange.js

@@ -27,18 +27,18 @@ const Db = require('../../lib/db')
 const Logger = require('@mojaloop/central-services-logger')
 
 const create = async (stateChange) => {
-  Logger.debug('save bulkTransferStateChange' + stateChange.toString())
+  Logger.isDebugEnabled && Logger.debug('save bulkTransferStateChange' + stateChange.toString())
   try {
-    return await Db.bulkTransferStateChange.insert(stateChange)
+    return await Db.from('bulkTransferStateChange').insert(stateChange)
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }
 
 const getByBulkTransferId = async (id) => {
   try {
-    return await Db.bulkTransferStateChange.query(async (builder) => {
+    return await Db.from('bulkTransferStateChange').query(async (builder) => {
       const result = builder
         .where({ 'bulkTransferStateChange.bulkTransferId': id })
         .select('bulkTransferStateChange.*')
@@ -47,14 +47,14 @@ const getByBulkTransferId = async (id) => {
       return result
     })
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }
 
 const getByTransferId = async (id) => {
   try {
-    return await Db.bulkTransferStateChange.query(async (builder) => {
+    return await Db.from('bulkTransferStateChange').query(async (builder) => {
       const result = builder
         .innerJoin('bulkTransferAssociation AS bta', 'bta.bulkTransferId', 'bulkTransferStateChange.bulkTransferId')
         .where({ 'bta.transferId': id })
@@ -64,7 +64,7 @@ const getByTransferId = async (id) => {
       return result
     })
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }

package/src/models/bulkTransfer/facade.js

@@ -72,7 +72,7 @@ const saveBulkTransferReceived = async (payload, participants, stateReason = nul
       }
     })
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }
@@ -117,14 +117,65 @@ const saveBulkTransferProcessing = async (payload, stateReason = null, isValid =
       }
     })
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
+    throw err
+  }
+}
+
+const saveBulkTransferErrorProcessing = async (payload, stateReason = null, isValid = true) => {
+  try {
+    const bulkTransferFulfilmentRecord = {
+      bulkTransferId: payload.bulkTransferId,
+      completedDate: Time.getUTCString(new Date())
+    }
+
+    const state = (isValid ? Enum.Transfers.BulkTransferState.PROCESSING : Enum.Transfers.BulkTransferState.INVALID)
+    const bulkTransferStateChangeRecord = {
+      bulkTransferId: payload.bulkTransferId,
+      bulkTransferStateId: state,
+      reason: stateReason
+    }
+
+    const knex = await Db.getKnex()
+    return await knex.transaction(async (trx) => {
+      try {
+        await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord)
+        if (payload.errorInformation.extensionList && payload.errorInformation.extensionList.extension) {
+          const bulkTransferExtensionsRecordList = payload.errorInformation.extensionList.extension.map(ext => {
+            return {
+              bulkTransferId: payload.bulkTransferId,
+              isFulfilment: true,
+              key: ext.key,
+              value: ext.value
+            }
+          })
+          await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx)
+        }
+        const returnedInsertIds = await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord).returning('bulkTransferStateChangeId')
+        const bulkTransferStateChangeId = returnedInsertIds[0]
+        const bulkTransferErrorRecord = {
+          bulkTransferStateChangeId,
+          errorCode: payload.errorInformation.errorCode,
+          errorDescription: payload.errorInformation.errorDescription
+        }
+        await knex('bulkTransferError').transacting(trx).insert(bulkTransferErrorRecord)
+        await trx.commit
+        return state
+      } catch (err) {
+        await trx.rollback
+        throw err
+      }
+    })
+  } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }
 
 const TransferFacade = {
   saveBulkTransferReceived,
-  saveBulkTransferProcessing
+  saveBulkTransferProcessing,
+  saveBulkTransferErrorProcessing
 }
 
 module.exports = TransferFacade

package/src/models/bulkTransfer/individualTransfer.js

@@ -29,7 +29,7 @@ const Logger = require('@mojaloop/central-services-logger')
 const getAllById = async (id) => {
   try {
     const knex = await Db.getKnex()
-    return await Db.bulkTransferAssociation.query(async (builder) => {
+    return await Db.from('bulkTransferAssociation').query(async (builder) => {
       const result = builder
         .innerJoin('transfer AS t', 't.transferId', 'bulkTransferAssociation.transferId')
         .innerJoin('ilpPacket AS ip', 'ip.transferId', 't.transferId')
@@ -54,7 +54,7 @@ const getAllById = async (id) => {
       return result
     })
   } catch (err) {
-    Logger.error(err)
+    Logger.isErrorEnabled && Logger.error(err)
     throw err
   }
 }

package/src/models/ilpPackets/ilpPacket.js

@@ -0,0 +1,36 @@
+/*****
+ 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
+ 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
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ 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
+ 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>
+
+ * ModusBox
+ - Lazola Lucas <lazola.lucas@modusbox.com>
+ --------------
+ ******/
+'use strict'
+
+const Db = require('../../lib/db')
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
+
+exports.getById = async (id) => {
+  try {
+    return await Db.from('ilpPacket').find({ transferId: id })
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}

package/src/models/ledgerAccountType/ledgerAccountType.js

@@ -18,21 +18,157 @@
  * Gates Foundation
  - Name Surname <name.surname@gatesfoundation.com>
 
+ * ModusBox
  * Georgi Georgiev <georgi.georgiev@modusbox.com>
  * Valentin Genev <valentin.genev@modusbox.com>
  * Rajiv Mothilal <rajiv.mothilal@modusbox.com>
  * Miguel de Barros <miguel.debarros@modusbox.com>
+ * Claudio Viola <claudio.viola@modusbox.com>
  --------------
  ******/
-
 'use strict'
 
 const Db = require('../../lib/db')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
-exports.getLedgerAccountByName = async (name) => {
+/* istanbul ignore next */
+exports.getLedgerAccountByName = async (name, trx = null) => {
+  try {
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        const ledgerAccountType = await knex('ledgerAccountType')
+          .select()
+          .where('name', name)
+          .transacting(trx)
+        if (doCommit) {
+          await trx.commit
+        }
+        return ledgerAccountType.length > 0 ? ledgerAccountType[0] : null
+      } catch (err) {
+        if (doCommit) {
+          await trx.rollback
+        }
+        throw ErrorHandler.Factory.reformatFSPIOPError(err)
+      }
+    }
+    if (trx) {
+      return trxFunction(trx, false)
+    } else {
+      return knex.transaction(trxFunction)
+    }
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+/* istanbul ignore next */
+exports.getLedgerAccountsByName = async (names, trx = null) => {
+  try {
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        const ledgerAccountTypes = await knex('ledgerAccountType')
+          .select('name')
+          .whereIn('name', names)
+          .transacting(trx)
+        if (doCommit) {
+          await trx.commit
+        }
+        return ledgerAccountTypes
+      } catch (err) {
+        if (doCommit) {
+          await trx.rollback
+        }
+        throw ErrorHandler.Factory.reformatFSPIOPError(err)
+      }
+    }
+    if (trx) {
+      return trxFunction(trx, false)
+    } else {
+      return knex.transaction(trxFunction)
+    }
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+/* istanbul ignore next */
+exports.bulkInsert = async (records, trx = null) => {
+  try {
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        await knex('ledgerAccountType')
+          .insert(records)
+          .transacting(trx)
+        const recordsNames = records.map(record => record.name)
+        const createdIds = await knex.select('ledgerAccountTypeId')
+          .from('ledgerAccountType')
+          .whereIn('name', recordsNames)
+          .transacting(trx)
+        if (doCommit) {
+          await trx.commit
+        }
+        return createdIds.map(record => record.ledgerAccountTypeId)
+      } catch (err) {
+        if (doCommit) {
+          await trx.rollback
+        }
+        throw ErrorHandler.Factory.reformatFSPIOPError(err)
+      }
+    }
+    if (trx) {
+      return trxFunction(trx, false)
+    } else {
+      return knex.transaction(trxFunction)
+    }
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+exports.create = async (name, description, isActive, isSettleable, trx = null) => {
+  try {
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        await knex('ledgerAccountType')
+          .insert({
+            name,
+            description,
+            isActive,
+            isSettleable
+          })
+          .transacting(trx)
+        const createdId = await knex.select('ledgerAccountTypeId')
+          .from('ledgerAccountType')
+          .where('name', name)
+          .transacting(trx)
+        if (doCommit) {
+          await trx.commit
+        }
+        return createdId[0].ledgerAccountTypeId
+      } catch (err) {
+        if (doCommit) {
+          await trx.rollback()
+        }
+        throw ErrorHandler.Factory.reformatFSPIOPError(err)
+      }
+    }
+    if (trx) {
+      return trxFunction(trx, false)
+    } else {
+      return knex.transaction(trxFunction)
+    }
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+exports.getAll = async () => {
   try {
-    return await Db.ledgerAccountType.findOne({ name })
+    return await Db.from('ledgerAccountType').find({ })
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }

package/src/models/misc/migrationLock.js

@@ -33,7 +33,7 @@ const Db = require('../../lib/db')
  * @returns {Promise<boolean>} - true if locked, false if not. Rejects if an error occours
  */
 const getIsMigrationLocked = async () => {
-  const result = await Db.migration_lock.query(async builder => {
+  const result = await Db.from('migration_lock').query(async builder => {
     builder.select('is_locked AS isLocked')
       .orderBy('index', 'desc')
       .first()

package/src/models/misc/segment.js

@@ -30,7 +30,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 const getByParams = async (params) => {
   try {
-    return await Db.segment.findOne(params)
+    return await Db.from('segment').findOne(params)
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }