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 branch 'master' into wrong_login_is_not_password_reset

Browse Source
This commit is contained in:
Hannes Heine 2021-12-14 07:45:42 +01:00 committed by GitHub
commit d2ba68de72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ 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' import { BalanceRepository } from '../../typeorm/repository/Balance'
import { calculateDecay } from '../../util/decay'
@Resolver() @Resolver()
export class AdminResolver { export class AdminResolver {
@ -149,10 +150,11 @@ export class AdminResolver {
const pendingCreation = await loginPendingTasksAdminRepository.findOneOrFail(id) const pendingCreation = await loginPendingTasksAdminRepository.findOneOrFail(id)
const transactionRepository = getCustomRepository(TransactionRepository) const transactionRepository = getCustomRepository(TransactionRepository)
const receivedCallDate = new Date()
let transaction = new Transaction() let transaction = new Transaction()
transaction.transactionTypeId = 1 transaction.transactionTypeId = 1
transaction.memo = pendingCreation.memo transaction.memo = pendingCreation.memo
transaction.received = new Date() transaction.received = receivedCallDate
transaction.blockchainTypeId = 1 transaction.blockchainTypeId = 1
transaction = await transactionRepository.save(transaction) transaction = await transactionRepository.save(transaction)
if (!transaction) throw new Error('Could not create transaction') if (!transaction) throw new Error('Could not create transaction')
@ -174,7 +176,11 @@ export class AdminResolver {
if (!lastUserTransaction) { if (!lastUserTransaction) {
newBalance = 0 newBalance = 0
} else { } else {
newBalance = lastUserTransaction.balance newBalance = await calculateDecay(
lastUserTransaction.balance,
lastUserTransaction.balanceDate,
receivedCallDate,
)
} }
newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString())) newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()))
@ -195,8 +201,8 @@ export class AdminResolver {
if (!userBalance) userBalance = balanceRepository.create() if (!userBalance) userBalance = balanceRepository.create()
userBalance.userId = pendingCreation.userId userBalance.userId = pendingCreation.userId
userBalance.amount = Number(newBalance) userBalance.amount = Number(newBalance)
userBalance.modified = new Date() userBalance.modified = receivedCallDate
userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date() userBalance.recordDate = receivedCallDate
await balanceRepository.save(userBalance) await balanceRepository.save(userBalance)
await loginPendingTasksAdminRepository.delete(pendingCreation) await loginPendingTasksAdminRepository.delete(pendingCreation)