fix: fix for database insert failures

src/handlers/grossSettlement/handler.js

@@ -105,9 +105,7 @@ async function processTransferSettlement (error, messages) {
         await knex.transaction(async trx => {
           try {
             await transferSettlementService.processMsgFulfil(transferEventId, transferEventStateStatus, trx)
-            await trx.commit
           } catch (err) {
-            await trx.rollback
             throw ErrorHandler.Factory.reformatFSPIOPError(err)
           }
         })

src/handlers/rules/handler.js

@@ -99,9 +99,7 @@ async function processRules (error, messages) {
       await knex.transaction(async trx => {
         try {
           await RulesService.insertLedgerEntries(ledgerEntries, transferEventId, trx)
-          await trx.commit
         } catch (err) {
-          await trx.rollback
           throw ErrorHandler.Factory.reformatFSPIOPError(err)
         }
       })

src/models/settlement/facade.js

@@ -208,15 +208,8 @@ const settlementTransfersPrepare = async function (settlementId, transactionTime
           createdDate: transactionTimestamp
         })
         .transacting(trx)
-
-      if (doCommit) {
-        await trx.commit
-      }
     } catch (err) {
       Logger.isErrorEnabled && Logger.error(err)
-      if (doCommit) {
-        await trx.rollback
-      }
       throw ErrorHandler.Factory.reformatFSPIOPError(err)
     }
   }
@@ -246,7 +239,6 @@ const settlementTransfersPrepare = async function (settlementId, transactionTime
 const settlementTransfersReserve = async function (settlementId, transactionTimestamp, requireLiquidityCheck, enums, trx = null) {
   const knex = await Db.getKnex()
   let isLimitExceeded, transferStateChangeId
-
   // Retrieve list of PS_TRANSFERS_RESERVED, but not RESERVED
   const settlementTransferList = await knex('settlementParticipantCurrency AS spc')
     .join('settlementParticipantCurrencyStateChange AS spcsc', function () {
@@ -389,16 +381,9 @@ const settlementTransfersReserve = async function (settlementId, transactionTime
             })
             .transacting(trx)
         }
-
-        if (doCommit) {
-          await trx.commit
-        }
       }
     } catch (err) {
       Logger.isErrorEnabled && Logger.error(err)
-      if (doCommit) {
-        await trx.rollback
-      }
       throw ErrorHandler.Factory.reformatFSPIOPError(err)
     }
   }
@@ -550,16 +535,9 @@ const settlementTransfersAbort = async function (settlementId, transactionTimest
             })
             .transacting(trx)
         }
-
-        if (doCommit) {
-          await trx.commit
-        }
       }
     } catch (err) {
       Logger.isErrorEnabled && Logger.error(err)
-      if (doCommit) {
-        await trx.rollback
-      }
       throw ErrorHandler.Factory.reformatFSPIOPError(err)
     }
   }
@@ -727,16 +705,9 @@ const settlementTransfersCommit = async function (settlementId, transactionTimes
           const message = Facade.getNotificationMessage(action, destination, payload)
           await Utility.produceGeneralMessage(Utility.ENUMS.NOTIFICATION, Utility.ENUMS.EVENT, message, Utility.ENUMS.STATE.SUCCESS)
         }
-
-        if (doCommit) {
-          await trx.commit
-        }
       }
     } catch (err) {
       Logger.isErrorEnabled && Logger.error(err)
-      if (doCommit) {
-        await trx.rollback
-      }
       throw ErrorHandler.Factory.reformatFSPIOPError(err)
     }
   }
@@ -1211,9 +1182,6 @@ const Facade = {
               .update({ currentStateChangeId: settlementStateChangeId })
               .transacting(trx)
           }
-
-          await trx.commit
-
           return {
             id: settlementId,
             state: settlementData.settlementStateId,
@@ -1224,7 +1192,6 @@ const Facade = {
         }
       } catch (err) {
         Logger.isErrorEnabled && Logger.error(err)
-        await trx.rollback
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     })
@@ -1329,15 +1296,13 @@ const Facade = {
           .update({ currentStateChangeId: settlementStateChangeId })
           .transacting(trx)
 
-        await trx.commit
         return {
           id: settlementId,
           state: payload.state,
           reason: payload.reason
         }
       } catch (err) {
         Logger.isErrorEnabled && Logger.error(err)
-        await trx.rollback
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     })
@@ -1546,11 +1511,9 @@ const Facade = {
         await knex('settlement').transacting(trx)
           .where('settlementId', settlementId)
           .update({ currentStateChangeId: settlementStateChangeId })
-        await trx.commit
         return settlementId
       } catch (err) {
         Logger.isErrorEnabled && Logger.error(err)
-        await trx.rollback
         throw ErrorHandler.Factory.reformatFSPIOPError(err)
       }
     })

src/models/settlementWindow/facade.js

