From 604354a9dfe80e9b721059000aa09c513f1fa70b Mon Sep 17 00:00:00 2001 From: Petar Bozin Date: Tue, 24 Jan 2017 22:47:59 +0100 Subject: [PATCH] Changed amt to -amt for transactions via kafka and obpjvm --- .gitignore | 1 + .../code/bankconnectors/KafkaMappedConnector.scala | 11 +++-------- .../code/bankconnectors/ObpJvmMappedConnector.scala | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4e8dc6fcf..5516275f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ target src/main/resources/ src/test/resources/ *.iml +src/main/resources/log4j.properties diff --git a/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala b/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala index 8f90998fe..5c9461d3a 100644 --- a/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala +++ b/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala @@ -444,12 +444,7 @@ object KafkaMappedConnector extends Connector with Loggable { override def makePaymentImpl(fromAccount: AccountType, toAccount: AccountType, amt: BigDecimal, description : String): Box[TransactionId] = { - val fromTransAmt = -amt //from account balance should decrease - val toTransAmt = amt //to account balance should increase - - //we need to save a copy of this payment as a transaction in each of the accounts involved, with opposite amounts - val sentTransactionId = saveTransaction(fromAccount, toAccount, fromTransAmt, description) - saveTransaction(toAccount, fromAccount, toTransAmt, description) + val sentTransactionId = saveTransaction(fromAccount, toAccount, -amt, description) sentTransactionId } @@ -468,7 +463,7 @@ object KafkaMappedConnector extends Connector with Loggable { val currency = account.currency //update the balance of the account for which a transaction is being created - val newAccountBalance : Long = account.balance.toLong + Helper.convertToSmallestCurrencyUnits(amt, account.currency) + //val newAccountBalance : Long = account.balance.toLong + Helper.convertToSmallestCurrencyUnits(amt, account.currency) //account.balance = newAccountBalance val req : Map[String,String] = Map( @@ -477,7 +472,7 @@ object KafkaMappedConnector extends Connector with Loggable { "name" -> OBPUser.getCurrentUserUsername, "accountId" -> account.accountId.value, "currency" -> currency, - "amount" -> amt.toString, + "amount" -> (-amt).toString, "otherAccountId" -> counterparty.accountId.value, "otherAccountCurrency" -> counterparty.currency, "transactionType" -> "AC" diff --git a/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala b/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala index 260f6bd76..d205bd798 100644 --- a/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala +++ b/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala @@ -556,7 +556,7 @@ object ObpJvmMappedConnector extends Connector with Loggable { override def makePaymentImpl(fromAccount: AccountType, toAccount: AccountType, amt: BigDecimal, description : String): Box[TransactionId] = { for { - sentTransactionId <- saveTransaction(fromAccount, toAccount, amt, description) + sentTransactionId <- saveTransaction(fromAccount, toAccount, -amt, description) } yield { sentTransactionId } @@ -577,7 +577,7 @@ private def saveTransaction(fromAccount: AccountType, toAccount: AccountType, am val accountId = fromAccount.accountId.value val bankId = fromAccount.bankId.value val currency = fromAccount.currency - val amount = amt.asInstanceOf[java.math.BigDecimal] + val amount = (-amt).asInstanceOf[java.math.BigDecimal] val counterpartyId = toAccount.accountId.value val newBalanceCurrency = toAccount.currency val newBalanceAmount = toAccount.balance