diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts index f4e5cf4a6..c63416e7e 100644 --- a/backend/src/graphql/arg/Paginated.ts +++ b/backend/src/graphql/arg/Paginated.ts @@ -6,15 +6,15 @@ import { Order } from '@enum/Order' @ArgsType() export class Paginated { - @Field(() => Int, { defaultValue: 1 }) + @Field(() => Int, { nullable: true }) @IsPositive() - currentPage: number + currentPage?: number @Field(() => Int, { nullable: true }) @IsPositive() pageSize?: number - @Field(() => Order, { defaultValue: Order.DESC }) + @Field(() => Order, { nullable: true }) @IsEnum(Order) - order: Order + order?: Order } diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index 77ef0c298..9331111ee 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -7,6 +7,7 @@ import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArg import { Connection } from '@typeorm/connection' import { LogError } from '@/server/LogError' +import { Order } from '@/graphql/enum/Order' interface Relations { [key: string]: boolean | Relations @@ -28,7 +29,7 @@ function joinRelationsRecursive( } export const findContributions = async ( - { pageSize = 3, currentPage, order }: Paginated, + { pageSize = 3, currentPage = 1, order = Order.DESC }: Paginated, filter: SearchContributionsFilterArgs, withDeleted = false, relations: Relations | undefined = undefined,