IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3198 from gradido/fix_view_expired_links

Browse Source 
fix(frontend): show links even when all expired
This commit is contained in:
einhornimmond 2023-09-01 14:53:48 +02:00 committed by GitHub
commit 87672b8d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
/* eslint-disable new-cap */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { getConnection, In } from '@dbTools/typeorm'
import { getConnection, In, IsNull } from '@dbTools/typeorm'
import { Transaction as dbTransaction } from '@entity/Transaction'
import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
import { User as dbUser } from '@entity/User'
@ -264,7 +264,28 @@ export class TransactionResolver {
logger.debug(`transactions=${transactions}`)
// virtual transaction for pending transaction-links sum
if (sumHoldAvailableAmount.greaterThan(0)) {
if (sumHoldAvailableAmount.isZero()) {
const linkCount = await dbTransactionLink.count({
where: {
userId: user.id,
redeemedAt: IsNull(),
},
})
if (linkCount > 0) {
transactions.push(
virtualLinkTransaction(
lastTransaction.balance,
new Decimal(0),
new Decimal(0),
new Decimal(0),
now,
now,
self,
(userTransactions.length && userTransactions[0].balance) || new Decimal(0),
),
)
}
} else if (sumHoldAvailableAmount.greaterThan(0)) {
logger.debug(`sumHoldAvailableAmount > 0: transactions=${transactions}`)
transactions.push(
virtualLinkTransaction(