From 93c2d6814ad1952105d1fbdc05f94ef174712c10 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 18 Jul 2022 11:27:44 +0200
Subject: [PATCH] Change the listContribution query to give back
 ContributionListResult object with linkCount.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 12 ++++++++----
 backend/src/seeds/graphql/queries.ts                 |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index d71ecac59..c834904d6 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -2,6 +2,7 @@ import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
 import { Contribution as dbContribution } from '@entity/Contribution'
+import { User as dbUser } from '@entity/User'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { FindOperator, IsNull } from '@dbTools/typeorm'
 import ContributionArgs from '@arg/ContributionArgs'
@@ -39,21 +40,21 @@ export class ContributionResolver {
   }
 
   @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
-  @Query(() => [Contribution])
+  @Query(() => ContributionListResult)
   async listContributions(
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
     @Arg('filterConfirmed', () => Boolean)
     filterConfirmed: boolean | null,
     @Ctx() context: Context,
-  ): Promise<Contribution[]> {
+  ): Promise<ContributionListResult> {
     const user = getUser(context)
     const where: {
       userId: number
       confirmedBy?: FindOperator<number> | null
     } = { userId: user.id }
     if (filterConfirmed) where.confirmedBy = IsNull()
-    const contributions = await dbContribution.find({
+    const [contributions, count] = await dbContribution.findAndCount({
       where,
       order: {
         createdAt: order,
@@ -62,7 +63,10 @@ export class ContributionResolver {
       skip: (currentPage - 1) * pageSize,
       take: pageSize,
     })
-    return contributions.map((contribution) => new Contribution(contribution, new User(user)))
+    return new ContributionListResult(
+      count,
+      contributions.map((contribution) => new Contribution(contribution, new User(user))),
+    )
   }
 
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTIONS])
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index deae5f97b..e18d6b303 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -185,9 +185,12 @@ export const listContributions = gql`
       order: $order
       filterConfirmed: $filterConfirmed
     ) {
-      id
-      amount
-      memo
+      linkCount
+      linkList {
+        id
+        amount
+        memo
+      }
     }
   }
 `