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

more refactors, fixed some todos and simplified things

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-02-21 01:16:15 +01:00
parent 2d0d02c7f6
commit acc49581cb
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
import { getCustomRepository, getConnection, QueryRunner } from '@dbTools/typeorm' import { getCustomRepository, getConnection, QueryRunner, In } from '@dbTools/typeorm'
import CONFIG from '../../config' import CONFIG from '../../config'
import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail' import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail'
@ -47,7 +47,7 @@ async function calculateAndAddDecayTransactions(
transactionIds.push(userTransaction.transactionId) transactionIds.push(userTransaction.transactionId)
}) })
const transactions = await dbTransaction.find({ where: { id: transactionIds } }) const transactions = await dbTransaction.find({ where: { id: In(transactionIds) } })
const transactionIndiced: dbTransaction[] = [] const transactionIndiced: dbTransaction[] = []
transactions.forEach((transaction: dbTransaction) => { transactions.forEach((transaction: dbTransaction) => {
@ -114,7 +114,7 @@ async function calculateAndAddDecayTransactions(
finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
if (transaction.userId === user.id) { if (transaction.userId === user.id) {
finalTransaction.type = TransactionType.SEND finalTransaction.type = TransactionType.SEND
otherUser = userIndiced.find((u) => u.id === transaction.sendReceiverUserId) // TODO properly enforce null otherUser = userIndiced.find((u) => u.id === transaction.sendReceiverUserId)
// finalTransaction.pubkey = sendCoin.recipiantPublic // finalTransaction.pubkey = sendCoin.recipiantPublic
} else if (transaction.sendReceiverUserId === user.id) { } else if (transaction.sendReceiverUserId === user.id) {
finalTransaction.type = TransactionType.RECIEVE finalTransaction.type = TransactionType.RECIEVE
@ -304,7 +304,6 @@ export class TransactionResolver {
@Ctx() context: any, @Ctx() context: any,
): Promise<boolean> { ): Promise<boolean> {
// TODO this is subject to replay attacks // TODO this is subject to replay attacks
// validate sender user (logged in)
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const senderUser = await userRepository.findByPubkeyHex(context.pubKey) const senderUser = await userRepository.findByPubkeyHex(context.pubKey)
if (senderUser.pubKey.length !== 32) { if (senderUser.pubKey.length !== 32) {
@ -316,7 +315,6 @@ export class TransactionResolver {
} }
// validate recipient user // validate recipient user
// TODO: the detour over the public key is unnecessary
const recipientUser = await dbUser.findOne({ email: email }, { withDeleted: true }) const recipientUser = await dbUser.findOne({ email: email }, { withDeleted: true })
if (!recipientUser) { if (!recipientUser) {
throw new Error('recipient not known') throw new Error('recipient not known')
@ -335,7 +333,7 @@ export class TransactionResolver {
await queryRunner.startTransaction('READ UNCOMMITTED') await queryRunner.startTransaction('READ UNCOMMITTED')
try { try {
// transaction // transaction
let transaction = new dbTransaction() const transaction = new dbTransaction()
transaction.transactionTypeId = TransactionTypeId.SEND transaction.transactionTypeId = TransactionTypeId.SEND
transaction.memo = memo transaction.memo = memo
transaction.userId = senderUser.id transaction.userId = senderUser.id
@ -344,13 +342,7 @@ export class TransactionResolver {
transaction.sendReceiverPublicKey = recipientUser.pubKey transaction.sendReceiverPublicKey = recipientUser.pubKey
transaction.amount = BigInt(centAmount) transaction.amount = BigInt(centAmount)
// TODO: NO! this is problematic in its construction await queryRunner.manager.insert(dbTransaction, transaction)
const insertResult = await queryRunner.manager.insert(dbTransaction, transaction)
transaction = await queryRunner.manager
.findOneOrFail(dbTransaction, insertResult.generatedMaps[0].id)
.catch((error) => {
throw new Error('error loading saved transaction: ' + error)
})
// Insert Transaction: sender - amount // Insert Transaction: sender - amount
const senderUserTransactionBalance = await addUserTransaction( const senderUserTransactionBalance = await addUserTransaction(