From bc47e9c3c38c35b46898164704bf81a571fa68b5 Mon Sep 17 00:00:00 2001
From: cavdy <cavdyofficials@gmail.com>
Date: Tue, 30 Apr 2019 00:01:57 +0100
Subject: [PATCH] bug(Transaction concatenate instead of adding or
 substracting):Transaction concatenate instead of adding or substracting
 Transaction concatenate instead of performing mathematical operation [Deliver
 #165699638]

---
 server/v1/services/accounts.js    | 2 +-
 server/v1/services/transaction.js | 4 ++--
 server/v1/test/transactions.js    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/v1/services/accounts.js b/server/v1/services/accounts.js
index 9ed2891..d82cf25 100644
--- a/server/v1/services/accounts.js
+++ b/server/v1/services/accounts.js
@@ -13,7 +13,7 @@ const CreateAccountService = {
     const ACNumberGenerator = Math.floor(Math.random() * 1000000000) + 3000000000;
     const date = new Date();
     const createdOn = `${date.getDate()}/${date.getMonth() + 1}/${date.getFullYear()}`;
-    const balance = 0.00;
+    const balance = parseFloat(0.00).toFixed(2);
     const status = 'draft';
 
     // pulling users data from database
diff --git a/server/v1/services/transaction.js b/server/v1/services/transaction.js
index 3308f48..4067bcc 100644
--- a/server/v1/services/transaction.js
+++ b/server/v1/services/transaction.js
@@ -35,7 +35,7 @@ const TransactionService = {
 
       if (/^[0-9]{1,}$/.test(transactionData.amount)) {
         // substract the passed in amount from the current balance
-        const newBalance = balance - transactionData.amount;
+        const newBalance = Number.parseFloat(balance) - Number.parseFloat(transactionData.amount);
 
         // check if account balance is zero
         if (newBalance < 0) {
@@ -132,7 +132,7 @@ const TransactionService = {
 
       if (/^[0-9]{1,}$/.test(transactionData.amount)) {
         // add the passed in amount from the current balance
-        const newBalance = balance + transactionData.amount;
+        const newBalance = Number.parseFloat(balance) + Number.parseFloat(transactionData.amount);
         const transactionDbData = await dbConnection
           .dbConnect('INSERT into transactions(createdon, type, accountNumber, cashier, amount, oldbalance, newbalance) values($1, $2, $3, $4, $5,$6, $7) RETURNING id, accountnumber, amount, cashier, type',
             [createdOn, 'credit', accountnumber, id, transactionData.amount, balance, newBalance]);
diff --git a/server/v1/test/transactions.js b/server/v1/test/transactions.js
index 64a3939..134aea0 100644
--- a/server/v1/test/transactions.js
+++ b/server/v1/test/transactions.js
@@ -74,7 +74,7 @@ describe('Testing Transactions Controller', () => {
           .post('/api/v1/transactions/3404704124/debit')
           .set('Authorization', `Bearer ${token}`)
           .send({
-            amount: 500,
+            amount: 5000,
           });
         expect(res.body).to.be.an('object');
         expect(res.body.status).to.equal(422);