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

fixed backend for new migration

Browse Source 
properly write linked Transactions when sendCoin
This commit is contained in:
Ulf Gebhardt 2022-02-24 00:41:44 +01:00
parent 0c5466f650
commit 3a35cbfee5
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/config/index.ts
View File

@ -4,7 +4,7 @@ import dotenv from 'dotenv'
dotenv.config()
const constants = {
DB_VERSION: '0025-combine_transaction_tables2',
DB_VERSION: '0026-clean_transaction_table',
DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
}

4
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -318,13 +318,11 @@ export class AdminResolver {
newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()))
let transaction = new Transaction()
transaction.transactionTypeId = TransactionTypeId.CREATION
transaction.typeId = TransactionTypeId.CREATION
transaction.memo = pendingCreation.memo
transaction.received = receivedCallDate
transaction.userId = pendingCreation.userId
transaction.amount = BigInt(parseInt(pendingCreation.amount.toString()))
transaction.creationDate = pendingCreation.date
transaction.transactionId = randomInt(99999)
transaction.balance = BigInt(newBalance)
transaction.balanceDate = receivedCallDate
transaction = await transaction.save()

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

@ -135,8 +135,8 @@ export class TransactionResolver {
userTransactions.forEach((transaction: dbTransaction) => {
involvedUserIds.push(transaction.userId)
if (
transaction.transactionTypeId === TransactionTypeId.SEND ||
transaction.transactionTypeId === TransactionTypeId.RECEIVE
transaction.typeId === TransactionTypeId.SEND ||
transaction.typeId === TransactionTypeId.RECEIVE
) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
involvedUserIds.push(transaction.linkedUserId!) // TODO ensure not null properly
@ -152,7 +152,7 @@ export class TransactionResolver {
const userTransaction = userTransactions[i]
const finalTransaction = new Transaction()
finalTransaction.transactionId = userTransaction.id
finalTransaction.date = userTransaction.received.toISOString()
finalTransaction.date = userTransaction.balanceDate.toISOString()
finalTransaction.memo = userTransaction.memo
finalTransaction.totalBalance = roundFloorFrom4(Number(userTransaction.balance))
const previousTransaction = i > 0 ? userTransactions[i - 1] : null
@ -183,7 +183,7 @@ export class TransactionResolver {
finalTransaction.balance = roundFloorFrom4(Number(userTransaction.amount)) // Todo unsafe conversion
const otherUser = userIndiced.find((u) => u.id === userTransaction.linkedUserId)
switch (userTransaction.transactionTypeId) {
switch (userTransaction.typeId) {
case TransactionTypeId.CREATION:
finalTransaction.name = 'Gradido Akademie'
finalTransaction.type = TransactionType.CREATION
@ -300,14 +300,11 @@ export class TransactionResolver {
const receivedCallDate = new Date()
// transaction
const transactionSend = new dbTransaction()
transactionSend.transactionTypeId = TransactionTypeId.SEND
transactionSend.typeId = TransactionTypeId.SEND
transactionSend.memo = memo
transactionSend.userId = senderUser.id
transactionSend.pubkey = senderUser.pubKey
transactionSend.linkedUserId = recipientUser.id
transactionSend.amount = BigInt(centAmount)
transactionSend.received = receivedCallDate
transactionSend.transactionId = randomInt(99999)
const sendBalance = await calculateNewBalance(senderUser.id, receivedCallDate, -centAmount)
transactionSend.balance = BigInt(Math.trunc(sendBalance))
transactionSend.balanceDate = receivedCallDate
@ -315,14 +312,11 @@ export class TransactionResolver {
await queryRunner.manager.insert(dbTransaction, transactionSend)
const transactionReceive = new dbTransaction()
transactionReceive.transactionTypeId = TransactionTypeId.RECEIVE
transactionReceive.typeId = TransactionTypeId.RECEIVE
transactionReceive.memo = memo
transactionReceive.userId = recipientUser.id
transactionReceive.pubkey = recipientUser.pubKey
transactionReceive.linkedUserId = senderUser.id
transactionReceive.amount = BigInt(centAmount)
transactionReceive.received = receivedCallDate
transactionReceive.transactionId = randomInt(99999)
const receiveBalance = await calculateNewBalance(
recipientUser.id,
receivedCallDate,
@ -331,8 +325,13 @@ export class TransactionResolver {
transactionReceive.balance = BigInt(Math.trunc(receiveBalance))
transactionReceive.balanceDate = receivedCallDate
transactionReceive.sendSenderFinalBalance = transactionSend.balance
transactionReceive.linkedTransactionId = transactionSend.id
await queryRunner.manager.insert(dbTransaction, transactionReceive)
// Save linked transaction id for send
transactionSend.linkedTransactionId = transactionReceive.id
await queryRunner.manager.update(dbTransaction, { id: transactionSend.id }, transactionSend)
// Update Balance: sender - amount
const senderStateBalance = await updateStateBalance(
senderUser,