From e69437cb9f8f68208e461faeed203a0e49747360 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 4 Mar 2022 12:48:38 +0100 Subject: [PATCH] include decay in balance --- backend/src/graphql/resolver/TransactionResolver.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index c05e0e3d9..969a64e32 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -31,6 +31,7 @@ import { User } from '../model/User' import { communityUser } from '../../util/communityUser' import { virtualDecayTransaction } from '../../util/virtualDecayTransaction' import Decimal from 'decimal.js-light' +import { calculateDecay } from '../../util/decay' @Resolver() export class TransactionResolver { @@ -47,6 +48,7 @@ export class TransactionResolver { }: Paginated, @Ctx() context: any, ): Promise { + const now = new Date() // find user const userRepository = getCustomRepository(UserRepository) // TODO: separate those usecases - this is a security issue @@ -111,7 +113,6 @@ export class TransactionResolver { // decay transaction if (currentPage === 1 && order === Order.DESC) { - const now = new Date() transactions.push( virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self), ) @@ -131,7 +132,7 @@ export class TransactionResolver { // Construct Result return new TransactionList( - lastTransaction.balance, + calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, now).balance, transactions, userTransactionsCount, balanceGDT,