From 30c72bb7340381d2d32eeec14c0b91951d9ad2d5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 13 Dec 2022 10:10:42 +0100
Subject: [PATCH 01/36] Setup rejecctContribution method.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 15bdbfc2e..71c1d21b7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -252,4 +252,13 @@ export class ContributionResolver {
 
     return new UnconfirmedContribution(contributionToUpdate, user, creations)
   }
+
+  @Authorized([RIGHTS.REJECT_CONTRIBUTION])
+  @Mutation(() => Boolean)
+  async rejectContribution(
+    @Arg('id', () => Int) id: number,
+    @Ctx() context: Context,
+  ): Promise<boolean> {
+    return true
+  }
 }

From ca01e343942b1adeba6949581fa79bbcc60a7224 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 13 Dec 2022 10:17:35 +0100
Subject: [PATCH 02/36] Get adminUser and find contribution with specific id.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 71c1d21b7..a610c9bfd 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -259,6 +259,9 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
+    const user = getUser(context)
+
+    const contributionToUpdate = await dbContribution.findOne({ id })
     return true
   }
 }

From dabef05dc0ba0e35b9a389707f2b25b38294e947 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 20 Dec 2022 10:24:27 +0100
Subject: [PATCH 03/36] Change name of user to moderatorUser.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index feef8ea3c..15edaa9a9 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -686,9 +686,10 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const user = getUser(context)
+    const moderatorUser = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({ id })
+
     return true
   }
 }

From 853bfabd57bcb2f5ce7375d33f3b9ff57dfeb55d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 20 Dec 2022 12:09:59 +0100
Subject: [PATCH 04/36] Finish denie logic, add deniedAt IsNull() to queries.

---
 backend/src/graphql/model/Contribution.ts     |  8 +++++
 .../graphql/resolver/ContributionResolver.ts  | 30 ++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index cf57e632f..d71d2ce6b 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -18,6 +18,8 @@ export class Contribution {
     this.contributionDate = contribution.contributionDate
     this.state = contribution.contributionStatus
     this.messagesCount = contribution.messages ? contribution.messages.length : 0
+    this.deniedAt = contribution.deniedAt
+    this.deniedBy = contribution.deniedBy
   }
 
   @Field(() => Number)
@@ -47,6 +49,12 @@ export class Contribution {
   @Field(() => Number, { nullable: true })
   confirmedBy: number | null
 
+  @Field(() => Date, { nullable: true })
+  deniedAt: Date | null
+
+  @Field(() => Number, { nullable: true })
+  deniedBy: number | null
+
   @Field(() => Date)
   contributionDate: Date
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 15edaa9a9..ea12d1362 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -146,6 +146,7 @@ export class ContributionResolver {
     @Ctx() context: Context,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
+    // TODO: Check if deniedAt IsNull()
     const where: {
       userId: number
       confirmedBy?: FindOperator<number> | null
@@ -214,7 +215,7 @@ export class ContributionResolver {
     const user = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
-      where: { id: contributionId, confirmedAt: IsNull() },
+      where: { id: contributionId, confirmedAt: IsNull(), deniedAt: IsNull() },
     })
     if (!contributionToUpdate) {
       logger.error('No contribution found to given id')
@@ -406,7 +407,7 @@ export class ContributionResolver {
     const moderator = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
-      where: { id, confirmedAt: IsNull() },
+      where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
     })
     if (!contributionToUpdate) {
       logger.error('No contribution found to given id.')
@@ -472,6 +473,7 @@ export class ContributionResolver {
       .from(DbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
       .where({ confirmedAt: IsNull() })
+      .andWhere({ deniedAt: IsNull() })
       .getMany()
 
     if (contributions.length === 0) {
@@ -686,9 +688,29 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const moderatorUser = getUser(context)
-
     const contributionToUpdate = await DbContribution.findOne({ id })
+    // TODO: Check
+    // - contribution exists
+    // - state has accept one
+    if (!contributionToUpdate) {
+      logger.error(`Contribution not found for given id: ${id}`)
+      throw new Error(`Contribution not found for given id.`)
+    }
+    if (
+      contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
+      contributionToUpdate.contributionStatus !== ContributionStatus.PENDING
+    ) {
+      logger.error(
+        `Contribution state (${contributionToUpdate.contributionStatus}) is not allowed.`,
+      )
+      throw new Error(`State of the contribution is not allowed.`)
+    }
+    const user = getUser(context)
+
+    contributionToUpdate.contributionStatus = ContributionStatus.DENIED
+    contributionToUpdate.deniedBy = user.id
+    contributionToUpdate.deniedAt = new Date()
+    await contributionToUpdate.save()
 
     return true
   }

From a584a6991244e7bc3c0d0660a12ea50132a9b876 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 20 Dec 2022 12:10:31 +0100
Subject: [PATCH 05/36] Add deniedAt and deniedBy to the listAllContribution
 query.

---
 frontend/src/graphql/queries.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index d261797c2..2bc10c61d 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -201,6 +201,8 @@ export const listAllContributions = gql`
         contributionDate
         confirmedAt
         confirmedBy
+        deniedAt
+        deniedBy
       }
     }
   }

From df0a396a4562e69b9e02c34bc83805787009811d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 22 Dec 2022 10:01:48 +0100
Subject: [PATCH 06/36] Change logic so that deny is also integrated.

---
 .../components/Contributions/ContributionListItem.vue  | 10 ++++++++++
 frontend/src/graphql/queries.js                        |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 53de8c461..bb26893f7 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -130,6 +130,14 @@ export default {
       type: String,
       required: false,
     },
+    deniedBy: {
+      type: Number,
+      required: false,
+    },
+    deniedAt: {
+      type: String,
+      required: false,
+    },
     state: {
       type: String,
       required: false,
@@ -157,11 +165,13 @@ export default {
   computed: {
     icon() {
       if (this.deletedAt) return 'x-circle'
+      if (this.deniedAt) return 'x-circle'
       if (this.confirmedAt) return 'check'
       return 'bell-fill'
     },
     variant() {
       if (this.deletedAt) return 'danger'
+      if (this.deniedAt) return 'danger'
       if (this.confirmedAt) return 'success'
       if (this.state === 'IN_PROGRESS') return 'warning'
       return 'primary'
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 2bc10c61d..d5eea9fdc 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -182,6 +182,8 @@ export const listContributions = gql`
         deletedAt
         state
         messagesCount
+        deniedAt
+        deniedBy
       }
     }
   }

From 493aa3201106e36ba0027f80b55cf50460330321 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 12 Jan 2023 15:05:41 +0100
Subject: [PATCH 07/36] Deny contribution sends rejected contribution email.

---
 .../graphql/resolver/ContributionResolver.ts  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index d93b675d2..bca3e7674 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -709,13 +709,33 @@ export class ContributionResolver {
       )
       throw new Error(`State of the contribution is not allowed.`)
     }
-    const user = getUser(context)
+    const moderator = getUser(context)
+    const user = await DbUser.findOne(
+      { id: contributionToUpdate.userId },
+      { relations: ['emailContact'] },
+    )
+    if (!user) {
+      logger.error(
+        `Could not find User for the Contribution (userId: ${contributionToUpdate.userId}).`,
+      )
+      throw new Error('Could not find User for the Contribution.')
+    }
 
     contributionToUpdate.contributionStatus = ContributionStatus.DENIED
-    contributionToUpdate.deniedBy = user.id
+    contributionToUpdate.deniedBy = moderator.id
     contributionToUpdate.deniedAt = new Date()
-    await contributionToUpdate.save()
+    const res = await contributionToUpdate.save()
 
-    return true
+    sendContributionRejectedEmail({
+      firstName: user.firstName,
+      lastName: user.lastName,
+      email: user.emailContact.email,
+      language: user.language,
+      senderFirstName: moderator.firstName,
+      senderLastName: moderator.lastName,
+      contributionMemo: contributionToUpdate.memo,
+    })
+
+    return !!res
   }
 }

From b88bfabb781ed0dd991413cb0c49d68592a069b3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 12 Jan 2023 15:06:45 +0100
Subject: [PATCH 08/36] Add button to deny contribution in the admin interface

---
 .../components/Tables/OpenCreationsTable.vue  | 14 +++++++++++-
 admin/src/graphql/rejectContribution.js       |  7 ++++++
 admin/src/pages/CreationConfirm.vue           | 22 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 admin/src/graphql/rejectContribution.js

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 2c5caabb5..2c32c2fbf 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -8,7 +8,7 @@
           @click="$emit('remove-creation', row.item)"
           class="mr-2"
         >
-          <b-icon icon="x" variant="light"></b-icon>
+          <b-icon icon="trash" variant="light"></b-icon>
         </b-button>
       </template>
       <template #cell(editCreation)="row">
@@ -49,6 +49,18 @@
           </b-button>
         </div>
       </template>
+      <template #cell(deny)="row">
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            variant="danger"
+            size="md"
+            @click="$emit('reject-creation', row.item)"
+            class="mr-2"
+          >
+            <b-icon icon="x" variant="light"></b-icon>
+          </b-button>
+        </div>
+      </template>
       <template #row-details="row">
         <row-details
           :row="row"
diff --git a/admin/src/graphql/rejectContribution.js b/admin/src/graphql/rejectContribution.js
new file mode 100644
index 000000000..095a36854
--- /dev/null
+++ b/admin/src/graphql/rejectContribution.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const rejectContribution = gql`
+  mutation ($id: Int!) {
+    rejectContribution(id: $id)
+  }
+`
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 311c898a5..d8179339f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -7,6 +7,7 @@
       class="mt-4"
       :items="pendingCreations"
       :fields="fields"
+      @reject-creation="rejectCreation"
       @remove-creation="removeCreation"
       @show-overlay="showOverlay"
       @update-state="updateState"
