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

package/src/models/settlement/settlementModel.js

@@ -28,41 +28,116 @@
 const Db = require('../../lib/db')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
-exports.create = async (name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, autoPositionReset) => {
+/* istanbul ignore next */
+exports.create = async (name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, settlementAccountTypeId, autoPositionReset, trx = null) => {
   try {
-    return await Db.settlementModel.insert({
-      name,
-      isActive,
-      settlementGranularityId,
-      settlementInterchangeId,
-      settlementDelayId,
-      currencyId,
-      requireLiquidityCheck,
-      ledgerAccountTypeId,
-      autoPositionReset
-    })
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        await knex('settlementModel')
+          .insert({
+            name,
+            isActive,
+            settlementGranularityId,
+            settlementInterchangeId,
+            settlementDelayId,
+            currencyId,
+            requireLiquidityCheck,
+            ledgerAccountTypeId,
+            settlementAccountTypeId,
+            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)
+    } else {
+      return knex.transaction(trxFunction)
+    }
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
-exports.getByName = async (name) => {
+/* istanbul ignore next */
+exports.getByName = async (name, trx = null) => {
   try {
-    const result = await Db.settlementModel.find({ name: name })
-    return result[0]
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      try {
+        const result = await knex('settlementModel')
+          .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)
+    } else {
+      return knex.transaction(trxFunction)
+    }
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 exports.getAll = async () => {
   try {
-    return await Db.settlementModel.find()
+    return await Db.from('settlementModel').find({ isActive: 1 })
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 exports.update = async (settlementModel, isActive) => {
   try {
-    return await Db.settlementModel.update({ settlementModelId: settlementModel.settlementModelId }, { isActive })
+    return await Db.from('settlementModel').update({ settlementModelId: settlementModel.settlementModelId }, { isActive })
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+/* istanbul ignore next */
+exports.getSettlementModelsByName = async (names, trx = null) => {
+  try {
+    const knex = Db.getKnex()
+    const trxFunction = async (trx, doCommit = true) => {
+      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)
+    } else {
+      return knex.transaction(trxFunction)
+    }
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }

package/src/models/settlement/settlementModelCached.js

@@ -0,0 +1,139 @@
+/*****
+ 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>
+
+ * Neal Donnan <neal.donnan@modusbox.com>
+ --------------
+ ******/
+
+'use strict'
+
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const Cache = require('../../lib/cache')
+const SettlementModel = require('../../models/settlement/settlementModel')
+const Metrics = require('@mojaloop/central-services-metrics')
+
+let cacheClient
+let settlementModelsAllCacheKey
+
+/*
+  Private API
+*/
+
+const buildUnifiedSettlementModelsData = (allSettlementModels) => {
+  // build indexes (or indices?) - optimization for byId and byName access
+  const indexById = {}
+  const indexByName = {}
+  const indexByLedgerAccountTypeId = {}
+
+  allSettlementModels.forEach((oneSettlementModel) => {
+    // Add to indexes
+    indexById[oneSettlementModel.settlementModelId] = oneSettlementModel
+    indexByName[oneSettlementModel.name] = oneSettlementModel
+    indexByLedgerAccountTypeId[oneSettlementModel.ledgerAccountTypeId] = oneSettlementModel
+  })
+
+  // build unified structure - indexes + data
+  const unifiedSettlementModels = {
+    indexById,
+    indexByName,
+    indexByLedgerAccountTypeId,
+    allSettlementModels
+  }
+
+  return unifiedSettlementModels
+}
+
+const getSettlementModelsCached = async () => {
+  const histTimer = Metrics.getHistogram(
+    'model_settlementModel',
+    'model_getSettlementModelsCached - Metrics for settlementModel model',
+    ['success', 'queryName', 'hit']
+  ).startTimer()
+  // Do we have valid settlement models list in the cache ?
+  let cachedSettlementModels = cacheClient.get(settlementModelsAllCacheKey)
+  if (!cachedSettlementModels) {
+    // No settlement models in the cache, so fetch from participant API
+    const allSettlementModels = await SettlementModel.getAll()
+    cachedSettlementModels = buildUnifiedSettlementModelsData(allSettlementModels)
+
+    // store in cache
+    cacheClient.set(settlementModelsAllCacheKey, cachedSettlementModels)
+    histTimer({ success: true, queryName: 'model_getSettlementModelsCached', hit: false })
+  } else {
+    // unwrap settlement models list from catbox structure
+    cachedSettlementModels = cachedSettlementModels.item
+    histTimer({ success: true, queryName: 'model_getSettlementModelsCached', hit: true })
+  }
+  return cachedSettlementModels
+}
+
+/*
+  Public API
+*/
+exports.initialize = async () => {
+  /* Register as cache client */
+  const settlementModelCacheClientMeta = {
+    id: 'settlementModels',
+    preloadCache: getSettlementModelsCached
+  }
+
+  cacheClient = Cache.registerCacheClient(settlementModelCacheClientMeta)
+  settlementModelsAllCacheKey = cacheClient.createKey('all')
+}
+
+exports.invalidateSettlementModelsCache = async () => {
+  cacheClient.drop(settlementModelsAllCacheKey)
+}
+
+exports.getById = async (id) => {
+  try {
+    const cachedSettlementModels = await getSettlementModelsCached()
+    return cachedSettlementModels.indexById[id]
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+exports.getByName = async (name) => {
+  try {
+    const cachedSettlementModels = await getSettlementModelsCached()
+    return cachedSettlementModels.indexByName[name]
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+exports.getByLedgerAccountTypeId = async (ledgerAccountTypeId) => {
+  try {
+    const cachedSettlementModels = await getSettlementModelsCached()
+    return cachedSettlementModels.indexByLedgerAccountTypeId[ledgerAccountTypeId]
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}
+
+exports.getAll = async () => {
+  try {
+    const cachedSettlementModels = await getSettlementModelsCached()
+    return cachedSettlementModels.allSettlementModels
+  } catch (err) {
+    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+  }
+}

package/src/models/transfer/facade.js

@@ -44,6 +44,7 @@ const Config = require('../../lib/config')
 const _ = require('lodash')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Logger = require('@mojaloop/central-services-logger')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 // Alphabetically ordered list of error texts used below
 const UnsupportedActionText = 'Unsupported action'
@@ -51,7 +52,7 @@ const UnsupportedActionText = 'Unsupported action'
 const getById = async (id) => {
   try {
     /** @namespace Db.transfer **/
-    return await Db.transfer.query(async (builder) => {
+    return await Db.from('transfer').query(async (builder) => {
       const transferResult = await builder
         .where({
           'transfer.transferId': id,
@@ -122,7 +123,7 @@ const getById = async (id) => {
 const getByIdLight = async (id) => {
   try {
     /** @namespace Db.transfer **/
-    return await Db.transfer.query(async (builder) => {
+    return await Db.from('transfer').query(async (builder) => {
       const transferResult = await builder
         .where({ 'transfer.transferId': id })
         .leftJoin('ilpPacket AS ilpp', 'ilpp.transferId', 'transfer.transferId')
@@ -173,7 +174,7 @@ const getByIdLight = async (id) => {
 
 const getAll = async () => {
   try {
-    return await Db.transfer.query(async (builder) => {
+    return await Db.from('transfer').query(async (builder) => {
       const transferResultList = await builder
         .where({
           'tprt1.name': 'PAYER_DFSP', // TODO: refactor to use transferParticipantRoleTypeId
@@ -228,7 +229,7 @@ const getAll = async () => {
 const getTransferInfoToChangePosition = async (id, transferParticipantRoleTypeId, ledgerEntryTypeId) => {
   try {
     /** @namespace Db.transferParticipant **/
-    return await Db.transferParticipant.query(async builder => {
+    return await Db.from('transferParticipant').query(async builder => {
       return builder
         .where({
           'transferParticipant.transferId': id,
@@ -250,6 +251,12 @@ const getTransferInfoToChangePosition = async (id, transferParticipantRoleTypeId
 }
 
 const savePayeeTransferResponse = async (transferId, payload, action, fspiopError) => {
+  const histTimerSavePayeeTranferResponsedEnd = Metrics.getHistogram(
+    'model_transfer',
+    'facade_savePayeeTransferResponse - Metrics for transfer model',
+    ['success', 'queryName']
+  ).startTimer()
+
   let state
   let isFulfilment = false
   let isError = false
@@ -259,18 +266,22 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro
   switch (action) {
     case TransferEventAction.COMMIT:
     case TransferEventAction.BULK_COMMIT:
+    case TransferEventAction.RESERVE:
       state = TransferInternalState.RECEIVED_FULFIL
-      extensionList = payload.extensionList
+      extensionList = payload && payload.extensionList
       isFulfilment = true
       break
     case TransferEventAction.REJECT:
       state = TransferInternalState.RECEIVED_REJECT
+      extensionList = payload && payload.extensionList
       extensionList = payload.extensionList
       isFulfilment = true
       break
+    case TransferEventAction.BULK_ABORT:
+    case TransferEventAction.ABORT_VALIDATION:
     case TransferEventAction.ABORT:
       state = TransferInternalState.RECEIVED_ERROR
-      extensionList = payload.errorInformation.extensionList
+      extensionList = payload && payload.errorInformation && payload.errorInformation.extensionList
       isError = true
       break
     default:
@@ -319,10 +330,16 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro
   try {
     /** @namespace Db.getKnex **/
     const knex = await Db.getKnex()
+    const histTPayeeResponseValidationPassedEnd = Metrics.getHistogram(
+      'model_transfer',
+      'facade_saveTransferPrepared_transaction - Metrics for transfer model',
+      ['success', 'queryName']
+    ).startTimer()
+
     await knex.transaction(async (trx) => {
       try {
-        if (!fspiopError && [TransferEventAction.COMMIT, TransferEventAction.BULK_COMMIT].includes(action)) {
-          const res = await Db.settlementWindow.query(builder => {
+        if (!fspiopError && [TransferEventAction.COMMIT, TransferEventAction.BULK_COMMIT, TransferEventAction.RESERVE].includes(action)) {
+          const res = await Db.from('settlementWindow').query(builder => {
             return builder
               .leftJoin('settlementWindowStateChange AS swsc', 'swsc.settlementWindowStateChangeId', 'settlementWindow.currentStateChangeId')
               .select(
@@ -336,23 +353,25 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro
               .orderBy('changedDate', 'desc')
           })
           transferFulfilmentRecord.settlementWindowId = res[0].settlementWindowId
-          Logger.debug('savePayeeTransferResponse::settlementWindowId')
+          Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::settlementWindowId')
         }
         if (isFulfilment) {
           await knex('transferFulfilment').transacting(trx).insert(transferFulfilmentRecord)
           result.transferFulfilmentRecord = transferFulfilmentRecord
-          Logger.debug('savePayeeTransferResponse::transferFulfilment')
+          Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferFulfilment')
         }
         if (transferExtensionRecordsList.length > 0) {
+          // ###! CAN BE DONE THROUGH A BATCH
           for (const transferExtension of transferExtensionRecordsList) {
             await knex('transferExtension').transacting(trx).insert(transferExtension)
           }
+          // ###!
           result.transferExtensionRecordsList = transferExtensionRecordsList
-          Logger.debug('savePayeeTransferResponse::transferExtensionRecordsList')
+          Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferExtensionRecordsList')
         }
         await knex('transferStateChange').transacting(trx).insert(transferStateChangeRecord)
         result.transferStateChangeRecord = transferStateChangeRecord
-        Logger.debug('savePayeeTransferResponse::transferStateChange')
+        Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferStateChange')
         if (fspiopError) {
           const insertedTransferStateChange = await knex('transferStateChange').transacting(trx)
             .where({ transferId })
@@ -361,24 +380,32 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro
           transferErrorRecord.transferStateChangeId = insertedTransferStateChange.transferStateChangeId
           await knex('transferError').transacting(trx).insert(transferErrorRecord)
           result.transferErrorRecord = transferErrorRecord
-          Logger.debug('savePayeeTransferResponse::transferError')
+          Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferError')
         }
-        await trx.commit
+        histTPayeeResponseValidationPassedEnd({ success: true, queryName: 'facade_saveTransferPrepared_transaction' })
         result.savePayeeTransferResponseExecuted = true
-        Logger.debug('savePayeeTransferResponse::success')
+        Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::success')
       } catch (err) {
-        await trx.rollback
-        Logger.error('savePayeeTransferResponse::failure')
+        await trx.rollback()
+        histTPayeeResponseValidationPassedEnd({ success: false, queryName: 'facade_saveTransferPrepared_transaction' })
+        Logger.isErrorEnabled && Logger.error('savePayeeTransferResponse::failure')
         throw err
       }
     })
+    histTimerSavePayeeTranferResponsedEnd({ success: true, queryName: 'facade_savePayeeTransferResponse' })
     return result
   } catch (err) {
+    histTimerSavePayeeTranferResponsedEnd({ success: false, queryName: 'facade_savePayeeTransferResponse' })
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
 
 const saveTransferPrepared = async (payload, stateReason = null, hasPassedValidation = true) => {
+  const histTimerSaveTransferPreparedEnd = Metrics.getHistogram(
+    'model_transfer',
+    'facade_saveTransferPrepared - Metrics for transfer model',
+    ['success', 'queryName']
+  ).startTimer()
   try {
     const participants = []
     const names = [payload.payeeFsp, payload.payerFsp]
@@ -433,6 +460,11 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida
 
     const knex = await Db.getKnex()
     if (hasPassedValidation) {
+      const histTimerSaveTranferTransactionValidationPassedEnd = Metrics.getHistogram(
+        'model_transfer',
+        'facade_saveTransferPrepared_transaction - Metrics for transfer model',
+        ['success', 'queryName']
+      ).startTimer()
       return await knex.transaction(async (trx) => {
         try {
           await knex('transfer').transacting(trx).insert(transferRecord)
@@ -453,23 +485,32 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida
           }
           await knex('ilpPacket').transacting(trx).insert(ilpPacketRecord)
           await knex('transferStateChange').transacting(trx).insert(transferStateChangeRecord)
-          await trx.commit
+          await trx.commit()
+          histTimerSaveTranferTransactionValidationPassedEnd({ success: true, queryName: 'facade_saveTransferPrepared_transaction' })
         } catch (err) {
-          await trx.rollback
+          await trx.rollback()
+          histTimerSaveTranferTransactionValidationPassedEnd({ success: false, queryName: 'facade_saveTransferPrepared_transaction' })
           throw err
         }
       })
     } else {
+      const histTimerSaveTranferNoValidationEnd = Metrics.getHistogram(
+        'model_transfer',
+        'facade_saveTransferPrepared_no_validation - Metrics for transfer model',
+        ['success', 'queryName']
+      ).startTimer()
       await knex('transfer').insert(transferRecord)
       try {
         await knex('transferParticipant').insert(payerTransferParticipantRecord)
       } catch (err) {
-        Logger.warn(`Payer transferParticipant insert error: ${err.message}`)
+        Logger.isWarnEnabled && Logger.warn(`Payer transferParticipant insert error: ${err.message}`)
+        histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' })
       }
       try {
         await knex('transferParticipant').insert(payeeTransferParticipantRecord)
       } catch (err) {
-        Logger.warn(`Payee transferParticipant insert error: ${err.message}`)
+        histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' })
+        Logger.isWarnEnabled && Logger.warn(`Payee transferParticipant insert error: ${err.message}`)
       }
       payerTransferParticipantRecord.name = payload.payerFsp
       payeeTransferParticipantRecord.name = payload.payeeFsp
@@ -485,21 +526,27 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida
         try {
           await knex.batchInsert('transferExtension', transferExtensionsRecordList)
         } catch (err) {
-          Logger.warn(`batchInsert transferExtension error: ${err.message}`)
+          Logger.isWarnEnabled && Logger.warn(`batchInsert transferExtension error: ${err.message}`)
+          histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' })
         }
       }
       try {
         await knex('ilpPacket').insert(ilpPacketRecord)
       } catch (err) {
-        Logger.warn(`ilpPacket insert error: ${err.message}`)
+        Logger.isWarnEnabled && Logger.warn(`ilpPacket insert error: ${err.message}`)
+        histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' })
       }
       try {
         await knex('transferStateChange').insert(transferStateChangeRecord)
+        histTimerSaveTranferNoValidationEnd({ success: true, queryName: 'facade_saveTransferPrepared_no_validation' })
       } catch (err) {
-        Logger.warn(`transferStateChange insert error: ${err.message}`)
+        Logger.isWarnEnabled && Logger.warn(`transferStateChange insert error: ${err.message}`)
+        histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' })
       }
     }
+    histTimerSaveTransferPreparedEnd({ success: true, queryName: 'transfer_model_facade_saveTransferPrepared' })
   } catch (err) {
+    histTimerSaveTransferPreparedEnd({ success: false, queryName: 'transfer_model_facade_saveTransferPrepared' })
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
 }
@@ -529,7 +576,7 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida
 const getTransferStateByTransferId = async (id) => {
   try {
     /** @namespace Db.transferStateChange **/
-    return await Db.transferStateChange.query(async (builder) => {
+    return await Db.from('transferStateChange').query(async (builder) => {
       return builder
         .innerJoin('transferState AS ts', 'ts.transferStateId', 'transferStateChange.transferStateId')
         .where({
@@ -734,7 +781,7 @@ const transferStateAndPositionUpdate = async function (param1, enums, trx = null
           await knex('participantPositionChange')
             .insert({
               participantPositionId: info.drPositionId,
-              transferStateChangeId: transferStateChangeId,
+              transferStateChangeId,
               value: new MLNumber(info.drPositionValue).add(info.drAmount).toFixed(Config.AMOUNT.SCALE),
               reservedValue: info.drReservedValue,
               createdDate: param1.createdDate
@@ -757,7 +804,7 @@ const transferStateAndPositionUpdate = async function (param1, enums, trx = null
           await knex('participantPositionChange')
             .insert({
               participantPositionId: info.crPositionId,
-              transferStateChangeId: transferStateChangeId,
+              transferStateChangeId,
               value: new MLNumber(info.crPositionValue).add(info.crAmount).toFixed(Config.AMOUNT.SCALE),
               reservedValue: info.crReservedValue,
               createdDate: param1.createdDate
@@ -838,8 +885,8 @@ const reconciliationTransferPrepare = async function (payload, transactionTimest
             transferId: payload.transferId,
             participantCurrencyId: reconciliationAccountId,
             transferParticipantRoleTypeId: enums.transferParticipantRoleType.HUB,
-            ledgerEntryTypeId: ledgerEntryTypeId,
-            amount: amount,
+            ledgerEntryTypeId,
+            amount,
             createdDate: transactionTimestamp
           })
           .transacting(trx)
@@ -848,7 +895,7 @@ const reconciliationTransferPrepare = async function (payload, transactionTimest
             transferId: payload.transferId,
             participantCurrencyId: payload.participantCurrencyId,
             transferParticipantRoleTypeId: enums.transferParticipantRoleType.DFSP_SETTLEMENT,
-            ledgerEntryTypeId: ledgerEntryTypeId,
+            ledgerEntryTypeId,
             amount: -amount,
             createdDate: transactionTimestamp
           })
@@ -1079,7 +1126,7 @@ const reconciliationTransferAbort = async function (payload, transactionTimestam
 
 const getTransferParticipant = async (participantName, transferId) => {
   try {
-    return Db.participant.query(async (builder) => {
+    return Db.from('participant').query(async (builder) => {
       return builder
         .where({
           'participant.name': participantName,
@@ -1098,6 +1145,23 @@ const getTransferParticipant = async (participantName, transferId) => {
   }
 }
 
+const recordFundsIn = async (payload, transactionTimestamp, enums) => {
+  const knex = Db.getKnex()
+  // Save the valid transfer into the database
+  return knex.transaction(async trx => {
+    try {
+      await TransferFacade.reconciliationTransferPrepare(payload, transactionTimestamp, enums, trx)
+      await TransferFacade.reconciliationTransferReserve(payload, transactionTimestamp, enums, trx)
+      await TransferFacade.reconciliationTransferCommit(payload, transactionTimestamp, enums, trx)
+      await trx.commit
+    } catch (err) {
+      Logger.isErrorEnabled && Logger.error(err)
+      await trx.rollback
+      throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    }
+  })
+}
+
 const TransferFacade = {
   getById,
   getByIdLight,
@@ -1112,7 +1176,8 @@ const TransferFacade = {
   reconciliationTransferReserve,
   reconciliationTransferCommit,
   reconciliationTransferAbort,
-  getTransferParticipant
+  getTransferParticipant,
+  recordFundsIn
 }
 
 module.exports = TransferFacade

package/src/models/transfer/ilpPacket.js

@@ -33,7 +33,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling')
 
 exports.saveIlpPacket = async (record) => {
   try {
-    return await Db.ilpPacket.insert({
+    return await Db.from('ilpPacket').insert({
       transferId: record.transferId,
       value: record.value
     })
@@ -44,7 +44,7 @@ exports.saveIlpPacket = async (record) => {
 
 exports.getByTransferId = async (transferId) => {
   try {
-    return await Db.ilpPacket.findOne({ transferId: transferId })
+    return await Db.from('ilpPacket').findOne({ transferId })
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
@@ -56,7 +56,7 @@ exports.update = async (record) => {
     value: record.value
   }
   try {
-    return await Db.ilpPacket.update({ transferId: record.transferId }, Util.omitNil(fields))
+    return await Db.from('ilpPacket').update({ transferId: record.transferId }, Util.omitNil(fields))
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }
@@ -64,7 +64,7 @@ exports.update = async (record) => {
 
 exports.destroyByTransferId = async (record) => {
   try {
-    return await Db.ilpPacket.destroy({ transferId: record.transferId })
+    return await Db.from('ilpPacket').destroy({ transferId: record.transferId })
   } catch (err) {
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }