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

refactor the methods and types

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-02-25 16:55:05 +01:00
parent 43b8b649bd
commit 302ea9945d
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
database/migrations/0027-decimal_types.ts
View File

@ -29,13 +29,13 @@ Decimal.set({
const DECAY_START_TIME = new Date('2021-05-13 17:46:31') // GMT+0 const DECAY_START_TIME = new Date('2021-05-13 17:46:31') // GMT+0
// TODO: externalize all those definitions and functions into an external decay library
interface Decay { interface Decay {
balance: Decimal balance: Decimal
decay: Decimal | null decay: Decimal | null
start: Date | null start: Date | null
end: Date | null end: Date | null
duration: number | null duration: number | null
startBlock: Date
} }
export enum TransactionTypeId { export enum TransactionTypeId {
@ -50,10 +50,15 @@ function decayFormula(amount: Decimal, seconds: number): Decimal {
) )
} }
function calculateDecay(amount: Decimal, from: Date, to: Date): Decay { function calculateDecay(
amount: Decimal,
from: Date,
to: Date,
startBlock: Date = DECAY_START_TIME,
): Decay {
const fromMs = from.getTime() const fromMs = from.getTime()
const toMs = to.getTime() const toMs = to.getTime()
const decayStartBlockMs = DECAY_START_TIME.getTime() const startBlockMs = startBlock.getTime()
if (toMs < fromMs) { if (toMs < fromMs) {
throw new Error('to < from, reverse decay calculation is invalid') throw new Error('to < from, reverse decay calculation is invalid')
@ -66,22 +71,21 @@ function calculateDecay(amount: Decimal, from: Date, to: Date): Decay {
start: null, start: null,
end: null, end: null,
duration: null, duration: null,
startBlock: DECAY_START_TIME,
} }
// decay started after end date; no decay // decay started after end date; no decay
if (decayStartBlockMs > toMs) { if (startBlockMs > toMs) {
return decay return decay
} }
// decay started before start date; decay for full duration // decay started before start date; decay for full duration
if (decayStartBlockMs < fromMs) { if (startBlockMs < fromMs) {
decay.start = from decay.start = from
decay.duration = (toMs - fromMs) / 1000 decay.duration = (toMs - fromMs) / 1000
} }
// decay started between start and end date; decay from decay start till end date // decay started between start and end date; decay from decay start till end date
else { else {
decay.start = DECAY_START_TIME decay.start = DECAY_START_TIME
decay.duration = (toMs - decayStartBlockMs) / 1000 decay.duration = (toMs - startBlockMs) / 1000
} }
decay.end = to decay.end = to
@ -165,7 +169,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
if (transaction.type_id === TransactionTypeId.SEND) { if (transaction.type_id === TransactionTypeId.SEND) {
decAmount = decAmount.mul(-1) decAmount = decAmount.mul(-1)
} }
// dec_decay
const decayStart = previous ? previous.balance_date : transaction.balance_date const decayStart = previous ? previous.balance_date : transaction.balance_date
const decay = calculateDecay(balance, decayStart, transaction.balance_date) const decay = calculateDecay(balance, decayStart, transaction.balance_date)
balance = decay.balance.add(decAmount) balance = decay.balance.add(decAmount)
@ -178,11 +181,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
const tempDecOldBalance = new Decimal(transaction.balance).dividedBy(10000) const tempDecOldBalance = new Decimal(transaction.balance).dividedBy(10000)
const tempDecDiffBalance = balance.minus(tempDecOldBalance) const tempDecDiffBalance = balance.minus(tempDecOldBalance)
/*
if(transaction.user_id === 943){
console.log(previous ? 'p' : 'n', transaction.user_id, decayStart, decay.start, decay.end, decay.duration, transaction.balance_date)
}
*/
// Update // Update
await queryFn(` await queryFn(`
UPDATE transactions SET UPDATE transactions SET