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

improved query

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-11 10:21:07 +01:00
parent 3aa3ead86e
commit df94fa8e37
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
import { getCustomRepository, getConnection, MoreThan } from '@dbTools/typeorm'
import { getCustomRepository, getConnection } from '@dbTools/typeorm'
import CONFIG from '@/config'
import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail'
@ -23,7 +23,6 @@ import { TransactionLinkRepository } from '@repository/TransactionLink'
import { User as dbUser } from '@entity/User'
import { Transaction as dbTransaction } from '@entity/Transaction'
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
import { apiPost } from '@/apis/HttpRequest'
import { TransactionTypeId } from '@enum/TransactionTypeId'
@ -115,10 +114,8 @@ export class TransactionResolver {
const transactions: Transaction[] = []
const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
const { sumHoldAvailableAmount, sumAmount } = await transactionLinkRepository.sumAmounts(
user.id,
now,
)
const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
await transactionLinkRepository.sumAmounts(user.id, now)
// decay transaction
if (!onlyCreations && currentPage === 1 && order === Order.DESC) {
@ -127,24 +124,14 @@ export class TransactionResolver {
)
// open transaction link sum transaction
if (sumHoldAvailableAmount.greaterThan(0)) {
const lastTransactionLink = await dbTransactionLink.find({
where: { userId: self.id, redeemedBy: null, validUntil: MoreThan(now) },
order: { createdAt: 'DESC' },
take: 1,
})
const firstTransactionLink = await dbTransactionLink.find({
where: { userId: self.id, redeemedBy: null, validUntil: MoreThan(now) },
order: { createdAt: 'ASC' },
take: 1,
})
transactions.push(
virtualLinkTransaction(
lastTransaction.balance,
sumAmount,
sumHoldAvailableAmount,
sumHoldAvailableAmount.minus(sumAmount.toString()),
firstTransactionLink[0].createdAt,
lastTransactionLink[0].validUntil,
firstDate || now,
lastDate || now,
self,
),
)

3
backend/src/server/plugins.ts
View File

@ -39,7 +39,6 @@ const apolloLogPlugin = ApolloLogPlugin({
},
})
const plugins =
process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin, apolloLogPlugin]
const plugins = process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin] // , apolloLogPlugin
export default plugins

28
backend/src/typeorm/repository/TransactionLink.ts
View File

@ -7,20 +7,30 @@ export class TransactionLinkRepository extends Repository<dbTransactionLink> {
async sumAmounts(
userId: number,
date: Date,
): Promise<{ sumHoldAvailableAmount: Decimal; sumAmount: Decimal }> {
const { sumHoldAvailableAmount, sumAmount } = await this.createQueryBuilder('transactionLinks')
.select('SUM(transactionLinks.holdAvailableAmount)', 'sumHoldAvailableAmount')
.addSelect('SUM(transactionLinks.amount)', 'sumAmount')
.where('transactionLinks.userId = :userId', { userId })
.andWhere('transactionLinks.redeemedAt is NULL')
.andWhere('transactionLinks.validUntil > :date', { date })
.orderBy('transactionLinks.createdAt', 'DESC')
.getRawOne()
): Promise<{
sumHoldAvailableAmount: Decimal
sumAmount: Decimal
lastDate: Date | null
firstDate: Date | null
}> {
const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
await this.createQueryBuilder('transactionLinks')
.select('SUM(transactionLinks.holdAvailableAmount)', 'sumHoldAvailableAmount')
.addSelect('SUM(transactionLinks.amount)', 'sumAmount')
.addSelect('MAX(transactionLinks.validUntil)', 'lastDate')
.addSelect('MIN(transactionLinks.createdAt)', 'firstDate')
.where('transactionLinks.userId = :userId', { userId })
.andWhere('transactionLinks.redeemedAt is NULL')
.andWhere('transactionLinks.validUntil > :date', { date })
.orderBy('transactionLinks.createdAt', 'DESC')
.getRawOne()
return {
sumHoldAvailableAmount: sumHoldAvailableAmount
? new Decimal(sumHoldAvailableAmount)
: new Decimal(0),
sumAmount: sumAmount ? new Decimal(sumAmount) : new Decimal(0),
lastDate: lastDate || null,
firstDate: firstDate || null,
}
}
}