From cac7f5865a51abd8a433277213ffe430b0532300 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Wed, 1 Nov 2023 09:43:36 +0100 Subject: [PATCH] fix default value --- backend/src/graphql/arg/Paginated.ts | 4 ++-- backend/src/graphql/resolver/util/findContributions.ts | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts index 6bb31a6b8..f4e5cf4a6 100644 --- a/backend/src/graphql/arg/Paginated.ts +++ b/backend/src/graphql/arg/Paginated.ts @@ -10,9 +10,9 @@ export class Paginated { @IsPositive() currentPage: number - @Field(() => Int, { defaultValue: 3 }) + @Field(() => Int, { nullable: true }) @IsPositive() - pageSize: number + pageSize?: number @Field(() => Order, { defaultValue: Order.DESC }) @IsEnum(Order) diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index 48d66d883..77ef0c298 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -28,7 +28,7 @@ function joinRelationsRecursive( } export const findContributions = async ( - paginate: Paginated, + { pageSize = 3, currentPage, order }: Paginated, filter: SearchContributionsFilterArgs, withDeleted = false, relations: Relations | undefined = undefined, @@ -61,9 +61,9 @@ export const findContributions = async ( ) } return queryBuilder - .orderBy('Contribution.createdAt', paginate.order) - .addOrderBy('Contribution.id', paginate.order) - .skip((paginate.currentPage - 1) * paginate.pageSize) - .take(paginate.pageSize) + .orderBy('Contribution.createdAt', order) + .addOrderBy('Contribution.id', order) + .skip((currentPage - 1) * pageSize) + .take(pageSize) .getManyAndCount() }