From e9e97549a7b33cd6da4e628479c5134f5ffcb859 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 29 Mar 2022 01:12:07 +0200 Subject: [PATCH] rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails --- backend/src/graphql/resolver/BalanceResolver.ts | 2 +- backend/src/graphql/resolver/GdtResolver.ts | 6 +++--- backend/src/graphql/resolver/TransactionResolver.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 4867da54d..dfaafc8e0 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -21,7 +21,7 @@ export class BalanceResolver { const now = new Date() const gdtResolver = new GdtResolver() - const balanceGDT = await gdtResolver.gdtSum(context) + const balanceGDT = await gdtResolver.gdtBalance(context) const lastTransaction = await Transaction.findOne( { userId: user.id }, diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index a563a0845..e2409160b 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -33,9 +33,9 @@ export class GdtResolver { } } - @Authorized([RIGHTS.GDT_SUM]) + @Authorized([RIGHTS.GDT_BALANCE]) @Query(() => Number) - async gdtSum(@Ctx() context: any): Promise { + async gdtBalance(@Ctx() context: any): Promise { const { user } = context try { const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, { @@ -48,7 +48,7 @@ export class GdtResolver { } catch (err: any) { // eslint-disable-next-line no-console console.log('Could not query GDT Server', err) - return 0 + return null } } diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 1a5bf80d6..00b47658b 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -156,7 +156,7 @@ export class TransactionResolver { // get GDT const gdtResolver = new GdtResolver() - const balanceGDT = await gdtResolver.gdtSum(context) + const balanceGDT = await gdtResolver.gdtBalance(context) if (!lastTransaction) { return new TransactionList(new Decimal(0), [], 0, 0, balanceGDT)