From b604be584780e774789e3a52dd333cb0c6011e4f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:16:53 +0100
Subject: [PATCH 01/12] object as arg for find contributions

---
 .../graphql/resolver/ContributionResolver.ts  | 27 +++++++++----------
 .../resolver/util/findContributions.ts        | 27 ++++++++++++-------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ab177d759..5946b0237 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -135,15 +135,15 @@ export class ContributionResolver {
   ): Promise<ContributionListResult> {
     const user = getUser(context)
 
-    const [dbContributions, count] = await findContributions(
+    const [dbContributions, count] = await findContributions({
       order,
       currentPage,
       pageSize,
-      true,
-      ['messages'],
-      user.id,
+      withDeleted: true,
+      relations: ['messages'],
+      userId: user.id,
       statusFilter,
-    )
+    })
     return new ContributionListResult(
       count,
       dbContributions.map((contribution) => new Contribution(contribution, user)),
@@ -158,15 +158,13 @@ export class ContributionResolver {
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
     statusFilter?: ContributionStatus[],
   ): Promise<ContributionListResult> {
-    const [dbContributions, count] = await findContributions(
+    const [dbContributions, count] = await findContributions({
       order,
       currentPage,
       pageSize,
-      false,
-      ['user'],
-      undefined,
+      relations: ['user'],
       statusFilter,
-    )
+    })
 
     return new ContributionListResult(
       count,
@@ -386,15 +384,14 @@ export class ContributionResolver {
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
     statusFilter?: ContributionStatus[],
   ): Promise<ContributionListResult> {
-    const [dbContributions, count] = await findContributions(
+    const [dbContributions, count] = await findContributions({
       order,
       currentPage,
       pageSize,
-      true,
-      ['user'],
-      undefined,
+      withDeleted: true,
+      relations: ['user'],
       statusFilter,
-    )
+    })
 
     return new ContributionListResult(
       count,
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 5201284aa..48f08f041 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -3,16 +3,24 @@ import { Order } from '@enum/Order'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { In } from '@dbTools/typeorm'
 
+interface FindContributionsOptions {
+  order: Order
+  currentPage: number
+  pageSize: number
+  withDeleted?: boolean
+  relations?: string[]
+  userId?: number
+  statusFilter?: ContributionStatus[]
+}
+
 export const findContributions = async (
-  order: Order,
-  currentPage: number,
-  pageSize: number,
-  withDeleted: boolean,
-  relations: string[],
-  userId?: number,
-  statusFilter?: ContributionStatus[],
-): Promise<[DbContribution[], number]> =>
-  DbContribution.findAndCount({
+  options: FindContributionsOptions,
+): Promise<[DbContribution[], number]> => {
+  const { order, currentPage, pageSize, withDeleted, relations, userId, statusFilter } = {
+    withDeleted: false,
+    ...options,
+  }
+  return DbContribution.findAndCount({
     where: {
       ...(statusFilter && statusFilter.length && { contributionStatus: In(statusFilter) }),
       ...(userId && { userId }),
@@ -26,3 +34,4 @@ export const findContributions = async (
     skip: (currentPage - 1) * pageSize,
     take: pageSize,
   })
+}

From e48bbd7b47baf70857aac67506018b1aa52e29ae Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:33:18 +0100
Subject: [PATCH 02/12] rename admin list all contributions query

---
 ...ributions.js => adminListContributions.js} |  4 ++--
 admin/src/pages/CreationConfirm.spec.js       | 20 +++++++++----------
 admin/src/pages/CreationConfirm.vue           | 10 +++++-----
 admin/src/pages/Overview.spec.js              | 14 ++++++-------
 admin/src/pages/Overview.vue                  |  8 ++++----
 backend/src/auth/RIGHTS.ts                    |  2 +-
 .../resolver/ContributionResolver.test.ts     | 20 +++++++++----------
 .../graphql/resolver/ContributionResolver.ts  |  6 +++---
 backend/src/seeds/graphql/queries.ts          |  4 ++--
 9 files changed, 44 insertions(+), 44 deletions(-)
 rename admin/src/graphql/{adminListAllContributions.js => adminListContributions.js} (88%)

diff --git a/admin/src/graphql/adminListAllContributions.js b/admin/src/graphql/adminListContributions.js
similarity index 88%
rename from admin/src/graphql/adminListAllContributions.js
rename to admin/src/graphql/adminListContributions.js
index cd47cd1d4..7b6848bd5 100644
--- a/admin/src/graphql/adminListAllContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -1,13 +1,13 @@
 import gql from 'graphql-tag'
 
-export const adminListAllContributions = gql`
+export const adminListContributions = gql`
   query (
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
   ) {
-    adminListAllContributions(
+    adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 87f94e91f..c9d9661c2 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { denyContribution } from '../graphql/denyContribution'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
 import VueApollo from 'vue-apollo'
@@ -38,7 +38,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    adminListAllContributions: {
+    adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -92,14 +92,14 @@ const defaultData = () => {
 
 describe('CreationConfirm', () => {
   let wrapper
-  const adminListAllContributionsMock = jest.fn()
+  const adminListContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
   const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
-    adminListAllContributions,
-    adminListAllContributionsMock
+    adminListContributions,
+    adminListContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -337,7 +337,7 @@ describe('CreationConfirm', () => {
         })
 
         it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
+          expect(adminListContributionsMock).toBeCalledWith({
             currentPage: 1,
             order: 'DESC',
             pageSize: 25,
@@ -352,7 +352,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -368,7 +368,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -384,7 +384,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
@@ -400,7 +400,7 @@ describe('CreationConfirm', () => {
           })
 
           it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
+            expect(adminListContributionsMock).toBeCalledWith({
               currentPage: 1,
               order: 'DESC',
               pageSize: 25,
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55b819268..aad03ffde 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -73,7 +73,7 @@
 <script>
 import Overlay from '../components/Overlay'
 import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { denyContribution } from '../graphql/denyContribution'
@@ -384,7 +384,7 @@ export default {
   apollo: {
     ListAllContributions: {
       query() {
-        return adminListAllContributions
+        return adminListContributions
       },
       variables() {
         return {
@@ -394,9 +394,9 @@ export default {
         }
       },
       fetchPolicy: 'no-cache',
-      update({ adminListAllContributions }) {
-        this.rows = adminListAllContributions.contributionCount
-        this.items = adminListAllContributions.contributionList
+      update({ adminListContributions }) {
+        this.rows = adminListContributions.contributionCount
+        this.items = adminListContributions.contributionList
       },
       error({ message }) {
         this.toastError(message)
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index beb5bc2dd..2f4126f2b 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import Overview from './Overview'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 import VueApollo from 'vue-apollo'
 import { createMockClient } from 'mock-apollo-client'
 import { toastErrorSpy } from '../../test/testSetup'
@@ -30,7 +30,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    adminListAllContributions: {
+    adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -84,11 +84,11 @@ const defaultData = () => {
 
 describe('Overview', () => {
   let wrapper
-  const adminListAllContributionsMock = jest.fn()
+  const adminListContributionsMock = jest.fn()
 
   mockClient.setRequestHandler(
-    adminListAllContributions,
-    adminListAllContributionsMock
+    adminListContributions,
+    adminListContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -109,8 +109,8 @@ describe('Overview', () => {
       })
     })
 
-    it('calls the adminListAllContributions query', () => {
-      expect(adminListAllContributionsMock).toBeCalledWith({
+    it('calls the adminListContributions query', () => {
+      expect(adminListContributionsMock).toBeCalledWith({
         currentPage: 1,
         order: 'DESC',
         pageSize: 25,
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index c5316a35b..90924c9a9 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -31,7 +31,7 @@
   </div>
 </template>
 <script>
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
 
 export default {
   name: 'overview',
@@ -43,7 +43,7 @@ export default {
   apollo: {
     AllContributions: {
       query() {
-        return adminListAllContributions
+        return adminListContributions
       },
       variables() {
         // may be at some point we need a pagination here
@@ -51,8 +51,8 @@ export default {
           statusFilter: this.statusFilter,
         }
       },
-      update({ adminListAllContributions }) {
-        this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+      update({ adminListContributions }) {
+        this.$store.commit('setOpenCreations', adminListContributions.contributionCount)
       },
       error({ message }) {
         this.toastError(message)
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 8b0e82c86..58a762028 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -44,7 +44,7 @@ export enum RIGHTS {
   ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION',
   ADMIN_UPDATE_CONTRIBUTION = 'ADMIN_UPDATE_CONTRIBUTION',
   ADMIN_DELETE_CONTRIBUTION = 'ADMIN_DELETE_CONTRIBUTION',
-  LIST_UNCONFIRMED_CONTRIBUTIONS = 'LIST_UNCONFIRMED_CONTRIBUTIONS',
+  ADMIN_LIST_CONTRIBUTIONS = 'ADMIN_LIST_CONTRIBUTIONS',
   CONFIRM_CONTRIBUTION = 'CONFIRM_CONTRIBUTION',
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
   CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST',
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index ed4cdffa0..249e15c91 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -22,7 +22,7 @@ import {
 import {
   listAllContributions,
   listContributions,
-  adminListAllContributions,
+  adminListContributions,
 } from '@/seeds/graphql/queries'
 import {
   sendContributionConfirmedEmail,
@@ -2656,12 +2656,12 @@ describe('ContributionResolver', () => {
     })
   })
 
-  describe('adminListAllContribution', () => {
+  describe('adminListContributions', () => {
     describe('unauthenticated', () => {
       it('returns an error', async () => {
         await expect(
           query({
-            query: adminListAllContributions,
+            query: adminListContributions,
           }),
         ).resolves.toEqual(
           expect.objectContaining({
@@ -2686,7 +2686,7 @@ describe('ContributionResolver', () => {
       it('returns an error', async () => {
         await expect(
           query({
-            query: adminListAllContributions,
+            query: adminListContributions,
           }),
         ).resolves.toEqual(
           expect.objectContaining({
@@ -2710,9 +2710,9 @@ describe('ContributionResolver', () => {
 
       it('returns 17 creations in total', async () => {
         const {
-          data: { adminListAllContributions: contributionListObject },
-        }: { data: { adminListAllContributions: ContributionListResult } } = await query({
-          query: adminListAllContributions,
+          data: { adminListContributions: contributionListObject },
+        }: { data: { adminListContributions: ContributionListResult } } = await query({
+          query: adminListContributions,
         })
         expect(contributionListObject.contributionList).toHaveLength(17)
         expect(contributionListObject).toMatchObject({
@@ -2877,9 +2877,9 @@ describe('ContributionResolver', () => {
 
       it('returns two pending creations with page size set to 2', async () => {
         const {
-          data: { adminListAllContributions: contributionListObject },
-        }: { data: { adminListAllContributions: ContributionListResult } } = await query({
-          query: adminListAllContributions,
+          data: { adminListContributions: contributionListObject },
+        }: { data: { adminListContributions: ContributionListResult } } = await query({
+          query: adminListContributions,
           variables: {
             currentPage: 1,
             pageSize: 2,
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 5946b0237..4c585d2d9 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -376,9 +376,9 @@ export class ContributionResolver {
     return result
   }
 
-  @Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS])
-  @Query(() => ContributionListResult) // [UnconfirmedContribution]
-  async adminListAllContributions(
+  @Authorized([RIGHTS.ADMIN_LIST_CONTRIBUTIONS])
+  @Query(() => ContributionListResult)
+  async adminListContributions(
     @Args()
     { currentPage = 1, pageSize = 3, order = Order.DESC }: Paginated,
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 6e2e58c67..22e0e9186 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -204,14 +204,14 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF
 `
 // from admin interface
 
-export const adminListAllContributions = gql`
+export const adminListContributions = gql`
   query (
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
   ) {
-    adminListAllContributions(
+    adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order

From ecd9efac4f0d5d254aa22cd0af68a03cb737c4ad Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:47:11 +0100
Subject: [PATCH 03/12] add optional arg user id to admin list contributions
 query

---
 backend/src/graphql/resolver/ContributionResolver.ts | 3 +++
 backend/src/seeds/graphql/queries.ts                 | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 4c585d2d9..016b850a9 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -383,12 +383,15 @@ export class ContributionResolver {
     { currentPage = 1, pageSize = 3, order = Order.DESC }: Paginated,
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
     statusFilter?: ContributionStatus[],
+    @Arg('userId', () => Int, { nullable: true })
+    userId?: number,
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await findContributions({
       order,
       currentPage,
       pageSize,
       withDeleted: true,
+      userId,
       relations: ['user'],
       statusFilter,
     })
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 22e0e9186..b7324e029 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -210,12 +210,14 @@ export const adminListContributions = gql`
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
+    $userId: Int
   ) {
     adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
       statusFilter: $statusFilter
+      userId: $userId
     ) {
       contributionCount
       contributionList {

From 77a415236ee03629a599665c5c0b3ecb0f500a97 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:51:55 +0100
Subject: [PATCH 04/12] use admin list contributions for contribution
 transaction list

---
 admin/src/components/CreationTransactionList.spec.js | 2 +-
 admin/src/components/CreationTransactionList.vue     | 8 ++++----
 admin/src/graphql/adminListContributions.js          | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 5950f7d62..5bfe2e79a 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -6,7 +6,7 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    creationTransactionList: {
+    adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 950afcebc..8dca5a6c8 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -42,7 +42,7 @@
   </div>
 </template>
 <script>
-import { creationTransactionList } from '../graphql/creationTransactionList'
+import { adminListContributions } from '../graphql/adminListContributions'
 export default {
   name: 'CreationTransactionList',
   props: {
@@ -96,7 +96,7 @@ export default {
     getTransactions() {
       this.$apollo
         .query({
-          query: creationTransactionList,
+          query: adminListContributions,
           variables: {
             currentPage: this.currentPage,
             pageSize: this.perPage,
@@ -105,8 +105,8 @@ export default {
           },
         })
         .then((result) => {
-          this.rows = result.data.creationTransactionList.contributionCount
-          this.items = result.data.creationTransactionList.contributionList
+          this.rows = result.data.adminListContributions.contributionCount
+          this.items = result.data.adminListContributions.contributionList
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index 7b6848bd5..9d63bf6a9 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -6,12 +6,14 @@ export const adminListContributions = gql`
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
+    $userId: Int
   ) {
     adminListContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
       statusFilter: $statusFilter
+      userId: $userId
     ) {
       contributionCount
       contributionList {

From d370f106e09d05c0304e983b0e8a365b400293fd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:53:24 +0100
Subject: [PATCH 05/12] remove admin creationTransactionList

---
 admin/src/graphql/creationTransactionList.js | 23 --------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 admin/src/graphql/creationTransactionList.js

diff --git a/admin/src/graphql/creationTransactionList.js b/admin/src/graphql/creationTransactionList.js
deleted file mode 100644
index fc3a80b18..000000000
--- a/admin/src/graphql/creationTransactionList.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import gql from 'graphql-tag'
-
-export const creationTransactionList = gql`
-  query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC, $userId: Int!) {
-    creationTransactionList(
-      currentPage: $currentPage
-      pageSize: $pageSize
-      order: $order
-      userId: $userId
-    ) {
-      contributionCount
-      contributionList {
-        id
-        amount
-        createdAt
-        confirmedAt
-        contributionDate
-        memo
-        state
-      }
-    }
-  }
-`

From 5d6caee37d9b5605e83fcd8817444cb49212ad7a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:56:25 +0100
Subject: [PATCH 06/12] remove creation transaction list

---
 backend/src/auth/RIGHTS.ts                    |  1 -
 .../graphql/resolver/ContributionResolver.ts  | 27 -------------------
 2 files changed, 28 deletions(-)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 58a762028..e0c4a39a4 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -47,7 +47,6 @@ export enum RIGHTS {
   ADMIN_LIST_CONTRIBUTIONS = 'ADMIN_LIST_CONTRIBUTIONS',
   CONFIRM_CONTRIBUTION = 'CONFIRM_CONTRIBUTION',
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
-  CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST',
   LIST_TRANSACTION_LINKS_ADMIN = 'LIST_TRANSACTION_LINKS_ADMIN',
   CREATE_CONTRIBUTION_LINK = 'CREATE_CONTRIBUTION_LINK',
   DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 016b850a9..0936ac9e7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -551,33 +551,6 @@ export class ContributionResolver {
     return true
   }
 
-  @Authorized([RIGHTS.CREATION_TRANSACTION_LIST])
-  @Query(() => ContributionListResult)
-  async creationTransactionList(
-    @Args()
-    { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
-    @Arg('userId', () => Int) userId: number,
-  ): Promise<ContributionListResult> {
-    const offset = (currentPage - 1) * pageSize
-    const [contributionResult, count] = await getConnection()
-      .createQueryBuilder()
-      .select('c')
-      .from(DbContribution, 'c')
-      .leftJoinAndSelect('c.user', 'u')
-      .where(`user_id = ${userId}`)
-      .withDeleted()
-      .limit(pageSize)
-      .offset(offset)
-      .orderBy('c.created_at', order)
-      .getManyAndCount()
-
-    return new ContributionListResult(
-      count,
-      contributionResult.map((contribution) => new Contribution(contribution, contribution.user)),
-    )
-    // return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
-  }
-
   @Authorized([RIGHTS.OPEN_CREATIONS])
   @Query(() => [OpenCreation])
   async openCreations(

From 1f28eb9482587d5727119a6635b0d005a1f8be5a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 17:58:57 +0100
Subject: [PATCH 07/12] coverage backend to 81%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5eadf1e94..a02aa4b5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -427,7 +427,7 @@ jobs:
           report_name: Coverage Backend
           type: lcov
           result_path: ./backend/coverage/lcov.info
-          min_coverage: 80
+          min_coverage: 81
           token: ${{ github.token }}
 
   ##########################################################################

From b28de4c811c2e18cd8e61dbd984ed15fa776c649 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 7 Mar 2023 18:16:32 +0100
Subject: [PATCH 08/12] use apollo correctly

---
 .../CreationTransactionList.spec.js           | 136 +++++++++++-------
 .../components/CreationTransactionList.vue    |  47 +++---
 2 files changed, 103 insertions(+), 80 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 5bfe2e79a..e88d7cc22 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -1,43 +1,75 @@
 import { mount } from '@vue/test-utils'
 import CreationTransactionList from './CreationTransactionList'
 import { toastErrorSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminListContributions } from '../graphql/adminListContributions'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
-const apolloQueryMock = jest.fn().mockResolvedValue({
-  data: {
+const defaultData = () => {
+  return {
     adminListContributions: {
       contributionCount: 2,
       contributionList: [
         {
           id: 1,
-          amount: 5.8,
-          createdAt: '2022-09-21T11:09:51.000Z',
-          confirmedAt: null,
-          contributionDate: '2022-08-01T00:00:00.000Z',
-          memo: 'für deine Hilfe, Fräulein Rottenmeier',
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
+          userId: 99,
+          email: 'bibi@bloxberg.de',
+          amount: 500,
+          memo: 'Danke für alles',
+          date: new Date(),
+          moderator: 1,
           state: 'PENDING',
+          creation: [500, 500, 500],
+          messagesCount: 0,
+          deniedBy: null,
+          deniedAt: null,
+          confirmedBy: null,
+          confirmedAt: null,
+          contributionDate: new Date(),
+          deletedBy: null,
+          deletedAt: null,
+          createdAt: new Date(),
         },
         {
           id: 2,
-          amount: '47',
-          createdAt: '2022-09-21T11:09:28.000Z',
-          confirmedAt: '2022-09-21T11:09:28.000Z',
-          contributionDate: '2022-08-01T00:00:00.000Z',
-          memo: 'für deine Hilfe, Frau Holle',
-          state: 'CONFIRMED',
+          firstName: 'Räuber',
+          lastName: 'Hotzenplotz',
+          userId: 100,
+          email: 'raeuber@hotzenplotz.de',
+          amount: 1000000,
+          memo: 'Gut Ergattert',
+          date: new Date(),
+          moderator: 1,
+          state: 'PENDING',
+          creation: [500, 500, 500],
+          messagesCount: 0,
+          deniedBy: null,
+          deniedAt: null,
+          confirmedBy: null,
+          confirmedAt: new Date(),
+          contributionDate: new Date(),
+          deletedBy: null,
+          deletedAt: null,
+          createdAt: new Date(),
         },
       ],
     },
-  },
-})
+  }
+}
 
 const mocks = {
   $d: jest.fn((t) => t),
   $t: jest.fn((t) => t),
-  $apollo: {
-    query: apolloQueryMock,
-  },
 }
 
 const propsData = {
@@ -48,55 +80,53 @@ const propsData = {
 describe('CreationTransactionList', () => {
   let wrapper
 
+  const adminListContributionsMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminListContributions,
+    adminListContributionsMock
+      .mockRejectedValueOnce({ message: 'Ouch!' })
+      .mockResolvedValue({ data: defaultData() }),
+  )
+
   const Wrapper = () => {
-    return mount(CreationTransactionList, { localVue, mocks, propsData })
+    return mount(CreationTransactionList, { localVue, mocks, propsData, apolloProvider })
   }
 
   describe('mount', () => {
     beforeEach(() => {
+      jest.clearAllMocks()
       wrapper = Wrapper()
     })
 
-    it('sends query to Apollo when created', () => {
-      expect(apolloQueryMock).toBeCalledWith(
-        expect.objectContaining({
-          variables: {
-            currentPage: 1,
-            pageSize: 10,
-            order: 'DESC',
-            userId: 1,
-          },
-        }),
-      )
-    })
-
-    it('has two values for the transaction', () => {
-      expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
-    })
-
-    describe('query transaction with error', () => {
-      beforeEach(() => {
-        apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
-        wrapper = Wrapper()
-      })
-
-      it('calls the API', () => {
-        expect(apolloQueryMock).toBeCalled()
-      })
-
+    describe('server error', () => {
       it('toast error', () => {
-        expect(toastErrorSpy).toBeCalledWith('OUCH!')
+        expect(toastErrorSpy).toBeCalledWith('Ouch!')
       })
     })
 
-    describe('watch currentPage', () => {
-      beforeEach(async () => {
-        jest.clearAllMocks()
-        await wrapper.setData({ currentPage: 2 })
+    describe('sever success', () => {
+      it('sends query to Apollo when created', () => {
+        expect(adminListContributionsMock).toBeCalledWith({
+          currentPage: 1,
+          pageSize: 10,
+          order: 'DESC',
+          userId: 1,
+        })
       })
 
-      it('returns the string in normal order if reversed property is not true', () => {
-        expect(wrapper.vm.currentPage).toBe(2)
+      it('has two values for the transaction', () => {
+        expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
+      })
+
+      describe('watch currentPage', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.setData({ currentPage: 2 })
+        })
+
+        it('returns the string in normal order if reversed property is not true', () => {
+          expect(wrapper.vm.currentPage).toBe(2)
+        })
       })
     })
   })
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 8dca5a6c8..a4849c87e 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -92,33 +92,26 @@ export default {
       ],
     }
   },
-  methods: {
-    getTransactions() {
-      this.$apollo
-        .query({
-          query: adminListContributions,
-          variables: {
-            currentPage: this.currentPage,
-            pageSize: this.perPage,
-            order: 'DESC',
-            userId: parseInt(this.userId),
-          },
-        })
-        .then((result) => {
-          this.rows = result.data.adminListContributions.contributionCount
-          this.items = result.data.adminListContributions.contributionList
-        })
-        .catch((error) => {
-          this.toastError(error.message)
-        })
-    },
-  },
-  created() {
-    this.getTransactions()
-  },
-  watch: {
-    currentPage() {
-      this.getTransactions()
+  apollo: {
+    AdminListContributions: {
+      query() {
+        return adminListContributions
+      },
+      variables() {
+        return {
+          currentPage: this.currentPage,
+          pageSize: this.perPage,
+          order: 'DESC',
+          userId: parseInt(this.userId),
+        }
+      },
+      update({ adminListContributions }) {
+        this.rows = adminListContributions.contributionCount
+        this.items = adminListContributions.contributionList
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
     },
   },
 }

From d9b19fbfa0699cd0938f4cda8481bc54eb71125c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:44:57 +0100
Subject: [PATCH 09/12] liniting

---
 admin/src/pages/CreationConfirm.vue | 670 ++++++++++++++--------------
 1 file changed, 335 insertions(+), 335 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 92dc01750..b367d1b7f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -83,343 +83,343 @@
   </div>
 </template>
 <script>
- import Overlay from '../components/Overlay'
- import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
- import { adminListContributions } from '../graphql/adminListContributions'
- import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
- import { confirmContribution } from '../graphql/confirmContribution'
- import { denyContribution } from '../graphql/denyContribution'
+import Overlay from '../components/Overlay'
+import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
+import { adminListContributions } from '../graphql/adminListContributions'
+import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
+import { confirmContribution } from '../graphql/confirmContribution'
+import { denyContribution } from '../graphql/denyContribution'
 
- const FILTER_TAB_MAP = [
-   ['IN_PROGRESS', 'PENDING'],
-   ['CONFIRMED'],
-   ['DENIED'],
-   ['DELETED'],
-   ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
- ]
+const FILTER_TAB_MAP = [
+  ['IN_PROGRESS', 'PENDING'],
+  ['CONFIRMED'],
+  ['DENIED'],
+  ['DELETED'],
+  ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
+]
 
- export default {
-   name: 'CreationConfirm',
-   components: {
-     OpenCreationsTable,
-     Overlay,
-   },
-   data() {
-     return {
-       tabIndex: 0,
-       items: [],
-       overlay: false,
-       item: {},
-       variant: 'confirm',
-       rows: 0,
-       currentPage: 1,
-       pageSize: 25,
-     }
-   },
-   methods: {
-     deleteCreation() {
-       this.$apollo
-           .mutate({
-             mutation: adminDeleteContribution,
-             variables: {
-               id: this.item.id,
-             },
-           })
-           .then((result) => {
-             this.overlay = false
-             this.updatePendingCreations(this.item.id)
-             this.toastSuccess(this.$t('creation_form.toasted_delete'))
-           })
-           .catch((error) => {
-             this.overlay = false
-             this.toastError(error.message)
-           })
-     },
-     denyCreation() {
-       this.$apollo
-           .mutate({
-             mutation: denyContribution,
-             variables: {
-               id: this.item.id,
-             },
-           })
-           .then((result) => {
-             this.overlay = false
-             this.updatePendingCreations(this.item.id)
-             this.toastSuccess(this.$t('creation_form.toasted_denied'))
-           })
-           .catch((error) => {
-             this.overlay = false
-             this.toastError(error.message)
-           })
-     },
-     confirmCreation() {
-       this.$apollo
-           .mutate({
-             mutation: confirmContribution,
-             variables: {
-               id: this.item.id,
-             },
-           })
-           .then((result) => {
-             this.overlay = false
-             this.updatePendingCreations(this.item.id)
-             this.toastSuccess(this.$t('creation_form.toasted_created'))
-           })
-           .catch((error) => {
-             this.overlay = false
-             this.toastError(error.message)
-           })
-     },
-     updatePendingCreations(id) {
-       this.items = this.items.filter((obj) => obj.id !== id)
-       this.$store.commit('openCreationsMinus', 1)
-     },
-     showOverlay(item, variant) {
-       this.overlay = true
-       this.item = item
-       this.variant = variant
-     },
-     updateStatus(id) {
-       this.items.find((obj) => obj.id === id).messagesCount++
-       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
-     },
-     formatDateOrDash(value) {
-       return value ? this.$d(new Date(value), 'short') : '—'
-     },
-   },
-   computed: {
-     fields() {
-       return [
-         [
-           // open contributions
-           { key: 'bookmark', label: this.$t('delete') },
-           { key: 'deny', label: this.$t('deny') },
-           { key: 'firstName', label: this.$t('firstname') },
-           { key: 'lastName', label: this.$t('lastname') },
-           {
-             key: 'amount',
-             label: this.$t('creation'),
-             formatter: (value) => {
-               return value + ' GDD'
-             },
-           },
-           { key: 'memo', label: this.$t('text'), class: 'text-break' },
-           {
-             key: 'contributionDate',
-             label: this.$t('created'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           { key: 'moderator', label: this.$t('moderator') },
-           { key: 'editCreation', label: this.$t('chat') },
-           { key: 'confirm', label: this.$t('save') },
-         ],
-         [
-           // confirmed contributions
-           { key: 'firstName', label: this.$t('firstname') },
-           { key: 'lastName', label: this.$t('lastname') },
-           {
-             key: 'amount',
-             label: this.$t('creation'),
-             formatter: (value) => {
-               return value + ' GDD'
-             },
-           },
-           { key: 'memo', label: this.$t('text'), class: 'text-break' },
-           {
-             key: 'contributionDate',
-             label: this.$t('created'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'createdAt',
-             label: this.$t('createdAt'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'confirmedAt',
-             label: this.$t('contributions.confirms'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           { key: 'confirmedBy', label: this.$t('moderator') },
-           { key: 'chatCreation', label: this.$t('chat') },
-         ],
-         [
-           // denied contributions
-           { key: 'firstName', label: this.$t('firstname') },
-           { key: 'lastName', label: this.$t('lastname') },
-           {
-             key: 'amount',
-             label: this.$t('creation'),
-             formatter: (value) => {
-               return value + ' GDD'
-             },
-           },
-           { key: 'memo', label: this.$t('text'), class: 'text-break' },
-           {
-             key: 'contributionDate',
-             label: this.$t('created'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'createdAt',
-             label: this.$t('createdAt'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'deniedAt',
-             label: this.$t('contributions.denied'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           { key: 'deniedBy', label: this.$t('moderator') },
-           { key: 'chatCreation', label: this.$t('chat') },
-         ],
-         [
-           // deleted contributions
-           { key: 'firstName', label: this.$t('firstname') },
-           { key: 'lastName', label: this.$t('lastname') },
-           {
-             key: 'amount',
-             label: this.$t('creation'),
-             formatter: (value) => {
-               return value + ' GDD'
-             },
-           },
-           { key: 'memo', label: this.$t('text'), class: 'text-break' },
-           {
-             key: 'contributionDate',
-             label: this.$t('created'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'createdAt',
-             label: this.$t('createdAt'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'deletedAt',
-             label: this.$t('contributions.deleted'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           { key: 'deletedBy', label: this.$t('moderator') },
-           { key: 'chatCreation', label: this.$t('chat') },
-         ],
-         [
-           // all contributions
-           { key: 'state', label: this.$t('status') },
-           { key: 'firstName', label: this.$t('firstname') },
-           { key: 'lastName', label: this.$t('lastname') },
-           {
-             key: 'amount',
-             label: this.$t('creation'),
-             formatter: (value) => {
-               return value + ' GDD'
-             },
-           },
-           { key: 'memo', label: this.$t('text'), class: 'text-break' },
-           {
-             key: 'contributionDate',
-             label: this.$t('created'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'createdAt',
-             label: this.$t('createdAt'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           {
-             key: 'confirmedAt',
-             label: this.$t('contributions.confirms'),
-             formatter: (value) => {
-               return this.formatDateOrDash(value)
-             },
-           },
-           { key: 'confirmedBy', label: this.$t('moderator') },
-           { key: 'chatCreation', label: this.$t('chat') },
-         ],
-       ][this.tabIndex]
-     },
-     statusFilter() {
-       return FILTER_TAB_MAP[this.tabIndex]
-     },
-     overlayTitle() {
-       return `overlay.${this.variant}.title`
-     },
-     overlayText() {
-       return `overlay.${this.variant}.text`
-     },
-     overlayQuestion() {
-       return `overlay.${this.variant}.question`
-     },
-     overlayBtnText() {
-       return `overlay.${this.variant}.yes`
-     },
-     overlayEvent() {
-       return this[`${this.variant}Creation`]
-     },
-     overlayIcon() {
-       switch (this.variant) {
-         case 'confirm':
-           return 'success'
-         case 'deny':
-           return 'warning'
-         case 'delete':
-           return 'danger'
-         default:
-           return 'info'
-       }
-     },
-   },
-   apollo: {
-     ListAllContributions: {
-       query() {
-         return adminListContributions
-       },
-       variables() {
-         return {
-           currentPage: this.currentPage,
-           pageSize: this.pageSize,
-           statusFilter: this.statusFilter,
-         }
-       },
-       fetchPolicy: 'no-cache',
-       update({ adminListContributions }) {
-         this.rows = adminListContributions.contributionCount
-         this.items = adminListContributions.contributionList
-         if (this.statusFilter === FILTER_TAB_MAP[0]) {
-           this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
-         }
-       },
-       error({ message }) {
-         this.toastError(message)
-       },
-     },
-   },
- }
+export default {
+  name: 'CreationConfirm',
+  components: {
+    OpenCreationsTable,
+    Overlay,
+  },
+  data() {
+    return {
+      tabIndex: 0,
+      items: [],
+      overlay: false,
+      item: {},
+      variant: 'confirm',
+      rows: 0,
+      currentPage: 1,
+      pageSize: 25,
+    }
+  },
+  methods: {
+    deleteCreation() {
+      this.$apollo
+        .mutate({
+          mutation: adminDeleteContribution,
+          variables: {
+            id: this.item.id,
+          },
+        })
+        .then((result) => {
+          this.overlay = false
+          this.updatePendingCreations(this.item.id)
+          this.toastSuccess(this.$t('creation_form.toasted_delete'))
+        })
+        .catch((error) => {
+          this.overlay = false
+          this.toastError(error.message)
+        })
+    },
+    denyCreation() {
+      this.$apollo
+        .mutate({
+          mutation: denyContribution,
+          variables: {
+            id: this.item.id,
+          },
+        })
+        .then((result) => {
+          this.overlay = false
+          this.updatePendingCreations(this.item.id)
+          this.toastSuccess(this.$t('creation_form.toasted_denied'))
+        })
+        .catch((error) => {
+          this.overlay = false
+          this.toastError(error.message)
+        })
+    },
+    confirmCreation() {
+      this.$apollo
+        .mutate({
+          mutation: confirmContribution,
+          variables: {
+            id: this.item.id,
+          },
+        })
+        .then((result) => {
+          this.overlay = false
+          this.updatePendingCreations(this.item.id)
+          this.toastSuccess(this.$t('creation_form.toasted_created'))
+        })
+        .catch((error) => {
+          this.overlay = false
+          this.toastError(error.message)
+        })
+    },
+    updatePendingCreations(id) {
+      this.items = this.items.filter((obj) => obj.id !== id)
+      this.$store.commit('openCreationsMinus', 1)
+    },
+    showOverlay(item, variant) {
+      this.overlay = true
+      this.item = item
+      this.variant = variant
+    },
+    updateStatus(id) {
+      this.items.find((obj) => obj.id === id).messagesCount++
+      this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
+    },
+    formatDateOrDash(value) {
+      return value ? this.$d(new Date(value), 'short') : '—'
+    },
+  },
+  computed: {
+    fields() {
+      return [
+        [
+          // open contributions
+          { key: 'bookmark', label: this.$t('delete') },
+          { key: 'deny', label: this.$t('deny') },
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'moderator', label: this.$t('moderator') },
+          { key: 'editCreation', label: this.$t('chat') },
+          { key: 'confirm', label: this.$t('save') },
+        ],
+        [
+          // confirmed contributions
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'createdAt',
+            label: this.$t('createdAt'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'confirmedAt',
+            label: this.$t('contributions.confirms'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'confirmedBy', label: this.$t('moderator') },
+          { key: 'chatCreation', label: this.$t('chat') },
+        ],
+        [
+          // denied contributions
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'createdAt',
+            label: this.$t('createdAt'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'deniedAt',
+            label: this.$t('contributions.denied'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'deniedBy', label: this.$t('moderator') },
+          { key: 'chatCreation', label: this.$t('chat') },
+        ],
+        [
+          // deleted contributions
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'createdAt',
+            label: this.$t('createdAt'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'deletedAt',
+            label: this.$t('contributions.deleted'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'deletedBy', label: this.$t('moderator') },
+          { key: 'chatCreation', label: this.$t('chat') },
+        ],
+        [
+          // all contributions
+          { key: 'state', label: this.$t('status') },
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'createdAt',
+            label: this.$t('createdAt'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'confirmedAt',
+            label: this.$t('contributions.confirms'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'confirmedBy', label: this.$t('moderator') },
+          { key: 'chatCreation', label: this.$t('chat') },
+        ],
+      ][this.tabIndex]
+    },
+    statusFilter() {
+      return FILTER_TAB_MAP[this.tabIndex]
+    },
+    overlayTitle() {
+      return `overlay.${this.variant}.title`
+    },
+    overlayText() {
+      return `overlay.${this.variant}.text`
+    },
+    overlayQuestion() {
+      return `overlay.${this.variant}.question`
+    },
+    overlayBtnText() {
+      return `overlay.${this.variant}.yes`
+    },
+    overlayEvent() {
+      return this[`${this.variant}Creation`]
+    },
+    overlayIcon() {
+      switch (this.variant) {
+        case 'confirm':
+          return 'success'
+        case 'deny':
+          return 'warning'
+        case 'delete':
+          return 'danger'
+        default:
+          return 'info'
+      }
+    },
+  },
+  apollo: {
+    ListAllContributions: {
+      query() {
+        return adminListContributions
+      },
+      variables() {
+        return {
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          statusFilter: this.statusFilter,
+        }
+      },
+      fetchPolicy: 'no-cache',
+      update({ adminListContributions }) {
+        this.rows = adminListContributions.contributionCount
+        this.items = adminListContributions.contributionList
+        if (this.statusFilter === FILTER_TAB_MAP[0]) {
+          this.$store.commit('setOpenCreations', adminListContributions.contributionCount)
+        }
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
+}
 </script>
 <style>
 #overlay {

From 66bfd6c88420d7225edd2d25d41f987512366fcf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 15:03:46 +0100
Subject: [PATCH 10/12] what the fuck

---
 .../src/graphql/resolver/util/findContributions.ts    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 48f08f041..a3c34cea1 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -7,10 +7,10 @@ interface FindContributionsOptions {
   order: Order
   currentPage: number
   pageSize: number
-  withDeleted?: boolean
-  relations?: string[]
-  userId?: number
-  statusFilter?: ContributionStatus[]
+  withDeleted?: boolean | null
+  relations?: string[] | null
+  userId?: number | null
+  statusFilter?: ContributionStatus[] | null
 }
 
 export const findContributions = async (
@@ -18,6 +18,7 @@ export const findContributions = async (
 ): Promise<[DbContribution[], number]> => {
   const { order, currentPage, pageSize, withDeleted, relations, userId, statusFilter } = {
     withDeleted: false,
+    relations: [],
     ...options,
   }
   return DbContribution.findAndCount({
@@ -25,7 +26,7 @@ export const findContributions = async (
       ...(statusFilter && statusFilter.length && { contributionStatus: In(statusFilter) }),
       ...(userId && { userId }),
     },
-    withDeleted: withDeleted,
+    withDeleted,
     order: {
       createdAt: order,
       id: order,

From a448272620dc416243158cbdd70be6de0440133e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 15:25:36 +0100
Subject: [PATCH 11/12] fixed build type check

---
 backend/src/graphql/resolver/util/findContributions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index a3c34cea1..1daa831c4 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -7,8 +7,8 @@ interface FindContributionsOptions {
   order: Order
   currentPage: number
   pageSize: number
-  withDeleted?: boolean | null
-  relations?: string[] | null
+  withDeleted?: boolean
+  relations?: string[]
   userId?: number | null
   statusFilter?: ContributionStatus[] | null
 }

From 5056dd64dc5efe91d74b7bbfb66a3933caa9206a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Mar 2023 14:38:11 +0100
Subject: [PATCH 12/12] coverage to 81%

---
 backend/jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/jest.config.js b/backend/jest.config.js
index cd63f11d8..66a883b51 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
   collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
   coverageThreshold: {
     global: {
-      lines: 80,
+      lines: 81,
     },
   },
   setupFiles: ['<rootDir>/test/testSetup.ts'],