mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Store the right amount in the database.
This commit is contained in:
parent
9834e96d23
commit
0da5c3d2c8
@ -15,6 +15,7 @@ import { Transaction } from '@entity/Transaction'
|
|||||||
import { TransactionCreation } from '@entity/TransactionCreation'
|
import { TransactionCreation } from '@entity/TransactionCreation'
|
||||||
import { UserTransaction } from '@entity/UserTransaction'
|
import { UserTransaction } from '@entity/UserTransaction'
|
||||||
import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
|
import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
|
||||||
|
import { BalanceRepository } from '../../typeorm/repository/Balance'
|
||||||
|
|
||||||
@Resolver()
|
@Resolver()
|
||||||
export class AdminResolver {
|
export class AdminResolver {
|
||||||
@ -179,13 +180,13 @@ export class AdminResolver {
|
|||||||
} else {
|
} else {
|
||||||
newBalance = lastUserTransaction.balance
|
newBalance = lastUserTransaction.balance
|
||||||
}
|
}
|
||||||
|
newBalance += Number(parseInt(pendingCreation.amount.toString()) / 10000)
|
||||||
|
|
||||||
const newUserTransaction = new UserTransaction()
|
const newUserTransaction = new UserTransaction()
|
||||||
newUserTransaction.userId = pendingCreation.userId
|
newUserTransaction.userId = pendingCreation.userId
|
||||||
newUserTransaction.transactionId = transaction.id
|
newUserTransaction.transactionId = transaction.id
|
||||||
newUserTransaction.transactionTypeId = transaction.transactionTypeId
|
newUserTransaction.transactionTypeId = transaction.transactionTypeId
|
||||||
newUserTransaction.balance = Number(
|
newUserTransaction.balance = Number(newBalance)
|
||||||
newBalance + parseInt(pendingCreation.amount.toString()) / 10000,
|
|
||||||
)
|
|
||||||
newUserTransaction.balanceDate = transaction.received
|
newUserTransaction.balanceDate = transaction.received
|
||||||
|
|
||||||
console.log(newUserTransaction)
|
console.log(newUserTransaction)
|
||||||
@ -194,6 +195,18 @@ export class AdminResolver {
|
|||||||
throw new Error('Error saving user transaction: ' + error)
|
throw new Error('Error saving user transaction: ' + error)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const balanceRepository = getCustomRepository(BalanceRepository)
|
||||||
|
let userBalance = await balanceRepository.findByUser(pendingCreation.userId)
|
||||||
|
|
||||||
|
if (!userBalance) userBalance = balanceRepository.create()
|
||||||
|
userBalance.userId = pendingCreation.userId
|
||||||
|
userBalance.amount = Number(newBalance * 10000)
|
||||||
|
userBalance.modified = new Date()
|
||||||
|
userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
|
||||||
|
await balanceRepository.save(userBalance)
|
||||||
|
console.log('userBalance', userBalance)
|
||||||
|
await pendingCreationRepository.delete(pendingCreation)
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user