From a1e7e65830c1f38cd10d1182a04d7f0b905085de Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 12 May 2022 14:36:04 +0200 Subject: [PATCH] fix: Count Deprecated Links as Well --- .../src/graphql/resolver/BalanceResolver.ts | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 909a22144..9df164960 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -7,7 +7,7 @@ import { 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, getCustomRepository } from '@dbTools/typeorm' +import { getCustomRepository } from '@dbTools/typeorm' import { TransactionLinkRepository } from '@repository/TransactionLink' @Resolver() @@ -39,16 +39,13 @@ export class BalanceResolver { context.transactionCount || context.transactionCount === 0 ? context.transactionCount : await dbTransaction.count({ where: { userId: user.id } }) - const linkCount = - context.linkCount || context.linkCount === 0 - ? context.linkCount - : await dbTransactionLink.count({ - where: { - userId: user.id, - redeemedAt: null, - validUntil: MoreThan(new Date()), - }, - }) + const linkCount = await dbTransactionLink.count({ + where: { + userId: user.id, + redeemedAt: null, + // validUntil: MoreThan(new Date()), + }, + }) // The decay is always calculated on the last booked transaction const calculatedDecay = calculateDecay(