@mojaloop/central-ledger 17.7.8 → 17.8.0-orb.1

package/src/models/position/participantPositionChanges.js

@@ -0,0 +1,68 @@
+/*****
+ 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>
+
+ * Vijaya Kumar Guthi <vijaya.guthi@infitx.com>
+ --------------
+ ******/
+
+'use strict'
+
+const Db = require('../../lib/db')
+const Logger = require('@mojaloop/central-services-logger')
+const Enum = require('@mojaloop/central-services-shared').Enum
+
+const getReservedPositionChangesByCommitRequestId = async (commitRequestId) => {
+  try {
+    const knex = await Db.getKnex()
+    const participantPositionChanges = await knex('fxTransferStateChange')
+      .where('fxTransferStateChange.commitRequestId', commitRequestId)
+      .where('fxTransferStateChange.transferStateId', Enum.Transfers.TransferInternalState.RESERVED)
+      .innerJoin('participantPositionChange AS ppc', 'ppc.fxTransferStateChangeId', 'fxTransferStateChange.fxTransferStateChangeId')
+      .select(
+        'ppc.*'
+      )
+    return participantPositionChanges
+  } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
+    throw err
+  }
+}
+
+const getReservedPositionChangesByTransferId = async (transferId) => {
+  try {
+    const knex = await Db.getKnex()
+    const participantPositionChanges = await knex('transferStateChange')
+      .where('transferStateChange.transferId', transferId)
+      .where('transferStateChange.transferStateId', Enum.Transfers.TransferInternalState.RESERVED)
+      .innerJoin('participantPositionChange AS ppc', 'ppc.transferStateChangeId', 'transferStateChange.transferStateChangeId')
+      .select(
+        'ppc.*'
+      )
+    return participantPositionChanges
+  } catch (err) {
+    Logger.isErrorEnabled && Logger.error(err)
+    throw err
+  }
+}
+
+module.exports = {
+  getReservedPositionChangesByCommitRequestId,
+  getReservedPositionChangesByTransferId
+}

package/src/models/settlement/settlementModel.js

@@ -32,7 +32,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 exports.create = async (name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, settlementAccountTypeId, autoPositionReset, trx = null) => {
   try {
     const knex = Db.getKnex()
-    const trxFunction = async (trx, doCommit = true) => {
+    const trxFunction = async (trx) => {
       try {
         await knex('settlementModel')
           .insert({
@@ -48,18 +48,12 @@ exports.create = async (name, isActive, settlementGranularityId, settlementInter
             autoPositionReset
           })
           .transacting(trx)
-        if (doCommit) {
-          await trx.commit
-        }
       } catch (err) {
-        if (doCommit) {
-          await trx.rollback
-        }
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     }
     if (trx) {
-      return trxFunction(trx, false)
+      return trxFunction(trx)
     } else {
       return knex.transaction(trxFunction)
     }
@@ -77,19 +71,13 @@ exports.getByName = async (name, trx = null) => {
           .select()
           .where('name', name)
           .transacting(trx)
-        if (doCommit) {
-          await trx.commit
-        }
         return result.length > 0 ? result[0] : null
       } catch (err) {
-        if (doCommit) {
-          await trx.rollback
-        }
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     }
     if (trx) {
-      return trxFunction(trx, false)
+      return trxFunction(trx)
     } else {
       return knex.transaction(trxFunction)
     }
@@ -116,25 +104,19 @@ exports.update = async (settlementModel, isActive) => {
 exports.getSettlementModelsByName = async (names, trx = null) => {
   try {
     const knex = Db.getKnex()
-    const trxFunction = async (trx, doCommit = true) => {
+    const trxFunction = async (trx) => {
       try {
         const settlementModelNames = knex('settlementModel')
           .select('name')
           .whereIn('name', names)
           .transacting(trx)
-        if (doCommit) {
-          await trx.commit
-        }
         return settlementModelNames
       } catch (err) {
-        if (doCommit) {
-          await trx.rollback
-        }
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     }
     if (trx) {
-      return trxFunction(trx, false)
+      return trxFunction(trx)
     } else {
       return knex.transaction(trxFunction)
     }