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

change symbol name and <

Browse Source
This commit is contained in:
einhornimmond 2021-10-15 12:29:56 +02:00
parent 2f3ad854d5
commit 0e7236e9ef
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -71,24 +71,27 @@ async function calculateAndAddDecayTransactions(
finalTransaction.date = transaction.received.toISOString() finalTransaction.date = transaction.received.toISOString()
finalTransaction.memo = transaction.memo finalTransaction.memo = transaction.memo
finalTransaction.totalBalance = roundFloorFrom4(userTransaction.balance) finalTransaction.totalBalance = roundFloorFrom4(userTransaction.balance)
const prev = i > 0 ? userTransactions[i - 1] : null const previousTransaction = i > 0 ? userTransactions[i - 1] : null
if (prev) { if (previousTransaction) {
const current = userTransaction const currentTransaction = userTransaction
const decay = await calculateDecayWithInterval( const decay = await calculateDecayWithInterval(
prev.balance, previousTransaction.balance,
prev.balanceDate, previousTransaction.balanceDate,
current.balanceDate, currentTransaction.balanceDate,
) )
const balance = prev.balance - decay.balance const balance = previousTransaction.balance - decay.balance
if (decayStartTransaction && decayStartTransaction.received >= prev.balanceDate) { if (
decayStartTransaction &&
decayStartTransaction.received < currentTransaction.balanceDate
) {
finalTransaction.decay = decay finalTransaction.decay = decay
finalTransaction.decay.balance = roundFloorFrom4(balance) finalTransaction.decay.balance = roundFloorFrom4(balance)
if ( if (
decayStartTransaction && decayStartTransaction &&
prev.transactionId < decayStartTransaction.id && previousTransaction.transactionId < decayStartTransaction.id &&
current.transactionId > decayStartTransaction.id currentTransaction.transactionId > decayStartTransaction.id
) { ) {
finalTransaction.decay.decayStartBlock = ( finalTransaction.decay.decayStartBlock = (
decayStartTransaction.received.getTime() / 1000 decayStartTransaction.received.getTime() / 1000