@@ -50,6 +50,7 @@ const Facade = {
   },
 
   getTransfersCount: async function ({ settlementWindowId }) {
+    // Get fxTransferFulfilment count aswell?
     return Db.from('transferFulfilment').query(builder => {
       return builder
         .count('* as cnt')
@@ -80,6 +81,7 @@ const Facade = {
 
   getByParams: async function ({ query }) {
     const { participantId, state, fromDateTime, toDateTime, currency } = query
+    // Get from fxTransferFulfilment as well?
     return Db.from('settlementWindow').query(builder => {
       if (!participantId) {
         const b = builder
@@ -160,11 +162,9 @@ const Facade = {
           await knex('settlementWindow').transacting(trx)
             .where({ settlementWindowId: newSettlementWindowId })
             .update({ currentStateChangeId: newSettlementWindowStateChangeId })
-          await trx.commit
           return newSettlementWindowId[0]
         } catch (err) {
           Logger.isErrorEnabled && Logger.error(err)
-          await trx.rollback
           throw ErrorHandler.Factory.reformatFSPIOPError(err)
         }
       })
@@ -247,10 +247,6 @@ const Facade = {
                 .join('participantPositionChange AS ppc', 'ppc.transferStateChangeId', 'tsc.transferStateChangeId')
                 .join('participantCurrency AS pc', 'pc.participantCurrencyId', 'ppc.participantCurrencyId')
                 .join('participant AS p', 'p.participantId', 'pc.participantId')
-                .leftJoin('transferParticipant AS tp', function () {
-                  this.on('tp.participantId', 'p.participantId')
-                    .andOn('tp.transferId', 'tf.transferId')
-                })
                 .join('settlementWindowContent AS swc', function () {
                   this.on('swc.settlementWindowId', 'tf.settlementWindowId')
                     .on('swc.ledgerAccountTypeId', 'pc.ledgerAccountTypeId')
@@ -259,17 +255,44 @@ const Facade = {
                 .join('settlementModel AS m', 'm.settlementModelId', 'swc.settlementModelId')
                 .where('tf.settlementWindowId', settlementWindowId)
                 .andWhere('m.settlementGranularityId', Enum.Settlements.SettlementGranularity.NET)
-                .groupBy('swc.settlementWindowContentId', 'pc.participantCurrencyId', 'tp.transferParticipantRoleTypeId', 'tp.ledgerEntryTypeId')
+                .groupBy('swc.settlementWindowContentId', 'pc.participantCurrencyId', 'transferParticipantRoleTypeId', 'ledgerEntryTypeId')
                 .select('swc.settlementWindowContentId', 'pc.participantCurrencyId',
-                  knex.raw('CASE WHEN ?? = NULL THEN ? ELSE ?? END AS transferParticipantRoleTypeId', ['tp.transferParticipantRoleTypeId', 7, 'tp.transferParticipantRoleTypeId']), // @todo 7 = Enum.Accounts.TransferParticipantRoleType.COUNTER_PARTY_FSP requires upgrade of cs-shared
-                  knex.raw('CASE WHEN ?? = NULL THEN ? ELSE ?? END AS ledgerEntryTypeId', ['tp.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, 'tp.ledgerEntryTypeId']),
+                  knex.raw('CASE WHEN ppc.change > 0 THEN ? ELSE ?? END AS transferParticipantRoleTypeId', [ Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP]),
+                  knex.raw('? AS ??', [Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, 'ledgerEntryTypeId']),
                   knex.raw('? AS ??', [Enum.Settlements.SettlementWindowState.CLOSED, 'settlementWindowStateId']),
                   knex.raw('? AS ??', [transactionTimestamp, 'createdDate']))
                 .sum('ppc.change AS amount')
             })
             .transacting(trx)
           await builder
 
+          const fxBuilder = knex
+            .from(knex.raw('settlementContentAggregation (settlementWindowContentId, participantCurrencyId, transferParticipantRoleTypeId, ledgerEntryTypeId, currentStateId, createdDate, amount)'))
+            .insert(function () {
+              this.from('fxTransferFulfilment AS fxtf')
+                .join('fxTransferStateChange AS fxtsc', 'fxtsc.commitRequestId', 'fxtf.commitRequestId')
+                .join('participantPositionChange AS ppc', 'ppc.fxTransferStateChangeId', 'fxtsc.fxTransferStateChangeId')
+                .join('participantCurrency AS pc', 'pc.participantCurrencyId', 'ppc.participantCurrencyId')
+                .join('participant AS p', 'p.participantId', 'pc.participantId')
+                .join('settlementWindowContent AS swc', function () {
+                  this.on('swc.settlementWindowId', 'fxtf.settlementWindowId')
+                    .on('swc.ledgerAccountTypeId', 'pc.ledgerAccountTypeId')
+                    .on('swc.currencyId', 'pc.currencyId')
+                })
+                .join('settlementModel AS m', 'm.settlementModelId', 'swc.settlementModelId')
+                .where('fxtf.settlementWindowId', settlementWindowId)
+                .andWhere('m.settlementGranularityId', Enum.Settlements.SettlementGranularity.NET)
+                .groupBy('swc.settlementWindowContentId', 'pc.participantCurrencyId', 'transferParticipantRoleTypeId', 'ledgerEntryTypeId')
+                .select('swc.settlementWindowContentId', 'pc.participantCurrencyId',
+                  knex.raw('CASE WHEN ppc.change > 0 THEN ? ELSE ?? END AS transferParticipantRoleTypeId', [ Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP]),
+                  knex.raw('? AS ??', [Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, 'ledgerEntryTypeId']),
+                  knex.raw('? AS ??', [Enum.Settlements.SettlementWindowState.CLOSED, 'settlementWindowStateId']),
+                  knex.raw('? AS ??', [transactionTimestamp, 'createdDate']))
+                .sum('ppc.change AS amount')
+            })
+            .transacting(trx)
+          await fxBuilder
+
           // Insert settlementWindowContentStateChange
           builder = knex
             .from(knex.raw('settlementWindowContentStateChange (settlementWindowContentId, settlementWindowStateId, reason, createdDate)'))
@@ -313,11 +336,9 @@ const Facade = {
             .where({ settlementWindowId })
             .update({ currentStateChangeId: settlementWindowStateChangeId })
 
-          await trx.commit
           return true
         } catch (err) {
           Logger.isErrorEnabled && Logger.error(err)
-          await trx.rollback
           throw ErrorHandler.Factory.reformatFSPIOPError(err)
         }
       })