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 pull request #988 from gradido/apollo_fix

Browse Source 
deliver a decay block every time
This commit is contained in:
einhornimmond 2021-10-15 11:40:48 +02:00 committed by GitHub
commit a1f8022295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,18 +82,16 @@ async function calculateAndAddDecayTransactions(
) )
const balance = prev.balance - decay.balance const balance = prev.balance - decay.balance
if (balance) { finalTransaction.decay = decay
finalTransaction.decay = decay finalTransaction.decay.balance = roundFloorFrom4(balance)
finalTransaction.decay.balance = roundFloorFrom4(balance) if (
if ( decayStartTransaction &&
decayStartTransaction && prev.transactionId < decayStartTransaction.id &&
prev.transactionId < decayStartTransaction.id && current.transactionId > decayStartTransaction.id
current.transactionId > decayStartTransaction.id ) {
) { finalTransaction.decay.decayStartBlock = (
finalTransaction.decay.decayStartBlock = ( decayStartTransaction.received.getTime() / 1000
decayStartTransaction.received.getTime() / 1000 ).toString()
).toString()
}
} }
} }
@ -144,15 +142,14 @@ async function calculateAndAddDecayTransactions(
now.getTime(), now.getTime(),
) )
const balance = userTransaction.balance - decay.balance const balance = userTransaction.balance - decay.balance
if (balance) {
const decayTransaction = new Transaction() const decayTransaction = new Transaction()
decayTransaction.type = 'decay' decayTransaction.type = 'decay'
decayTransaction.balance = roundFloorFrom4(balance) decayTransaction.balance = roundFloorFrom4(balance)
decayTransaction.decayDuration = decay.decayDuration decayTransaction.decayDuration = decay.decayDuration
decayTransaction.decayStart = decay.decayStart decayTransaction.decayStart = decay.decayStart
decayTransaction.decayEnd = decay.decayEnd decayTransaction.decayEnd = decay.decayEnd
finalTransactions.push(decayTransaction) finalTransactions.push(decayTransaction)
}
} }
} }