From a6e70363392ef88aef007c721cf5c5649c3970f8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 12 Apr 2022 21:34:33 +0200 Subject: [PATCH] remove unused fields from balance model --- backend/src/graphql/model/Balance.ts | 17 ----------------- backend/src/graphql/resolver/BalanceResolver.ts | 5 ----- 2 files changed, 22 deletions(-) diff --git a/backend/src/graphql/model/Balance.ts b/backend/src/graphql/model/Balance.ts index 619d9b242..f04b235ee 100644 --- a/backend/src/graphql/model/Balance.ts +++ b/backend/src/graphql/model/Balance.ts @@ -5,33 +5,20 @@ import Decimal from 'decimal.js-light' export class Balance { constructor(data: { balance: Decimal - decay: Decimal - lastBookedBalance: Decimal balanceGDT: number | null count: number linkCount: number - lastBookedDate?: Date | null }) { this.balance = data.balance - this.decay = data.decay - this.lastBookedBalance = data.lastBookedBalance this.balanceGDT = data.balanceGDT || null this.count = data.count this.linkCount = data.linkCount - this.lastBookedDate = data.lastBookedDate || null } // the actual balance, decay included @Field(() => Decimal) balance: Decimal - // the decay since the last booked balance - @Field(() => Decimal) - decay: Decimal - - @Field(() => Decimal) - lastBookedBalance: Decimal - @Field(() => Number, { nullable: true }) balanceGDT: number | null @@ -42,8 +29,4 @@ export class Balance { // the count of transaction links @Field(() => Number) linkCount: number - - // may be null as there may be no transaction - @Field(() => Date, { nullable: true }) - lastBookedDate: Date | null } diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 7cbd455cb..909a22144 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -29,8 +29,6 @@ export class BalanceResolver { if (!lastTransaction) { return new Balance({ balance: new Decimal(0), - decay: new Decimal(0), - lastBookedBalance: new Decimal(0), balanceGDT, count: 0, linkCount: 0, @@ -69,12 +67,9 @@ export class BalanceResolver { balance: calculatedDecay.balance .minus(sumHoldAvailableAmount.toString()) .toDecimalPlaces(2, Decimal.ROUND_DOWN), // round towards zero - decay: calculatedDecay.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR), // round towards - infinity - lastBookedBalance: lastTransaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN), balanceGDT, count, linkCount, - lastBookedDate: lastTransaction.balanceDate, }) } }