From 3a8229f60f8388f6c1e724c8ce2da575d28b8c0d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 23 Mar 2022 19:18:18 +0100 Subject: [PATCH] include hold available amount in balance calculation --- backend/src/graphql/resolver/BalanceResolver.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 5093d4347..4867da54d 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -9,7 +9,8 @@ import { Transaction, Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' import { GdtResolver } from './GdtResolver' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' -import { MoreThan } from '@dbTools/typeorm' +import { MoreThan, getCustomRepository } from '@dbTools/typeorm' +import { TransactionLinkRepository } from '@repository/TransactionLink' @Resolver() export class BalanceResolver { @@ -48,8 +49,11 @@ export class BalanceResolver { }, }) + const transactionLinkRepository = getCustomRepository(TransactionLinkRepository) + const { sumHoldAvailableAmount } = await transactionLinkRepository.summary(user.id, now) + const calculatedDecay = calculateDecay( - lastTransaction.balance, + lastTransaction.balance.minus(sumHoldAvailableAmount.toString()), lastTransaction.balanceDate, now, )