Merge pull request #1064 from siiky/fix/lam-266/profits-calculation

Profits calculation

lib/new-admin/graphql/resolvers/transaction.resolver.js

@@ -11,7 +11,7 @@ const logDateFormat = require('../../../logs').logDateFormat
 
 const transactionsLoader = new DataLoader(ids => transactions.getCustomerTransactionsBatch(ids))
 const txLogFields = ['txClass', 'id', 'deviceId', 'toAddress', 'cryptoAtoms',
-  'cryptoCode', 'fiat', 'fiatCode', 'fee', 'status',
+  'cryptoCode', 'fiat', 'fiatCode', 'fee', 'status', 'fiatProfit',
   'dispense', 'notified', 'redeem', 'phone', 'error',
   'created', 'confirmedAt', 'hdIndex', 'swept', 'timedout',
   'dispenseConfirmed', 'provisioned1', 'provisioned2',

lib/new-admin/services/transactions.js

@@ -126,21 +126,28 @@ function simplifiedBatch (data) {
     ...it,
     status: getStatus(it),
     fiatProfit: getProfit(it).toString(),
-    cryptoAmount: getCryptoAmount(it)
+    cryptoAmount: getCryptoAmount(it).toString()
   }))
 
   return _.compose(_.map(_.pick(fields)), addSimplifiedFields)(data)
 }
 
-const getCryptoAmount = it => coinUtils.toUnit(BN(it.cryptoAtoms), it.cryptoCode).toString()
+const getCryptoAmount = it => coinUtils.toUnit(BN(it.cryptoAtoms), it.cryptoCode)
 
 const getProfit = it => {
-  const discountValue = _.isNil(it.discount) ? BN(100) : BN(100).minus(it.discount)
+  /* fiat - crypto*tickerPrice + fee */
-  const discountPercentage = BN(discountValue).div(100)
+  const calcCashInProfit = (fiat, crypto, tickerPrice, fee) => fiat.minus(crypto.times(tickerPrice)).plus(fee)
-  const commissionPercentage = BN(it.commissionPercentage).times(discountPercentage)
+  /* crypto*tickerPrice - fiat */
-  const getCommissionFee = it => BN(commissionPercentage).times(BN(it.fiat))
+  const calcCashOutProfit = (fiat, crypto, tickerPrice) => crypto.times(tickerPrice).minus(fiat)
-  if (!it.cashInFee) return getCommissionFee(it)
+
-  return getCommissionFee(it).plus(BN(it.cashInFee))
+  const fiat = BN(it.fiat)
+  const crypto = getCryptoAmount(it)
+  const tickerPrice = BN(it.rawTickerPrice)
+  const isCashIn = it.txClass === 'cashIn'
+
+  return isCashIn
+    ? calcCashInProfit(fiat, crypto, tickerPrice, BN(it.cashInFee))
+    : calcCashOutProfit(fiat, crypto, tickerPrice)
 }
 
 const getCashOutStatus = it => {

new-lamassu-admin/src/pages/Transactions/DetailsCard.js

@@ -85,6 +85,27 @@ const CANCEL_CASH_IN_TRANSACTION = gql`
   }
 `
 
+const getCryptoAmount = tx =>
+  coinUtils.toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode).toNumber()
+
+/* Port of getProfit() from lib/new-admin/services/transactions.js */
+const getCommission = tx => {
+  const calcCashInProfit = (fiat, crypto, tickerPrice, fee) =>
+    fiat - crypto * tickerPrice + fee
+  const calcCashOutProfit = (fiat, crypto, tickerPrice) =>
+    crypto * tickerPrice - fiat
+
+  const fiat = Number.parseFloat(tx.fiat)
+  const crypto = getCryptoAmount(tx)
+  const tickerPrice = Number.parseFloat(tx.rawTickerPrice)
+  const isCashIn = tx.txClass === 'cashIn'
+  const cashInFee = isCashIn ? Number.parseFloat(tx.cashInFee) : 0
+
+  return isCashIn
+    ? calcCashInProfit(fiat, crypto, tickerPrice, cashInFee)
+    : calcCashOutProfit(fiat, crypto, tickerPrice)
+}
+
 const formatAddress = (cryptoCode = '', address = '') =>
   coinUtils.formatCryptoAddress(cryptoCode, address).replace(/(.{5})/g, '$1 ')
 
@@ -115,13 +136,15 @@ const DetailsRow = ({ it: tx, timezone }) => {
     }
   )
 
+  const commission = getCommission(tx).toFixed(2)
+  const commissionPercentage =
+    Number.parseFloat(tx.commissionPercentage, 2) * 100
+  const cashInFee = isCashIn ? Number.parseFloat(tx.cashInFee) : 0
   const fiat = Number.parseFloat(tx.fiat)
-  const crypto = coinUtils.toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode)
+  const crypto = getCryptoAmount(tx)
-  const commissionPercentage = Number.parseFloat(tx.commissionPercentage, 2)
+  const exchangeRate = (fiat / crypto).toFixed(2)
-  const commission = Number(fiat * commissionPercentage).toFixed(2)
-  const discount = tx.discount ? `-${tx.discount}%` : null
-  const exchangeRate = BigNumber(fiat / crypto).toFormat(2)
   const displayExRate = `1 ${tx.cryptoCode} = ${exchangeRate} ${tx.fiatCode}`
+  const discount = tx.discount ? `-${tx.discount}%` : null
 
   const parseDateString = parse(new Date(), 'yyyyMMdd')
 
@@ -304,7 +327,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
         <div className={classes.commission}>
           <Label>Commission</Label>
           <div className={classes.container}>
-            {`${commission} ${tx.fiatCode} (${commissionPercentage * 100} %)`}
+            {`${commission} ${tx.fiatCode} (${commissionPercentage} %)`}
             {discount && (
               <div className={classes.chip}>
                 <Label1 className={classes.chipLabel}>{discount}</Label1>
@@ -314,11 +337,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
         </div>
         <div>
           <Label>Fixed fee</Label>
-          <div>
+          <div>{isCashIn ? `${cashInFee} ${tx.fiatCode}` : 'N/A'}</div>
-            {isCashIn
-              ? `${Number.parseFloat(tx.cashInFee)} ${tx.fiatCode}`
-              : 'N/A'}
-          </div>
         </div>
       </div>
       <div className={classes.secondRow}>

new-lamassu-admin/src/pages/Transactions/Transactions.js

@@ -116,6 +116,7 @@ const GET_TRANSACTIONS = gql`
       isAnonymous
       batched
       batchTime
+      rawTickerPrice
       batchError
       walletScore
     }