IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-date-display-on-redeem-transaction-link

Browse Source
This commit is contained in:
Moriz Wahl 2022-04-01 14:49:05 +02:00 committed by GitHub
commit f17b8d92f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/graphql/model/Transaction.ts
View File

@ -12,15 +12,22 @@ export class Transaction {
this.user = user
this.previous = transaction.previous
this.typeId = transaction.typeId
this.amount = transaction.amount
this.balance = transaction.balance
this.amount = transaction.amount.toDecimalPlaces(2, Decimal.ROUND_DOWN)
this.balance = transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
this.balanceDate = transaction.balanceDate
if (!transaction.decayStart) {
this.decay = new Decay(transaction.balance, new Decimal(0), null, null, null)
// TODO: hot fix, we should separate decay calculation from decay graphql model
this.decay = new Decay(
transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
new Decimal(0),
null,
null,
null,
)
} else {
this.decay = new Decay(
transaction.balance,
transaction.decay,
transaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
transaction.decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
transaction.decayStart,
transaction.balanceDate,
Math.round((transaction.balanceDate.getTime() - transaction.decayStart.getTime()) / 1000),

6
backend/src/util/virtualTransactions.ts
View File

@ -42,11 +42,11 @@ const virtualLinkTransaction = (
userId: -1,
previous: -1,
typeId: TransactionTypeId.LINK_SUMMARY,
amount: amount,
balance: balance,
amount: amount.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
balance: balance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
balanceDate: validUntil,
decayStart: createdAt,
decay: decay,
decay: decay.toDecimalPlaces(2, Decimal.ROUND_FLOOR),
memo: '',
creationDate: null,
...defaultModelFunctions,