some misssing changes

This commit is contained in:
Ulf Gebhardt 2023-02-17 23:21:37 +01:00
parent b887068226
commit 16c3ba399e
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9

View File

@ -5,6 +5,7 @@ import { Order } from '@enum/Order'
import Paginated from '@arg/Paginated' import Paginated from '@arg/Paginated'
import TransactionLinkFilters from '@arg/TransactionLinkFilters' import TransactionLinkFilters from '@arg/TransactionLinkFilters'
import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
import { User } from '@/graphql/model/User'
export default async function transactionLinkList( export default async function transactionLinkList(
{ currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
@ -18,7 +19,7 @@ export default async function transactionLinkList(
} }
const [transactionLinks, count] = await DbTransactionLink.findAndCount({ const [transactionLinks, count] = await DbTransactionLink.findAndCount({
where: { where: {
user: user.id, userId: user.id,
...(!withRedeemed && { redeemedBy: null }), ...(!withRedeemed && { redeemedBy: null }),
...(!withExpired && { validUntil: MoreThan(new Date()) }), ...(!withExpired && { validUntil: MoreThan(new Date()) }),
}, },
@ -32,6 +33,6 @@ export default async function transactionLinkList(
return { return {
count, count,
links: transactionLinks.map((tl) => new TransactionLink(tl, user)), links: transactionLinks.map((tl) => new TransactionLink(tl, new User(user))),
} }
} }