@@ -20,6 +21,7 @@ import OpenCreationsTable from '../components/Tables/OpenCreationsTable.vue'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
+import { rejectContribution } from '../graphql/rejectContribution'
 
 export default {
   name: 'CreationConfirm',
@@ -35,6 +37,25 @@ export default {
     }
   },
   methods: {
+    rejectCreation(item) {
+      this.$bvModal.msgBoxConfirm(this.$t('creation_form.rejectNow')).then(async (value) => {
+        if (value) {
+          await this.$apollo
+            .mutate({
+              mutation: rejectContribution,
+              variables: {
+                id: item.id,
+              },
+            })
+            .then((result) => {
+              this.toastSuccess(this.$t('creation_form.toasted_rejected'))
+            })
+            .catch((error) => {
+              this.toastError(error.message)
+            })
+        }
+      })
+    },
     removeCreation(item) {
       this.$bvModal.msgBoxConfirm(this.$t('creation_form.deleteNow')).then(async (value) => {
         if (value)
@@ -110,6 +131,7 @@ export default {
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
         { key: 'confirm', label: this.$t('save') },
+        { key: 'deny', label: this.$t('deny') },
       ]
     },
   },

From 9b4d1cd2b302f3156ae1f6332e55dbadd4c524d3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 12 Jan 2023 15:29:34 +0100
Subject: [PATCH 09/36] Add new locales.

---
 admin/src/locales/de.json           | 3 +++
 admin/src/locales/en.json           | 3 +++
 admin/src/pages/CreationConfirm.vue | 1 +
 3 files changed, 7 insertions(+)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index ad7a668e2..f1c15bb3f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -38,6 +38,7 @@
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
+    "rejectNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "reset": "Zurücksetzen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
@@ -45,6 +46,7 @@
     "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit",
     "toasted_created": "Schöpfung wurde erfolgreich gespeichert",
     "toasted_delete": "Offene Schöpfung wurde gelöscht",
+    "toasted_rejected": "Offene Schöpfung wurde abgelehnt",
     "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit",
     "update_creation": "Schöpfung aktualisieren"
   },
@@ -54,6 +56,7 @@
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
+  "deny": "Ablehnen",
   "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 3f8751fa1..f08c2819d 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -38,6 +38,7 @@
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
+    "rejectNow": "Do you really want to deny this contribution to the community?",
     "reset": "Reset",
     "select_month": "Select month",
     "select_value": "Select amount",
@@ -45,6 +46,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
+    "toasted_rejected": "Open creation has been deny",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -54,6 +56,7 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
+  "deny": "Refuse",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index d8179339f..3acfa6bda 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -48,6 +48,7 @@ export default {
               },
             })
             .then((result) => {
+              this.updatePendingCreations(item.id)
               this.toastSuccess(this.$t('creation_form.toasted_rejected'))
             })
             .catch((error) => {

From 79220ced79884eae9d382fc7fc7bdec3cec3bffd Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:05:56 +0100
Subject: [PATCH 10/36] Add deleted Contribution to the Contribution list in
 the admin interface.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index bca3e7674..6790ea5ad 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -674,6 +674,7 @@ export class ContributionResolver {
       .from(DbContribution, 'c')
       .leftJoinAndSelect('c.user', 'u')
       .where(`user_id = ${userId}`)
+      .withDeleted()
       .limit(pageSize)
       .offset(offset)
       .orderBy('c.created_at', order)

From 70017c3115e0ef93c8ac835af89667d66bdbcbfd Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:07:26 +0100
Subject: [PATCH 11/36] Add state & messagesCount to the query
 listAllContributions.

---
 frontend/src/graphql/queries.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 753f40458..a35e01141 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -205,6 +205,8 @@ export const listAllContributions = gql`
         contributionDate
         confirmedAt
         confirmedBy
+        state
+        messagesCount
         deniedAt
         deniedBy
       }

From 2e9f8caa9d07c82da9751e062891e6db14e4fc7e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:08:18 +0100
Subject: [PATCH 12/36] Add denied symbols in the frontend.

---
 .../Contributions/ContributionListItem.vue        | 15 ++++++++-------
 .../Template/RightSide/ContributionInfo.vue       | 14 ++++----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index ec319834e..fe1bf22be 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -30,7 +30,11 @@
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
           </div>
-          <div class="font-weight-bold">{{ amount | GDD }}</div>
+          <div v-if="['DENIED'].includes(state) && allContribution" class="font-weight-bold">
+            <b-icon icon="x-circle" variant="danger"></b-icon>
+            {{ $t('contribution.alert.rejected') }}
+          </div>
+          <div v-else class="font-weight-bold">{{ amount | GDD }}</div>
         </b-col>
         <b-col cols="12" md="1" lg="1" class="text-right align-items-center">
           <div v-if="messagesCount > 0" @click="visible = !visible">
@@ -38,10 +42,7 @@
           </div>
         </b-col>
       </b-row>
-      <b-row
-        v-if="(!['CONFIRMED', 'DELETED'].includes(state) && !allContribution) || messagesCount > 0"
-        class="p-2"
-      >
+      <b-row v-if="messagesCount > 0" class="p-2">
         <b-col cols="3" class="mr-auto text-center">
           <div
             v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
@@ -176,7 +177,7 @@ export default {
   },
   computed: {
     icon() {
-      if (this.deletedAt) return 'x-circle'
+      if (this.deletedAt) return 'trash'
       if (this.deniedAt) return 'x-circle'
       if (this.confirmedAt) return 'check'
       if (this.state === 'IN_PROGRESS') return 'question-circle'
@@ -184,7 +185,7 @@ export default {
     },
     variant() {
       if (this.deletedAt) return 'danger'
-      if (this.deniedAt) return 'danger'
+      if (this.deniedAt) return 'warning'
       if (this.confirmedAt) return 'success'
       if (this.state === 'IN_PROGRESS') return 'f5'
       return 'primary'
diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.vue b/frontend/src/components/Template/RightSide/ContributionInfo.vue
index 68cf65867..ff86b7fc8 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.vue
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.vue
@@ -22,6 +22,10 @@
           <b-icon icon="x-circle" variant="danger"></b-icon>
           {{ $t('contribution.alert.rejected') }}
         </li>
+        <li>
+          <b-icon icon="trash" variant="warning"></b-icon>
+          {{ $t('contribution.alert.rejected') }}
+        </li>
       </ul>
     </div>
     <div v-if="hash === '#all'" show fade variant="secondary" class="text-dark">
@@ -29,16 +33,6 @@
       <p>
         {{ $t('contribution.alert.communityNoteList') }}
       </p>
-      <ul>
-        <li>
-          <b-icon icon="bell-fill" variant="primary"></b-icon>
-          {{ $t('contribution.alert.pending') }}
-        </li>
-        <li>
-          <b-icon icon="check" variant="success"></b-icon>
-          {{ $t('contribution.alert.confirm') }}
-        </li>
-      </ul>
     </div>
     <div v-if="hash === '#edit'" show fade variant="secondary" class="text-dark">
       <div>

From 605812d7773c9be985fbb3847b545bc5ab1bb7d5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:15:14 +0100
Subject: [PATCH 13/36] Add error to confirmContribution mutation in case where
 contributionState is 'DENIED'

---
 backend/src/graphql/resolver/ContributionResolver.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 6790ea5ad..8c9959208 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -561,6 +561,10 @@ export class ContributionResolver {
       logger.error(`Contribution not found for given id: ${id}`)
       throw new Error('Contribution not found to given id.')
     }
+    if (contribution.contributionStatus === 'DENIED') {
+      logger.error(`Contribution state (${contribution.contributionStatus}) can't be confirmed`)
+      throw new Error("Contribution state can't be confirmed")
+    }
     const moderatorUser = getUser(context)
     if (moderatorUser.id === contribution.userId) {
       logger.error('Moderator can not confirm own contribution')

From 9d8c0266178174940a2ea1c3de288bb1beb9a522 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:35:33 +0100
Subject: [PATCH 14/36] Move contribution, user and moderator search in the
 first try block to lock the database.

---
 .../graphql/resolver/ContributionResolver.ts  | 37 ++-----------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 99db32155..a81a47339 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -557,37 +557,6 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const clientTimezoneOffset = getClientTimezoneOffset(context)
-    const contribution = await DbContribution.findOne(id)
-    if (!contribution) {
-      logger.error(`Contribution not found for given id: ${id}`)
-      throw new Error('Contribution not found to given id.')
-    }
-    if (contribution.contributionStatus === 'DENIED') {
-      logger.error(`Contribution state (${contribution.contributionStatus}) can't be confirmed`)
-      throw new Error("Contribution state can't be confirmed")
-    }
-    const moderatorUser = getUser(context)
-    if (moderatorUser.id === contribution.userId) {
-      logger.error('Moderator can not confirm own contribution')
-      throw new Error('Moderator can not confirm own contribution')
-    }
-    const user = await DbUser.findOneOrFail(
-      { id: contribution.userId },
-      { withDeleted: true, relations: ['emailContact'] },
-    )
-    if (user.deletedAt) {
-      logger.error('This user was deleted. Cannot confirm a contribution.')
-      throw new Error('This user was deleted. Cannot confirm a contribution.')
-    }
-    const creations = await getUserCreation(contribution.userId, clientTimezoneOffset, false)
-    validateContribution(
-      creations,
-      contribution.amount,
-      contribution.contributionDate,
-      clientTimezoneOffset,
-    )
-
     // acquire lock
     const releaseLock = await TRANSACTIONS_LOCK.acquire()
 
@@ -598,9 +567,9 @@ export class ContributionResolver {
         logger.error(`Contribution not found for given id: ${id}`)
         throw new Error('Contribution not found to given id.')
       }
-      if (contribution.confirmedAt) {
-        logger.error(`Contribution already confirmd: ${id}`)
-        throw new Error('Contribution already confirmd.')
+      if (contribution.contributionStatus === 'DENIED') {
+        logger.error(`Contribution state (${contribution.contributionStatus}) can't be confirmed`)
+        throw new Error("Contribution state can't be confirmed")
       }
       const moderatorUser = getUser(context)
       if (moderatorUser.id === contribution.userId) {

From 7a7246cde516f37fe1c2e660e57033c5f0a2061e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 11:37:48 +0100
Subject: [PATCH 15/36] Add error for already confirmed contribution.

---
 backend/src/graphql/resolver/ContributionResolver.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index a81a47339..ac6c99544 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -567,9 +567,13 @@ export class ContributionResolver {
         logger.error(`Contribution not found for given id: ${id}`)
         throw new Error('Contribution not found to given id.')
       }
+      if (contribution.confirmedAt) {
+        logger.error(`Contribution already confirmd: ${id}`)
+        throw new Error('Contribution already confirmd.')
+      }
       if (contribution.contributionStatus === 'DENIED') {
-        logger.error(`Contribution state (${contribution.contributionStatus}) can't be confirmed`)
-        throw new Error("Contribution state can't be confirmed")
+        logger.error(`Contribution already denied: ${id}`)
+        throw new Error('Contribution already denied.')
       }
       const moderatorUser = getUser(context)
       if (moderatorUser.id === contribution.userId) {

From 51abaf8a22bb813b77528c88f086e2ff9234b425 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 13 Jan 2023 13:20:00 +0100
Subject: [PATCH 16/36] Last changes to make it work.

---
 backend/src/graphql/resolver/ContributionResolver.ts         | 1 -
 .../src/components/Contributions/ContributionListItem.vue    | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ac6c99544..6d8318b72 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -149,7 +149,6 @@ export class ContributionResolver {
     @Ctx() context: Context,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    // TODO: Check if deniedAt IsNull()
     const where: {
       userId: number
       confirmedBy?: FindOperator<number> | null
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index fe1bf22be..69cc5637a 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -42,7 +42,10 @@
           </div>
         </b-col>
       </b-row>
-      <b-row v-if="messagesCount > 0" class="p-2">
+      <b-row
+        v-if="(!['CONFIRMED', 'DELETED'].includes(state) && !allContribution) || messagesCount > 0"
+        class="p-2"
+      >
         <b-col cols="3" class="mr-auto text-center">
           <div
             v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"

From 0d268ae96f18d775a869769797160eac6e928551 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 16 Jan 2023 09:47:08 +0100
Subject: [PATCH 17/36] Change tests to the new reject layout.

---
 .../src/components/Contributions/ContributionListItem.spec.js   | 2 +-
 .../src/components/Template/RightSide/ContributionInfo.spec.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 86b0efa31..3415ee5d3 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -48,7 +48,7 @@ describe('ContributionListItem', () => {
 
       it('is x-circle when deletedAt is present', async () => {
         await wrapper.setProps({ deletedAt: new Date().toISOString() })
-        expect(wrapper.vm.icon).toBe('x-circle')
+        expect(wrapper.vm.icon).toBe('trash')
       })
 
       it('is check when confirmedAt is present', async () => {
diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.spec.js b/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
index c1f54816e..88a6b6ab8 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
@@ -72,7 +72,7 @@ describe('ContributionInfo', () => {
         expect(wrapper.find('p').text()).toBe('contribution.alert.communityNoteList')
       })
 
-      it('has a legend to explain the icons', () => {
+      it.skip('has a legend to explain the icons', () => {
         const listItems = wrapper.findAll('li')
 
         expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill')

From 121130175c63244f62d0dd0db3ffc7d6df274bac Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 12:27:40 +0100
Subject: [PATCH 18/36] Add tests for OpenCreationsTable to have 100% coverage.

---
 .../Tables/OpenCreationsTable.spec.js         | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 2eb149e4f..b96be3e06 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -5,6 +5,7 @@ const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue({})
 const apolloQueryMock = jest.fn().mockResolvedValue({})
+const toggleDetailsMock = jest.fn()
 
 const propsData = {
   items: [
@@ -138,5 +139,50 @@ describe('OpenCreationsTable', () => {
         expect(wrapper.vm.items[0].creation).toEqual([444, 555, 666])
       })
     })
+
+    describe('call updateState', () => {
+      beforeEach(() => {
+        wrapper.vm.updateState(4)
+      })
+
+      it('emits update-state', () => {
+        expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
+      })
+    })
+
+    describe('call updateCreationData', () => {
+      const date = new Date()
+      beforeEach(() => {
+        wrapper.vm.updateCreationData({
+          amount: Number(80.0),
+          date: date,
+          memo: 'Test memo',
+          row: {
+            item: {},
+            detailsShowing: false,
+            toggleDetails: toggleDetailsMock,
+          },
+        })
+      })
+
+      it('emits update-state', () => {
+        expect(
+          wrapper.vm.$emit('update-contributions', {
+            amount: Number(80.0),
+            date: date,
+            memo: 'Test memo',
+            row: {
+              item: {},
+              detailsShowing: false,
+              toggleDetails: toggleDetailsMock,
+            },
+          }),
+        ).toBeTruthy()
+      })
+
+      it('calls toggleDetails', () => {
+        expect(toggleDetailsMock).toBeCalled()
+      })
+    })
   })
 })

From 576241f22d67f1d1efebffa07ab85b2eac782ba0 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 14:29:31 +0100
Subject: [PATCH 19/36] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f08c2819d..b82efd42f 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -46,7 +46,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
-    "toasted_rejected": "Open creation has been deny",
+    "toasted_rejected": "Open creation has been denied",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },

From b8b675367709fc6af5e8f9457cfb794ecba0d979 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 14:44:18 +0100
Subject: [PATCH 20/36] Reviewed change requests.

---
 admin/src/locales/en.json                            | 2 +-
 backend/src/graphql/resolver/ContributionResolver.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index b82efd42f..bcaa50dab 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -56,7 +56,7 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
-  "deny": "Refuse",
+  "deny": "Deny",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 6d8318b72..3546c7c03 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -725,7 +725,11 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const contributionToUpdate = await DbContribution.findOne({ id })
+    const contributionToUpdate = await DbContribution.findOne({
+      id,
+      confirmedAt: IsNull(),
+      deniedBy: IsNull(),
+    })
     // TODO: Check
     // - contribution exists
     // - state has accept one

From 9438cefb04759f5c029de646fcaa181fcd6b85a7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 15:24:41 +0100
Subject: [PATCH 21/36] Fix small merge error, and verifyLogin query.

---
 .../src/components/Template/RightSide/ContributionInfo.vue  | 6 +-----
 frontend/src/graphql/queries.js                             | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.vue b/frontend/src/components/Template/RightSide/ContributionInfo.vue
index 30e9f5133..e57d5de89 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.vue
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.vue
@@ -19,11 +19,7 @@
           {{ $t('contribution.alert.confirm') }}
         </li>
         <li>
-          <b-icon icon="x-circle" variant="danger"></b-icon>
-          {{ $t('contribution.alert.rejected') }}
-        </li>
-        <li>
-          <b-icon icon="trash" variant="warning"></b-icon>
+          <b-icon icon="x-circle" variant="warning"></b-icon>
           {{ $t('contribution.alert.rejected') }}
         </li>
         <li>
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 50ee00327..e199a3730 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -13,7 +13,6 @@ export const verifyLogin = gql`
       hasElopage
       publisherId
       isAdmin
-      creation
       hideAmountGDD
       hideAmountGDT
     }

From 191d86beee3f27ee8edfd84bbfd64d84d77c928b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 15:40:28 +0100
Subject: [PATCH 22/36] Add tests for decline button

---
 admin/src/pages/CreationConfirm.spec.js | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 13fa24f5f..d4f54e3a3 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm.vue'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
+import { rejectContribution } from '../graphql/rejectContribution'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
@@ -75,6 +76,7 @@ describe('CreationConfirm', () => {
 
   const listUnconfirmedContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
+  const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
@@ -89,6 +91,11 @@ describe('CreationConfirm', () => {
     adminDeleteContributionMock.mockResolvedValue({ data: { adminDeleteContribution: true } }),
   )
 
+  mockClient.setRequestHandler(
+    rejectContribution,
+    adminDenyContributionMock.mockResolvedValue({ data: { rejectContribution: true } }),
+  )
+
   mockClient.setRequestHandler(
     confirmContribution,
     confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
@@ -243,5 +250,45 @@ describe('CreationConfirm', () => {
         })
       })
     })
+
+    describe('decline creation with success', () => {
+      let spy
+
+      describe('admin confirms decline', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
+          await wrapper.findAll('tr').at(1).findAll('button').at(3).trigger('click')
+        })
+
+        it('opens a modal', () => {
+          expect(spy).toBeCalled()
+        })
+
+        it('calls the adminDeleteContribution mutation', () => {
+          expect(adminDenyContributionMock).toBeCalledWith({ id: 1 })
+        })
+
+        it('commits openCreationsMinus to store', () => {
+          expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
+        })
+
+        it('toasts a success message', () => {
+          expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_rejected')
+        })
+      })
+
+      describe('admin cancels decline', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(false))
+          await wrapper.findAll('tr').at(1).findAll('button').at(3).trigger('click')
+        })
+
+        it('does not call the adminDeleteContribution mutation', () => {
+          expect(adminDenyContributionMock).not.toBeCalled()
+        })
+      })
+    })
   })
 })

From d3549ef14441d276304b37031543ae7775d393c5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 16:01:30 +0100
Subject: [PATCH 23/36] Coverage of admin 96%.

---
 .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 ac60cfdf2..1f348347c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -479,7 +479,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 95
+          min_coverage: 96
           token: ${{ github.token }}
 
   ##############################################################################

From c73135e522af9d195d79609981ac958bb3758fbb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 17 Jan 2023 16:11:14 +0100
Subject: [PATCH 24/36] Change deny to reject.

---
 admin/src/locales/de.json               | 2 +-
 admin/src/locales/en.json               | 4 ++--
 admin/src/pages/CreationConfirm.spec.js | 8 ++++----
 admin/src/pages/CreationConfirm.vue     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index f1c15bb3f..382cfcb95 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -56,7 +56,7 @@
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
-  "deny": "Ablehnen",
+  "reject": "Ablehnen",
   "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index bcaa50dab..d2c65637c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -38,7 +38,7 @@
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
-    "rejectNow": "Do you really want to deny this contribution to the community?",
+    "rejectNow": "Do you really want to reject this contribution to the community?",
     "reset": "Reset",
     "select_month": "Select month",
     "select_value": "Select amount",
@@ -56,7 +56,7 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
-  "deny": "Deny",
+  "reject": "Reject",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d4f54e3a3..e5748d489 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -76,7 +76,7 @@ describe('CreationConfirm', () => {
 
   const listUnconfirmedContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
-  const adminDenyContributionMock = jest.fn()
+  const adminRejectContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
@@ -93,7 +93,7 @@ describe('CreationConfirm', () => {
 
   mockClient.setRequestHandler(
     rejectContribution,
-    adminDenyContributionMock.mockResolvedValue({ data: { rejectContribution: true } }),
+    adminRejectContributionMock.mockResolvedValue({ data: { rejectContribution: true } }),
   )
 
   mockClient.setRequestHandler(
@@ -266,7 +266,7 @@ describe('CreationConfirm', () => {
         })
 
         it('calls the adminDeleteContribution mutation', () => {
-          expect(adminDenyContributionMock).toBeCalledWith({ id: 1 })
+          expect(adminRejectContributionMock).toBeCalledWith({ id: 1 })
         })
 
         it('commits openCreationsMinus to store', () => {
@@ -286,7 +286,7 @@ describe('CreationConfirm', () => {
         })
 
         it('does not call the adminDeleteContribution mutation', () => {
-          expect(adminDenyContributionMock).not.toBeCalled()
+          expect(adminRejectContributionMock).not.toBeCalled()
         })
       })
     })
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 3acfa6bda..178d86a6c 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -132,7 +132,7 @@ export default {
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
         { key: 'confirm', label: this.$t('save') },
-        { key: 'deny', label: this.$t('deny') },
+        { key: 'reject', label: this.$t('reject') },
       ]
     },
   },

From dcbc1374418a2bc14d128e1765e45492df53d262 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 19 Jan 2023 09:19:29 +0100
Subject: [PATCH 25/36] Update yarn.lock file of admin.

---
 admin/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/yarn.lock b/admin/yarn.lock
index 5d8275b1a..ee4d635a6 100644
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -4141,9 +4141,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001271:
-  version "1.0.30001442"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz"
-  integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
+  version "1.0.30001445"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz"
+  integrity sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==
 
 capture-exit@^2.0.0:
   version "2.0.0"

From 7bd643b98b6e50c7b0a360b5307ad585871875de Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 13:39:25 +0100
Subject: [PATCH 26/36] feat(frontend): unit tetst community page

---
 frontend/package.json                |   2 +
 frontend/src/pages/Community.spec.js |   7 ++
 frontend/yarn.lock                   | 116 ++++++++++++++++++++++++++-
 3 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 55e28b45c..705dea0b2 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -66,6 +66,7 @@
     "vuex-persistedstate": "^4.0.0-beta.3"
   },
   "devDependencies": {
+    "@apollo/client": "^3.7.4",
     "@intlify/eslint-plugin-vue-i18n": "^1.4.0",
     "@vue/cli-plugin-babel": "^3.7.0",
     "@vue/cli-plugin-eslint": "^3.7.0",
@@ -76,6 +77,7 @@
     "babel-plugin-transform-require-context": "^0.1.1",
     "cross-env": "^7.0.3",
     "dotenv-webpack": "^7.0.3",
+    "mock-apollo-client": "^1.2.1",
     "postcss": "^8.4.8",
     "postcss-html": "^1.3.0",
     "postcss-scss": "^4.0.3",
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 41ecc75e9..2dd119233 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -3,6 +3,13 @@ import Community from './Community'
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
 import { listContributions, listAllContributions } from '@/graphql/queries'
+import { createMockClient } from 'mock-apollo-client'
+import VueApollo from 'vue-apollo'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
 
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index f374ac7bd..4abfbddf4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,6 +2,25 @@
 # yarn lockfile v1
 
 
+"@apollo/client@^3.7.4":
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.4.tgz#28c3fb7f89365ccaf185bc8b51860041f37629b3"
+  integrity sha512-bgiCKRmLSBImX4JRrw8NjqGo0AQE/mowCdHX1PJp2r5zIXrJx0UeaAYmx1qJY69Oz/KR7SKlLt4xK+bOP1jx7A==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    "@wry/context" "^0.7.0"
+    "@wry/equality" "^0.5.0"
+    "@wry/trie" "^0.3.0"
+    graphql-tag "^2.12.6"
+    hoist-non-react-statics "^3.3.2"
+    optimism "^0.16.1"
+    prop-types "^15.7.2"
+    response-iterator "^0.2.6"
+    symbol-observable "^4.0.0"
+    ts-invariant "^0.10.3"
+    tslib "^2.3.0"
+    zen-observable-ts "^1.2.5"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -1904,6 +1923,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@graphql-typed-document-node/core@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
+  integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -3159,6 +3183,13 @@
     "@types/node" ">=6"
     tslib "^1.9.3"
 
+"@wry/context@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.0.tgz#be88e22c0ddf62aeb0ae9f95c3d90932c619a5c8"
+  integrity sha512-LcDAiYWRtwAoSOArfk7cuYvFXytxfVrdX7yxoUmK7pPITLk5jYh2F8knCwS7LjgYL8u1eidPlKKV6Ikqq0ODqQ==
+  dependencies:
+    tslib "^2.3.0"
+
 "@wry/equality@^0.1.2":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790"
@@ -3166,6 +3197,20 @@
   dependencies:
     tslib "^1.9.3"
 
+"@wry/equality@^0.5.0":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.3.tgz#fafebc69561aa2d40340da89fa7dc4b1f6fb7831"
+  integrity sha512-avR+UXdSrsF2v8vIqIgmeTY0UR91UT+IyablCyKe/uk22uOJ8fusKZnH9JH9e1/EtLeNJBtagNmL3eJdnOV53g==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/trie@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.2.tgz#a06f235dc184bd26396ba456711f69f8c35097e6"
+  integrity sha512-yRTyhWSls2OY/pYLfwff867r8ekooZ4UI+/gxot5Wj8EFwSf2rG+n+Mo/6LoLQm1TKA4GRj2+LCpbfS937dClQ==
+  dependencies:
+    tslib "^2.3.0"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -7453,6 +7498,13 @@ graceful-fs@^4.2.4:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+graphql-tag@^2.12.6:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
 graphql-tag@^2.4.2:
   version "2.12.5"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f"
@@ -7636,6 +7688,13 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
+hoist-non-react-statics@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
+  dependencies:
+    react-is "^16.7.0"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -9915,7 +9974,7 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
-loose-envify@^1.0.0, loose-envify@^1.2.0:
+loose-envify@^1.0.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -10260,6 +10319,11 @@ mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mock-apollo-client@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-1.2.1.tgz#e3bfdc3ff73b1fea28fa7e91ec82e43ba8cbfa39"
+  integrity sha512-QYQ6Hxo+t7hard1bcHHbsHxlNQYTQsaMNsm2Psh/NbwLMi2R4tGzplJKt97MUWuARHMq3GHB4PTLj/gxej4Caw==
+
 moment@^2.19.2:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
@@ -10767,6 +10831,14 @@ optimism@^0.10.0:
   dependencies:
     "@wry/context" "^0.4.0"
 
+optimism@^0.16.1:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.2.tgz#519b0c78b3b30954baed0defe5143de7776bf081"
+  integrity sha512-zWNbgWj+3vLEjZNIh/okkY2EUfX+vB9TJopzIZwT1xxaMqC5hRLLraePod4c5n4He08xuXNH+zhKFFCu390wiQ==
+  dependencies:
+    "@wry/context" "^0.7.0"
+    "@wry/trie" "^0.3.0"
+
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -11721,6 +11793,15 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+prop-types@^15.7.2:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -11900,7 +11981,7 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-react-is@^16.8.4:
+react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -12269,6 +12350,11 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.1
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+response-iterator@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da"
+  integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw==
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -13406,6 +13492,11 @@ symbol-observable@^1.0.2:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+symbol-observable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
+  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
+
 symbol-tree@^3.2.2, symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -13704,6 +13795,13 @@ tryer@^1.0.1:
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
+ts-invariant@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c"
+  integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==
+  dependencies:
+    tslib "^2.1.0"
+
 ts-invariant@^0.4.0:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86"
@@ -13757,6 +13855,11 @@ tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
+tslib@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
 tsutils@^3.17.1:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -14919,7 +15022,14 @@ zen-observable-ts@^0.8.21:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable@^0.8.0:
+zen-observable-ts@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"
+  integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==
+  dependencies:
+    zen-observable "0.8.15"
+
+zen-observable@0.8.15, zen-observable@^0.8.0:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==

From be65595bee695c31321617a5b534f071ed34f824 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 18:21:00 +0100
Subject: [PATCH 27/36] refcator tests for apollo calls

---
 frontend/src/pages/Community.spec.js | 450 ++++++++++++++++-----------
 frontend/src/pages/Community.vue     | 145 ++++-----
 frontend/test/testSetup.js           |   1 +
 3 files changed, 325 insertions(+), 271 deletions(-)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 2dd119233..34fc3dba4 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils'
 import Community from './Community'
-import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
+import { toastErrorSpy, toastSuccessSpy, toastInfoSpy } from '@test/testSetup'
 import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
-import { listContributions, listAllContributions } from '@/graphql/queries'
+import { listContributions, listAllContributions, openCreations } from '@/graphql/queries'
 import { createMockClient } from 'mock-apollo-client'
 import VueApollo from 'vue-apollo'
 
@@ -12,54 +12,48 @@ const apolloProvider = new VueApollo({
 })
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
 const mockStoreDispach = jest.fn()
-const apolloQueryMock = jest.fn()
-const apolloMutationMock = jest.fn()
-const apolloRefetchMock = jest.fn()
+const routerPushMock = jest.fn()
 
 describe('Community', () => {
   let wrapper
 
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-    $apollo: {
-      query: apolloQueryMock,
-      mutate: apolloMutationMock,
-      queries: {
-        OpenCreations: {
-          refetch: apolloRefetchMock,
+  mockClient.setRequestHandler(
+    openCreations,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'Open Creations failed!' })
+      .mockResolvedValue({
+        data: {
+          openCreations: [
+            {
+              month: 0,
+              year: 2023,
+              amount: '1000',
+            },
+            {
+              month: 1,
+              year: 2023,
+              amount: '1000',
+            },
+            {
+              month: 2,
+              year: 2023,
+              amount: '1000',
+            },
+          ],
         },
-      },
-    },
-    $store: {
-      dispatch: mockStoreDispach,
-      state: {
-        creation: ['1000', '1000', '1000'],
-      },
-    },
-    $i18n: {
-      locale: 'en',
-    },
-    $router: {
-      push: jest.fn(),
-    },
-    $route: {
-      hash: 'my',
-    },
-  }
+      }),
+  )
 
-  const Wrapper = () => {
-    return mount(Community, {
-      localVue,
-      mocks,
-    })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      apolloQueryMock.mockResolvedValue({
+  mockClient.setRequestHandler(
+    listContributions,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'List Contributions failed!' })
+      .mockResolvedValue({
         data: {
           listContributions: {
             contributionList: [
@@ -71,10 +65,40 @@ describe('Community', () => {
                 deletedAt: null,
                 confirmedBy: null,
                 confirmedAt: null,
+                firstName: 'Bibi',
+                contributionDate: '2022-07-15T08:47:06.000Z',
+                lastName: 'Bloxberg',
+                state: 'IN_PROGRESS',
+                messagesCount: 0,
+              },
+              {
+                id: 1550,
+                amount: '200',
+                memo: 'Fleisig, fleisig am Arbeiten gewesen',
+                createdAt: '2022-07-15T08:47:06.000Z',
+                deletedAt: null,
+                confirmedBy: null,
+                confirmedAt: null,
+                firstName: 'Bibi',
+                contributionDate: '2022-06-15T08:47:06.000Z',
+                lastName: 'Bloxberg',
+                state: 'CONFIRMED',
+                messagesCount: 0,
               },
             ],
             contributionCount: 1,
           },
+        },
+      }),
+  )
+
+  mockClient.setRequestHandler(
+    listAllContributions,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'List All Contributions failed!' })
+      .mockResolvedValue({
+        data: {
           listAllContributions: {
             contributionList: [
               {
@@ -82,29 +106,137 @@ describe('Community', () => {
                 amount: '200',
                 memo: 'Fleisig, fleisig am Arbeiten mein lieber Freund, 50 Zeichen sind viel',
                 createdAt: '2022-07-15T08:47:06.000Z',
+                contributionDate: '2022-07-15T08:47:06.000Z',
                 deletedAt: null,
                 confirmedBy: null,
                 confirmedAt: null,
+                firstName: 'Bibi',
+                lastName: 'Bloxberg',
+              },
+              {
+                id: 1550,
+                amount: '200',
+                memo: 'Fleisig, fleisig am Arbeiten gewesen',
+                createdAt: '2022-07-15T08:47:06.000Z',
+                deletedAt: null,
+                confirmedBy: null,
+                confirmedAt: null,
+                firstName: 'Bibi',
+                contributionDate: '2022-06-15T08:47:06.000Z',
+                lastName: 'Bloxberg',
+                messagesCount: 0,
               },
               {
                 id: 1556,
                 amount: '400',
                 memo: 'Ein anderer lieber Freund ist auch sehr felißig am Arbeiten!!!!',
                 createdAt: '2022-07-16T08:47:06.000Z',
+                contributionDate: '2022-07-16T08:47:06.000Z',
                 deletedAt: null,
                 confirmedBy: null,
                 confirmedAt: null,
+                firstName: 'Bob',
+                lastName: 'der Baumeister',
               },
             ],
-            contributionCount: 2,
+            contributionCount: 3,
           },
         },
-      })
+      }),
+  )
+
+  mockClient.setRequestHandler(
+    createContribution,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'Create Contribution failed!' })
+      .mockResolvedValue({
+        data: {
+          createContribution: true,
+        },
+      }),
+  )
+
+  mockClient.setRequestHandler(
+    updateContribution,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'Update Contribution failed!' })
+      .mockResolvedValue({
+        data: {
+          updateContribution: true,
+        },
+      }),
+  )
+
+  mockClient.setRequestHandler(
+    deleteContribution,
+    jest
+      .fn()
+      .mockRejectedValueOnce({ message: 'Delete Contribution failed!' })
+      .mockResolvedValue({
+        data: {
+          deleteContribution: true,
+        },
+      }),
+  )
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
+    $store: {
+      dispatch: mockStoreDispach,
+      state: {
+        user: {
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
+        },
+      },
+    },
+    $i18n: {
+      locale: 'en',
+    },
+    $router: {
+      push: routerPushMock,
+    },
+    $route: {
+      hash: '#edit',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(Community, {
+      localVue,
+      mocks,
+      apolloProvider,
+    })
+  }
+
+  let apolloMutateSpy
+  let refetchContributionsSpy
+  let refetchAllContributionsSpy
+  let refetchOpenCreationsSpy
+
+  describe('mount', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
       wrapper = Wrapper()
+      apolloMutateSpy = jest.spyOn(wrapper.vm.$apollo, 'mutate')
+      refetchContributionsSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListContributions, 'refetch')
+      refetchAllContributionsSpy = jest.spyOn(
+        wrapper.vm.$apollo.queries.ListAllContributions,
+        'refetch',
+      )
+      refetchOpenCreationsSpy = jest.spyOn(wrapper.vm.$apollo.queries.OpenCreations, 'refetch')
     })
 
-    it('has a DIV .community-page', () => {
-      expect(wrapper.find('div.community-page').exists()).toBe(true)
+    describe('server response for queries is error', () => {
+      it('toasts three errors', () => {
+        expect(toastErrorSpy).toBeCalledTimes(3)
+        expect(toastErrorSpy).toBeCalledWith('Open Creations failed!')
+        expect(toastErrorSpy).toBeCalledWith('List Contributions failed!')
+        expect(toastErrorSpy).toBeCalledWith('List All Contributions failed!')
+      })
     })
 
     describe('tabs', () => {
@@ -112,60 +244,51 @@ describe('Community', () => {
         expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3)
       })
 
-      it.todo('check for correct tabIndex if state is "IN_PROGRESS" or not')
+      it('check for correct tabIndex if state is "IN_PROGRESS" or not', () => {
+        expect(routerPushMock).toBeCalledWith({ path: '/community#my' })
+      })
+
+      it('toasts an info', () => {
+        expect(toastInfoSpy).toBeCalledWith(
+          'Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!',
+        )
+      })
     })
 
     describe('API calls after creation', () => {
+      it('has a DIV .community-page', () => {
+        expect(wrapper.find('div.community-page').exists()).toBe(true)
+      })
+
       it('emits update transactions', () => {
         expect(wrapper.emitted('update-transactions')).toEqual([[0]])
       })
-
-      it('queries list of own contributions', () => {
-        expect(apolloQueryMock).toBeCalledWith({
-          fetchPolicy: 'no-cache',
-          query: listContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-          },
-        })
-      })
-
-      it('queries list of all contributions', () => {
-        expect(apolloQueryMock).toBeCalledWith({
-          fetchPolicy: 'no-cache',
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-          },
-        })
-      })
-
-      describe('server response is error', () => {
-        beforeEach(() => {
-          jest.clearAllMocks()
-          apolloQueryMock.mockRejectedValue({ message: 'Ups' })
-          wrapper = Wrapper()
-        })
-
-        it('toasts two errors', () => {
-          expect(toastErrorSpy).toBeCalledTimes(2)
-          expect(toastErrorSpy).toBeCalledWith('Ups')
-        })
-      })
     })
 
-    describe('set contrubtion', () => {
+    describe('save contrubtion', () => {
+      describe('with error', () => {
+        const now = new Date().toISOString()
+        beforeEach(async () => {
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: now,
+              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
+              amount: '200',
+            },
+          })
+          await wrapper.find('form').trigger('submit')
+        })
+
+        it('toasts the error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('Create Contribution failed!')
+        })
+      })
+
       describe('with success', () => {
         const now = new Date().toISOString()
         beforeEach(async () => {
           jest.clearAllMocks()
-          apolloMutationMock.mockResolvedValue({
-            data: {
-              createContribution: true,
-            },
-          })
           await wrapper.setData({
             form: {
               id: null,
@@ -178,7 +301,7 @@ describe('Community', () => {
         })
 
         it('calls the create contribution mutation', () => {
-          expect(apolloMutationMock).toBeCalledWith({
+          expect(apolloMutateSpy).toBeCalledWith({
             fetchPolicy: 'no-cache',
             mutation: createContribution,
             variables: {
@@ -194,62 +317,49 @@ describe('Community', () => {
         })
 
         it('updates the contribution list', () => {
-          expect(apolloQueryMock).toBeCalledWith({
-            fetchPolicy: 'no-cache',
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-            },
-          })
+          expect(refetchContributionsSpy).toBeCalled()
         })
 
-        it('verifies the login (to get the new creations available)', () => {
-          expect(apolloRefetchMock).toBeCalled()
+        it('updates the all contribution list', () => {
+          expect(refetchAllContributionsSpy).toBeCalled()
         })
 
-        it('set all data to the default values)', () => {
+        it('updates the open creations', () => {
+          expect(refetchOpenCreationsSpy).toBeCalled()
+        })
+
+        it('sets all data to the default values)', () => {
           expect(wrapper.vm.form.id).toBe(null)
           expect(wrapper.vm.form.date).toBe('')
           expect(wrapper.vm.form.memo).toBe('')
           expect(wrapper.vm.form.amount).toBe('')
         })
       })
-
-      describe('with error', () => {
-        const now = new Date().toISOString()
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          apolloMutationMock.mockRejectedValue({
-            message: 'Ouch!',
-          })
-          await wrapper.setData({
-            form: {
-              id: null,
-              date: now,
-              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
-              amount: '200',
-            },
-          })
-          await wrapper.find('form').trigger('submit')
-        })
-
-        it('toasts the error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('Ouch!')
-        })
-      })
     })
 
     describe('update contrubtion', () => {
+      describe('with error', () => {
+        const now = new Date().toISOString()
+        beforeEach(async () => {
+          await wrapper
+            .findComponent({ name: 'ContributionForm' })
+            .vm.$emit('update-contribution', {
+              id: 2,
+              date: now,
+              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
+              amount: '400',
+            })
+        })
+
+        it('toasts the error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('Update Contribution failed!')
+        })
+      })
+
       describe('with success', () => {
         const now = new Date().toISOString()
         beforeEach(async () => {
           jest.clearAllMocks()
-          apolloMutationMock.mockResolvedValue({
-            data: {
-              updateContribution: true,
-            },
-          })
           await wrapper
             .findComponent({ name: 'ContributionForm' })
             .vm.$emit('update-contribution', {
@@ -261,7 +371,7 @@ describe('Community', () => {
         })
 
         it('calls the update contribution mutation', () => {
-          expect(apolloMutationMock).toBeCalledWith({
+          expect(apolloMutateSpy).toBeCalledWith({
             fetchPolicy: 'no-cache',
             mutation: updateContribution,
             variables: {
@@ -278,40 +388,15 @@ describe('Community', () => {
         })
 
         it('updates the contribution list', () => {
-          expect(apolloQueryMock).toBeCalledWith({
-            fetchPolicy: 'no-cache',
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-            },
-          })
+          expect(refetchContributionsSpy).toBeCalled()
         })
 
-        it('verifies the login (to get the new creations available)', () => {
-          expect(apolloRefetchMock).toBeCalled()
-        })
-      })
-
-      describe('with error', () => {
-        const now = new Date().toISOString()
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          apolloMutationMock.mockRejectedValue({
-            message: 'Oh No!',
-          })
-          await wrapper
-            .findComponent({ name: 'ContributionForm' })
-            .vm.$emit('update-contribution', {
-              id: 2,
-              date: now,
-              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
-              amount: '400',
-            })
+        it('updates the all contribution list', () => {
+          expect(refetchAllContributionsSpy).toBeCalled()
         })
 
-        it('toasts the error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('Oh No!')
+        it('updates the open creations', () => {
+          expect(refetchOpenCreationsSpy).toBeCalled()
         })
       })
     })
@@ -324,19 +409,25 @@ describe('Community', () => {
         contributionListComponent = await wrapper.findComponent({ name: 'ContributionList' })
       })
 
-      describe('with success', () => {
+      describe('with error', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          apolloMutationMock.mockResolvedValue({
-            data: {
-              deleteContribution: true,
-            },
-          })
           contributionListComponent.vm.$emit('delete-contribution', { id: 2 })
         })
 
+        it('toasts the error message', () => {
+          expect(toastErrorSpy).toBeCalledWith('Delete Contribution failed!')
+        })
+      })
+
+      describe('with success', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await contributionListComponent.vm.$emit('delete-contribution', { id: 2 })
+        })
+
         it('calls the API', () => {
-          expect(apolloMutationMock).toBeCalledWith({
+          expect(apolloMutateSpy).toBeCalledWith({
             fetchPolicy: 'no-cache',
             mutation: deleteContribution,
             variables: {
@@ -350,32 +441,15 @@ describe('Community', () => {
         })
 
         it('updates the contribution list', () => {
-          expect(apolloQueryMock).toBeCalledWith({
-            fetchPolicy: 'no-cache',
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-            },
-          })
+          expect(refetchContributionsSpy).toBeCalled()
         })
 
-        it('verifies the login (to get the new creations available)', () => {
-          expect(apolloRefetchMock).toBeCalled()
-        })
-      })
-
-      describe('with error', () => {
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          apolloMutationMock.mockRejectedValue({
-            message: 'Oh my god!',
-          })
-          contributionListComponent.vm.$emit('delete-contribution', { id: 2 })
+        it('updates the all contribution list', () => {
+          expect(refetchAllContributionsSpy).toBeCalled()
         })
 
-        it('toasts the error message', () => {
-          expect(toastErrorSpy).toBeCalledWith('Oh my god!')
+        it('updates the open creations', () => {
+          expect(refetchOpenCreationsSpy).toBeCalled()
         })
       })
     })
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 13aad1a72..5bfa4f99a 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -10,7 +10,7 @@
           />
           <div class="mb-3"></div>
           <contribution-form
-            @set-contribution="setContribution"
+            @set-contribution="saveContribution"
             @update-contribution="updateContribution"
             v-model="form"
             :isThisMonth="isThisMonth"
@@ -70,6 +70,7 @@ export default {
       itemsAll: [],
       currentPage: 1,
       pageSize: 25,
+      currentPageAll: 1,
       pageSizeAll: 25,
       contributionCount: 0,
       contributionCountAll: 0,
@@ -107,6 +108,51 @@ export default {
         this.toastError(message)
       },
     },
+    ListAllContributions: {
+      query() {
+        return listAllContributions
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {
+          currentPage: this.currentPageAll,
+          pageSize: this.pageSizeAll,
+        }
+      },
+      update({ listAllContributions }) {
+        this.contributionCountAll = listAllContributions.contributionCount
+        this.itemsAll = listAllContributions.contributionList
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+    ListContributions: {
+      query() {
+        return listContributions
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+        }
+      },
+      update({ listContributions }) {
+        this.contributionCount = listContributions.contributionCount
+        this.items = listContributions.contributionList
+        if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
+          this.tabIndex = 1
+          if (this.$route.hash !== '#my') {
+            this.$router.push({ path: '/community#my' })
+          }
+          this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!')
+        }
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
   },
   watch: {
     $route(to, from) {
@@ -160,7 +206,12 @@ export default {
         this.$root.$emit('bv::toggle::collapse', value.id)
       })
     },
-    setContribution(data) {
+    refetchData() {
+      this.$apollo.queries.ListAllContributions.refetch()
+      this.$apollo.queries.ListContributions.refetch()
+      this.$apollo.queries.OpenCreations.refetch()
+    },
+    saveContribution(data) {
       this.$apollo
         .mutate({
           fetchPolicy: 'no-cache',
@@ -173,15 +224,7 @@ export default {
         })
         .then((result) => {
           this.toastSuccess(this.$t('contribution.submitted'))
-          this.updateListContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.updateListAllContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.$apollo.queries.OpenCreations.refetch()
+          this.refetchData()
         })
         .catch((err) => {
           this.toastError(err.message)
@@ -201,15 +244,7 @@ export default {
         })
         .then((result) => {
           this.toastSuccess(this.$t('contribution.updated'))
-          this.updateListContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.updateListAllContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.$apollo.queries.OpenCreations.refetch()
+          this.refetchData()
         })
         .catch((err) => {
           this.toastError(err.message)
@@ -226,68 +261,21 @@ export default {
         })
         .then((result) => {
           this.toastSuccess(this.$t('contribution.deleted'))
-          this.updateListContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.updateListAllContributions({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-          })
-          this.$apollo.queries.OpenCreations.refetch()
+          this.refetchData()
         })
         .catch((err) => {
           this.toastError(err.message)
         })
     },
     updateListAllContributions(pagination) {
-      this.$apollo
-        .query({
-          fetchPolicy: 'no-cache',
-          query: listAllContributions,
-          variables: {
-            currentPage: pagination.currentPage,
-            pageSize: pagination.pageSize,
-          },
-        })
-        .then((result) => {
-          const {
-            data: { listAllContributions },
-          } = result
-          this.contributionCountAll = listAllContributions.contributionCount
-          this.itemsAll = listAllContributions.contributionList
-        })
-        .catch((err) => {
-          this.toastError(err.message)
-        })
+      this.currentPageAll = pagination.currentPage
+      this.pageSizeAll = pagination.pageSize
+      this.$apollo.queries.ListAllContributions.refetch()
     },
     updateListContributions(pagination) {
-      this.$apollo
-        .query({
-          fetchPolicy: 'no-cache',
-          query: listContributions,
-          variables: {
-            currentPage: pagination.currentPage,
-            pageSize: pagination.pageSize,
-          },
-        })
-        .then((result) => {
-          const {
-            data: { listContributions },
-          } = result
-          this.contributionCount = listContributions.contributionCount
-          this.items = listContributions.contributionList
-          if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
-            this.tabIndex = 1
-            if (this.$route.hash !== '#my') {
-              this.$router.push({ path: '/community#my' })
-            }
-            this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!')
-          }
-        })
-        .catch((err) => {
-          this.toastError(err.message)
-        })
+      this.currentPage = pagination.currentPage
+      this.pageSize = pagination.pageSize
+      this.$apollo.queries.ListContributions.refetch()
     },
     updateContributionForm(item) {
       this.form.id = item.id
@@ -306,16 +294,7 @@ export default {
       this.items.find((item) => item.id === id).state = 'PENDING'
     },
   },
-
   created() {
-    this.updateListContributions({
-      currentPage: this.currentPage,
-      pageSize: this.pageSize,
-    })
-    this.updateListAllContributions({
-      currentPage: this.currentPage,
-      pageSize: this.pageSize,
-    })
     this.updateTransactions(0)
     this.tabIndex = 1
     this.$router.push({ path: '/community#my' })
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 06e84b269..ffe4caf41 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -22,6 +22,7 @@ import { loadFilters } from '@/filters/amount'
 import { toasters } from '@/mixins/toaster'
 export const toastErrorSpy = jest.spyOn(toasters.methods, 'toastError')
 export const toastSuccessSpy = jest.spyOn(toasters.methods, 'toastSuccess')
+export const toastInfoSpy = jest.spyOn(toasters.methods, 'toastInfo')
 
 Object.keys(rules).forEach((rule) => {
   extend(rule, {

From a13c1a3cf52717224155cd3c5c0e362ce63ee493 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 19:29:06 +0100
Subject: [PATCH 28/36] further tests

---
 frontend/src/pages/Community.spec.js | 52 ++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 34fc3dba4..379994b73 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -406,7 +406,7 @@ describe('Community', () => {
 
       beforeEach(async () => {
         await wrapper.setData({ tabIndex: 1 })
-        contributionListComponent = await wrapper.findComponent({ name: 'ContributionList' })
+        contributionListComponent = wrapper.findComponent({ name: 'ContributionList' })
       })
 
       describe('with error', () => {
@@ -454,7 +454,7 @@ describe('Community', () => {
       })
     })
 
-    describe.skip('update contribution form', () => {
+    describe('update contribution form', () => {
       const now = new Date().toISOString()
       beforeEach(async () => {
         await wrapper.setData({ tabIndex: 1 })
@@ -472,12 +472,58 @@ describe('Community', () => {
         expect(wrapper.vm.form.id).toBe(2)
         expect(wrapper.vm.form.date).toBe(now)
         expect(wrapper.vm.form.memo).toBe('Mein Beitrag zur Gemeinschaft für diesen Monat ...')
-        expect(wrapper.vm.form.amount).toBe('400')
+        expect(wrapper.vm.form.amount).toBe('400.00')
       })
 
       it('sets tab index back to 0', () => {
         expect(wrapper.vm.tabIndex).toBe(0)
       })
     })
+
+    describe('update list all contributions', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        await wrapper.setData({ tabIndex: 2 })
+        await wrapper
+          .findAllComponents({ name: 'ContributionList' })
+          .at(1)
+          .vm.$emit('update-list-contributions', {
+            currentPage: 2,
+            pageSize: 5,
+          })
+      })
+
+      it('updates page size and current page', () => {
+        expect(wrapper.vm.pageSizeAll).toBe(5)
+        expect(wrapper.vm.currentPageAll).toBe(2)
+      })
+
+      it('updates the all contribution list', () => {
+        expect(refetchAllContributionsSpy).toBeCalled()
+      })
+    })
+
+    describe('update list contributions', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        await wrapper.setData({ tabIndex: 1 })
+        await wrapper
+          .findAllComponents({ name: 'ContributionList' })
+          .at(0)
+          .vm.$emit('update-list-contributions', {
+            currentPage: 2,
+            pageSize: 5,
+          })
+      })
+
+      it('updates page size and current page', () => {
+        expect(wrapper.vm.pageSize).toBe(5)
+        expect(wrapper.vm.currentPage).toBe(2)
+      })
+
+      it('updates the all contribution list', () => {
+        expect(refetchContributionsSpy).toBeCalled()
+      })
+    })
   })
 })

From b997a34aaf64358233e42bfd457b9eec50f7fc1d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 19:32:11 +0100
Subject: [PATCH 29/36] coverage frontend to 95%

---
 .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 dfac48371..54653b831 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -437,7 +437,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 93
+          min_coverage: 95
           token: ${{ github.token }}
   
   ##############################################################################

From 3b9a553513515d7e4f713b5fb227e0568db790b9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 20 Jan 2023 10:42:16 +0100
Subject: [PATCH 30/36] localized message

---
 frontend/src/pages/Community.spec.js |   4 +-
 frontend/src/pages/Community.vue     | 502 +++++++++++++--------------
 2 files changed, 252 insertions(+), 254 deletions(-)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 2beec7571..ecfc01716 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -249,9 +249,7 @@ describe('Community', () => {
       })
 
       it('toasts an info', () => {
-        expect(toastInfoSpy).toBeCalledWith(
-          'contribution.alert.answerQuestionToast',
-        )
+        expect(toastInfoSpy).toBeCalledWith('contribution.alert.answerQuestionToast')
       })
     })
 
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index a17466840..5b771eac9 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -48,258 +48,258 @@
   </div>
 </template>
 <script>
- import OpenCreationsAmount from '@/components/Contributions/OpenCreationsAmount.vue'
- import ContributionForm from '@/components/Contributions/ContributionForm.vue'
- import ContributionList from '@/components/Contributions/ContributionList.vue'
- import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
- import { listContributions, listAllContributions, openCreations } from '@/graphql/queries'
+import OpenCreationsAmount from '@/components/Contributions/OpenCreationsAmount.vue'
+import ContributionForm from '@/components/Contributions/ContributionForm.vue'
+import ContributionList from '@/components/Contributions/ContributionList.vue'
+import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
+import { listContributions, listAllContributions, openCreations } from '@/graphql/queries'
 
- export default {
-   name: 'Community',
-   components: {
-     ContributionForm,
-     ContributionList,
-     OpenCreationsAmount,
-   },
-   data() {
-     return {
-       hashLink: '',
-       tabLinkHashes: ['#edit', '#my', '#all'],
-       tabIndex: 0,
-       items: [],
-       itemsAll: [],
-       currentPage: 1,
-       pageSize: 25,
-       currentPageAll: 1,
-       pageSizeAll: 25,
-       contributionCount: 0,
-       contributionCountAll: 0,
-       form: {
-         id: null,
-         date: '',
-         memo: '',
-         hours: 0,
-         amount: '',
-       },
-       updateAmount: '',
-       maximalDate: new Date(),
-       openCreations: [],
-     }
-   },
-   mounted() {
-     this.$nextTick(() => {
-       this.tabIndex = this.tabLinkHashes.findIndex((hashLink) => hashLink === this.$route.hash)
-       this.hashLink = this.$route.hash
-     })
-   },
-   apollo: {
-     OpenCreations: {
-       query() {
-         return openCreations
-       },
-       fetchPolicy: 'network-only',
-       variables() {
-         return {}
-       },
-       update({ openCreations }) {
-         this.openCreations = openCreations
-       },
-       error({ message }) {
-         this.toastError(message)
-       },
-     },
-     ListAllContributions: {
-       query() {
-         return listAllContributions
-       },
-       fetchPolicy: 'network-only',
-       variables() {
-         return {
-           currentPage: this.currentPageAll,
-           pageSize: this.pageSizeAll,
-         }
-       },
-       update({ listAllContributions }) {
-         this.contributionCountAll = listAllContributions.contributionCount
-         this.itemsAll = listAllContributions.contributionList
-       },
-       error({ message }) {
-         this.toastError(message)
-       },
-     },
-     ListContributions: {
-       query() {
-         return listContributions
-       },
-       fetchPolicy: 'network-only',
-       variables() {
-         return {
-           currentPage: this.currentPage,
-           pageSize: this.pageSize,
-         }
-       },
-       update({ listContributions }) {
-         this.contributionCount = listContributions.contributionCount
-         this.items = listContributions.contributionList
-         if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
-           this.tabIndex = 1
-           if (this.$route.hash !== '#my') {
-             this.$router.push({ path: '/community#my' })
-           }
-           this.toastInfo(this.$t('contribution.alert.answerQuestionToast'))
-         }
-       },
-       error({ message }) {
-         this.toastError(message)
-       },
-     },
-   },
-   watch: {
-     $route(to, from) {
-       this.tabIndex = this.tabLinkHashes.findIndex((hashLink) => hashLink === to.hash)
-       this.hashLink = to.hash
-       this.closeAllOpenCollapse()
-     },
-     tabIndex(num) {
-       if (num !== 0) {
-         this.form = {
-           id: null,
-           date: new Date(),
-           memo: '',
-           hours: 0,
-           amount: '',
-         }
-       }
-     },
-   },
-   computed: {
-     minimalDate() {
-       const date = new Date(this.maximalDate)
-       return new Date(date.setMonth(date.getMonth() - 1, 1))
-     },
-     isThisMonth() {
-       const formDate = new Date(this.form.date)
-       return (
-         formDate.getFullYear() === this.maximalDate.getFullYear() &&
-         formDate.getMonth() === this.maximalDate.getMonth()
-       )
-     },
-     amountToAdd() {
-       // when existing contribution is edited, the amount is added back on top of the amount
-       if (this.form.id) return parseInt(this.updateAmount)
-       return 0
-     },
-     maxForMonths() {
-       const formDate = new Date(this.form.date)
-       if (this.openCreations && this.openCreations.length)
-         return this.openCreations.slice(1).map((creation) => {
-           if (creation.year === formDate.getFullYear() && creation.month === formDate.getMonth())
-             return parseInt(creation.amount) + this.amountToAdd
-           return parseInt(creation.amount)
-         })
-       return [0, 0]
-     },
-   },
-   methods: {
-     closeAllOpenCollapse() {
-       this.$el.querySelectorAll('.collapse.show').forEach((value) => {
-         this.$root.$emit('bv::toggle::collapse', value.id)
-       })
-     },
-     refetchData() {
-       this.$apollo.queries.ListAllContributions.refetch()
-       this.$apollo.queries.ListContributions.refetch()
-       this.$apollo.queries.OpenCreations.refetch()
-     },
-     saveContribution(data) {
-       this.$apollo
-           .mutate({
-             fetchPolicy: 'no-cache',
-             mutation: createContribution,
-             variables: {
-               creationDate: data.date,
-               memo: data.memo,
-               amount: data.amount,
-             },
-           })
-           .then((result) => {
-             this.toastSuccess(this.$t('contribution.submitted'))
-             this.refetchData()
-           })
-           .catch((err) => {
-             this.toastError(err.message)
-           })
-     },
-     updateContribution(data) {
-       this.$apollo
-           .mutate({
-             fetchPolicy: 'no-cache',
-             mutation: updateContribution,
-             variables: {
-               contributionId: data.id,
-               creationDate: data.date,
-               memo: data.memo,
-               amount: data.amount,
-             },
-           })
-           .then((result) => {
-             this.toastSuccess(this.$t('contribution.updated'))
-             this.refetchData()
-           })
-           .catch((err) => {
-             this.toastError(err.message)
-           })
-     },
-     deleteContribution(data) {
-       this.$apollo
-           .mutate({
-             fetchPolicy: 'no-cache',
-             mutation: deleteContribution,
-             variables: {
-               id: data.id,
-             },
-           })
-           .then((result) => {
-             this.toastSuccess(this.$t('contribution.deleted'))
-             this.refetchData()
-           })
-           .catch((err) => {
-             this.toastError(err.message)
-           })
-     },
-     updateListAllContributions(pagination) {
-       this.currentPageAll = pagination.currentPage
-       this.pageSizeAll = pagination.pageSize
-       this.$apollo.queries.ListAllContributions.refetch()
-     },
-     updateListContributions(pagination) {
-       this.currentPage = pagination.currentPage
-       this.pageSize = pagination.pageSize
-       this.$apollo.queries.ListContributions.refetch()
-     },
-     updateContributionForm(item) {
-       this.form.id = item.id
-       this.form.date = item.contributionDate
-       this.form.memo = item.memo
-       this.form.amount = item.amount
-       this.form.hours = item.amount / 20
-       this.updateAmount = item.amount
-       this.$router.push({ path: '#edit' })
-       this.tabIndex = 0
-     },
-     updateTransactions(pagination) {
-       this.$emit('update-transactions', pagination)
-     },
-     updateState(id) {
-       this.items.find((item) => item.id === id).state = 'PENDING'
-     },
-   },
-   created() {
-     this.updateTransactions(0)
-     this.tabIndex = 1
-     this.$router.push({ path: '/community#my' })
-   },
- }
+export default {
+  name: 'Community',
+  components: {
+    ContributionForm,
+    ContributionList,
+    OpenCreationsAmount,
+  },
+  data() {
+    return {
+      hashLink: '',
+      tabLinkHashes: ['#edit', '#my', '#all'],
+      tabIndex: 0,
+      items: [],
+      itemsAll: [],
+      currentPage: 1,
+      pageSize: 25,
+      currentPageAll: 1,
+      pageSizeAll: 25,
+      contributionCount: 0,
+      contributionCountAll: 0,
+      form: {
+        id: null,
+        date: '',
+        memo: '',
+        hours: 0,
+        amount: '',
+      },
+      updateAmount: '',
+      maximalDate: new Date(),
+      openCreations: [],
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.tabIndex = this.tabLinkHashes.findIndex((hashLink) => hashLink === this.$route.hash)
+      this.hashLink = this.$route.hash
+    })
+  },
+  apollo: {
+    OpenCreations: {
+      query() {
+        return openCreations
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {}
+      },
+      update({ openCreations }) {
+        this.openCreations = openCreations
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+    ListAllContributions: {
+      query() {
+        return listAllContributions
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {
+          currentPage: this.currentPageAll,
+          pageSize: this.pageSizeAll,
+        }
+      },
+      update({ listAllContributions }) {
+        this.contributionCountAll = listAllContributions.contributionCount
+        this.itemsAll = listAllContributions.contributionList
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+    ListContributions: {
+      query() {
+        return listContributions
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+        }
+      },
+      update({ listContributions }) {
+        this.contributionCount = listContributions.contributionCount
+        this.items = listContributions.contributionList
+        if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
+          this.tabIndex = 1
+          if (this.$route.hash !== '#my') {
+            this.$router.push({ path: '/community#my' })
+          }
+          this.toastInfo(this.$t('contribution.alert.answerQuestionToast'))
+        }
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
+  watch: {
+    $route(to, from) {
+      this.tabIndex = this.tabLinkHashes.findIndex((hashLink) => hashLink === to.hash)
+      this.hashLink = to.hash
+      this.closeAllOpenCollapse()
+    },
+    tabIndex(num) {
+      if (num !== 0) {
+        this.form = {
+          id: null,
+          date: new Date(),
+          memo: '',
+          hours: 0,
+          amount: '',
+        }
+      }
+    },
+  },
+  computed: {
+    minimalDate() {
+      const date = new Date(this.maximalDate)
+      return new Date(date.setMonth(date.getMonth() - 1, 1))
+    },
+    isThisMonth() {
+      const formDate = new Date(this.form.date)
+      return (
+        formDate.getFullYear() === this.maximalDate.getFullYear() &&
+        formDate.getMonth() === this.maximalDate.getMonth()
+      )
+    },
+    amountToAdd() {
+      // when existing contribution is edited, the amount is added back on top of the amount
+      if (this.form.id) return parseInt(this.updateAmount)
+      return 0
+    },
+    maxForMonths() {
+      const formDate = new Date(this.form.date)
+      if (this.openCreations && this.openCreations.length)
+        return this.openCreations.slice(1).map((creation) => {
+          if (creation.year === formDate.getFullYear() && creation.month === formDate.getMonth())
+            return parseInt(creation.amount) + this.amountToAdd
+          return parseInt(creation.amount)
+        })
+      return [0, 0]
+    },
+  },
+  methods: {
+    closeAllOpenCollapse() {
+      this.$el.querySelectorAll('.collapse.show').forEach((value) => {
+        this.$root.$emit('bv::toggle::collapse', value.id)
+      })
+    },
+    refetchData() {
+      this.$apollo.queries.ListAllContributions.refetch()
+      this.$apollo.queries.ListContributions.refetch()
+      this.$apollo.queries.OpenCreations.refetch()
+    },
+    saveContribution(data) {
+      this.$apollo
+        .mutate({
+          fetchPolicy: 'no-cache',
+          mutation: createContribution,
+          variables: {
+            creationDate: data.date,
+            memo: data.memo,
+            amount: data.amount,
+          },
+        })
+        .then((result) => {
+          this.toastSuccess(this.$t('contribution.submitted'))
+          this.refetchData()
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
+    updateContribution(data) {
+      this.$apollo
+        .mutate({
+          fetchPolicy: 'no-cache',
+          mutation: updateContribution,
+          variables: {
+            contributionId: data.id,
+            creationDate: data.date,
+            memo: data.memo,
+            amount: data.amount,
+          },
+        })
+        .then((result) => {
+          this.toastSuccess(this.$t('contribution.updated'))
+          this.refetchData()
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
+    deleteContribution(data) {
+      this.$apollo
+        .mutate({
+          fetchPolicy: 'no-cache',
+          mutation: deleteContribution,
+          variables: {
+            id: data.id,
+          },
+        })
+        .then((result) => {
+          this.toastSuccess(this.$t('contribution.deleted'))
+          this.refetchData()
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
+    updateListAllContributions(pagination) {
+      this.currentPageAll = pagination.currentPage
+      this.pageSizeAll = pagination.pageSize
+      this.$apollo.queries.ListAllContributions.refetch()
+    },
+    updateListContributions(pagination) {
+      this.currentPage = pagination.currentPage
+      this.pageSize = pagination.pageSize
+      this.$apollo.queries.ListContributions.refetch()
+    },
+    updateContributionForm(item) {
+      this.form.id = item.id
+      this.form.date = item.contributionDate
+      this.form.memo = item.memo
+      this.form.amount = item.amount
+      this.form.hours = item.amount / 20
+      this.updateAmount = item.amount
+      this.$router.push({ path: '#edit' })
+      this.tabIndex = 0
+    },
+    updateTransactions(pagination) {
+      this.$emit('update-transactions', pagination)
+    },
+    updateState(id) {
+      this.items.find((item) => item.id === id).state = 'PENDING'
+    },
+  },
+  created() {
+    this.updateTransactions(0)
+    this.tabIndex = 1
+    this.$router.push({ path: '/community#my' })
+  },
+}
 </script>
 <style scoped>
 .tab-content {

From 24557ae35b1859506ed988283c757fc508b1cf9c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 14:43:07 +0100
Subject: [PATCH 31/36] Fix locales.

---
 admin/src/locales/de.json | 2 +-
 admin/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 382cfcb95..5d894ff06 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -56,7 +56,6 @@
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
-  "reject": "Ablehnen",
   "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
@@ -122,6 +121,7 @@
     }
   },
   "redeemed": "eingelöst",
+  "reject": "Ablehnen",
   "remove": "Entfernen",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "remove_all": "alle Nutzer entfernen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index d2c65637c..8c94a0296 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -56,7 +56,6 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
-  "reject": "Reject",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
@@ -122,6 +121,7 @@
     }
   },
   "redeemed": "redeemed",
+  "reject": "Reject",
   "remove": "Remove",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "remove_all": "Remove all users",

From da652e674564df162319d80a1aca05a737104b8e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 15:22:37 +0100
Subject: [PATCH 32/36] Rename reject to deny and rejected to denied.

---
 admin/src/components/Tables/OpenCreationsTable.vue |  2 +-
 admin/src/graphql/denyContribution.js              |  7 +++++++
 admin/src/graphql/rejectContribution.js            |  7 -------
 admin/src/locales/de.json                          |  6 +++---
 admin/src/locales/en.json                          |  6 +++---
 admin/src/pages/CreationConfirm.spec.js            |  4 ++--
 admin/src/pages/CreationConfirm.vue                | 14 +++++++-------
 backend/src/auth/RIGHTS.ts                         |  2 +-
 backend/src/emails/sendEmailVariants.test.ts       |  8 ++++----
 backend/src/emails/sendEmailVariants.ts            |  4 ++--
 .../emails/templates/contributionRejected/html.pug |  8 ++++----
 .../templates/contributionRejected/subject.pug     |  2 +-
 .../src/graphql/resolver/ContributionResolver.ts   | 10 +++++-----
 backend/src/locales/en.json                        |  4 ++--
 .../Contributions/ContributionListItem.vue         |  2 +-
 .../Template/RightSide/ContributionInfo.spec.js    |  2 +-
 .../Template/RightSide/ContributionInfo.vue        |  2 +-
 frontend/src/locales/de.json                       |  2 +-
 frontend/src/locales/en.json                       |  2 +-
 frontend/src/locales/es.json                       |  2 +-
 frontend/src/locales/fr.json                       |  2 +-
 frontend/src/locales/nl.json                       |  2 +-
 frontend/src/locales/tr.json                       |  2 +-
 23 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 admin/src/graphql/denyContribution.js
 delete mode 100644 admin/src/graphql/rejectContribution.js

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 2c32c2fbf..5cb407989 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -54,7 +54,7 @@
           <b-button
             variant="danger"
             size="md"
-            @click="$emit('reject-creation', row.item)"
+            @click="$emit('deny-creation', row.item)"
             class="mr-2"
           >
             <b-icon icon="x" variant="light"></b-icon>
diff --git a/admin/src/graphql/denyContribution.js b/admin/src/graphql/denyContribution.js
new file mode 100644
index 000000000..063059c97
--- /dev/null
+++ b/admin/src/graphql/denyContribution.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const denyContribution = gql`
+  mutation ($id: Int!) {
+    denyContribution(id: $id)
+  }
+`
diff --git a/admin/src/graphql/rejectContribution.js b/admin/src/graphql/rejectContribution.js
deleted file mode 100644
index 095a36854..000000000
--- a/admin/src/graphql/rejectContribution.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import gql from 'graphql-tag'
-
-export const rejectContribution = gql`
-  mutation ($id: Int!) {
-    rejectContribution(id: $id)
-  }
-`
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 5d894ff06..11e84c5cd 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -38,7 +38,7 @@
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
-    "rejectNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
+    "denyNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "reset": "Zurücksetzen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
@@ -46,7 +46,7 @@
     "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit",
     "toasted_created": "Schöpfung wurde erfolgreich gespeichert",
     "toasted_delete": "Offene Schöpfung wurde gelöscht",
-    "toasted_rejected": "Offene Schöpfung wurde abgelehnt",
+    "toasted_denied": "Offene Schöpfung wurde abgelehnt",
     "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit",
     "update_creation": "Schöpfung aktualisieren"
   },
@@ -121,7 +121,7 @@
     }
   },
   "redeemed": "eingelöst",
-  "reject": "Ablehnen",
+  "deny": "Ablehnen",
   "remove": "Entfernen",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "remove_all": "alle Nutzer entfernen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8c94a0296..54df546cd 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -38,7 +38,7 @@
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
-    "rejectNow": "Do you really want to reject this contribution to the community?",
+    "denyNow": "Do you really want to reject this contribution to the community?",
     "reset": "Reset",
     "select_month": "Select month",
     "select_value": "Select amount",
@@ -46,7 +46,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
-    "toasted_rejected": "Open creation has been denied",
+    "toasted_denied": "Open creation has been denied",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -121,7 +121,7 @@
     }
   },
   "redeemed": "redeemed",
-  "reject": "Reject",
+  "deny": "Reject",
   "remove": "Remove",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "remove_all": "Remove all users",
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index e5748d489..786f7db4a 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm.vue'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
-import { rejectContribution } from '../graphql/rejectContribution'
+import { denyContribution } from '../graphql/denyContribution'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
@@ -92,7 +92,7 @@ describe('CreationConfirm', () => {
   )
 
   mockClient.setRequestHandler(
-    rejectContribution,
+    denyContribution,
     adminRejectContributionMock.mockResolvedValue({ data: { rejectContribution: true } }),
   )
 
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index ce0ba3a8c..0a6b5ca6e 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -7,7 +7,7 @@
       class="mt-4"
       :items="pendingCreations"
       :fields="fields"
-      @reject-creation="rejectCreation"
+      @deny-creation="denyCreation"
       @remove-creation="removeCreation"
       @show-overlay="showOverlay"
       @update-state="updateState"
@@ -21,7 +21,7 @@ import OpenCreationsTable from '../components/Tables/OpenCreationsTable.vue'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
-import { rejectContribution } from '../graphql/rejectContribution'
+import { denyContribution } from '../graphql/denyContribution'
 
 export default {
   name: 'CreationConfirm',
@@ -37,19 +37,19 @@ export default {
     }
   },
   methods: {
-    rejectCreation(item) {
-      this.$bvModal.msgBoxConfirm(this.$t('creation_form.rejectNow')).then(async (value) => {
+    denyCreation(item) {
+      this.$bvModal.msgBoxConfirm(this.$t('creation_form.denyNow')).then(async (value) => {
         if (value) {
           await this.$apollo
             .mutate({
-              mutation: rejectContribution,
+              mutation: denyContribution,
               variables: {
                 id: item.id,
               },
             })
             .then((result) => {
               this.updatePendingCreations(item.id)
-              this.toastSuccess(this.$t('creation_form.toasted_rejected'))
+              this.toastSuccess(this.$t('creation_form.toasted_denied'))
             })
             .catch((error) => {
               this.toastError(error.message)
@@ -132,7 +132,7 @@ export default {
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
         { key: 'confirm', label: this.$t('save') },
-        { key: 'reject', label: this.$t('reject') },
+        { key: 'deny', label: this.$t('deny') },
       ]
     },
   },
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 146eeb5b8..98f6cf118 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -54,5 +54,5 @@ export enum RIGHTS {
   DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
-  REJECT_CONTRIBUTION = 'REJECT_CONTRIBUTION',
+  DENY_CONTRIBUTION = 'DENY_CONTRIBUTION',
 }
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 1015f2cb5..ddbc387a1 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -9,7 +9,7 @@ import {
   sendAccountActivationEmail,
   sendAccountMultiRegistrationEmail,
   sendContributionConfirmedEmail,
-  sendContributionRejectedEmail,
+  sendContributionDeniedEmail,
   sendResetPasswordEmail,
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
@@ -360,9 +360,9 @@ describe('sendEmailVariants', () => {
     })
   })
 
-  describe('sendContributionRejectedEmail', () => {
+  describe('sendContributionDeniedEmail', () => {
     beforeAll(async () => {
-      result = await sendContributionRejectedEmail({
+      result = await sendContributionDeniedEmail({
         firstName: 'Peter',
         lastName: 'Lustig',
         email: 'peter@lustig.de',
@@ -379,7 +379,7 @@ describe('sendEmailVariants', () => {
           receiver: {
             to: 'Peter Lustig <peter@lustig.de>',
           },
-          template: 'contributionRejected',
+          template: 'contributionDenied',
           locals: {
             firstName: 'Peter',
             lastName: 'Lustig',
diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index cb1376510..681ee56af 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -103,7 +103,7 @@ export const sendContributionConfirmedEmail = (data: {
   })
 }
 
-export const sendContributionRejectedEmail = (data: {
+export const sendContributionDeniedEmail = (data: {
   firstName: string
   lastName: string
   email: string
@@ -114,7 +114,7 @@ export const sendContributionRejectedEmail = (data: {
 }): Promise<Record<string, unknown> | null> => {
   return sendEmailTranslated({
     receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` },
-    template: 'contributionRejected',
+    template: 'contributionDenied',
     locals: {
       firstName: data.firstName,
       lastName: data.lastName,
diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug
index 531f75543..a324374a7 100644
--- a/backend/src/emails/templates/contributionRejected/html.pug
+++ b/backend/src/emails/templates/contributionRejected/html.pug
@@ -1,13 +1,13 @@
 doctype html
 html(lang=locale)
   head
-    title= t('emails.contributionRejected.subject')
+    title= t('emails.contributionDenied.subject')
   body
-    h1(style='margin-bottom: 24px;')= t('emails.contributionRejected.subject')
+    h1(style='margin-bottom: 24px;')= t('emails.contributionDenied.subject')
     #container.col
       include ../hello.pug
-      p= t('emails.contributionRejected.commonGoodContributionRejected', { senderFirstName, senderLastName, contributionMemo })
-      p= t('emails.contributionRejected.toSeeContributionsAndMessages')
+      p= t('emails.contributionDenied.commonGoodContributionDenied', { senderFirstName, senderLastName, contributionMemo })
+      p= t('emails.contributionDenied.toSeeContributionsAndMessages')
       p
         = t('emails.general.linkToYourAccount')
         = " "
diff --git a/backend/src/emails/templates/contributionRejected/subject.pug b/backend/src/emails/templates/contributionRejected/subject.pug
index 40a7622b8..57431e56e 100644
--- a/backend/src/emails/templates/contributionRejected/subject.pug
+++ b/backend/src/emails/templates/contributionRejected/subject.pug
@@ -1 +1 @@
-= t('emails.contributionRejected.subject')
+= t('emails.contributionDenied.subject')
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 72009bc7b..c458e800f 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -50,7 +50,7 @@ import { eventProtocol } from '@/event/EventProtocolEmitter'
 import { calculateDecay } from '@/util/decay'
 import {
   sendContributionConfirmedEmail,
-  sendContributionRejectedEmail,
+  sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 
@@ -541,7 +541,7 @@ export class ContributionResolver {
     await eventProtocol.writeEvent(
       event.setEventAdminContributionDelete(eventAdminContributionDelete),
     )
-    sendContributionRejectedEmail({
+    sendContributionDeniedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.emailContact.email,
@@ -721,9 +721,9 @@ export class ContributionResolver {
     })
   }
 
-  @Authorized([RIGHTS.REJECT_CONTRIBUTION])
+  @Authorized([RIGHTS.DENY_CONTRIBUTION])
   @Mutation(() => Boolean)
-  async rejectContribution(
+  async denyContribution(
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
@@ -765,7 +765,7 @@ export class ContributionResolver {
     contributionToUpdate.deniedAt = new Date()
     const res = await contributionToUpdate.save()
 
-    sendContributionRejectedEmail({
+    sendContributionDeniedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.emailContact.email,
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index ac1ad380f..5cde70d26 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -23,8 +23,8 @@
       "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
       "subject": "Gradido: Your contribution to the common good was confirmed"
     },
-    "contributionRejected": {
-      "commonGoodContributionRejected": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
+    "contributionDenied": {
+      "commonGoodContributionDenied": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was rejected",
       "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
     },
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 4930fb518..d830f1bcd 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -35,7 +35,7 @@
           </div>
           <div v-if="state === 'DENIED' && allContribution" class="font-weight-bold">
             <b-icon icon="x-circle" variant="danger"></b-icon>
-            {{ $t('contribution.alert.rejected') }}
+            {{ $t('contribution.alert.denied') }}
           </div>
           <div v-if="state === 'DELETED'" class="small">
             {{ $t('contribution.deleted') }}
diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.spec.js b/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
index 88a6b6ab8..f4c88b9f5 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.spec.js
@@ -55,7 +55,7 @@ describe('ContributionInfo', () => {
         expect(listItems.at(2).text()).toBe('contribution.alert.confirm')
 
         expect(listItems.at(3).find('svg').attributes('aria-label')).toEqual('x circle')
-        expect(listItems.at(3).text()).toBe('contribution.alert.rejected')
+        expect(listItems.at(3).text()).toBe('contribution.alert.denied')
       })
     })
 
diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.vue b/frontend/src/components/Template/RightSide/ContributionInfo.vue
index e57d5de89..f9952fd83 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.vue
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.vue
@@ -20,7 +20,7 @@
         </li>
         <li>
           <b-icon icon="x-circle" variant="warning"></b-icon>
-          {{ $t('contribution.alert.rejected') }}
+          {{ $t('contribution.alert.denied') }}
         </li>
         <li>
           <b-icon icon="trash" variant="danger"></b-icon>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 406f2564a..3db98b5bb 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -45,7 +45,7 @@
       "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
       "pending": "Eingereicht und wartet auf Bestätigung",
-      "rejected": "abgelehnt"
+      "denied": "abgelehnt"
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 16d4a414b..830e50275 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -45,7 +45,7 @@
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "pending": "Submitted and waiting for confirmation",
-      "rejected": "deleted"
+      "denied": "deleted"
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 0377dcb4e..4e7ed113e 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -42,7 +42,7 @@
       "in_progress": "Hay una pregunta de los moderatores.",
       "myContributionNoteList": "Puedes editar o eliminar las contribuciones enviadas que aún no han sido confirmadas en cualquier momento.",
       "pending": "Enviado y a la espera de confirmación",
-      "rejected": "rechazado"
+      "denied": "rechazado"
     },
     "date": "Contribución para:",
     "delete": "Eliminar la contribución. ¿Estás seguro?",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 389e86307..c2a72f964 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -44,7 +44,7 @@
       "in_progress": "Il y a une question du modérateur.",
       "myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
       "pending": "Inscription en attente de validation",
-      "rejected": "supprimé"
+      "denied": "supprimé"
     },
     "date": "Contribution pour:",
     "delete": "Supprimer la contribution! Êtes-vous sûr?",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index ed1181e4c..75d25b13c 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -42,7 +42,7 @@
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
       "pending": "Ingediend en wacht op bevestiging",
-      "rejected": "afgewezen"
+      "denied": "afgewezen"
     },
     "date": "Bijdrage voor:",
     "delete": "Bijdrage verwijderen! Weet je het zeker?",
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index 33642f3c6..1b807c1ce 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -37,7 +37,7 @@
       "myContributionNoteList": "Bildirmiş olduğun henüz onaylanmamış olan  faaliyetleri istediğin zaman düzenleyebilir veya silebilirsin.",
       "myContributionNoteSupport": "Yakın zamanda moderatörlerle aranda bir diyalog olasılığı olacak. Şu anda herhangi bir sorun yaşıyorsan, lütfen destek hattına başvur.",
       "pending": "Gönderildi ve onay bekleniyor",
-      "rejected": "reddedildi"
+      "denied": "reddedildi"
     },
     "date": "Hizmet:",
     "delete": "Hizmeti sil! Emin misin?",

From 62c85476d40e9ebe52dc9b0fe99fe87fbe1e1b67 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 15:29:19 +0100
Subject: [PATCH 33/36] Correct tests.

---
 admin/src/pages/CreationConfirm.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 786f7db4a..e56a953f9 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -93,7 +93,7 @@ describe('CreationConfirm', () => {
 
   mockClient.setRequestHandler(
     denyContribution,
-    adminRejectContributionMock.mockResolvedValue({ data: { rejectContribution: true } }),
+    adminRejectContributionMock.mockResolvedValue({ data: { denyContribution: true } }),
   )
 
   mockClient.setRequestHandler(
@@ -274,7 +274,7 @@ describe('CreationConfirm', () => {
         })
 
         it('toasts a success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_rejected')
+          expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_denied')
         })
       })
 

From 4f85b8508dfa9de6006859f1197c1c31e5c643fd Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 15:38:28 +0100
Subject: [PATCH 34/36] Fix locales.

---
 admin/src/locales/de.json                                     | 4 ++--
 admin/src/locales/en.json                                     | 4 ++--
 .../{contributionRejected => contributionDenied}/html.pug     | 0
 .../{contributionRejected => contributionDenied}/subject.pug  | 0
 frontend/src/locales/de.json                                  | 4 ++--
 frontend/src/locales/en.json                                  | 4 ++--
 frontend/src/locales/es.json                                  | 4 ++--
 frontend/src/locales/fr.json                                  | 4 ++--
 frontend/src/locales/nl.json                                  | 4 ++--
 frontend/src/locales/tr.json                                  | 4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename backend/src/emails/templates/{contributionRejected => contributionDenied}/html.pug (100%)
 rename backend/src/emails/templates/{contributionRejected => contributionDenied}/subject.pug (100%)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 11e84c5cd..0783896a2 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -35,10 +35,10 @@
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
     "deleteNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich löschen?",
+    "denyNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
-    "denyNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "reset": "Zurücksetzen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
@@ -56,6 +56,7 @@
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
+  "deny": "Ablehnen",
   "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
@@ -121,7 +122,6 @@
     }
   },
   "redeemed": "eingelöst",
-  "deny": "Ablehnen",
   "remove": "Entfernen",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "remove_all": "alle Nutzer entfernen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 54df546cd..78d595f34 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -35,10 +35,10 @@
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
     "deleteNow": "Do you really want to delete this contribution to the community?",
+    "denyNow": "Do you really want to reject this contribution to the community?",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
-    "denyNow": "Do you really want to reject this contribution to the community?",
     "reset": "Reset",
     "select_month": "Select month",
     "select_value": "Select amount",
@@ -56,6 +56,7 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
+  "deny": "Reject",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
@@ -121,7 +122,6 @@
     }
   },
   "redeemed": "redeemed",
-  "deny": "Reject",
   "remove": "Remove",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "remove_all": "Remove all users",
diff --git a/backend/src/emails/templates/contributionRejected/html.pug b/backend/src/emails/templates/contributionDenied/html.pug
similarity index 100%
rename from backend/src/emails/templates/contributionRejected/html.pug
rename to backend/src/emails/templates/contributionDenied/html.pug
diff --git a/backend/src/emails/templates/contributionRejected/subject.pug b/backend/src/emails/templates/contributionDenied/subject.pug
similarity index 100%
rename from backend/src/emails/templates/contributionRejected/subject.pug
rename to backend/src/emails/templates/contributionDenied/subject.pug
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 3db98b5bb..a51b48e37 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -42,10 +42,10 @@
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "deleted": "gelöscht",
+      "denied": "abgelehnt",
       "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
-      "pending": "Eingereicht und wartet auf Bestätigung",
-      "denied": "abgelehnt"
+      "pending": "Eingereicht und wartet auf Bestätigung"
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 830e50275..73b2c88e2 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -42,10 +42,10 @@
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "deleted": "deleted",
+      "denied": "deleted",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
-      "pending": "Submitted and waiting for confirmation",
-      "denied": "deleted"
+      "pending": "Submitted and waiting for confirmation"
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 4e7ed113e..9441a10a2 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -39,10 +39,10 @@
       "answerQuestion": "Por favor,  contesta las preguntas",
       "communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
       "confirm": "confirmado",
+      "denied": "rechazado",
       "in_progress": "Hay una pregunta de los moderatores.",
       "myContributionNoteList": "Puedes editar o eliminar las contribuciones enviadas que aún no han sido confirmadas en cualquier momento.",
-      "pending": "Enviado y a la espera de confirmación",
-      "denied": "rechazado"
+      "pending": "Enviado y a la espera de confirmación"
     },
     "date": "Contribución para:",
     "delete": "Eliminar la contribución. ¿Estás seguro?",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index c2a72f964..9e2c11fc5 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -41,10 +41,10 @@
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": "Approuvé",
       "deleted": "Supprimé",
+      "denied": "supprimé",
       "in_progress": "Il y a une question du modérateur.",
       "myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
-      "pending": "Inscription en attente de validation",
-      "denied": "supprimé"
+      "pending": "Inscription en attente de validation"
     },
     "date": "Contribution pour:",
     "delete": "Supprimer la contribution! Êtes-vous sûr?",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 75d25b13c..0ac052c47 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -39,10 +39,10 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
       "confirm": "bevestigt",
+      "denied": "afgewezen",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
-      "pending": "Ingediend en wacht op bevestiging",
-      "denied": "afgewezen"
+      "pending": "Ingediend en wacht op bevestiging"
     },
     "date": "Bijdrage voor:",
     "delete": "Bijdrage verwijderen! Weet je het zeker?",
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index 1b807c1ce..4bfc7145b 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -34,10 +34,10 @@
     "alert": {
       "communityNoteList": "Burada, bu topluluğun tüm üyelerinden gönderilen ve onaylanan bütün faydalı hizmetleri bulacaksın.",
       "confirm": "onaylandı",
+      "denied": "reddedildi",
       "myContributionNoteList": "Bildirmiş olduğun henüz onaylanmamış olan  faaliyetleri istediğin zaman düzenleyebilir veya silebilirsin.",
       "myContributionNoteSupport": "Yakın zamanda moderatörlerle aranda bir diyalog olasılığı olacak. Şu anda herhangi bir sorun yaşıyorsan, lütfen destek hattına başvur.",
-      "pending": "Gönderildi ve onay bekleniyor",
-      "denied": "reddedildi"
+      "pending": "Gönderildi ve onay bekleniyor"
     },
     "date": "Hizmet:",
     "delete": "Hizmeti sil! Emin misin?",

From 2291cc813e435109da2904d87d178e0987a12a31 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 15:47:31 +0100
Subject: [PATCH 35/36] Change en translation from deny to reject.

---
 admin/src/pages/CreationConfirm.spec.js | 6 +++---
 frontend/src/locales/en.json            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index e56a953f9..f99ff5247 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -251,10 +251,10 @@ describe('CreationConfirm', () => {
       })
     })
 
-    describe('decline creation with success', () => {
+    describe('deny creation with success', () => {
       let spy
 
-      describe('admin confirms decline', () => {
+      describe('admin confirms deny', () => {
         beforeEach(async () => {
           spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
           spy.mockImplementation(() => Promise.resolve('some value'))
@@ -278,7 +278,7 @@ describe('CreationConfirm', () => {
         })
       })
 
-      describe('admin cancels decline', () => {
+      describe('admin cancels deny', () => {
         beforeEach(async () => {
           spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
           spy.mockImplementation(() => Promise.resolve(false))
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 73b2c88e2..ce65ac9af 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -42,7 +42,7 @@
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "deleted": "deleted",
-      "denied": "deleted",
+      "denied": "rejected",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "pending": "Submitted and waiting for confirmation"

From 57222d07c4f70e1f8216477c0aebb3d9b9e4b76e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 24 Jan 2023 15:56:58 +0100
Subject: [PATCH 36/36] Change rejected to deny, add error test for
 denyContribution & remove TODO comment.

---
 admin/src/pages/CreationConfirm.spec.js       | 24 +++++++++++++++----
 .../graphql/resolver/ContributionResolver.ts  |  3 ---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index f99ff5247..ecf34f564 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -76,7 +76,7 @@ describe('CreationConfirm', () => {
 
   const listUnconfirmedContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
-  const adminRejectContributionMock = jest.fn()
+  const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
@@ -93,7 +93,9 @@ describe('CreationConfirm', () => {
 
   mockClient.setRequestHandler(
     denyContribution,
-    adminRejectContributionMock.mockResolvedValue({ data: { denyContribution: true } }),
+    adminDenyContributionMock
+      .mockRejectedValueOnce({ message: 'Ouch!' })
+      .mockResolvedValue({ data: { denyContribution: true } }),
   )
 
   mockClient.setRequestHandler(
@@ -251,6 +253,20 @@ describe('CreationConfirm', () => {
       })
     })
 
+    describe('deny creation with error', () => {
+      let spy
+
+      beforeEach(async () => {
+        spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+        spy.mockImplementation(() => Promise.resolve('some value'))
+        await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('Ouchhh!')
+      })
+    })
+
     describe('deny creation with success', () => {
       let spy
 
@@ -266,7 +282,7 @@ describe('CreationConfirm', () => {
         })
 
         it('calls the adminDeleteContribution mutation', () => {
-          expect(adminRejectContributionMock).toBeCalledWith({ id: 1 })
+          expect(adminDenyContributionMock).toBeCalledWith({ id: 1 })
         })
 
         it('commits openCreationsMinus to store', () => {
@@ -286,7 +302,7 @@ describe('CreationConfirm', () => {
         })
 
         it('does not call the adminDeleteContribution mutation', () => {
-          expect(adminRejectContributionMock).not.toBeCalled()
+          expect(adminDenyContributionMock).not.toBeCalled()
         })
       })
     })
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index c458e800f..0c758b52b 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -732,9 +732,6 @@ export class ContributionResolver {
       confirmedAt: IsNull(),
       deniedBy: IsNull(),
     })
-    // TODO: Check
-    // - contribution exists
-    // - state has accept one
     if (!contributionToUpdate) {
       logger.error(`Contribution not found for given id: ${id}`)
       throw new Error(`Contribution not found for given id.`)