From 736310f5d5ea4a00bc98a752d1e2ecefbf6a60af Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 2 Feb 2022 03:05:00 +0100 Subject: [PATCH] fix build error - type errors --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- backend/src/graphql/resolver/BalanceResolver.ts | 2 +- backend/src/util/validate.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 4204c6c2f..0ecce0b13 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -215,11 +215,11 @@ export class AdminResolver { if (!lastUserTransaction) { newBalance = 0 } else { - newBalance = await calculateDecay( + newBalance = calculateDecay( lastUserTransaction.balance, lastUserTransaction.balanceDate, receivedCallDate, - ) + ).balance } newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString())) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index dd7280657..0ecfbb7cd 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -35,7 +35,7 @@ export class BalanceResolver { return new Balance({ balance: roundFloorFrom4(balanceEntity.amount), decay: roundFloorFrom4( - await calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now), + calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now).balance, ), decay_date: now.toString(), }) diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index b94550d63..edd663e9e 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -21,7 +21,7 @@ async function hasUserAmount(user: dbUser, amount: number): Promise { const balance = await balanceRepository.findOne({ userId: user.id }) if (!balance) return false - const decay = await calculateDecay(balance.amount, balance.recordDate, new Date()) + const decay = calculateDecay(balance.amount, balance.recordDate, new Date()).balance return decay > amount }