From cac7f5865a51abd8a433277213ffe430b0532300 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Wed, 1 Nov 2023 09:43:36 +0100
Subject: [PATCH 1/3] 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()
 }

From d5a362bb59f694950ce24be0bcefd4bda20d146d Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Wed, 1 Nov 2023 09:47:06 +0100
Subject: [PATCH 2/3] make it complete

---
 backend/src/graphql/arg/Paginated.ts                   | 8 ++++----
 backend/src/graphql/resolver/util/findContributions.ts | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

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,

From e1249beaad75172baf4d9339d917a4586845f1cb Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Wed, 1 Nov 2023 09:51:35 +0100
Subject: [PATCH 3/3] fix linting

---
 backend/src/graphql/resolver/util/findContributions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 9331111ee..d02043ff6 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -6,8 +6,8 @@ import { Paginated } from '@arg/Paginated'
 import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'
 import { Connection } from '@typeorm/connection'
 
-import { LogError } from '@/server/LogError'
 import { Order } from '@/graphql/enum/Order'
+import { LogError } from '@/server/LogError'
 
 interface Relations {
   [key: string]: boolean | Relations