From d1770ccb1aae89529e4a176ef13505ba47639394 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 23 Mar 2022 08:20:37 +0100 Subject: [PATCH] default values for filters --- backend/src/graphql/arg/TransactionLinkFilters.ts | 6 +++--- backend/src/graphql/resolver/AdminResolver.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/arg/TransactionLinkFilters.ts b/backend/src/graphql/arg/TransactionLinkFilters.ts index d856a8117..e2f752d3f 100644 --- a/backend/src/graphql/arg/TransactionLinkFilters.ts +++ b/backend/src/graphql/arg/TransactionLinkFilters.ts @@ -2,12 +2,12 @@ import { ArgsType, Field } from 'type-graphql' @ArgsType() export default class TransactionLinkFilters { - @Field(() => Boolean, { nullable: true }) + @Field(() => Boolean, { nullable: true, defaultValue: true }) withDeleted?: boolean - @Field(() => Boolean, { nullable: true }) + @Field(() => Boolean, { nullable: true, defaultValue: true }) withExpired?: boolean - @Field(() => Boolean, { nullable: true }) + @Field(() => Boolean, { nullable: true, defaultValue: true }) withRedeemed?: boolean } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index e58ab741e..6760338bf 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -381,7 +381,7 @@ export class AdminResolver { @Args() { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, @Args() - { withDeleted = true, withExpired = true, withRedeemed = true }: TransactionLinkFilters, + filters: TransactionLinkFilters, @Arg('userId', () => Int) userId: number, ): Promise { const user = await dbUser.findOneOrFail({ id: userId }) @@ -392,11 +392,11 @@ export class AdminResolver { } = { userId, } - if (!withRedeemed) where.redeemedBy = null - if (!withExpired) where.validUntil = MoreThan(new Date()) + if (!filters.withRedeemed) where.redeemedBy = null + if (!filters.withExpired) where.validUntil = MoreThan(new Date()) const transactionLinks = await dbTransactionLink.find({ where, - withDeleted, + withDeleted: filters.withDeleted, order: { createdAt: order, },