From 3f950a9bb8adbae50d25efa0e4d86752df9d195d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 15 Aug 2022 11:02:05 +0200
Subject: [PATCH 001/163] Method to retrieve not registered emails.

---
 backend/src/auth/RIGHTS.ts                    |  1 +
 .../src/graphql/resolver/KlicktippResolver.ts | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index d5e2cc7ce..8e51c182e 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -48,4 +48,5 @@ export enum RIGHTS {
   LIST_CONTRIBUTION_LINKS = 'LIST_CONTRIBUTION_LINKS',
   DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
+  ADMIN_RETRIEVE_NOT_REGISTERED_EMAILS = 'ADMIN_RETRIEVE_NOT_REGISTERED_EMAILS',
 }
diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index ce9a097e2..fecf6f08c 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -7,6 +7,8 @@ import {
 } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
 import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
+import { User } from '@entity/User'
+import { backendLogger } from '@/server/logger'
 
 @Resolver()
 export class KlicktippResolver {
@@ -35,4 +37,21 @@ export class KlicktippResolver {
   ): Promise<boolean> {
     return await klicktippSignIn(email, language)
   }
+
+  @Authorized([RIGHTS.ADMIN_RETRIEVE_NOT_REGISTERED_EMAILS])
+  @Query(() => [String])
+  async retrieveNotRegisteredEmails(): Promise<string[]> {
+    const users = await User.find()
+    const notRegisteredUser = []
+    for (let i = 0; i < users.length; i++) {
+      const user = users[i]
+      try {
+        await getKlickTippUser(user.email)
+      } catch (err) {
+        notRegisteredUser.push(user.email)
+        backendLogger.error(`Error with email: ${user.email}; ${err}`)
+      }
+    }
+    return notRegisteredUser
+  }
 }

From 32b5bf3d6b02adf701b9b071fefa14d7a7f2251c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 16 Aug 2022 07:01:33 +0200
Subject: [PATCH 002/163] Remove resolver method for klickTipp not registered
 users.

---
 .../src/graphql/resolver/KlicktippResolver.ts   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index fecf6f08c..07b872c43 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -37,21 +37,4 @@ export class KlicktippResolver {
   ): Promise<boolean> {
     return await klicktippSignIn(email, language)
   }
-
-  @Authorized([RIGHTS.ADMIN_RETRIEVE_NOT_REGISTERED_EMAILS])
-  @Query(() => [String])
-  async retrieveNotRegisteredEmails(): Promise<string[]> {
-    const users = await User.find()
-    const notRegisteredUser = []
-    for (let i = 0; i < users.length; i++) {
-      const user = users[i]
-      try {
-        await getKlickTippUser(user.email)
-      } catch (err) {
-        notRegisteredUser.push(user.email)
-        backendLogger.error(`Error with email: ${user.email}; ${err}`)
-      }
-    }
-    return notRegisteredUser
-  }
 }

From 49de7366f44d47ac3c2e4449454f3aad6b4db14f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 16 Aug 2022 07:02:07 +0200
Subject: [PATCH 003/163] Add method to log every user that is not registered
 at KlickTipp.

---
 backend/src/klicktipp.ts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 backend/src/klicktipp.ts

diff --git a/backend/src/klicktipp.ts b/backend/src/klicktipp.ts
new file mode 100644
index 000000000..3139cd296
--- /dev/null
+++ b/backend/src/klicktipp.ts
@@ -0,0 +1,28 @@
+import connection from '@/typeorm/connection'
+import { getKlickTippUser } from './apis/KlicktippController'
+import { User } from '../../database/entity/User'
+import { getConnection } from '@dbTools/typeorm'
+
+export async function retrieveNotRegisteredEmails(): Promise<string[]> {
+  const con = await connection()
+  if (!con) {
+    throw new Error('No connection to database')
+  }
+  const users = await User.find()
+  const notRegisteredUser = []
+  for (let i = 0; i < users.length; i++) {
+    const user = users[i]
+    try {
+      await getKlickTippUser(user.email)
+    } catch (err) {
+      notRegisteredUser.push(user.email)
+      // eslint-disable-next-line no-console
+      console.log(`${user.email}`)
+    }
+  }
+  await con.close()
+  console.log('User die nicht bei KlickTipp vorhanden sind: ', notRegisteredUser)
+  return notRegisteredUser
+}
+
+retrieveNotRegisteredEmails()

From ea85f9c3ae17d458eb917fdd6f0481419fface59 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 16 Aug 2022 07:02:34 +0200
Subject: [PATCH 004/163] Add yarn klicktipp to start the script of not
 registered user.

---
 backend/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index c56c8e960..f3033a620 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,8 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
+    "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/klicktipp.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",

From fad26a30dd6c63b7ca8db19bf6614339be43036d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 18 Aug 2022 10:30:13 +0200
Subject: [PATCH 005/163] prework messages in adminarea

---
 .../ContributionMessagesFormular.vue          | 39 +++++++++++++++
 .../ContributionMessagesList.vue              | 47 +++++++++++++++++++
 .../components/Tables/OpenCreationsTable.vue  | 17 ++++++-
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
 create mode 100644 admin/src/components/ContributionMessages/ContributionMessagesList.vue

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
new file mode 100644
index 000000000..177520fd4
--- /dev/null
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="contribution-messages-formular">
+    <b-form @submit="onSubmit" @reset="onReset">
+      <b-form-textarea
+        id="textarea"
+        v-model="form.text"
+        placeholder="Enter something..."
+        rows="3"
+        max-rows="6"
+      ></b-form-textarea>
+      <p v-if="form.text !== ''" class="mt-5">Vorschau</p>
+      <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
+      <b-button type="submit" variant="primary">Submit</b-button>
+      <b-button type="reset" variant="danger">Reset</b-button>
+    </b-form>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesFormular',
+  data() {
+    return {
+      form: {
+        text: '',
+      },
+    }
+  },
+  methods: {
+    onSubmit(event) {
+      event.preventDefault()
+      alert(JSON.stringify(this.form))
+    },
+    onReset(event) {
+      event.preventDefault()
+      this.form.text = ''
+    },
+  },
+}
+</script>
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
new file mode 100644
index 000000000..2f1c038d2
--- /dev/null
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="contribution-messages-list">ContributionMessagesList
+
+      <b-container>
+          <div v-for="message in messages">
+          {{message}}</div>
+      </b-container>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesList',
+  data() {
+    return {
+      messages: [
+        {
+          id: '0',
+          msgid: '0',
+          memo: 'kjsdn sdnnasd andandandak sd n askdna kdnak asdnadjasndk adkand',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: true,
+        },
+        {
+          id: '1',
+          msgid: '0',
+          memo: 'nftzfD dfRDTD FDdrD TFt F ZTFZF TZfz FF T TZF Z ff ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: false,
+        },
+        {
+          id: '0',
+          msgid: '0',
+          memo: 'oG iu Hih hi  ',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: true,
+        },
+      ],
+    }
+  },
+}
+</script>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 3ebc81fba..2b8956206 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -21,6 +21,9 @@
         >
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
+        <b-button v-else @click="rowToggleDetails(row, 0)">
+          <b-icon icon="chat-dots"></b-icon>
+        </b-button>
       </template>
       <template #cell(confirm)="row">
         <b-button variant="success" size="md" @click="$emit('show-overlay', row.item)" class="mr-2">
@@ -36,7 +39,7 @@
           @row-toggle-details="rowToggleDetails"
         >
           <template #show-creation>
-            <div>
+            <div v-if="row.item.moderator">
               <edit-creation-formular
                 type="singleCreation"
                 :creation="row.item.creation"
@@ -47,6 +50,14 @@
                 @update-user-data="updateUserData"
               />
             </div>
+            <div v-else>
+              <contribution-messages-formular />
+              <hr />
+              <contribution-messages-list />
+              <br />
+              <br />
+              <br />
+            </div>
           </template>
         </row-details>
       </template>
@@ -58,6 +69,8 @@
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails.vue'
 import EditCreationFormular from '../EditCreationFormular.vue'
+import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList.vue'
 
 export default {
   name: 'OpenCreationsTable',
@@ -65,6 +78,8 @@ export default {
   components: {
     EditCreationFormular,
     RowDetails,
+    ContributionMessagesFormular,
+    ContributionMessagesList,
   },
   props: {
     items: {

From edbe59b5bac2db05eb54335b866e05481608a424 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 18 Aug 2022 10:36:20 +0200
Subject: [PATCH 006/163] fix lint

---
 .../ContributionMessagesList.vue                     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 2f1c038d2..18fbdc56d 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,10 +1,12 @@
 <template>
-  <div class="contribution-messages-list">ContributionMessagesList
+  <div class="contribution-messages-list">
+    ContributionMessagesList
 
-      <b-container>
-          <div v-for="message in messages">
-          {{message}}</div>
-      </b-container>
+    <b-container>
+      <div v-for="message in messages">
+        {{ message }}
+      </div>
+    </b-container>
   </div>
 </template>
 <script>

From efac17a9a985e797fe4f656f9f00e65d08bc39b9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 18 Aug 2022 15:27:02 +0200
Subject: [PATCH 007/163] add slotsystem

---
 .../ContributionMessagesFormular.vue          | 41 +++++++++++-----
 .../ContributionMessagesList.vue              | 48 ++++++++++++++++---
 .../slots/ContributionMessagesListItem.vue    | 16 +++++++
 .../slots/IsModerator.vue                     | 27 +++++++++++
 .../slots/IsNotModerator.vue                  | 33 +++++++++++++
 .../components/Tables/OpenCreationsTable.vue  |  8 +---
 6 files changed, 147 insertions(+), 26 deletions(-)
 create mode 100644 admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
 create mode 100644 admin/src/components/ContributionMessages/slots/IsModerator.vue
 create mode 100644 admin/src/components/ContributionMessages/slots/IsNotModerator.vue

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 177520fd4..4643112fd 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,18 +1,33 @@
 <template>
   <div class="contribution-messages-formular">
-    <b-form @submit="onSubmit" @reset="onReset">
-      <b-form-textarea
-        id="textarea"
-        v-model="form.text"
-        placeholder="Enter something..."
-        rows="3"
-        max-rows="6"
-      ></b-form-textarea>
-      <p v-if="form.text !== ''" class="mt-5">Vorschau</p>
-      <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
-      <b-button type="submit" variant="primary">Submit</b-button>
-      <b-button type="reset" variant="danger">Reset</b-button>
-    </b-form>
+    <div v-if="form.text !== ''" class="mt-5">
+      <h4>Vorschau</h4>
+      <div class="border border-info m-5">
+        <b-row>
+          <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
+          <b-col cols="11">
+            <pre class="ml-3 mt-3 mb-5">
+              <span class="ml-2 mr-2">
+              {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+            </span>
+            {{ form.text }}</pre>
+          </b-col>
+        </b-row>
+      </div>
+    </div>
+    <div>
+      <b-form @submit="onSubmit" @reset="onReset">
+        <b-form-textarea
+          id="textarea"
+          v-model="form.text"
+          placeholder="Enter something..."
+          rows="3"
+          max-rows="6"
+        ></b-form-textarea>
+        <b-button type="submit" variant="primary">Submit</b-button>
+        <b-button type="reset" variant="danger">Reset</b-button>
+      </b-form>
+    </div>
   </div>
 </template>
 <script>
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 18fbdc56d..409ceb6b1 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -3,15 +3,37 @@
     ContributionMessagesList
 
     <b-container>
-      <div v-for="message in messages">
-        {{ message }}
+      <div v-for="message in messages" v-bind:key="message.id">
+        <contribution-messages-list-item :typeId="message.isModerator">
+          <template #1>
+            <is-moderator :message="message"></is-moderator>
+          </template>
+          <template #0>
+            <is-not-moderator :message="message" class="text-right"></is-not-moderator>
+          </template>
+        </contribution-messages-list-item>
       </div>
     </b-container>
+    <br />
+    <br />
+    <br />
+    <contribution-messages-formular />
   </div>
 </template>
 <script>
+import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
+import IsModerator from './slots/IsModerator.vue'
+import IsNotModerator from './slots/IsNotModerator.vue'
+import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+
 export default {
   name: 'ContributionMessagesList',
+  components: {
+    ContributionMessagesListItem,
+    IsModerator,
+    IsNotModerator,
+    ContributionMessagesFormular,
+  },
   data() {
     return {
       messages: [
@@ -22,7 +44,7 @@ export default {
           uuid: '1',
           firstName: 'peter',
           lastName: 'lustig',
-          isModerator: true,
+          isModerator: 1,
         },
         {
           id: '1',
@@ -31,19 +53,33 @@ export default {
           uuid: '2',
           firstName: 'bibi',
           lastName: 'bloxberg',
-          isModerator: false,
+          isModerator: 0,
         },
         {
-          id: '0',
+          id: '2',
           msgid: '0',
           memo: 'oG iu Hih hi  ',
           uuid: '1',
           firstName: 'peter',
           lastName: 'lustig',
-          isModerator: true,
+          isModerator: 1,
+        },
+        {
+          id: '3',
+          msgid: '0',
+          memo: 'zdg  gdggs ds gdggusgdug nftz s s ZF TZfz FF 564c ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: 0,
         },
       ],
     }
   },
 }
 </script>
+<style scoped>
+.temp-message {
+  margin-top: 50px;
+}
+</style>
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
new file mode 100644
index 000000000..74d349d12
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <slot :name="typeId"></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesListItem',
+  props: {
+    typeId: {
+      type: Number,
+      required: true,
+    },
+  },
+}
+</script>
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
new file mode 100644
index 000000000..1fd284b65
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="slot-is-moderator">
+    <b-avatar square text="AA"></b-avatar>
+    <span class="ml-2 mr-2">{{ message.firstName }} {{ message.lastName }}</span>
+    <div class="mt-2">{{ message }}</div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.slot-is-moderator {
+  clear: both;
+  background-color: rgb(250, 158, 207);
+  width: 75%;
+  margin-top: 20px;
+}
+</style>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
new file mode 100644
index 000000000..8554fdcf1
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="slot-is-not-moderator">
+    <div class="text-right">
+      <b-avatar text="BV"></b-avatar>
+      <span class="ml-2 mr-2 text-bold">{{ message.firstName }} {{ message.lastName }}</span>
+      <div class="mt-2">{{ message }}</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.clear {
+  clear: both;
+}
+.slot-is-not-moderator {
+  clear: both;
+  float: right;
+  background-color: aquamarine;
+  width: 75%;
+  margin-top: 20px;
+}
+</style>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 2b8956206..649435798 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -51,12 +51,7 @@
               />
             </div>
             <div v-else>
-              <contribution-messages-formular />
-              <hr />
               <contribution-messages-list />
-              <br />
-              <br />
-              <br />
             </div>
           </template>
         </row-details>
@@ -69,7 +64,7 @@
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails.vue'
 import EditCreationFormular from '../EditCreationFormular.vue'
-import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList.vue'
 
 export default {
@@ -78,7 +73,6 @@ export default {
   components: {
     EditCreationFormular,
     RowDetails,
-    ContributionMessagesFormular,
     ContributionMessagesList,
   },
   props: {

From 2a093c234f59294423ddb8b44b980d5c508d2726 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 18 Aug 2022 15:28:50 +0200
Subject: [PATCH 008/163] fix lint

---
 .../components/ContributionMessages/ContributionMessagesList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 409ceb6b1..65484b14e 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="contribution-messages-list">
     ContributionMessagesList
-
     <b-container>
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :typeId="message.isModerator">

From 8f117f23b412055a11b21c2fc09fe7696632824f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 10:13:11 +0200
Subject: [PATCH 009/163] Add new right CREATE_CONTRIBUTION_MESSAGE

---
 backend/src/auth/RIGHTS.ts | 1 +
 backend/src/auth/ROLES.ts  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 0d8252402..c38315de4 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -33,6 +33,7 @@ export enum RIGHTS {
   LIST_CONTRIBUTION_LINKS = 'LIST_CONTRIBUTION_LINKS',
   COMMUNITY_STATISTICS = 'COMMUNITY_STATISTICS',
   SEARCH_ADMIN_USERS = 'SEARCH_ADMIN_USERS',
+  CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
   SET_USER_ROLE = 'SET_USER_ROLE',
diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts
index f14e77b17..bad18db9e 100644
--- a/backend/src/auth/ROLES.ts
+++ b/backend/src/auth/ROLES.ts
@@ -31,6 +31,7 @@ export const ROLE_USER = new Role('user', [
   RIGHTS.SEARCH_ADMIN_USERS,
   RIGHTS.LIST_CONTRIBUTION_LINKS,
   RIGHTS.COMMUNITY_STATISTICS,
+  RIGHTS.CREATE_CONTRIBUTION_MESSAGE,
 ])
 export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights
 

From a59967d767d0f9aab702f8d501785f2b49b9566d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 10:30:14 +0200
Subject: [PATCH 010/163] Add new Arg for ContributionMessage

---
 backend/src/graphql/arg/ContributionMessageArgs.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 backend/src/graphql/arg/ContributionMessageArgs.ts

diff --git a/backend/src/graphql/arg/ContributionMessageArgs.ts b/backend/src/graphql/arg/ContributionMessageArgs.ts
new file mode 100644
index 000000000..963824350
--- /dev/null
+++ b/backend/src/graphql/arg/ContributionMessageArgs.ts
@@ -0,0 +1,11 @@
+import { ArgsType, Field, InputType } from 'type-graphql'
+
+@InputType()
+@ArgsType()
+export default class ContributionArgs {
+  @Field(() => Number)
+  contributionId: number
+
+  @Field(() => String)
+  message: string
+}

From 0376cffb193f230faedeaaeb4dbf4c273abed229 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 10:30:48 +0200
Subject: [PATCH 011/163] First steps createContributionMessage method of
 ContributionMessageResolver.

---
 .../resolver/ContributionMessageResolver.ts   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 backend/src/graphql/resolver/ContributionMessageResolver.ts

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
new file mode 100644
index 000000000..e10bcf853
--- /dev/null
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -0,0 +1,33 @@
+import { RIGHTS } from '@/auth/RIGHTS'
+import { Context, getUser } from '@/server/context'
+import { ContributionMessage } from '@entity/ContributionMessage'
+import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
+import ContributionMessageArgs from '@arg/ContributionMessageArgs'
+import { Contribution } from '@entity/Contribution'
+import { ContributionMessageType } from '@enum/MessageType'
+
+@Resolver()
+export class ContributionResolver {
+  @Authorized([RIGHTS.CREATE_CONTRIBUTION_MESSAGE])
+  @Mutation(() => ContributionMessage)
+  async createContributionMessage(
+    @Args() { contributionId, message }: ContributionMessageArgs,
+    @Ctx() context: Context,
+  ): Promise<ContributionMessage> {
+    const user = getUser(context)
+    const contribution = await Contribution.findOneOrFail({ id: contributionId })
+    if (!user.isAdmin && contribution.userId !== user.id) {
+      throw new Error('Can not send message to contribution of another user')
+    }
+
+    const contributionMessage = new ContributionMessage()
+    contributionMessage.contributionId = contributionId
+    contributionMessage.createdAt = new Date()
+    contributionMessage.message = message
+    contributionMessage.userId = user.id
+    contributionMessage.type = ContributionMessageType.DIALOG
+
+    ContributionMessage.save(contributionMessage)
+    return contributionMessage
+  }
+}

From 281f6cde3feb3cd04b054aeaf94564f8d6d74b98 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 10:39:56 +0200
Subject: [PATCH 012/163] Update contributionStatus to new state.

---
 .../graphql/resolver/ContributionMessageResolver.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index e10bcf853..b6df23488 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -5,6 +5,7 @@ import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
+import { ContributionStatus } from '../enum/ContributionStatus'
 
 @Resolver()
 export class ContributionResolver {
@@ -26,8 +27,18 @@ export class ContributionResolver {
     contributionMessage.message = message
     contributionMessage.userId = user.id
     contributionMessage.type = ContributionMessageType.DIALOG
-
     ContributionMessage.save(contributionMessage)
+
+    if (user.isAdmin && contribution.contributionStatus === ContributionStatus.PENDING) {
+      contribution.contributionStatus = ContributionStatus.IN_PROGRESS
+    } else if (
+      !user.isAdmin &&
+      contribution.contributionStatus === ContributionStatus.IN_PROGRESS
+    ) {
+      contribution.contributionStatus = ContributionStatus.PENDING
+    }
+    Contribution.save(contribution)
+
     return contributionMessage
   }
 }

From c5b84694d04111fe6ce316594141ec24ab19b0f4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 12:16:20 +0200
Subject: [PATCH 013/163] Withdrew admin part of user
 createContributionMessage.

---
 .../resolver/ContributionMessageResolver.ts   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index b6df23488..ea80dd7d4 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -1,3 +1,4 @@
+import { backendLogger as logger } from '@/server/logger'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { ContributionMessage } from '@entity/ContributionMessage'
@@ -6,9 +7,11 @@ import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '../enum/ContributionStatus'
+import { getConnection } from '@dbTools/typeorm'
 
 @Resolver()
 export class ContributionResolver {
+  // TODO: Have two method one for admin on for
   @Authorized([RIGHTS.CREATE_CONTRIBUTION_MESSAGE])
   @Mutation(() => ContributionMessage)
   async createContributionMessage(
@@ -16,29 +19,35 @@ export class ContributionResolver {
     @Ctx() context: Context,
   ): Promise<ContributionMessage> {
     const user = getUser(context)
-    const contribution = await Contribution.findOneOrFail({ id: contributionId })
-    if (!user.isAdmin && contribution.userId !== user.id) {
-      throw new Error('Can not send message to contribution of another user')
-    }
-
+    const queryRunner = getConnection().createQueryRunner()
+    await queryRunner.connect()
+    await queryRunner.startTransaction('READ UNCOMMITTED')
     const contributionMessage = new ContributionMessage()
-    contributionMessage.contributionId = contributionId
-    contributionMessage.createdAt = new Date()
-    contributionMessage.message = message
-    contributionMessage.userId = user.id
-    contributionMessage.type = ContributionMessageType.DIALOG
-    ContributionMessage.save(contributionMessage)
+    try {
+      const contribution = await Contribution.findOneOrFail({ id: contributionId })
+      if (contribution.userId !== user.id) {
+        throw new Error('Can not send message to contribution of another user')
+      }
 
-    if (user.isAdmin && contribution.contributionStatus === ContributionStatus.PENDING) {
-      contribution.contributionStatus = ContributionStatus.IN_PROGRESS
-    } else if (
-      !user.isAdmin &&
-      contribution.contributionStatus === ContributionStatus.IN_PROGRESS
-    ) {
-      contribution.contributionStatus = ContributionStatus.PENDING
+      contributionMessage.contributionId = contributionId
+      contributionMessage.createdAt = new Date()
+      contributionMessage.message = message
+      contributionMessage.userId = user.id
+      contributionMessage.type = ContributionMessageType.DIALOG
+      await queryRunner.manager.insert(ContributionMessage, contributionMessage)
+
+      if (contribution.contributionStatus === ContributionStatus.IN_PROGRESS) {
+        contribution.contributionStatus = ContributionStatus.PENDING
+        await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
+      }
+      await queryRunner.commitTransaction()
+    } catch (e) {
+      await queryRunner.rollbackTransaction()
+      logger.error(`ContributionMessage was not successful: ${e}`)
+      throw new Error(`Transaction was not successful: ${e}`)
+    } finally {
+      await queryRunner.release()
     }
-    Contribution.save(contribution)
-
     return contributionMessage
   }
 }

From bca2f49483115f062076abb84e9f0a018de58f51 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 12:17:11 +0200
Subject: [PATCH 014/163] Add admin right to create contribution message.

---
 backend/src/auth/RIGHTS.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index c38315de4..a62a09bee 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -51,4 +51,5 @@ export enum RIGHTS {
   CREATE_CONTRIBUTION_LINK = 'CREATE_CONTRIBUTION_LINK',
   DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
+  ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
 }

From 710d47b594c6158b81f631e095fa9659a7a3de82 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 12:21:38 +0200
Subject: [PATCH 015/163] Add adminCreateContributionMessage.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index e70fe71ee..01d70cd3c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -62,6 +62,9 @@ import {
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
+import { ContributionMessage } from '@entity/ContributionMessage'
+import ContributionMessageArgs from '../arg/ContributionMessageArgs'
+import { ContributionMessageType } from '../enum/MessageType'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -696,4 +699,44 @@ export class AdminResolver {
     logger.debug(`updateContributionLink successful!`)
     return new ContributionLink(dbContributionLink)
   }
+
+  @Authorized([RIGHTS.ADMIN_CREATE_CONTRIBUTION_MESSAGE])
+  @Mutation(() => ContributionMessage)
+  async adminCreateContributionMessage(
+    @Args() { contributionId, message }: ContributionMessageArgs,
+    @Ctx() context: Context,
+  ): Promise<ContributionMessage> {
+    const user = getUser(context)
+    const queryRunner = getConnection().createQueryRunner()
+    await queryRunner.connect()
+    await queryRunner.startTransaction('READ UNCOMMITTED')
+    const contributionMessage = new ContributionMessage()
+    try {
+      const contribution = await Contribution.findOneOrFail({ id: contributionId })
+
+      contributionMessage.contributionId = contributionId
+      contributionMessage.createdAt = new Date()
+      contributionMessage.message = message
+      contributionMessage.userId = user.id
+      contributionMessage.type = ContributionMessageType.DIALOG
+      await queryRunner.manager.insert(ContributionMessage, contributionMessage)
+
+      if (
+        contribution.contributionStatus === ContributionStatus.DELETED ||
+        contribution.contributionStatus === ContributionStatus.DENIED ||
+        contribution.contributionStatus === ContributionStatus.PENDING
+      ) {
+        contribution.contributionStatus = ContributionStatus.IN_PROGRESS
+        await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
+      }
+      await queryRunner.commitTransaction()
+    } catch (e) {
+      await queryRunner.rollbackTransaction()
+      logger.error(`ContributionMessage was not successful: ${e}`)
+      throw new Error(`Transaction was not successful: ${e}`)
+    } finally {
+      await queryRunner.release()
+    }
+    return contributionMessage
+  }
 }

From 5ca422c6d3aaa1ce30cacfe3b4055627fc339bb4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 12:27:06 +0200
Subject: [PATCH 016/163] Change import for enum and arg.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 01d70cd3c..48acada1f 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -63,8 +63,8 @@ import {
   MEMO_MIN_CHARS,
 } from './const/const'
 import { ContributionMessage } from '@entity/ContributionMessage'
-import ContributionMessageArgs from '../arg/ContributionMessageArgs'
-import { ContributionMessageType } from '../enum/MessageType'
+import ContributionMessageArgs from '@arg/ContributionMessageArgs'
+import { ContributionMessageType } from '@enum/MessageType'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?

From 27fd42f097e39597b6efdf95ca7e9f392b115aec Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 22 Aug 2022 12:27:46 +0200
Subject: [PATCH 017/163] Change import for enum.

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

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index ea80dd7d4..158b3fafb 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -6,7 +6,7 @@ import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
-import { ContributionStatus } from '../enum/ContributionStatus'
+import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 
 @Resolver()

From 8bfc505c5c6c8b529f2952c9182342457e46b6fe Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 23 Aug 2022 11:08:01 +0200
Subject: [PATCH 018/163] contribution messages locales

---
 .../ContributionMessagesFormular.vue          | 19 +++++++++++--------
 .../ContributionMessagesList.vue              |  1 -
 .../slots/IsNotModerator.vue                  |  1 +
 .../components/Tables/OpenCreationsTable.vue  |  3 ++-
 admin/src/locales/de.json                     |  7 ++++++-
 admin/src/locales/en.json                     |  7 ++++++-
 6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 4643112fd..f3de7be3d 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,16 +1,19 @@
 <template>
   <div class="contribution-messages-formular">
     <div v-if="form.text !== ''" class="mt-5">
-      <h4>Vorschau</h4>
+      <h4>{{ $t('preview') }}</h4>
       <div class="border border-info m-5">
         <b-row>
           <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
           <b-col cols="11">
-            <pre class="ml-3 mt-3 mb-5">
-              <span class="ml-2 mr-2">
-              {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
-            </span>
-            {{ form.text }}</pre>
+            <pre class="mt-2">
+            {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+            </pre>
+          </b-col>
+        </b-row>
+        <b-row>
+          <b-col>
+            <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
           </b-col>
         </b-row>
       </div>
@@ -24,8 +27,8 @@
           rows="3"
           max-rows="6"
         ></b-form-textarea>
-        <b-button type="submit" variant="primary">Submit</b-button>
-        <b-button type="reset" variant="danger">Reset</b-button>
+        <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+        <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
       </b-form>
     </div>
   </div>
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 65484b14e..9087beacf 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="contribution-messages-list">
-    ContributionMessagesList
     <b-container>
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :typeId="message.isModerator">
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8554fdcf1..668e840fe 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -29,5 +29,6 @@ export default {
   background-color: aquamarine;
   width: 75%;
   margin-top: 20px;
+  margin-bottom: 20px;
 }
 </style>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 649435798..87ffc9df4 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -23,6 +23,7 @@
         </b-button>
         <b-button v-else @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
+          <b-icon icon="exclamation-circle-fill"></b-icon>
         </b-button>
       </template>
       <template #cell(confirm)="row">
@@ -36,7 +37,7 @@
           type="show-creation"
           slotName="show-creation"
           :index="0"
-          @row-toggle-details="rowToggleDetails"
+          @row-toggle-details="rowToggleDetails(row, 0)"
         >
           <template #show-creation>
             <div v-if="row.item.moderator">
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 4f1b40b71..f4654f07b 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -69,6 +69,10 @@
     },
     "short_hash": "({shortHash})"
   },
+  "form": {
+    "submit":"absenden",
+    "reset": "löschen"
+  },
   "GDD": "GDD",
   "hide_details": "Details verbergen",
   "lastname": "Nachname",
@@ -155,5 +159,6 @@
   },
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
-  "user_search": "Nutzer-Suche"
+  "user_search": "Nutzer-Suche",
+  "preview":"Vorschau"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 2145a87d3..92416a20a 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -69,6 +69,10 @@
     },
     "short_hash": "({shortHash})"
   },
+  "form": {
+    "submit":"submit",
+    "reset": "reset"
+  },
   "GDD": "GDD",
   "hide_details": "Hide details",
   "lastname": "Lastname",
@@ -155,5 +159,6 @@
   },
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
-  "user_search": "User search"
+  "user_search": "User search",
+  "preview":"Preview"
 }

From e70a18c6bb42bc4b022b26616e46a6d309957ba4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Aug 2022 11:09:41 +0200
Subject: [PATCH 019/163] Change thrown error message.

---
 backend/src/graphql/resolver/AdminResolver.ts               | 2 +-
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 48acada1f..68d3d4a8d 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -733,7 +733,7 @@ export class AdminResolver {
     } catch (e) {
       await queryRunner.rollbackTransaction()
       logger.error(`ContributionMessage was not successful: ${e}`)
-      throw new Error(`Transaction was not successful: ${e}`)
+      throw new Error(`ContributionMessage was not successful: ${e}`)
     } finally {
       await queryRunner.release()
     }
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 158b3fafb..a9529dfe7 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -44,7 +44,7 @@ export class ContributionResolver {
     } catch (e) {
       await queryRunner.rollbackTransaction()
       logger.error(`ContributionMessage was not successful: ${e}`)
-      throw new Error(`Transaction was not successful: ${e}`)
+      throw new Error(`ContributionMessage was not successful: ${e}`)
     } finally {
       await queryRunner.release()
     }

From 1c433e2d57269ce9decdddf6f26c728f71413888 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Aug 2022 11:53:19 +0200
Subject: [PATCH 020/163] Add graphql object that will be returned instead of
 dbEntity.

---
 .../src/graphql/model/ContributionMessage.ts  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 backend/src/graphql/model/ContributionMessage.ts

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
new file mode 100644
index 000000000..caf5eddc4
--- /dev/null
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -0,0 +1,37 @@
+import { Field, ObjectType } from 'type-graphql'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
+import { User } from './User'
+
+@ObjectType()
+export class ContributionMessage {
+  constructor(contributionMessage: DbContributionMessage, user: User) {
+    this.id = contributionMessage.id
+    this.message = contributionMessage.message
+    this.createdAt = contributionMessage.createdAt
+    this.updatedAt = contributionMessage.updatedAt
+    this.type = contributionMessage.type
+    this.userFirstName = user.firstName
+    this.userLastName = user.lastName
+  }
+
+  @Field(() => Number)
+  id: number
+
+  @Field(() => String)
+  message: string
+
+  @Field(() => Date)
+  createdAt: Date
+
+  @Field(() => Date, { nullable: true })
+  updatedAt?: Date | null
+
+  @Field(() => String)
+  type: string
+
+  @Field(() => String, { nullable: true })
+  userFirstName: string | null
+
+  @Field(() => String, { nullable: true })
+  userLastName: string | null
+}

From 2c459a8fae7e4ee0e7acf98ac641a6bac72b2010 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Aug 2022 11:55:34 +0200
Subject: [PATCH 021/163] Changed the Contribution.find so that we can throw a
 specific error, added an GraphQL Model as return value instead of DbEntity.

---
 backend/src/graphql/resolver/AdminResolver.ts    | 15 +++++++++------
 .../resolver/ContributionMessageResolver.ts      | 16 ++++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 68d3d4a8d..9a5609b75 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -62,9 +62,10 @@ import {
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
-import { ContributionMessage } from '@entity/ContributionMessage'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { ContributionMessageType } from '@enum/MessageType'
+import { ContributionMessage } from '@model/ContributionMessage'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -710,16 +711,18 @@ export class AdminResolver {
     const queryRunner = getConnection().createQueryRunner()
     await queryRunner.connect()
     await queryRunner.startTransaction('READ UNCOMMITTED')
-    const contributionMessage = new ContributionMessage()
+    const contributionMessage = DbContributionMessage.create()
     try {
-      const contribution = await Contribution.findOneOrFail({ id: contributionId })
-
+      const contribution = await Contribution.findOne({ id: contributionId })
+      if (!contribution) {
+        throw new Error('Contribution not found')
+      }
       contributionMessage.contributionId = contributionId
       contributionMessage.createdAt = new Date()
       contributionMessage.message = message
       contributionMessage.userId = user.id
       contributionMessage.type = ContributionMessageType.DIALOG
-      await queryRunner.manager.insert(ContributionMessage, contributionMessage)
+      await queryRunner.manager.insert(DbContributionMessage, contributionMessage)
 
       if (
         contribution.contributionStatus === ContributionStatus.DELETED ||
@@ -737,6 +740,6 @@ export class AdminResolver {
     } finally {
       await queryRunner.release()
     }
-    return contributionMessage
+    return new ContributionMessage(contributionMessage, new User(user))
   }
 }
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index a9529dfe7..dbffc77ce 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -1,17 +1,18 @@
 import { backendLogger as logger } from '@/server/logger'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
-import { ContributionMessage } from '@entity/ContributionMessage'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
+import { ContributionMessage } from '@model/ContributionMessage'
+import { User } from '@model/User'
 
 @Resolver()
 export class ContributionResolver {
-  // TODO: Have two method one for admin on for
   @Authorized([RIGHTS.CREATE_CONTRIBUTION_MESSAGE])
   @Mutation(() => ContributionMessage)
   async createContributionMessage(
@@ -22,9 +23,12 @@ export class ContributionResolver {
     const queryRunner = getConnection().createQueryRunner()
     await queryRunner.connect()
     await queryRunner.startTransaction('READ UNCOMMITTED')
-    const contributionMessage = new ContributionMessage()
+    const contributionMessage = DbContributionMessage.create()
     try {
-      const contribution = await Contribution.findOneOrFail({ id: contributionId })
+      const contribution = await Contribution.findOne({ id: contributionId })
+      if (!contribution) {
+        throw new Error('Contribution not found')
+      }
       if (contribution.userId !== user.id) {
         throw new Error('Can not send message to contribution of another user')
       }
@@ -34,7 +38,7 @@ export class ContributionResolver {
       contributionMessage.message = message
       contributionMessage.userId = user.id
       contributionMessage.type = ContributionMessageType.DIALOG
-      await queryRunner.manager.insert(ContributionMessage, contributionMessage)
+      await queryRunner.manager.insert(DbContributionMessage, contributionMessage)
 
       if (contribution.contributionStatus === ContributionStatus.IN_PROGRESS) {
         contribution.contributionStatus = ContributionStatus.PENDING
@@ -48,6 +52,6 @@ export class ContributionResolver {
     } finally {
       await queryRunner.release()
     }
-    return contributionMessage
+    return new ContributionMessage(contributionMessage, new User(user))
   }
 }

From e3e4b61c57176c724a63c2e32d274c1f82674721 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Aug 2022 11:59:24 +0200
Subject: [PATCH 022/163] Rename export of ContributionArgs to
 ContributionMessageArgs.

---
 backend/src/graphql/arg/ContributionMessageArgs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/arg/ContributionMessageArgs.ts b/backend/src/graphql/arg/ContributionMessageArgs.ts
index 963824350..dd75baed0 100644
--- a/backend/src/graphql/arg/ContributionMessageArgs.ts
+++ b/backend/src/graphql/arg/ContributionMessageArgs.ts
@@ -2,7 +2,7 @@ import { ArgsType, Field, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
-export default class ContributionArgs {
+export default class ContributionMessageArgs {
   @Field(() => Number)
   contributionId: number
 

From 41fb0d2a9f5f0b50cc7096eaf8be917b206ea442 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 23 Aug 2022 13:46:55 +0200
Subject: [PATCH 023/163] Change export name of ContributionMessageResolver
 class.

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

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index dbffc77ce..7c4779e63 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -12,7 +12,7 @@ import { ContributionMessage } from '@model/ContributionMessage'
 import { User } from '@model/User'
 
 @Resolver()
-export class ContributionResolver {
+export class ContributionMessageResolver {
   @Authorized([RIGHTS.CREATE_CONTRIBUTION_MESSAGE])
   @Mutation(() => ContributionMessage)
   async createContributionMessage(

From 285561546252345e121892a3b89a858009235061 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 23 Aug 2022 11:19:10 +0200
Subject: [PATCH 024/163] add components ContributionMessagesList.vue

---
 .../ContributionMessagesList.vue              | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesList.vue

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
new file mode 100644
index 000000000..fa3ca2b46
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="contribution-messages-list">
+    <b-container>
+      <div v-for="message in messages" v-bind:key="message.id">
+        <contribution-messages-list-item :typeId="message.isModerator">
+          <template #1>
+            <is-moderator :message="message"></is-moderator>
+          </template>
+          <template #0>
+            <is-not-moderator :message="message" class="text-right"></is-not-moderator>
+          </template>
+        </contribution-messages-list-item>
+      </div>
+    </b-container>
+    <br />
+    <br />
+    <br />
+    <contribution-messages-formular />
+  </div>
+</template>
+<script>
+import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
+import IsModerator from './slots/IsModerator.vue'
+import IsNotModerator from './slots/IsNotModerator.vue'
+import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+export default {
+  name: 'ContributionMessagesList',
+  components: {
+    ContributionMessagesListItem,
+    IsModerator,
+    IsNotModerator,
+    ContributionMessagesFormular,
+  },
+  data() {
+    return {
+      messages: [
+        {
+          id: '0',
+          msgid: '0',
+          memo: 'kjsdn sdnnasd andandandak sd n askdna kdnak asdnadjasndk adkand',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: 1,
+        },
+        {
+          id: '1',
+          msgid: '0',
+          memo: 'nftzfD dfRDTD FDdrD TFt F ZTFZF TZfz FF T TZF Z ff ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: 0,
+        },
+        {
+          id: '2',
+          msgid: '0',
+          memo: 'oG iu Hih hi  ',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: 1,
+        },
+        {
+          id: '3',
+          msgid: '0',
+          memo: 'zdg  gdggs ds gdggusgdug nftz s s ZF TZfz FF 564c ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: 0,
+        },
+      ],
+    }
+  },
+}
+</script>
+<style scoped>
+.temp-message {
+  margin-top: 50px;
+}
+</style>

From 0def6472d524ee7484e9ad4a894a3aa1ad24dc80 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 23 Aug 2022 14:30:03 +0200
Subject: [PATCH 025/163] add files for ContributionMessages

---
 .../ContributionMessagesFormular.vue          | 57 +++++++++++++
 .../ContributionMessagesList.vue              | 82 +++++++++++++++++++
 .../ContributionMessagesListItem.vue          | 16 ++++
 .../slots/IsModerator.vue                     | 27 ++++++
 .../slots/IsNotModerator.vue                  | 34 ++++++++
 5 files changed, 216 insertions(+)
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesList.vue
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
 create mode 100644 frontend/src/components/ContributionMessages/slots/IsModerator.vue
 create mode 100644 frontend/src/components/ContributionMessages/slots/IsNotModerator.vue

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
new file mode 100644
index 000000000..f3de7be3d
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -0,0 +1,57 @@
+<template>
+  <div class="contribution-messages-formular">
+    <div v-if="form.text !== ''" class="mt-5">
+      <h4>{{ $t('preview') }}</h4>
+      <div class="border border-info m-5">
+        <b-row>
+          <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
+          <b-col cols="11">
+            <pre class="mt-2">
+            {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+            </pre>
+          </b-col>
+        </b-row>
+        <b-row>
+          <b-col>
+            <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
+          </b-col>
+        </b-row>
+      </div>
+    </div>
+    <div>
+      <b-form @submit="onSubmit" @reset="onReset">
+        <b-form-textarea
+          id="textarea"
+          v-model="form.text"
+          placeholder="Enter something..."
+          rows="3"
+          max-rows="6"
+        ></b-form-textarea>
+        <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+        <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+      </b-form>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesFormular',
+  data() {
+    return {
+      form: {
+        text: '',
+      },
+    }
+  },
+  methods: {
+    onSubmit(event) {
+      event.preventDefault()
+      alert(JSON.stringify(this.form))
+    },
+    onReset(event) {
+      event.preventDefault()
+      this.form.text = ''
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
new file mode 100644
index 000000000..fa3ca2b46
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="contribution-messages-list">
+    <b-container>
+      <div v-for="message in messages" v-bind:key="message.id">
+        <contribution-messages-list-item :typeId="message.isModerator">
+          <template #1>
+            <is-moderator :message="message"></is-moderator>
+          </template>
+          <template #0>
+            <is-not-moderator :message="message" class="text-right"></is-not-moderator>
+          </template>
+        </contribution-messages-list-item>
+      </div>
+    </b-container>
+    <br />
+    <br />
+    <br />
+    <contribution-messages-formular />
+  </div>
+</template>
+<script>
+import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
+import IsModerator from './slots/IsModerator.vue'
+import IsNotModerator from './slots/IsNotModerator.vue'
+import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+export default {
+  name: 'ContributionMessagesList',
+  components: {
+    ContributionMessagesListItem,
+    IsModerator,
+    IsNotModerator,
+    ContributionMessagesFormular,
+  },
+  data() {
+    return {
+      messages: [
+        {
+          id: '0',
+          msgid: '0',
+          memo: 'kjsdn sdnnasd andandandak sd n askdna kdnak asdnadjasndk adkand',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: 1,
+        },
+        {
+          id: '1',
+          msgid: '0',
+          memo: 'nftzfD dfRDTD FDdrD TFt F ZTFZF TZfz FF T TZF Z ff ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: 0,
+        },
+        {
+          id: '2',
+          msgid: '0',
+          memo: 'oG iu Hih hi  ',
+          uuid: '1',
+          firstName: 'peter',
+          lastName: 'lustig',
+          isModerator: 1,
+        },
+        {
+          id: '3',
+          msgid: '0',
+          memo: 'zdg  gdggs ds gdggusgdug nftz s s ZF TZfz FF 564c ',
+          uuid: '2',
+          firstName: 'bibi',
+          lastName: 'bloxberg',
+          isModerator: 0,
+        },
+      ],
+    }
+  },
+}
+</script>
+<style scoped>
+.temp-message {
+  margin-top: 50px;
+}
+</style>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
new file mode 100644
index 000000000..74d349d12
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <slot :name="typeId"></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesListItem',
+  props: {
+    typeId: {
+      type: Number,
+      required: true,
+    },
+  },
+}
+</script>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
new file mode 100644
index 000000000..1fd284b65
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="slot-is-moderator">
+    <b-avatar square text="AA"></b-avatar>
+    <span class="ml-2 mr-2">{{ message.firstName }} {{ message.lastName }}</span>
+    <div class="mt-2">{{ message }}</div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.slot-is-moderator {
+  clear: both;
+  background-color: rgb(250, 158, 207);
+  width: 75%;
+  margin-top: 20px;
+}
+</style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
new file mode 100644
index 000000000..668e840fe
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="slot-is-not-moderator">
+    <div class="text-right">
+      <b-avatar text="BV"></b-avatar>
+      <span class="ml-2 mr-2 text-bold">{{ message.firstName }} {{ message.lastName }}</span>
+      <div class="mt-2">{{ message }}</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.clear {
+  clear: both;
+}
+.slot-is-not-moderator {
+  clear: both;
+  float: right;
+  background-color: aquamarine;
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+</style>

From 0271a4274121fd7f137091604fd73d401888ded8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 10:56:19 +0200
Subject: [PATCH 026/163] Use user entity instead of user model.

---
 backend/src/graphql/model/ContributionMessage.ts           | 2 +-
 backend/src/graphql/resolver/AdminResolver.ts              | 2 +-
 .../src/graphql/resolver/ContributionMessageResolver.ts    | 3 +--
 backend/src/graphql/resolver/ContributionResolver.ts       | 7 +++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index caf5eddc4..98b6b2721 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -1,6 +1,6 @@
 import { Field, ObjectType } from 'type-graphql'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { User } from './User'
+import { User } from '@entity/User'
 
 @ObjectType()
 export class ContributionMessage {
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 9a5609b75..63da1baed 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -740,6 +740,6 @@ export class AdminResolver {
     } finally {
       await queryRunner.release()
     }
-    return new ContributionMessage(contributionMessage, new User(user))
+    return new ContributionMessage(contributionMessage, user)
   }
 }
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 7c4779e63..c73301598 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -9,7 +9,6 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage } from '@model/ContributionMessage'
-import { User } from '@model/User'
 
 @Resolver()
 export class ContributionMessageResolver {
@@ -52,6 +51,6 @@ export class ContributionMessageResolver {
     } finally {
       await queryRunner.release()
     }
-    return new ContributionMessage(contributionMessage, new User(user))
+    return new ContributionMessage(contributionMessage, user)
   }
 }
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 8056ffde3..a59ba0a86 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -96,13 +96,14 @@ export class ContributionResolver {
       order: {
         createdAt: order,
       },
+      relations: ['messages'],
       withDeleted: true,
       skip: (currentPage - 1) * pageSize,
       take: pageSize,
     })
     return new ContributionListResult(
       count,
-      contributions.map((contribution) => new Contribution(contribution, new User(user))),
+      contributions.map((contribution) => new Contribution(contribution, user)),
     )
   }
 
@@ -123,9 +124,7 @@ export class ContributionResolver {
       .getManyAndCount()
     return new ContributionListResult(
       count,
-      dbContributions.map(
-        (contribution) => new Contribution(contribution, new User(contribution.user)),
-      ),
+      dbContributions.map((contribution) => new Contribution(contribution, contribution.user)),
     )
   }
 

From bda04f87d26886e67bd91c937a4510bbe09def64 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 10:57:03 +0200
Subject: [PATCH 027/163] Add messages and state to the contribution model.

---
 backend/src/graphql/model/Contribution.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index aa878990c..741debbbb 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,7 +1,8 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution as dbContribution } from '@entity/Contribution'
-import { User } from './User'
+import { User } from '@entity/User'
+import { ContributionMessage } from './ContributionMessage'
 
 @ObjectType()
 export class Contribution {
@@ -16,6 +17,10 @@ export class Contribution {
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
+    this.state = contribution.contributionStatus
+    this.messages = contribution.messages
+      ? contribution.messages.map((message) => new ContributionMessage(message, user))
+      : []
   }
 
   @Field(() => Number)
@@ -47,6 +52,12 @@ export class Contribution {
 
   @Field(() => Date)
   contributionDate: Date
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
+
+  @Field(() => String)
+  state: string
 }
 
 @ObjectType()

From dd2022df25c10a1acbdacdc6ff508f97336d9981 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 10:57:52 +0200
Subject: [PATCH 028/163] Add new values to query for contributions in
 frontend.

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

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 03299dd49..f701ad8cf 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -206,6 +206,16 @@ export const listContributions = gql`
         confirmedAt
         confirmedBy
         deletedAt
+        state
+        messages {
+          id
+          message
+          createdAt
+          updatedAt
+          type
+          userFirstName
+          userLastName
+        }
       }
     }
   }

From a0d765c7f21bcde60c2445752df9a0fd0820bf76 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 24 Aug 2022 11:04:28 +0200
Subject: [PATCH 029/163] add list and formular for contribution messages

---
 .../ContributionMessagesList.vue              |  8 +++---
 .../Contributions/ContributionListItem.vue    | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index fa3ca2b46..517707cd8 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -19,10 +19,10 @@
   </div>
 </template>
 <script>
-import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
-import IsModerator from './slots/IsModerator.vue'
-import IsNotModerator from './slots/IsNotModerator.vue'
-import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+import ContributionMessagesListItem from '@/components/ContributionMessages/ContributionMessagesListItem.vue'
+import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
+import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
+import ContributionMessagesFormular from '@/components/ContributionMessages/ContributionMessagesFormular.vue'
 export default {
   name: 'ContributionMessagesList',
   components: {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 90e98bc4c..3654a28d2 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -35,14 +35,33 @@
           <div class="pointer" @click="deleteContribution({ id })">
             <b-icon icon="trash" class="h2"></b-icon>
           </div>
+          <div v-if="inProcess && type === 'pending'" class="pointer">
+            <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
+          </div>
+        </div>
+
+        <div v-if="inProcess && type === 'pending'">
+          <b-button v-if="inProcess && id > 36" v-b-toggle="collapsId" variant="primary">
+            Bitte beantworte die Nachfrage
+          </b-button>
+          <b-collapse :id="collapsId" class="mt-2">
+            <b-card>
+              <contribution-messages-list />
+            </b-card>
+          </b-collapse>
         </div>
       </div>
     </slot>
   </div>
 </template>
 <script>
+import ContributionMessagesList from '@/components/ContributionMessages/ContributionMessagesList.vue'
+
 export default {
   name: 'ContributionListItem',
+  components: {
+    ContributionMessagesList,
+  },
   props: {
     id: {
       type: Number,
@@ -80,6 +99,11 @@ export default {
       required: false,
     },
   },
+  data() {
+    return {
+      inProcess: true,
+    }
+  },
   computed: {
     type() {
       if (this.deletedAt) return 'deleted'
@@ -102,6 +126,9 @@ export default {
       // return this.contributionDate
       return this.createdAt
     },
+    collapsId() {
+      return 'collapse' + String(this.id)
+    },
   },
   methods: {
     deleteContribution(item) {

From 7bc82db3c41f2dd85e39edb3641ef2b9f4db09d0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 24 Aug 2022 12:45:13 +0200
Subject: [PATCH 030/163] add apollo mutation adminCreateContributionMessage

---
 .../ContributionMessagesFormular.vue          | 23 ++++++++++++++++++-
 .../ContributionMessagesList.vue              |  8 ++++++-
 .../components/Tables/OpenCreationsTable.vue  |  2 +-
 .../graphql/adminCreateContributionMessage.js | 15 ++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 admin/src/graphql/adminCreateContributionMessage.js

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index f3de7be3d..b7e706d5c 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -34,8 +34,16 @@
   </div>
 </template>
 <script>
+import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
+
 export default {
   name: 'ContributionMessagesFormular',
+  props: {
+    contributionId: {
+      type: Number,
+      required: true,
+    },
+  },
   data() {
     return {
       form: {
@@ -46,7 +54,20 @@ export default {
   methods: {
     onSubmit(event) {
       event.preventDefault()
-      alert(JSON.stringify(this.form))
+      this.$apollo
+        .mutate({
+          mutation: adminCreateContributionMessage,
+          variables: {
+            contributionId: this.contributionId,
+            message: this.form.text,
+          },
+        })
+        .then((result) => {
+          this.toastSuccess(result)
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     onReset(event) {
       event.preventDefault()
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 9087beacf..5f73db916 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -15,7 +15,7 @@
     <br />
     <br />
     <br />
-    <contribution-messages-formular />
+    <contribution-messages-formular :contributionId="contributionId" />
   </div>
 </template>
 <script>
@@ -26,6 +26,12 @@ import ContributionMessagesFormular from '../ContributionMessages/ContributionMe
 
 export default {
   name: 'ContributionMessagesList',
+  props: {
+    contributionId: {
+      type: Number,
+      required: true,
+    },
+  },
   components: {
     ContributionMessagesListItem,
     IsModerator,
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 87ffc9df4..980794319 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -52,7 +52,7 @@
               />
             </div>
             <div v-else>
-              <contribution-messages-list />
+              <contribution-messages-list :contributionId="row.item.id" />
             </div>
           </template>
         </row-details>
diff --git a/admin/src/graphql/adminCreateContributionMessage.js b/admin/src/graphql/adminCreateContributionMessage.js
new file mode 100644
index 000000000..25d81f151
--- /dev/null
+++ b/admin/src/graphql/adminCreateContributionMessage.js
@@ -0,0 +1,15 @@
+import gql from 'graphql-tag'
+
+export const adminCreateContributionMessage = gql`
+  mutation ($contributionId: Float!, $message: String!) {
+    adminCreateContributionMessage(contributionId: $contributionId, message: $message) {
+      id
+      message
+      createdAt
+      updatedAt
+      type
+      userFirstName
+      userLastName
+    }
+  }
+`

From 2e0820ca9c806a64726ad9cebeaa2db146ccadde Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 24 Aug 2022 14:47:18 +0200
Subject: [PATCH 031/163] yarn locales

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index f4654f07b..a9e18f165 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -70,7 +70,7 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "submit":"absenden",
+    "submit": "absenden",
     "reset": "löschen"
   },
   "GDD": "GDD",
@@ -160,5 +160,5 @@
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
   "user_search": "Nutzer-Suche",
-  "preview":"Vorschau"
+  "preview": "Vorschau"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 92416a20a..9b5ab107a 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -70,7 +70,7 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "submit":"submit",
+    "submit": "submit",
     "reset": "reset"
   },
   "GDD": "GDD",
@@ -160,5 +160,5 @@
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
   "user_search": "User search",
-  "preview":"Preview"
+  "preview": "Preview"
 }

From 59df924e1d6b9210edbf0a61ff84e2713acc04c4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 16:27:28 +0200
Subject: [PATCH 032/163] Add User to Contribution link, query the messages
 user in the listContributions query.

---
 backend/src/graphql/model/Contribution.ts     |  2 +-
 .../graphql/resolver/ContributionResolver.ts  | 24 +++++++++++--------
 .../User.ts                                   |  5 ++++
 .../ContributionMessage.ts                    |  6 +++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 741debbbb..c0e6d66f3 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -19,7 +19,7 @@ export class Contribution {
     this.contributionDate = contribution.contributionDate
     this.state = contribution.contributionStatus
     this.messages = contribution.messages
-      ? contribution.messages.map((message) => new ContributionMessage(message, user))
+      ? contribution.messages.map((message) => new ContributionMessage(message, message.user))
       : []
   }
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index a59ba0a86..f9538851b 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -14,6 +14,7 @@ import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { User } from '@model/User'
 import { validateContribution, getUserCreation, updateCreations } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { ContributionMessage } from '@entity/ContributionMessage'
 
 @Resolver()
 export class ContributionResolver {
@@ -90,17 +91,20 @@ export class ContributionResolver {
       userId: number
       confirmedBy?: FindOperator<number> | null
     } = { userId: user.id }
+
     if (filterConfirmed) where.confirmedBy = IsNull()
-    const [contributions, count] = await dbContribution.findAndCount({
-      where,
-      order: {
-        createdAt: order,
-      },
-      relations: ['messages'],
-      withDeleted: true,
-      skip: (currentPage - 1) * pageSize,
-      take: pageSize,
-    })
+
+    const [contributions, count] = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(dbContribution, 'c')
+      .innerJoinAndSelect('c.messages', 'm')
+      .innerJoinAndSelect('m.user', 'u')
+      .orderBy('c.createdAt', order)
+      .limit(pageSize)
+      .offset((currentPage - 1) * pageSize)
+      .getManyAndCount()
+
     return new ContributionListResult(
       count,
       contributions.map((contribution) => new Contribution(contribution, user)),
diff --git a/database/entity/0046-adapt_users_table_for_gradidoid/User.ts b/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
index 3f2547cad..a772a3c99 100644
--- a/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
+++ b/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
@@ -8,6 +8,7 @@ import {
   JoinColumn,
 } from 'typeorm'
 import { Contribution } from '../Contribution'
+import { ContributionMessage } from '../ContributionMessage'
 
 @Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
 export class User extends BaseEntity {
@@ -108,4 +109,8 @@ export class User extends BaseEntity {
   @OneToMany(() => Contribution, (contribution) => contribution.user)
   @JoinColumn({ name: 'user_id' })
   contributions?: Contribution[]
+
+  @OneToMany(() => ContributionMessage, (message) => message.user)
+  @JoinColumn({ name: 'user_id' })
+  messages?: ContributionMessage[]
 }
diff --git a/database/entity/0047-messages_tables/ContributionMessage.ts b/database/entity/0047-messages_tables/ContributionMessage.ts
index d9ac124dd..3d9c04d89 100644
--- a/database/entity/0047-messages_tables/ContributionMessage.ts
+++ b/database/entity/0047-messages_tables/ContributionMessage.ts
@@ -5,9 +5,11 @@ import {
   Entity,
   JoinColumn,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm'
 import { Contribution } from '../Contribution'
+import { User } from '../User'
 
 @Entity('contribution_messages', {
   engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci',
@@ -26,6 +28,10 @@ export class ContributionMessage extends BaseEntity {
   @Column({ name: 'user_id', unsigned: true, nullable: false })
   userId: number
 
+  @ManyToOne(() => User, (user) => user.messages)
+  @JoinColumn({ name: 'user_id' })
+  user: User
+
   @Column({ length: 2000, nullable: false, collation: 'utf8mb4_unicode_ci' })
   message: string
 

From e0fcdb2cee35352187b914fd113abdb2083cb6f0 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 16:31:36 +0200
Subject: [PATCH 033/163] Add new RIGHT for LIST_ALL_CONTRIBUTION_MESSAGES.

---
 backend/src/auth/RIGHTS.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index a62a09bee..4f144f1e9 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -34,6 +34,7 @@ export enum RIGHTS {
   COMMUNITY_STATISTICS = 'COMMUNITY_STATISTICS',
   SEARCH_ADMIN_USERS = 'SEARCH_ADMIN_USERS',
   CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE',
+  LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
   SET_USER_ROLE = 'SET_USER_ROLE',

From a9c3dd25edc2ed85237242df2b439a8c9b619cd8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 16:32:58 +0200
Subject: [PATCH 034/163] Add RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES to the
 ROLES of Users.

---
 backend/src/auth/ROLES.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts
index bad18db9e..eabaf8e99 100644
--- a/backend/src/auth/ROLES.ts
+++ b/backend/src/auth/ROLES.ts
@@ -32,6 +32,7 @@ export const ROLE_USER = new Role('user', [
   RIGHTS.LIST_CONTRIBUTION_LINKS,
   RIGHTS.COMMUNITY_STATISTICS,
   RIGHTS.CREATE_CONTRIBUTION_MESSAGE,
+  RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES,
 ])
 export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights
 

From 8b063639f69ffa76cff19c60ca72ac18ecc0ca86 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 24 Aug 2022 16:34:23 +0200
Subject: [PATCH 035/163] add apollo mutation createContributionMessage

---
 .../ContributionMessagesFormular.vue          | 25 +++++++-
 .../ContributionMessagesList.vue              | 62 +++++--------------
 .../ContributionMessagesListItem.vue          |  2 +-
 .../slots/IsModerator.vue                     |  2 +-
 .../slots/IsNotModerator.vue                  |  4 +-
 .../Contributions/ContributionList.vue        |  2 +
 .../Contributions/ContributionListItem.vue    | 40 +++++++-----
 frontend/src/graphql/mutations.js             | 14 +++++
 8 files changed, 86 insertions(+), 65 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index f3de7be3d..016016406 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -7,7 +7,7 @@
           <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
           <b-col cols="11">
             <pre class="mt-2">
-            {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+            {{ $store.state.firstName }} {{ $store.state.lastName }}
             </pre>
           </b-col>
         </b-row>
@@ -34,8 +34,16 @@
   </div>
 </template>
 <script>
+import {createContributionMessage} from '../../graphql/mutations.js'
+
 export default {
   name: 'ContributionMessagesFormular',
+  props: {
+    contributionId: {
+      type: Number,
+      required: true,
+    },
+  },
   data() {
     return {
       form: {
@@ -46,7 +54,20 @@ export default {
   methods: {
     onSubmit(event) {
       event.preventDefault()
-      alert(JSON.stringify(this.form))
+      this.$apollo
+        .mutate({
+          mutation: createContributionMessage,
+          variables: {
+            contributionId: this.contributionId,
+            message: this.form.text,
+          },
+        })
+        .then((result) => {
+          this.toastSuccess(result)
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     onReset(event) {
       event.preventDefault()
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 517707cd8..32d13702e 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -2,11 +2,11 @@
   <div class="contribution-messages-list">
     <b-container>
       <div v-for="message in messages" v-bind:key="message.id">
-        <contribution-messages-list-item :typeId="message.isModerator">
-          <template #1>
+        <contribution-messages-list-item :typeId="state">
+          <template #IN_PROGRESS>
             <is-moderator :message="message"></is-moderator>
           </template>
-          <template #0>
+          <template #PENDING>
             <is-not-moderator :message="message" class="text-right"></is-not-moderator>
           </template>
         </contribution-messages-list-item>
@@ -15,7 +15,7 @@
     <br />
     <br />
     <br />
-    <contribution-messages-formular />
+    <contribution-messages-formular :contributionId="contributionId" />
   </div>
 </template>
 <script>
@@ -31,47 +31,19 @@ export default {
     IsNotModerator,
     ContributionMessagesFormular,
   },
-  data() {
-    return {
-      messages: [
-        {
-          id: '0',
-          msgid: '0',
-          memo: 'kjsdn sdnnasd andandandak sd n askdna kdnak asdnadjasndk adkand',
-          uuid: '1',
-          firstName: 'peter',
-          lastName: 'lustig',
-          isModerator: 1,
-        },
-        {
-          id: '1',
-          msgid: '0',
-          memo: 'nftzfD dfRDTD FDdrD TFt F ZTFZF TZfz FF T TZF Z ff ',
-          uuid: '2',
-          firstName: 'bibi',
-          lastName: 'bloxberg',
-          isModerator: 0,
-        },
-        {
-          id: '2',
-          msgid: '0',
-          memo: 'oG iu Hih hi  ',
-          uuid: '1',
-          firstName: 'peter',
-          lastName: 'lustig',
-          isModerator: 1,
-        },
-        {
-          id: '3',
-          msgid: '0',
-          memo: 'zdg  gdggs ds gdggusgdug nftz s s ZF TZfz FF 564c ',
-          uuid: '2',
-          firstName: 'bibi',
-          lastName: 'bloxberg',
-          isModerator: 0,
-        },
-      ],
-    }
+  props: {
+    contributionId: {
+      type: Number,
+      required: true,
+    },
+    state: {
+      type: String,
+      required: true,
+    },
+    messages: {
+      type: Array,
+      required: true,
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 74d349d12..9bde5b8e0 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -8,7 +8,7 @@ export default {
   name: 'ContributionMessagesListItem',
   props: {
     typeId: {
-      type: Number,
+      type: String,
       required: true,
     },
   },
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 1fd284b65..1de58b023 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="slot-is-moderator">
     <b-avatar square text="AA"></b-avatar>
-    <span class="ml-2 mr-2">{{ message.firstName }} {{ message.lastName }}</span>
+    <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
     <div class="mt-2">{{ message }}</div>
   </div>
 </template>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 668e840fe..5b6305a2a 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,7 +2,9 @@
   <div class="slot-is-not-moderator">
     <div class="text-right">
       <b-avatar text="BV"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">{{ message.firstName }} {{ message.lastName }}</span>
+      <span class="ml-2 mr-2 text-bold">
+        {{ message.userFirstName }} {{ message.userLastName }}
+      </span>
       <div class="mt-2">{{ message }}</div>
     </div>
   </div>
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index cf8606e33..c77277fc3 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="contribution-list container">
     <div class="list-group" v-for="item in items" :key="item.id">
+    {{item}}
       <contribution-list-item
         v-bind="item"
+        :contributionId="item.id"
         @update-contribution-form="updateContributionForm"
         @delete-contribution="deleteContribution"
       />
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 3654a28d2..7d0625232 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -5,7 +5,7 @@
         <div class="d-inline-flex">
           <div class="mr-2"><b-icon :icon="icon" :variant="variant" class="h2"></b-icon></div>
           <div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div>
-          <div class="mr-2" :class="type != 'deleted' ? 'font-weight-bold' : ''">
+          <div class="mr-2" :class="state !== 'DELETED' ? 'font-weight-bold' : ''">
             {{ amount | GDD }}
           </div>
           {{ $t('math.minus') }}
@@ -18,7 +18,10 @@
           </span>
         </div>
         <div class="mr-2">{{ memo }}</div>
-        <div v-if="type === 'pending' && !firstName" class="d-flex flex-row-reverse">
+        <div
+          v-if="(state !== 'DELETED' && !firstName) || (state !== 'CONFIRMED' && !firstName)"
+          class="d-flex flex-row-reverse"
+        >
           <div
             class="pointer ml-5"
             @click="
@@ -35,18 +38,21 @@
           <div class="pointer" @click="deleteContribution({ id })">
             <b-icon icon="trash" class="h2"></b-icon>
           </div>
-          <div v-if="inProcess && type === 'pending'" class="pointer">
+          <div v-if="messages" class="pointer">
             <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
           </div>
         </div>
-
-        <div v-if="inProcess && type === 'pending'">
-          <b-button v-if="inProcess && id > 36" v-b-toggle="collapsId" variant="primary">
+        <div v-if="messages">
+          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="primary">
             Bitte beantworte die Nachfrage
           </b-button>
           <b-collapse :id="collapsId" class="mt-2">
             <b-card>
-              <contribution-messages-list />
+              <contribution-messages-list
+                :messages="messages"
+                :state="state"
+                :contributionId="contributionId"
+              />
             </b-card>
           </b-collapse>
         </div>
@@ -98,6 +104,18 @@ export default {
       type: String,
       required: false,
     },
+    state: {
+      type: String,
+      required: false,
+    },
+    messages: {
+      type: Array,
+      required: false,
+    },
+    contributionId: {
+      type: Number,
+      required: true,
+    },
   },
   data() {
     return {
@@ -105,11 +123,6 @@ export default {
     }
   },
   computed: {
-    type() {
-      if (this.deletedAt) return 'deleted'
-      if (this.confirmedAt) return 'confirmed'
-      return 'pending'
-    },
     icon() {
       if (this.deletedAt) return 'x-circle'
       if (this.confirmedAt) return 'check'
@@ -121,9 +134,6 @@ export default {
       return 'primary'
     },
     date() {
-      // if (this.deletedAt) return this.deletedAt
-      // if (this.confirmedAt) return this.confirmedAt
-      // return this.contributionDate
       return this.createdAt
     },
     collapsId() {
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 959bdefc3..9846784d5 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -122,3 +122,17 @@ export const deleteContribution = gql`
     deleteContribution(id: $id)
   }
 `
+
+export const createContributionMessage = gql`
+  mutation($contributionId: Float!, $message: String!) {
+    createContributionMessage(contributionId: $contributionId, message: $message) {
+      id
+      message
+      createdAt
+      updatedAt
+      type
+      userFirstName
+      userLastName
+    }
+  }
+`

From 057816e4c0a2df9052fbe0b416d8929388866e9a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 16:43:32 +0200
Subject: [PATCH 036/163] Change innerJoin to leftJoin, so that every
 contribution is shown not only the one with messages.

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index f9538851b..1b63c90d2 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -98,8 +98,8 @@ export class ContributionResolver {
       .createQueryBuilder()
       .select('c')
       .from(dbContribution, 'c')
-      .innerJoinAndSelect('c.messages', 'm')
-      .innerJoinAndSelect('m.user', 'u')
+      .leftJoinAndSelect('c.messages', 'm')
+      .leftJoinAndSelect('m.user', 'u')
       .orderBy('c.createdAt', order)
       .limit(pageSize)
       .offset((currentPage - 1) * pageSize)

From 4dbcabf96dad19d717a2ad2eb32115ad846dd8b2 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 24 Aug 2022 16:52:42 +0200
Subject: [PATCH 037/163] Add where clause.

---
 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 1b63c90d2..1b7a8f630 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -100,6 +100,7 @@ export class ContributionResolver {
       .from(dbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
       .leftJoinAndSelect('m.user', 'u')
+      .where(where)
       .orderBy('c.createdAt', order)
       .limit(pageSize)
       .offset((currentPage - 1) * pageSize)

From 5a0bbbf20de1cddc0685c064caf54e2dadf87155 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 24 Aug 2022 22:36:26 +0200
Subject: [PATCH 038/163] add slots for messages

---
 .../ContributionMessagesFormular.vue          |  9 ++++--
 .../ContributionMessagesList.vue              | 17 ++---------
 .../ContributionMessagesListItem.vue          | 28 +++++++++++++++++--
 .../slots/IsModerator.vue                     | 14 +++++++---
 .../slots/IsNotModerator.vue                  |  8 ++++--
 .../Contributions/ContributionList.vue        |  1 -
 .../Contributions/ContributionListItem.vue    | 15 ++++++++--
 7 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 016016406..fe7a2afc6 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -4,7 +4,12 @@
       <h4>{{ $t('preview') }}</h4>
       <div class="border border-info m-5">
         <b-row>
-          <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
+          <b-col cols="1">
+            <b-avatar
+              :text="`${$store.state.firstName[0]} ${$store.state.lastName[0]}`"
+              variant="info"
+            ></b-avatar>
+          </b-col>
           <b-col cols="11">
             <pre class="mt-2">
             {{ $store.state.firstName }} {{ $store.state.lastName }}
@@ -34,7 +39,7 @@
   </div>
 </template>
 <script>
-import {createContributionMessage} from '../../graphql/mutations.js'
+import { createContributionMessage } from '../../graphql/mutations.js'
 
 export default {
   name: 'ContributionMessagesFormular',
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 32d13702e..cebe8214b 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -2,33 +2,22 @@
   <div class="contribution-messages-list">
     <b-container>
       <div v-for="message in messages" v-bind:key="message.id">
-        <contribution-messages-list-item :typeId="state">
-          <template #IN_PROGRESS>
-            <is-moderator :message="message"></is-moderator>
-          </template>
-          <template #PENDING>
-            <is-not-moderator :message="message" class="text-right"></is-not-moderator>
-          </template>
-        </contribution-messages-list-item>
+        <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
     <br />
     <br />
     <br />
-    <contribution-messages-formular :contributionId="contributionId" />
+    <contribution-messages-formular v-if="state === 'PENDING' || state === 'IN_PROGRESS'" :contributionId="contributionId" />
   </div>
 </template>
 <script>
 import ContributionMessagesListItem from '@/components/ContributionMessages/ContributionMessagesListItem.vue'
-import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
-import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
 import ContributionMessagesFormular from '@/components/ContributionMessages/ContributionMessagesFormular.vue'
 export default {
   name: 'ContributionMessagesList',
   components: {
     ContributionMessagesListItem,
-    IsModerator,
-    IsNotModerator,
     ContributionMessagesFormular,
   },
   props: {
@@ -38,7 +27,7 @@ export default {
     },
     state: {
       type: String,
-      required: true,
+      required: false,
     },
     messages: {
       type: Array,
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 9bde5b8e0..d28357a31 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,15 +1,37 @@
 <template>
   <div>
-    <slot :name="typeId"></slot>
+    <is-not-moderator v-if="isNotModerator" :message="message"></is-not-moderator>
+    <is-moderator v-else :message="message"></is-moderator>
   </div>
 </template>
 <script>
+import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
+import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
+
 export default {
   name: 'ContributionMessagesListItem',
+  components: {
+    IsModerator,
+    IsNotModerator,
+  },
   props: {
-    typeId: {
-      type: String,
+    message: {
+      type: Object,
       required: true,
+      default() {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
+      moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
+    }
+  },
+  computed: {
+    isNotModerator() {
+      return this.storeName === this.moderationName
     },
   },
 }
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 1de58b023..077fa2e73 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="slot-is-moderator">
-    <b-avatar square text="AA"></b-avatar>
-    <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-    <div class="mt-2">{{ message }}</div>
+    <b-avatar
+      square
+      :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
+      variant="warning"
+    ></b-avatar>
+    <span class="ml-2 mr-2">
+      {{ message.userFirstName }} {{ message.userLastName }} (Moderator)
+    </span>
+    <div class="mt-2 h3">{{ message.message }}</div>
   </div>
 </template>
 <script>
@@ -20,7 +26,7 @@ export default {
 <style>
 .slot-is-moderator {
   clear: both;
-  background-color: rgb(250, 158, 207);
+  /* background-color: rgb(255, 242, 227); */
   width: 75%;
   margin-top: 20px;
 }
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 5b6305a2a..8696a211a 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="slot-is-not-moderator">
     <div class="text-right">
-      <b-avatar text="BV"></b-avatar>
+      <b-avatar
+        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
+        variant="info"
+      ></b-avatar>
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
-      <div class="mt-2">{{ message }}</div>
+      <div class="mt-2 h3">{{ message.message }}</div>
     </div>
   </div>
 </template>
@@ -28,7 +31,6 @@ export default {
 .slot-is-not-moderator {
   clear: both;
   float: right;
-  background-color: aquamarine;
   width: 75%;
   margin-top: 20px;
   margin-bottom: 20px;
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index c77277fc3..cffee360b 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="contribution-list container">
     <div class="list-group" v-for="item in items" :key="item.id">
-    {{item}}
       <contribution-list-item
         v-bind="item"
         :contributionId="item.id"
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 7d0625232..7e17ecbb5 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -23,6 +23,7 @@
           class="d-flex flex-row-reverse"
         >
           <div
+            v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
             class="pointer ml-5"
             @click="
               $emit('update-contribution-form', {
@@ -35,15 +36,20 @@
           >
             <b-icon icon="pencil" class="h2"></b-icon>
           </div>
-          <div class="pointer" @click="deleteContribution({ id })">
+          <div
+            v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
+            class="pointer"
+            @click="deleteContribution({ id })"
+          >
             <b-icon icon="trash" class="h2"></b-icon>
           </div>
-          <div v-if="messages" class="pointer">
+          <div v-if="messages.length" class="pointer">
             <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
           </div>
         </div>
         <div v-if="messages">
-          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="primary">
+          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="dark">
+            <b-icon icon="circle-fill" animation="throb" font-scale="1" variant="warning"></b-icon>
             Bitte beantworte die Nachfrage
           </b-button>
           <b-collapse :id="collapsId" class="mt-2">
@@ -111,6 +117,9 @@ export default {
     messages: {
       type: Array,
       required: false,
+      default() {
+        return []
+      },
     },
     contributionId: {
       type: Number,

From d2790588ba4518aa7de0d4d009903cf82e8edc31 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:09:13 +0200
Subject: [PATCH 039/163] Add new model ContributionMessageListResult.

---
 backend/src/graphql/model/ContributionMessage.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 98b6b2721..863813da9 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -35,3 +35,11 @@ export class ContributionMessage {
   @Field(() => String, { nullable: true })
   userLastName: string | null
 }
+@ObjectType()
+export class ContributionMessageListResult {
+  @Field(() => Number)
+  count: number
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
+}

From 3fbf8b6444a449b3b74bf3c76498097decb62e2c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:10:13 +0200
Subject: [PATCH 040/163] Query ContributionMessages for a specific
 contributionId.

---
 .../resolver/ContributionMessageResolver.ts   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index c73301598..f5dee91f6 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -2,13 +2,15 @@ import { backendLogger as logger } from '@/server/logger'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
+import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
-import { ContributionMessage } from '@model/ContributionMessage'
+import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
+import Paginated from '../arg/Paginated'
+import { Order } from '../enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {
@@ -53,4 +55,30 @@ export class ContributionMessageResolver {
     }
     return new ContributionMessage(contributionMessage, user)
   }
+
+  @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
+  @Query(() => ContributionMessageListResult)
+  async listContributionMessages(
+    @Arg('contributionId') contributionId: number,
+    @Args()
+    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
+  ): Promise<ContributionMessageListResult> {
+    const [contributionMessages, count] = await getConnection()
+      .createQueryBuilder()
+      .select('cm')
+      .from(DbContributionMessage, 'cm')
+      .leftJoinAndSelect('cm.user', 'u')
+      .where({ contributionId: contributionId })
+      .orderBy('cm.createdAt', order)
+      .limit(pageSize)
+      .offset((currentPage - 1) * pageSize)
+      .getManyAndCount()
+
+    return {
+      count,
+      messages: contributionMessages.map(
+        (message) => new ContributionMessage(message, message.user),
+      ),
+    }
+  }
 }

From 4b9bdb0f155f6f5963bd4384dd87807e1e241ca3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:11:24 +0200
Subject: [PATCH 041/163] Add userId to the ContributionMessage model.

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

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 863813da9..1357c02cb 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -12,6 +12,7 @@ export class ContributionMessage {
     this.type = contributionMessage.type
     this.userFirstName = user.firstName
     this.userLastName = user.lastName
+    this.userId = user.id
   }
 
   @Field(() => Number)
@@ -34,6 +35,9 @@ export class ContributionMessage {
 
   @Field(() => String, { nullable: true })
   userLastName: string | null
+
+  @Field(() => Number, { nullable: true })
+  userId: number | null
 }
 @ObjectType()
 export class ContributionMessageListResult {

From f3f0c27063053bed076e76442f98cfc10973a18d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:12:49 +0200
Subject: [PATCH 042/163] Fix imports.

---
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 4 ++--
 backend/src/graphql/resolver/ContributionResolver.ts        | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index f5dee91f6..408481513 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -9,8 +9,8 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
-import Paginated from '../arg/Paginated'
-import { Order } from '../enum/Order'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 1b7a8f630..f8300f164 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -11,10 +11,8 @@ import { ContributionType } from '@enum/ContributionType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { User } from '@model/User'
 import { validateContribution, getUserCreation, updateCreations } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { ContributionMessage } from '@entity/ContributionMessage'
 
 @Resolver()
 export class ContributionResolver {

From 0163eac52fe14de60fc8936d6a14acbec0803abc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:51:58 +0200
Subject: [PATCH 043/163] Add contribution state and contribution messages to
 the model

---
 .../src/graphql/model/UnconfirmedContribution.ts    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index 1d697a971..b7dc4bd72 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -2,10 +2,11 @@ import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { ContributionMessage } from '@model/ContributionMessage'
 
 @ObjectType()
 export class UnconfirmedContribution {
-  constructor(contribution: Contribution, user: User, creations: Decimal[]) {
+  constructor(contribution: Contribution, user: User | undefined, creations: Decimal[]) {
     this.id = contribution.id
     this.userId = contribution.userId
     this.amount = contribution.amount
@@ -15,6 +16,10 @@ export class UnconfirmedContribution {
     this.lastName = user ? user.lastName : ''
     this.email = user ? user.email : ''
     this.creation = creations
+    this.state = contribution.contributionStatus
+    this.messages = contribution.messages
+      ? contribution.messages.map((message) => new ContributionMessage(message, message.user))
+      : []
   }
 
   @Field(() => String)
@@ -46,4 +51,10 @@ export class UnconfirmedContribution {
 
   @Field(() => [Decimal])
   creation: Decimal[]
+
+  @Field(() => String)
+  state: string
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
 }

From cdb306dc8579989a7c7a827e16237193ee4a8a28 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:52:33 +0200
Subject: [PATCH 044/163] Change the query to get the messages and the user of
 a message.

---
 backend/src/graphql/resolver/AdminResolver.ts | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 63da1baed..a0eed646f 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -361,7 +361,15 @@ export class AdminResolver {
   @Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS])
   @Query(() => [UnconfirmedContribution])
   async listUnconfirmedContributions(): Promise<UnconfirmedContribution[]> {
-    const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } })
+    const contributions = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(Contribution, 'c')
+      .leftJoinAndSelect('c.messages', 'm')
+      .leftJoinAndSelect('m.user', 'u')
+      .where({ confirmedAt: IsNull() })
+      .getMany()
+
     if (contributions.length === 0) {
       return []
     }
@@ -374,18 +382,11 @@ export class AdminResolver {
       const user = users.find((u) => u.id === contribution.userId)
       const creation = userCreations.find((c) => c.id === contribution.userId)
 
-      return {
-        id: contribution.id,
-        userId: contribution.userId,
-        date: contribution.contributionDate,
-        memo: contribution.memo,
-        amount: contribution.amount,
-        moderator: contribution.moderatorId,
-        firstName: user ? user.firstName : '',
-        lastName: user ? user.lastName : '',
-        email: user ? user.email : '',
-        creation: creation ? creation.creations : FULL_CREATION_AVAILABLE,
-      }
+      return new UnconfirmedContribution(
+        contribution,
+        user,
+        creation ? creation.creations : FULL_CREATION_AVAILABLE,
+      )
     })
   }
 

From c27d64245b9f929439180147c41b6e4a075cc376 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 13:51:38 +0200
Subject: [PATCH 045/163] Add moderatorId to the object.

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

diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index b7dc4bd72..3b88bec1c 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -15,6 +15,7 @@ export class UnconfirmedContribution {
     this.firstName = user ? user.firstName : ''
     this.lastName = user ? user.lastName : ''
     this.email = user ? user.email : ''
+    this.moderator = contribution.moderatorId
     this.creation = creations
     this.state = contribution.contributionStatus
     this.messages = contribution.messages

From 8fbdbca5a84b98eb13daff71a97c4890f3f84b8f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:09:13 +0200
Subject: [PATCH 046/163] Add new model ContributionMessageListResult.

---
 backend/src/graphql/model/ContributionMessage.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 98b6b2721..863813da9 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -35,3 +35,11 @@ export class ContributionMessage {
   @Field(() => String, { nullable: true })
   userLastName: string | null
 }
+@ObjectType()
+export class ContributionMessageListResult {
+  @Field(() => Number)
+  count: number
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
+}

From 089b4d119541ba16cfadb0f79254157a798a157a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:10:13 +0200
Subject: [PATCH 047/163] Query ContributionMessages for a specific
 contributionId.

---
 .../resolver/ContributionMessageResolver.ts   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index c73301598..f5dee91f6 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -2,13 +2,15 @@ import { backendLogger as logger } from '@/server/logger'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
+import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { Contribution } from '@entity/Contribution'
 import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
-import { ContributionMessage } from '@model/ContributionMessage'
+import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
+import Paginated from '../arg/Paginated'
+import { Order } from '../enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {
@@ -53,4 +55,30 @@ export class ContributionMessageResolver {
     }
     return new ContributionMessage(contributionMessage, user)
   }
+
+  @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
+  @Query(() => ContributionMessageListResult)
+  async listContributionMessages(
+    @Arg('contributionId') contributionId: number,
+    @Args()
+    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
+  ): Promise<ContributionMessageListResult> {
+    const [contributionMessages, count] = await getConnection()
+      .createQueryBuilder()
+      .select('cm')
+      .from(DbContributionMessage, 'cm')
+      .leftJoinAndSelect('cm.user', 'u')
+      .where({ contributionId: contributionId })
+      .orderBy('cm.createdAt', order)
+      .limit(pageSize)
+      .offset((currentPage - 1) * pageSize)
+      .getManyAndCount()
+
+    return {
+      count,
+      messages: contributionMessages.map(
+        (message) => new ContributionMessage(message, message.user),
+      ),
+    }
+  }
 }

From ff9866d4f3df462bbf335f180065c5480ccb54d9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:11:24 +0200
Subject: [PATCH 048/163] Add userId to the ContributionMessage model.

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

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 863813da9..1357c02cb 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -12,6 +12,7 @@ export class ContributionMessage {
     this.type = contributionMessage.type
     this.userFirstName = user.firstName
     this.userLastName = user.lastName
+    this.userId = user.id
   }
 
   @Field(() => Number)
@@ -34,6 +35,9 @@ export class ContributionMessage {
 
   @Field(() => String, { nullable: true })
   userLastName: string | null
+
+  @Field(() => Number, { nullable: true })
+  userId: number | null
 }
 @ObjectType()
 export class ContributionMessageListResult {

From 9e255fb6e1ff57b128736e6fbc2f0cdd6bf61732 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 10:29:58 +0200
Subject: [PATCH 049/163] fix lint

---
 .../ContributionMessages/ContributionMessagesList.vue        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index cebe8214b..901e783b1 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -8,7 +8,10 @@
     <br />
     <br />
     <br />
-    <contribution-messages-formular v-if="state === 'PENDING' || state === 'IN_PROGRESS'" :contributionId="contributionId" />
+    <contribution-messages-formular
+      v-if="state === 'PENDING' || state === 'IN_PROGRESS'"
+      :contributionId="contributionId"
+    />
   </div>
 </template>
 <script>

From 87341f300fd46f4897c2c7a6efa99b97e299f0f6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 10:30:37 +0200
Subject: [PATCH 050/163] add graphql query listContributionMessages.js

---
 admin/src/graphql/listContributionMessages.js | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 admin/src/graphql/listContributionMessages.js

diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
new file mode 100644
index 000000000..319e26586
--- /dev/null
+++ b/admin/src/graphql/listContributionMessages.js
@@ -0,0 +1,24 @@
+import gql from 'graphql-tag'
+
+export const listContributionMessages = gql`
+  query ($contributionId: Int, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = DESC) {
+    listContributionMessages(
+      contributionId: $contributionId
+      pageSize: $pageSize
+      currentPage: $currentPage
+      order: $order
+    ) {
+      count
+      messages {
+        id
+        message
+        createdAt
+        updatedAt
+        type
+        userFirstName
+        userLastName
+        userId
+      }
+    }
+  }
+`

From 339f33526d53be4d4a87e62717148a9c74ed4f43 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:12:49 +0200
Subject: [PATCH 051/163] Fix imports.

---
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 4 ++--
 backend/src/graphql/resolver/ContributionResolver.ts        | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index f5dee91f6..408481513 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -9,8 +9,8 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
-import Paginated from '../arg/Paginated'
-import { Order } from '../enum/Order'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 1b7a8f630..f8300f164 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -11,10 +11,8 @@ import { ContributionType } from '@enum/ContributionType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { User } from '@model/User'
 import { validateContribution, getUserCreation, updateCreations } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { ContributionMessage } from '@entity/ContributionMessage'
 
 @Resolver()
 export class ContributionResolver {

From 8e61b89113ce6400bc3f014633987a15647b9c4c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:51:58 +0200
Subject: [PATCH 052/163] Add contribution state and contribution messages to
 the model

---
 .../src/graphql/model/UnconfirmedContribution.ts    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index 1d697a971..b7dc4bd72 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -2,10 +2,11 @@ import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { ContributionMessage } from '@model/ContributionMessage'
 
 @ObjectType()
 export class UnconfirmedContribution {
-  constructor(contribution: Contribution, user: User, creations: Decimal[]) {
+  constructor(contribution: Contribution, user: User | undefined, creations: Decimal[]) {
     this.id = contribution.id
     this.userId = contribution.userId
     this.amount = contribution.amount
@@ -15,6 +16,10 @@ export class UnconfirmedContribution {
     this.lastName = user ? user.lastName : ''
     this.email = user ? user.email : ''
     this.creation = creations
+    this.state = contribution.contributionStatus
+    this.messages = contribution.messages
+      ? contribution.messages.map((message) => new ContributionMessage(message, message.user))
+      : []
   }
 
   @Field(() => String)
@@ -46,4 +51,10 @@ export class UnconfirmedContribution {
 
   @Field(() => [Decimal])
   creation: Decimal[]
+
+  @Field(() => String)
+  state: string
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
 }

From 275ce304f9a3c6bb74aed7e35a193f346f472c81 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:52:33 +0200
Subject: [PATCH 053/163] Change the query to get the messages and the user of
 a message.

---
 backend/src/graphql/resolver/AdminResolver.ts | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 63da1baed..a0eed646f 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -361,7 +361,15 @@ export class AdminResolver {
   @Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS])
   @Query(() => [UnconfirmedContribution])
   async listUnconfirmedContributions(): Promise<UnconfirmedContribution[]> {
-    const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } })
+    const contributions = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(Contribution, 'c')
+      .leftJoinAndSelect('c.messages', 'm')
+      .leftJoinAndSelect('m.user', 'u')
+      .where({ confirmedAt: IsNull() })
+      .getMany()
+
     if (contributions.length === 0) {
       return []
     }
@@ -374,18 +382,11 @@ export class AdminResolver {
       const user = users.find((u) => u.id === contribution.userId)
       const creation = userCreations.find((c) => c.id === contribution.userId)
 
-      return {
-        id: contribution.id,
-        userId: contribution.userId,
-        date: contribution.contributionDate,
-        memo: contribution.memo,
-        amount: contribution.amount,
-        moderator: contribution.moderatorId,
-        firstName: user ? user.firstName : '',
-        lastName: user ? user.lastName : '',
-        email: user ? user.email : '',
-        creation: creation ? creation.creations : FULL_CREATION_AVAILABLE,
-      }
+      return new UnconfirmedContribution(
+        contribution,
+        user,
+        creation ? creation.creations : FULL_CREATION_AVAILABLE,
+      )
     })
   }
 

From 9ee47e020f36edebeb82bfb57f14239326db183c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 13:52:35 +0200
Subject: [PATCH 054/163] add listUnconfirmedContributions messages count

---
 .../ContributionMessagesList.vue              | 73 ++++++-------------
 .../slots/ContributionMessagesListItem.vue    | 28 ++++++-
 .../components/Tables/OpenCreationsTable.vue  | 34 ++++++++-
 admin/src/graphql/listContributionMessages.js |  7 +-
 .../ContributionMessagesList.vue              |  1 +
 5 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 5f73db916..399300a53 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,15 +1,22 @@
 <template>
   <div class="contribution-messages-list">
     <b-container>
+      {{ messagesCount }}
       <div v-for="message in messages" v-bind:key="message.id">
-        <contribution-messages-list-item :typeId="message.isModerator">
+        <b-container>
+          <div v-for="message in messages" v-bind:key="message.id">
+            <contribution-messages-list-item :message="message" />
+          </div>
+        </b-container>
+
+        <!-- <contribution-messages-list-item :typeId="message.isModerator">
           <template #1>
             <is-moderator :message="message"></is-moderator>
           </template>
           <template #0>
             <is-not-moderator :message="message" class="text-right"></is-not-moderator>
           </template>
-        </contribution-messages-list-item>
+        </contribution-messages-list-item> -->
       </div>
     </b-container>
     <br />
@@ -20,65 +27,27 @@
 </template>
 <script>
 import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
-import IsModerator from './slots/IsModerator.vue'
-import IsNotModerator from './slots/IsNotModerator.vue'
 import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
 
 export default {
   name: 'ContributionMessagesList',
+  components: {
+    ContributionMessagesListItem,
+    ContributionMessagesFormular,
+  },
   props: {
     contributionId: {
       type: Number,
       required: true,
     },
-  },
-  components: {
-    ContributionMessagesListItem,
-    IsModerator,
-    IsNotModerator,
-    ContributionMessagesFormular,
-  },
-  data() {
-    return {
-      messages: [
-        {
-          id: '0',
-          msgid: '0',
-          memo: 'kjsdn sdnnasd andandandak sd n askdna kdnak asdnadjasndk adkand',
-          uuid: '1',
-          firstName: 'peter',
-          lastName: 'lustig',
-          isModerator: 1,
-        },
-        {
-          id: '1',
-          msgid: '0',
-          memo: 'nftzfD dfRDTD FDdrD TFt F ZTFZF TZfz FF T TZF Z ff ',
-          uuid: '2',
-          firstName: 'bibi',
-          lastName: 'bloxberg',
-          isModerator: 0,
-        },
-        {
-          id: '2',
-          msgid: '0',
-          memo: 'oG iu Hih hi  ',
-          uuid: '1',
-          firstName: 'peter',
-          lastName: 'lustig',
-          isModerator: 1,
-        },
-        {
-          id: '3',
-          msgid: '0',
-          memo: 'zdg  gdggs ds gdggusgdug nftz s s ZF TZfz FF 564c ',
-          uuid: '2',
-          firstName: 'bibi',
-          lastName: 'bloxberg',
-          isModerator: 0,
-        },
-      ],
-    }
+    messagesCount: {
+      type: Number,
+      required: true,
+    },
+    messages: {
+      type: Array,
+      required: true,
+    },
   },
 }
 </script>
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 74d349d12..a1d9565c0 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,15 +1,37 @@
 <template>
   <div>
-    <slot :name="typeId"></slot>
+    <is-moderator v-if="isModerator" :message="message"></is-moderator>
+    <is-not-moderator v-else :message="message"></is-not-moderator>
   </div>
 </template>
 <script>
+import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
+import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
+
 export default {
   name: 'ContributionMessagesListItem',
+  components: {
+    IsModerator,
+    IsNotModerator,
+  },
   props: {
-    typeId: {
-      type: Number,
+    message: {
+      type: Object,
       required: true,
+      default() {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
+      moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
+    }
+  },
+  computed: {
+    isModerator() {
+      return this.storeName === this.moderationName
     },
   },
 }
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 980794319..a5f1a7a8d 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -2,6 +2,7 @@
   <div class="open-creations-table">
     <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
       <template #cell(bookmark)="row">
+        {{ row.item }}
         <b-button
           variant="danger"
           size="md"
@@ -21,7 +22,10 @@
         >
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
-        <b-button v-else @click="rowToggleDetails(row, 0)">
+        <b-button
+          v-else
+          @click="rowToggleDetails(row, 0), getListContributionMessages(row.item.id)"
+        >
           <b-icon icon="chat-dots"></b-icon>
           <b-icon icon="exclamation-circle-fill"></b-icon>
         </b-button>
@@ -52,7 +56,11 @@
               />
             </div>
             <div v-else>
-              <contribution-messages-list :contributionId="row.item.id" />
+              <contribution-messages-list
+                :contributionId="row.item.id"
+                :messages="messages"
+                :messagesCount="messagesCount"
+              />
             </div>
           </template>
         </row-details>
@@ -65,8 +73,8 @@
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails.vue'
 import EditCreationFormular from '../EditCreationFormular.vue'
-
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList.vue'
+import { listContributionMessages } from '../../graphql/listContributionMessages.js'
 
 export default {
   name: 'OpenCreationsTable',
@@ -93,10 +101,30 @@ export default {
         date: null,
         memo: null,
         moderator: null,
+        messagesCount: 0,
+        messages: [],
       },
     }
   },
   methods: {
+    getListContributionMessages(id) {
+      console.log('getListContributionMessages', id)
+      this.$apollo
+        .query({
+          query: listContributionMessages,
+          variables: {
+            contributionId: id,
+          },
+        })
+        .then((result) => {
+          console.log('result', result.data.listContributionMessages)
+          this.messagesCount = result.data.getListContributionMessages.count
+          this.messages = result.data.getListContributionMessages.messages
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
     updateCreationData(data) {
       this.creationUserData = data
       // this.creationUserData.amount = data.amount
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index 319e26586..c2fbcf823 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -1,7 +1,12 @@
 import gql from 'graphql-tag'
 
 export const listContributionMessages = gql`
-  query ($contributionId: Int, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = DESC) {
+  query (
+    $contributionId: Float!
+    $pageSize: Int = 25
+    $currentPage: Int = 1
+    $order: Order = DESC
+  ) {
     listContributionMessages(
       contributionId: $contributionId
       pageSize: $pageSize
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 901e783b1..c8d53868d 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -17,6 +17,7 @@
 <script>
 import ContributionMessagesListItem from '@/components/ContributionMessages/ContributionMessagesListItem.vue'
 import ContributionMessagesFormular from '@/components/ContributionMessages/ContributionMessagesFormular.vue'
+
 export default {
   name: 'ContributionMessagesList',
   components: {

From 84ee364051897fef67507455f644caa4b6c5dfff Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 15:00:21 +0200
Subject: [PATCH 055/163] Revert "Fix imports."

This reverts commit f3f0c27063053bed076e76442f98cfc10973a18d.
---
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 4 ++--
 backend/src/graphql/resolver/ContributionResolver.ts        | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 408481513..f5dee91f6 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -9,8 +9,8 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
-import Paginated from '@arg/Paginated'
-import { Order } from '@enum/Order'
+import Paginated from '../arg/Paginated'
+import { Order } from '../enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index f8300f164..1b7a8f630 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -11,8 +11,10 @@ import { ContributionType } from '@enum/ContributionType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { User } from '@model/User'
 import { validateContribution, getUserCreation, updateCreations } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { ContributionMessage } from '@entity/ContributionMessage'
 
 @Resolver()
 export class ContributionResolver {

From ead31344f5593018067cf5111e4ee032e0efaea9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 15:16:44 +0200
Subject: [PATCH 056/163] Remove leftJoin on user and remove messages from
 UnconfirmedContribution model added messageCount instead to the model.

---
 backend/src/graphql/model/UnconfirmedContribution.ts | 9 +++------
 backend/src/graphql/resolver/AdminResolver.ts        | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index 3b88bec1c..5847b08d0 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -2,7 +2,6 @@ import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
-import { ContributionMessage } from '@model/ContributionMessage'
 
 @ObjectType()
 export class UnconfirmedContribution {
@@ -18,9 +17,7 @@ export class UnconfirmedContribution {
     this.moderator = contribution.moderatorId
     this.creation = creations
     this.state = contribution.contributionStatus
-    this.messages = contribution.messages
-      ? contribution.messages.map((message) => new ContributionMessage(message, message.user))
-      : []
+    this.messageCount = contribution.messages ? contribution.messages.length : 0
   }
 
   @Field(() => String)
@@ -56,6 +53,6 @@ export class UnconfirmedContribution {
   @Field(() => String)
   state: string
 
-  @Field(() => [ContributionMessage])
-  messages: ContributionMessage[]
+  @Field(() => Number)
+  messageCount: number
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index a0eed646f..f4656aec8 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -366,7 +366,6 @@ export class AdminResolver {
       .select('c')
       .from(Contribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
-      .leftJoinAndSelect('m.user', 'u')
       .where({ confirmedAt: IsNull() })
       .getMany()
 

From 3894341db875887746fe233cf7821f36f9ca1b45 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 09:09:13 +0200
Subject: [PATCH 057/163] Add new model ContributionMessageListResult.

---
 backend/src/graphql/model/ContributionMessage.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 1357c02cb..c70a88e21 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -47,3 +47,11 @@ export class ContributionMessageListResult {
   @Field(() => [ContributionMessage])
   messages: ContributionMessage[]
 }
+@ObjectType()
+export class ContributionMessageListResult {
+  @Field(() => Number)
+  count: number
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
+}

From 3597feaa6cde6b0195e41dcdd82fff71490732ae Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 15:27:02 +0200
Subject: [PATCH 058/163] resolve conflict

---
 backend/src/graphql/model/ContributionMessage.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index c70a88e21..1357c02cb 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -47,11 +47,3 @@ export class ContributionMessageListResult {
   @Field(() => [ContributionMessage])
   messages: ContributionMessage[]
 }
-@ObjectType()
-export class ContributionMessageListResult {
-  @Field(() => Number)
-  count: number
-
-  @Field(() => [ContributionMessage])
-  messages: ContributionMessage[]
-}

From e510c2ddbf2c048dbca8e2e50f1131f1de74c193 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 15:27:12 +0200
Subject: [PATCH 059/163] Change import for enum.

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

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index f5dee91f6..408481513 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -9,8 +9,8 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
-import Paginated from '../arg/Paginated'
-import { Order } from '../enum/Order'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
 
 @Resolver()
 export class ContributionMessageResolver {

From 513936b55b1b400110e478c70d77daef5a3f52d7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 25 Aug 2022 13:51:38 +0200
Subject: [PATCH 060/163] Add moderatorId to the object.

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

diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index b7dc4bd72..3b88bec1c 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -15,6 +15,7 @@ export class UnconfirmedContribution {
     this.firstName = user ? user.firstName : ''
     this.lastName = user ? user.lastName : ''
     this.email = user ? user.email : ''
+    this.moderator = contribution.moderatorId
     this.creation = creations
     this.state = contribution.contributionStatus
     this.messages = contribution.messages

From 0104c5501be41753c3bed41e4a582a2b206df0fe Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 15:05:23 +0200
Subject: [PATCH 061/163] style contributionMessages and List

---
 .../ContributionMessagesList.vue              | 43 +++++++++++++------
 .../slots/ContributionMessagesListItem.vue    |  4 +-
 .../slots/IsModerator.vue                     | 13 ++++--
 .../slots/IsNotModerator.vue                  | 12 ++++--
 .../components/Tables/OpenCreationsTable.vue  | 33 +-------------
 admin/src/graphql/listContributionMessages.js |  7 +--
 6 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 399300a53..af4fbdd8e 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,13 +1,9 @@
 <template>
   <div class="contribution-messages-list">
     <b-container>
-      {{ messagesCount }}
+      {{ messages.lenght }}
       <div v-for="message in messages" v-bind:key="message.id">
-        <b-container>
-          <div v-for="message in messages" v-bind:key="message.id">
-            <contribution-messages-list-item :message="message" />
-          </div>
-        </b-container>
+        <contribution-messages-list-item :message="message" />
 
         <!-- <contribution-messages-list-item :typeId="message.isModerator">
           <template #1>
@@ -28,6 +24,7 @@
 <script>
 import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
 import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+import { listContributionMessages } from '../../graphql/listContributionMessages.js'
 
 export default {
   name: 'ContributionMessagesList',
@@ -40,15 +37,35 @@ export default {
       type: Number,
       required: true,
     },
-    messagesCount: {
-      type: Number,
-      required: true,
-    },
-    messages: {
-      type: Array,
-      required: true,
+  },
+  data() {
+    return {
+      messages: [],
+    }
+  },
+  methods: {
+    getListContributionMessages(id) {
+      // console.log('getListContributionMessages', id)
+      this.messages = []
+      this.$apollo
+        .query({
+          query: listContributionMessages,
+          variables: {
+            contributionId: id,
+          },
+        })
+        .then((result) => {
+          // console.log('result', result.data.listContributionMessages)
+          this.messages = result.data.listContributionMessages.messages
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
   },
+  created() {
+    this.getListContributionMessages(this.contributionId)
+  },
 }
 </script>
 <style scoped>
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index a1d9565c0..363a9a8a8 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -25,13 +25,13 @@ export default {
   },
   data() {
     return {
-      storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
+      // storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
       moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
     }
   },
   computed: {
     isModerator() {
-      return this.storeName === this.moderationName
+      return this.$store.state.moderator.id === this.message.userId
     },
   },
 }
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index 1fd284b65..d97fd876a 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="slot-is-moderator">
-    <b-avatar square text="AA"></b-avatar>
-    <span class="ml-2 mr-2">{{ message.firstName }} {{ message.lastName }}</span>
-    <div class="mt-2">{{ message }}</div>
+    <b-avatar
+      square
+      :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
+      variant="warning"
+    ></b-avatar>
+    <span class="ml-2 mr-2">
+      {{ message.userFirstName }} {{ message.userLastName }} (Moderator)
+    </span>
+    <div class="mt-2 text-bold h4">{{ message.message }}</div>
   </div>
 </template>
 <script>
@@ -20,7 +26,6 @@ export default {
 <style>
 .slot-is-moderator {
   clear: both;
-  background-color: rgb(250, 158, 207);
   width: 75%;
   margin-top: 20px;
 }
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 668e840fe..d7433f8ef 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,9 +1,14 @@
 <template>
   <div class="slot-is-not-moderator">
     <div class="text-right">
-      <b-avatar text="BV"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">{{ message.firstName }} {{ message.lastName }}</span>
-      <div class="mt-2">{{ message }}</div>
+      <b-avatar
+        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
+        variant="info"
+      ></b-avatar>
+      <span class="ml-2 mr-2 text-bold">
+        {{ message.userFirstName }} {{ message.userLastName }}
+      </span>
+      <div class="mt-2 text-bold h4">{{ message.message }}</div>
     </div>
   </div>
 </template>
@@ -26,7 +31,6 @@ export default {
 .slot-is-not-moderator {
   clear: both;
   float: right;
-  background-color: aquamarine;
   width: 75%;
   margin-top: 20px;
   margin-bottom: 20px;
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a5f1a7a8d..5ba4b240f 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -2,7 +2,6 @@
   <div class="open-creations-table">
     <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
       <template #cell(bookmark)="row">
-        {{ row.item }}
         <b-button
           variant="danger"
           size="md"
@@ -22,10 +21,7 @@
         >
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
-        <b-button
-          v-else
-          @click="rowToggleDetails(row, 0), getListContributionMessages(row.item.id)"
-        >
+        <b-button v-else @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
           <b-icon icon="exclamation-circle-fill"></b-icon>
         </b-button>
@@ -56,11 +52,7 @@
               />
             </div>
             <div v-else>
-              <contribution-messages-list
-                :contributionId="row.item.id"
-                :messages="messages"
-                :messagesCount="messagesCount"
-              />
+              <contribution-messages-list :contributionId="row.item.id" />
             </div>
           </template>
         </row-details>
@@ -74,7 +66,6 @@ import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails.vue'
 import EditCreationFormular from '../EditCreationFormular.vue'
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList.vue'
-import { listContributionMessages } from '../../graphql/listContributionMessages.js'
 
 export default {
   name: 'OpenCreationsTable',
@@ -101,30 +92,10 @@ export default {
         date: null,
         memo: null,
         moderator: null,
-        messagesCount: 0,
-        messages: [],
       },
     }
   },
   methods: {
-    getListContributionMessages(id) {
-      console.log('getListContributionMessages', id)
-      this.$apollo
-        .query({
-          query: listContributionMessages,
-          variables: {
-            contributionId: id,
-          },
-        })
-        .then((result) => {
-          console.log('result', result.data.listContributionMessages)
-          this.messagesCount = result.data.getListContributionMessages.count
-          this.messages = result.data.getListContributionMessages.messages
-        })
-        .catch((error) => {
-          this.toastError(error.message)
-        })
-    },
     updateCreationData(data) {
       this.creationUserData = data
       // this.creationUserData.amount = data.amount
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index c2fbcf823..2ae5943fa 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -1,12 +1,7 @@
 import gql from 'graphql-tag'
 
 export const listContributionMessages = gql`
-  query (
-    $contributionId: Float!
-    $pageSize: Int = 25
-    $currentPage: Int = 1
-    $order: Order = DESC
-  ) {
+  query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
     listContributionMessages(
       contributionId: $contributionId
       pageSize: $pageSize

From d026ee7ffc2c9577acb9563ba5d7486327022ac8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 15:20:07 +0200
Subject: [PATCH 062/163] add unused keys in locales

---
 .../src/components/ContributionMessages/slots/IsModerator.vue  | 3 ++-
 frontend/src/locales/de.json                                   | 1 +
 frontend/src/locales/en.json                                   | 1 +
 frontend/src/locales/es.json                                   | 1 +
 frontend/src/locales/fr.json                                   | 1 +
 frontend/src/locales/nl.json                                   | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 077fa2e73..bee635ea7 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -6,7 +6,8 @@
       variant="warning"
     ></b-avatar>
     <span class="ml-2 mr-2">
-      {{ message.userFirstName }} {{ message.userLastName }} (Moderator)
+      {{ message.userFirstName }} {{ message.userLastName }}
+      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
     </span>
     <div class="mt-2 h3">{{ message.message }}</div>
   </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 7c9f37370..b107ca612 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -22,6 +22,7 @@
     "continue-to-registration": "Weiter zur Registrierung",
     "current-community": "Aktuelle Gemeinschaft",
     "members": "Mitglieder",
+    "moderator": "Moderator",
     "moderators": "Moderatoren",
     "myContributions": "Meine Beiträge zum Gemeinwohl",
     "openContributionLinks": "öffentliche Beitrags-Linkliste",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8fe5f31ad..2b1eb492e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -22,6 +22,7 @@
     "continue-to-registration": "Continue to registration",
     "current-community": "Current community",
     "members": "Members",
+    "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "My contributions to the common good",
     "openContributionLinks": "open Contribution links list",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index f95344b23..df32c3729 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -22,6 +22,7 @@
     "continue-to-registration": "Continuar con el registro",
     "current-community": "Comunidad actual",
     "members": "Miembros",
+    "moderator": "Moderador",
     "moderators": "Moderadores",
     "myContributions": "Mis contribuciones al bien común",
     "openContributionLinks": "lista de enlaces de contribuciones públicas",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 44a08cd82..c8a25d2fb 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -22,6 +22,7 @@
     "continue-to-registration": "Continuez l´inscription",
     "current-community": "Communauté actuelle",
     "members": "Membres",
+    "moderator": "Modérateur",
     "moderators": "Modérateurs",
     "myContributions": "Mes contributions aux biens communs",
     "openContributionLinks": "liste de liens de contribution publique",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index f817d1458..fe0e83839 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -22,6 +22,7 @@
     "continue-to-registration": "Verder ter registratie",
     "current-community": "Actuele gemeenschap",
     "members": "Leden",
+    "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "Mijn bijdragen voor het algemeen belang",
     "openContributionLinks": "openbare lijst van bijdragen",

From 45ef5e5d088a74406a454084c90d65c1d1625569 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 15:22:56 +0200
Subject: [PATCH 063/163] Added missing keys in locales

---
 .../src/components/ContributionMessages/slots/IsModerator.vue  | 3 ++-
 .../src/components/ContributionMessages/slots/IsModerator.vue  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index d97fd876a..e00e53600 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -6,7 +6,8 @@
       variant="warning"
     ></b-avatar>
     <span class="ml-2 mr-2">
-      {{ message.userFirstName }} {{ message.userLastName }} (Moderator)
+      {{ message.userFirstName }} {{ message.userLastName }}
+      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
     </span>
     <div class="mt-2 text-bold h4">{{ message.message }}</div>
   </div>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index bee635ea7..08ae8ab4f 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -7,7 +7,7 @@
     ></b-avatar>
     <span class="ml-2 mr-2">
       {{ message.userFirstName }} {{ message.userLastName }}
-      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
+      <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
     </span>
     <div class="mt-2 h3">{{ message.message }}</div>
   </div>

From 4e5c930dd57d304896a2bba8ebd4fdf85059e310 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 15:45:51 +0200
Subject: [PATCH 064/163] add status icons in open contribution list

---
 admin/src/components/Tables/OpenCreationsTable.vue | 11 ++++++++++-
 admin/src/graphql/listUnconfirmedContributions.js  |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 5ba4b240f..6c0289ffe 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -23,7 +23,16 @@
         </b-button>
         <b-button v-else @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
-          <b-icon icon="exclamation-circle-fill"></b-icon>
+          <b-icon
+            v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+            icon="exclamation-circle-fill"
+            variant="warning"
+          ></b-icon> 
+          <b-icon
+            v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+            icon="question-diamond"
+            variant="light"
+          ></b-icon>
         </b-button>
       </template>
       <template #cell(confirm)="row">
diff --git a/admin/src/graphql/listUnconfirmedContributions.js b/admin/src/graphql/listUnconfirmedContributions.js
index c31347468..dbaa52d81 100644
--- a/admin/src/graphql/listUnconfirmedContributions.js
+++ b/admin/src/graphql/listUnconfirmedContributions.js
@@ -12,6 +12,8 @@ export const listUnconfirmedContributions = gql`
       date
       moderator
       creation
+      state
+      messageCount
     }
   }
 `

From 92ec3e4d25ed3dc3a9546ca6aa4fe46192d00b59 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 18:45:15 +0200
Subject: [PATCH 065/163] new status in_progress in contribution list

---
 .../ContributionMessagesList.vue              |   4 +-
 .../ContributionMessagesFormular.vue          |  36 ++-----
 .../ContributionMessagesList.vue              |  10 +-
 .../slots/IsNotModerator.vue                  |   5 +-
 .../Contributions/ContributionListItem.vue    | 100 ++++++++++--------
 frontend/src/locales/de.json                  |   5 +-
 frontend/src/locales/en.json                  |   5 +-
 frontend/src/locales/es.json                  |   5 +-
 frontend/src/locales/fr.json                  |   5 +-
 frontend/src/locales/nl.json                  |   5 +-
 frontend/src/pages/Community.vue              |   7 +-
 11 files changed, 96 insertions(+), 91 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index af4fbdd8e..b13e9139a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -15,9 +15,7 @@
         </contribution-messages-list-item> -->
       </div>
     </b-container>
-    <br />
-    <br />
-    <br />
+
     <contribution-messages-formular :contributionId="contributionId" />
   </div>
 </template>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index fe7a2afc6..e27989b12 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,28 +1,5 @@
 <template>
   <div class="contribution-messages-formular">
-    <div v-if="form.text !== ''" class="mt-5">
-      <h4>{{ $t('preview') }}</h4>
-      <div class="border border-info m-5">
-        <b-row>
-          <b-col cols="1">
-            <b-avatar
-              :text="`${$store.state.firstName[0]} ${$store.state.lastName[0]}`"
-              variant="info"
-            ></b-avatar>
-          </b-col>
-          <b-col cols="11">
-            <pre class="mt-2">
-            {{ $store.state.firstName }} {{ $store.state.lastName }}
-            </pre>
-          </b-col>
-        </b-row>
-        <b-row>
-          <b-col>
-            <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
-          </b-col>
-        </b-row>
-      </div>
-    </div>
     <div>
       <b-form @submit="onSubmit" @reset="onReset">
         <b-form-textarea
@@ -32,8 +9,14 @@
           rows="3"
           max-rows="6"
         ></b-form-textarea>
-        <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
-        <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+        <b-row class="mt-4 mb-6">
+          <b-col>
+            <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+          </b-col>
+          <b-col class="text-right">
+            <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+          </b-col>
+        </b-row>
       </b-form>
     </div>
   </div>
@@ -78,6 +61,9 @@ export default {
       event.preventDefault()
       this.form.text = ''
     },
+    toggleContributionMessagesBox() {
+      this.$emit('toggle-contribution-messages-box', this.contributionId)
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index c8d53868d..f8130f2bc 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -5,12 +5,11 @@
         <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
-    <br />
-    <br />
-    <br />
     <contribution-messages-formular
       v-if="state === 'PENDING' || state === 'IN_PROGRESS'"
+      class="mt-5"
       :contributionId="contributionId"
+      @toggle-contribution-messages-box="toggleContributionMessagesBox"
     />
   </div>
 </template>
@@ -38,6 +37,11 @@ export default {
       required: true,
     },
   },
+  methods: {
+    toggleContributionMessagesBox(id) {
+      this.$emit('toggle-contribution-messages-box', id)
+    },
+  },
 }
 </script>
 <style scoped>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8696a211a..d3cad8ca2 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -25,14 +25,11 @@ export default {
 }
 </script>
 <style>
-.clear {
-  clear: both;
-}
 .slot-is-not-moderator {
-  clear: both;
   float: right;
   width: 75%;
   margin-top: 20px;
   margin-bottom: 20px;
+  clear: both;
 }
 </style>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 7e17ecbb5..be19822d2 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,55 +2,64 @@
   <div class="contribution-list-item">
     <slot>
       <div class="border p-3 w-100 mb-1" :class="`border-${variant}`">
-        <div class="d-inline-flex">
-          <div class="mr-2"><b-icon :icon="icon" :variant="variant" class="h2"></b-icon></div>
-          <div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div>
-          <div class="mr-2" :class="state !== 'DELETED' ? 'font-weight-bold' : ''">
-            {{ amount | GDD }}
+        <div v-b-toggle="messages.length ? collapsId : ''">
+          <div class="d-inline-flex">
+            <div class="mr-2">
+              <b-icon
+                v-if="state === 'IN_PROGRESS'"
+                icon="question-square"
+                font-scale="2"
+                variant="warning"
+              ></b-icon>
+              <b-icon v-else :icon="icon" :variant="variant" class="h2"></b-icon>
+            </div>
+            <div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div>
+            <div class="mr-2" :class="state !== 'DELETED' ? 'font-weight-bold' : ''">
+              {{ amount | GDD }}
+            </div>
+            {{ $t('math.minus') }}
+            <div class="mx-2">{{ $d(new Date(date), 'short') }}</div>
           </div>
-          {{ $t('math.minus') }}
-          <div class="mx-2">{{ $d(new Date(date), 'short') }}</div>
-        </div>
-        <div class="mr-2">
-          <span>{{ $t('contribution.date') }}</span>
-          <span>
-            {{ $d(new Date(contributionDate), 'monthAndYear') }}
-          </span>
-        </div>
-        <div class="mr-2">{{ memo }}</div>
-        <div
-          v-if="(state !== 'DELETED' && !firstName) || (state !== 'CONFIRMED' && !firstName)"
-          class="d-flex flex-row-reverse"
-        >
+          <div class="mr-2">
+            <span>{{ $t('contribution.date') }}</span>
+            <span>
+              {{ $d(new Date(contributionDate), 'monthAndYear') }}
+            </span>
+          </div>
+          <div class="mr-2">{{ memo }}</div>
           <div
-            v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
-            class="pointer ml-5"
-            @click="
-              $emit('update-contribution-form', {
-                id: id,
-                contributionDate: contributionDate,
-                memo: memo,
-                amount: amount,
-              })
-            "
+            v-if="(state !== 'DELETED' && !firstName) || (state !== 'CONFIRMED' && !firstName)"
+            class="d-flex flex-row-reverse"
           >
-            <b-icon icon="pencil" class="h2"></b-icon>
-          </div>
-          <div
-            v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
-            class="pointer"
-            @click="deleteContribution({ id })"
-          >
-            <b-icon icon="trash" class="h2"></b-icon>
-          </div>
-          <div v-if="messages.length" class="pointer">
-            <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
+            <div
+              v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
+              class="pointer ml-5"
+              @click="
+                $emit('update-contribution-form', {
+                  id: id,
+                  contributionDate: contributionDate,
+                  memo: memo,
+                  amount: amount,
+                })
+              "
+            >
+              <b-icon icon="pencil" class="h2"></b-icon>
+            </div>
+            <div
+              v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
+              class="pointer"
+              @click="deleteContribution({ id })"
+            >
+              <b-icon icon="trash" class="h2"></b-icon>
+            </div>
+            <div v-if="messages.length" class="pointer">
+              <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
+            </div>
           </div>
         </div>
         <div v-if="messages">
-          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="dark">
-            <b-icon icon="circle-fill" animation="throb" font-scale="1" variant="warning"></b-icon>
-            Bitte beantworte die Nachfrage
+          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="warning">
+            {{ $t('contribution.alert.answerQuestion') }}
           </b-button>
           <b-collapse :id="collapsId" class="mt-2">
             <b-card>
@@ -58,6 +67,7 @@
                 :messages="messages"
                 :state="state"
                 :contributionId="contributionId"
+                @toggle-contribution-messages-box="toggleContributionMessagesBox"
               />
             </b-card>
           </b-collapse>
@@ -140,6 +150,7 @@ export default {
     variant() {
       if (this.deletedAt) return 'danger'
       if (this.confirmedAt) return 'success'
+      if (this.state === 'IN_PROGRESS') return 'warning'
       return 'primary'
     },
     date() {
@@ -155,6 +166,9 @@ export default {
         if (value) this.$emit('delete-contribution', item)
       })
     },
+    toggleContributionMessagesBox(id) {
+      alert('toggleContributionMessagesBox(' + id + ')')
+    },
   },
 }
 </script>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b107ca612..bbdc9886a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -38,9 +38,10 @@
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
-      "myContributionNoteSupport": "Es wird bald an dieser Stelle die Möglichkeit geben das ein Dialog zwischen Moderatoren und dir stattfinden kann. Solltest du jetzt Probleme haben bitte nimm Kontakt mit dem Support auf.",
       "pending": "Eingereicht und wartet auf Bestätigung",
-      "rejected": "abgelehnt"
+      "rejected": "abgelehnt",
+      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "answerQuestion": "Bitte beantworte die Nachfrage"
     },
     "date": "Beitrag für:",
     "delete": "Beitrag löschen! Bist du sicher?",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 2b1eb492e..4f7830f65 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -38,9 +38,10 @@
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
-      "myContributionNoteSupport": "Soon there will be the possibility for a dialogue between moderators and you. If you have any problems now, please contact the support.",
       "pending": "Submitted and waiting for confirmation",
-      "rejected": "deleted"
+      "rejected": "deleted",
+      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "answerQuestion": "Please answer the question"
     },
     "date": "Contribution for:",
     "delete": "Delete Contribution! Are you sure?",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index df32c3729..ffec649ed 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -38,9 +38,10 @@
       "communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
       "confirm": "confirmado",
       "myContributionNoteList": "Puedes editar o eliminar las contribuciones enviadas que aún no han sido confirmadas en cualquier momento.",
-      "myContributionNoteSupport": "Pronto existirá la posibilidad de que puedas dialogar con los moderadores. Si tienes algún problema ahora, ponte en contacto con el equipo de asistencia.",
       "pending": "Enviado y a la espera de confirmación",
-      "rejected": "rechazado"
+      "rejected": "rechazado",
+      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "answerQuestion": "Please answer the question"
     },
     "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 c8a25d2fb..b1ff773d0 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -38,9 +38,10 @@
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": " Approuvé",
       "myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
-      "myContributionNoteSupport": "Vous aurez bientôt la possibilité de dialoguer avec un médiateur. Si vous rencontrez un problème maintenant, merci de contacter l´aide en ligne.",
       "pending": "Inscription en attente de validation",
-      "rejected": "supprimé"
+      "rejected": "supprimé",
+      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "answerQuestion": "Please answer the question"
     },
     "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 fe0e83839..edb2ec21b 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -38,9 +38,10 @@
       "communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
       "confirm": "bevestigt",
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
-      "myContributionNoteSupport": "Hier heb je binnenkort de mogelijkheid een gesprek met een moderator te voeren. Mocht je nu problemen hebben, dan neem alsjeblieft contact op met Support.",
       "pending": "Ingediend en wacht op bevestiging",
-      "rejected": "afgewezen"
+      "rejected": "afgewezen",
+      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "answerQuestion": "Please answer the question"
     },
     "date": "Bijdrage voor:",
     "delete": "Bijdrage verwijderen! Weet je het zeker?",
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 64aca6156..5f9eb57f6 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -22,6 +22,10 @@
                   <b-icon icon="bell-fill" variant="primary"></b-icon>
                   {{ $t('contribution.alert.pending') }}
                 </li>
+                <li>
+                  <b-icon icon="question-square" variant="warning"></b-icon>
+                  {{ $t('contribution.alert.in_progress') }}
+                </li>
                 <li>
                   <b-icon icon="check" variant="success"></b-icon>
                   {{ $t('contribution.alert.confirm') }}
@@ -32,9 +36,6 @@
                 </li>
               </ul>
               <hr />
-              <p class="mb-0">
-                {{ $t('contribution.alert.myContributionNoteSupport') }}
-              </p>
             </b-alert>
           </div>
           <contribution-list

From 38559694e23ecbf7f18e0356850d6654fe3c2789 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 18:46:16 +0200
Subject: [PATCH 066/163] fix lint && fix locales

---
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index bbdc9886a..1296616d3 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -40,7 +40,7 @@
       "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",
-      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "answerQuestion": "Bitte beantworte die Nachfrage"
     },
     "date": "Beitrag für:",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4f7830f65..ee31350ce 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -40,7 +40,7 @@
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "pending": "Submitted and waiting for confirmation",
       "rejected": "deleted",
-      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "answerQuestion": "Please answer the question"
     },
     "date": "Contribution for:",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index ffec649ed..fa6613092 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -40,7 +40,7 @@
       "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",
-      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "answerQuestion": "Please answer the question"
     },
     "date": "Contribución para:",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index b1ff773d0..948f1b0fe 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -40,7 +40,7 @@
       "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é",
-      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "answerQuestion": "Please answer the question"
     },
     "date": "Contribution pour:",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index edb2ec21b..69896cbea 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -40,7 +40,7 @@
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
       "pending": "Ingediend en wacht op bevestiging",
       "rejected": "afgewezen",
-      "in_progress":"Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "answerQuestion": "Please answer the question"
     },
     "date": "Bijdrage voor:",

From 773207f80fd8a35f321dfc39c2d036e4e14a4454 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 25 Aug 2022 18:46:58 +0200
Subject: [PATCH 067/163] fix lint in adminarea

---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 6c0289ffe..50ae6df97 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -27,7 +27,7 @@
             v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
             icon="exclamation-circle-fill"
             variant="warning"
-          ></b-icon> 
+          ></b-icon>
           <b-icon
             v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
             icon="question-diamond"

From 1090d17fdb365da3e592c20ea86b7f2062c0535c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 26 Aug 2022 08:32:15 +0200
Subject: [PATCH 068/163] Remove OneToMany import.

---
 database/entity/0047-messages_tables/ContributionMessage.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/entity/0047-messages_tables/ContributionMessage.ts b/database/entity/0047-messages_tables/ContributionMessage.ts
index 3d9c04d89..e5226043d 100644
--- a/database/entity/0047-messages_tables/ContributionMessage.ts
+++ b/database/entity/0047-messages_tables/ContributionMessage.ts
@@ -5,7 +5,6 @@ import {
   Entity,
   JoinColumn,
   ManyToOne,
-  OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm'
 import { Contribution } from '../Contribution'

From 894140b41837e8ab2a0a3c7a7d1dcfcb97ed456a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 26 Aug 2022 08:50:08 +0200
Subject: [PATCH 069/163] Remove unused imports.

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 1b7a8f630..f8300f164 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -11,10 +11,8 @@ import { ContributionType } from '@enum/ContributionType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { User } from '@model/User'
 import { validateContribution, getUserCreation, updateCreations } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { ContributionMessage } from '@entity/ContributionMessage'
 
 @Resolver()
 export class ContributionResolver {

From 5dc74b9cb8d7dd1854f613e2f35f9916aefbd96e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 26 Aug 2022 08:32:15 +0200
Subject: [PATCH 070/163] Remove OneToMany import.

---
 database/entity/0047-messages_tables/ContributionMessage.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/entity/0047-messages_tables/ContributionMessage.ts b/database/entity/0047-messages_tables/ContributionMessage.ts
index 3d9c04d89..e5226043d 100644
--- a/database/entity/0047-messages_tables/ContributionMessage.ts
+++ b/database/entity/0047-messages_tables/ContributionMessage.ts
@@ -5,7 +5,6 @@ import {
   Entity,
   JoinColumn,
   ManyToOne,
-  OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm'
 import { Contribution } from '../Contribution'

From c6f2e9fb0d4c9f7d1acb58d9a92e967bed66b265 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 27 Aug 2022 11:20:14 +0200
Subject: [PATCH 071/163] reload messages if submited

---
 .../ContributionMessagesFormular.vue          |  2 ++
 .../ContributionMessagesList.vue              |  4 +++
 .../Contributions/ContributionList.vue        |  1 +
 .../Contributions/ContributionListItem.vue    | 25 +++++++++++++++++--
 frontend/src/graphql/queries.js               | 23 +++++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index e27989b12..5fed6ebd6 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -51,6 +51,8 @@ export default {
           },
         })
         .then((result) => {
+          this.$emit('get-list-contribution-messages', this.contributionId)
+          this.form.text = ''
           this.toastSuccess(result)
         })
         .catch((error) => {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index f8130f2bc..1b8e36cae 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -10,6 +10,7 @@
       class="mt-5"
       :contributionId="contributionId"
       @toggle-contribution-messages-box="toggleContributionMessagesBox"
+      @get-list-contribution-messages="getListContributionMessages"
     />
   </div>
 </template>
@@ -41,6 +42,9 @@ export default {
     toggleContributionMessagesBox(id) {
       this.$emit('toggle-contribution-messages-box', id)
     },
+    getListContributionMessages() {
+      this.$emit('get-list-contribution-messages', this.contributionId)
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index cffee360b..724a69281 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -47,6 +47,7 @@ export default {
   data() {
     return {
       currentPage: 1,
+      messages: [],
     }
   },
   methods: {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index be19822d2..6e95093db 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
   <div class="contribution-list-item">
     <slot>
       <div class="border p-3 w-100 mb-1" :class="`border-${variant}`">
-        <div v-b-toggle="messages.length ? collapsId : ''">
+        <div v-b-toggle="messages.length ? collapsId : ''" @click="getListContributionMessages">
           <div class="d-inline-flex">
             <div class="mr-2">
               <b-icon
@@ -64,10 +64,11 @@
           <b-collapse :id="collapsId" class="mt-2">
             <b-card>
               <contribution-messages-list
-                :messages="messages"
+                :messages="messages_get"
                 :state="state"
                 :contributionId="contributionId"
                 @toggle-contribution-messages-box="toggleContributionMessagesBox"
+                @get-list-contribution-messages="getListContributionMessages"
               />
             </b-card>
           </b-collapse>
@@ -78,6 +79,7 @@
 </template>
 <script>
 import ContributionMessagesList from '@/components/ContributionMessages/ContributionMessagesList.vue'
+import { listContributionMessages } from '../../graphql/queries.js'
 
 export default {
   name: 'ContributionListItem',
@@ -139,6 +141,7 @@ export default {
   data() {
     return {
       inProcess: true,
+      messages_get: [],
     }
   },
   computed: {
@@ -169,6 +172,24 @@ export default {
     toggleContributionMessagesBox(id) {
       alert('toggleContributionMessagesBox(' + id + ')')
     },
+    getListContributionMessages() {
+      console.log('getListContributionMessages', this.contributionId)
+      this.$apollo
+        .query({
+          query: listContributionMessages,
+          variables: {
+            contributionId: this.contributionId,
+          },
+          fetchPolicy: 'no-cache',
+        })
+        .then((result) => {
+          console.log('result', result.data.listContributionMessages.messages)
+          this.messages_get = result.data.listContributionMessages.messages
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
   },
 }
 </script>
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index f701ad8cf..d7fc0ce98 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -265,3 +265,26 @@ export const searchAdminUsers = gql`
     }
   }
 `
+
+export const listContributionMessages = gql`
+  query($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
+    listContributionMessages(
+      contributionId: $contributionId
+      pageSize: $pageSize
+      currentPage: $currentPage
+      order: $order
+    ) {
+      count
+      messages {
+        id
+        message
+        createdAt
+        updatedAt
+        type
+        userFirstName
+        userLastName
+        userId
+      }
+    }
+  }
+`

From fd74a2e67105b45a28041e28022b1fcaecb09e9c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 27 Aug 2022 11:20:30 +0200
Subject: [PATCH 072/163] reload messages if submited adminarea

---
 .../ContributionMessagesFormular.vue          | 30 +++++++------------
 .../ContributionMessagesList.vue              |  6 +++-
 .../slots/ContributionMessagesListItem.vue    |  6 ----
 .../slots/IsModerator.vue                     | 24 ++++++++-------
 .../slots/IsNotModerator.vue                  |  7 +----
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index b7e706d5c..c04f8a573 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,23 +1,5 @@
 <template>
   <div class="contribution-messages-formular">
-    <div v-if="form.text !== ''" class="mt-5">
-      <h4>{{ $t('preview') }}</h4>
-      <div class="border border-info m-5">
-        <b-row>
-          <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
-          <b-col cols="11">
-            <pre class="mt-2">
-            {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
-            </pre>
-          </b-col>
-        </b-row>
-        <b-row>
-          <b-col>
-            <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
-          </b-col>
-        </b-row>
-      </div>
-    </div>
     <div>
       <b-form @submit="onSubmit" @reset="onReset">
         <b-form-textarea
@@ -27,8 +9,14 @@
           rows="3"
           max-rows="6"
         ></b-form-textarea>
-        <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
-        <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+        <b-row class="mt-4 mb-6">
+          <b-col>
+            <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+          </b-col>
+          <b-col class="text-right">
+            <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+          </b-col>
+        </b-row>
       </b-form>
     </div>
   </div>
@@ -63,6 +51,8 @@ export default {
           },
         })
         .then((result) => {
+          this.$emit('get-list-contribution-messages', this.contributionId)
+          this.form.text = ''
           this.toastSuccess(result)
         })
         .catch((error) => {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index b13e9139a..15762b18d 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -16,7 +16,10 @@
       </div>
     </b-container>
 
-    <contribution-messages-formular :contributionId="contributionId" />
+    <contribution-messages-formular
+      :contributionId="contributionId"
+      @get-list-contribution-messages="getListContributionMessages"
+    />
   </div>
 </template>
 <script>
@@ -51,6 +54,7 @@ export default {
           variables: {
             contributionId: id,
           },
+          fetchPolicy: 'no-cache',
         })
         .then((result) => {
           // console.log('result', result.data.listContributionMessages)
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 363a9a8a8..3af14307c 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -23,12 +23,6 @@ export default {
       },
     },
   },
-  data() {
-    return {
-      // storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
-      moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
-    }
-  },
   computed: {
     isModerator() {
       return this.$store.state.moderator.id === this.message.userId
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index e00e53600..fd4d619d7 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="slot-is-moderator">
-    <b-avatar
-      square
-      :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
-      variant="warning"
-    ></b-avatar>
-    <span class="ml-2 mr-2">
-      {{ message.userFirstName }} {{ message.userLastName }}
-      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-    </span>
-    <div class="mt-2 text-bold h4">{{ message.message }}</div>
+    <div class="text-right">
+      <b-avatar
+        square
+        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
+        variant="warning"
+      ></b-avatar>
+      <span class="ml-2 mr-2">
+        {{ message.userFirstName }} {{ message.userLastName }}
+        <small class="ml-4 text-success">{{ $t('moderator') }}</small>
+      </span>
+      <div class="mt-2 text-bold h4">{{ message.message }}</div>
+    </div>
   </div>
 </template>
 <script>
@@ -27,7 +29,9 @@ export default {
 <style>
 .slot-is-moderator {
   clear: both;
+  float: right;
   width: 75%;
   margin-top: 20px;
+  margin-bottom: 20px;
 }
 </style>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index d7433f8ef..bec99ae1e 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="slot-is-not-moderator">
-    <div class="text-right">
+    <div>
       <b-avatar
         :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
         variant="info"
@@ -25,14 +25,9 @@ export default {
 }
 </script>
 <style>
-.clear {
-  clear: both;
-}
 .slot-is-not-moderator {
   clear: both;
-  float: right;
   width: 75%;
   margin-top: 20px;
-  margin-bottom: 20px;
 }
 </style>

From ef52c8b6d560d30d551e92ba2619e741488c4975 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 08:08:30 +0200
Subject: [PATCH 073/163] delete unused toggleContributionMessagesBox function

---
 .../ContributionMessages/ContributionMessagesFormular.vue     | 3 ---
 .../src/components/Contributions/ContributionListItem.vue     | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 5fed6ebd6..80708726c 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -63,9 +63,6 @@ export default {
       event.preventDefault()
       this.form.text = ''
     },
-    toggleContributionMessagesBox() {
-      this.$emit('toggle-contribution-messages-box', this.contributionId)
-    },
   },
 }
 </script>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 6e95093db..976730384 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -173,7 +173,7 @@ export default {
       alert('toggleContributionMessagesBox(' + id + ')')
     },
     getListContributionMessages() {
-      console.log('getListContributionMessages', this.contributionId)
+      // console.log('getListContributionMessages', this.contributionId)
       this.$apollo
         .query({
           query: listContributionMessages,
@@ -183,7 +183,7 @@ export default {
           fetchPolicy: 'no-cache',
         })
         .then((result) => {
-          console.log('result', result.data.listContributionMessages.messages)
+          // console.log('result', result.data.listContributionMessages.messages)
           this.messages_get = result.data.listContributionMessages.messages
         })
         .catch((error) => {

From 14ca1378bf4505882646b26c8070572a830b470f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 08:15:48 +0200
Subject: [PATCH 074/163] delete unused toggleContributionMessagesBox function

---
 .../ContributionMessages/ContributionMessagesList.vue         | 4 ----
 .../src/components/Contributions/ContributionListItem.vue     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 1b8e36cae..98e92e6e7 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -9,7 +9,6 @@
       v-if="state === 'PENDING' || state === 'IN_PROGRESS'"
       class="mt-5"
       :contributionId="contributionId"
-      @toggle-contribution-messages-box="toggleContributionMessagesBox"
       @get-list-contribution-messages="getListContributionMessages"
     />
   </div>
@@ -39,9 +38,6 @@ export default {
     },
   },
   methods: {
-    toggleContributionMessagesBox(id) {
-      this.$emit('toggle-contribution-messages-box', id)
-    },
     getListContributionMessages() {
       this.$emit('get-list-contribution-messages', this.contributionId)
     },
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 976730384..8fc742cd3 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -67,7 +67,6 @@
                 :messages="messages_get"
                 :state="state"
                 :contributionId="contributionId"
-                @toggle-contribution-messages-box="toggleContributionMessagesBox"
                 @get-list-contribution-messages="getListContributionMessages"
               />
             </b-card>
@@ -169,9 +168,6 @@ export default {
         if (value) this.$emit('delete-contribution', item)
       })
     },
-    toggleContributionMessagesBox(id) {
-      alert('toggleContributionMessagesBox(' + id + ')')
-    },
     getListContributionMessages() {
       // console.log('getListContributionMessages', this.contributionId)
       this.$apollo

From 15af14a2331616c9053453e9433b652007d1dec6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 10:00:41 +0200
Subject: [PATCH 075/163] add methods updateState and emits

---
 .../ContributionMessages/ContributionMessagesFormular.vue     | 1 +
 .../ContributionMessages/ContributionMessagesList.vue         | 4 ++++
 frontend/src/components/Contributions/ContributionList.vue    | 4 ++++
 .../src/components/Contributions/ContributionListItem.vue     | 4 ++++
 frontend/src/pages/Community.vue                              | 4 ++++
 5 files changed, 17 insertions(+)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 80708726c..7ec3c4ff9 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -52,6 +52,7 @@ export default {
         })
         .then((result) => {
           this.$emit('get-list-contribution-messages', this.contributionId)
+          this.$emit('update-state', this.contributionId)
           this.form.text = ''
           this.toastSuccess(result)
         })
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 98e92e6e7..896487160 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -10,6 +10,7 @@
       class="mt-5"
       :contributionId="contributionId"
       @get-list-contribution-messages="getListContributionMessages"
+      @update-state="updateState"
     />
   </div>
 </template>
@@ -41,6 +42,9 @@ export default {
     getListContributionMessages() {
       this.$emit('get-list-contribution-messages', this.contributionId)
     },
+    updateState(id) {
+      this.$emit('update-state', id)
+    },
   },
 }
 </script>
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index 724a69281..11cc0f9dd 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -6,6 +6,7 @@
         :contributionId="item.id"
         @update-contribution-form="updateContributionForm"
         @delete-contribution="deleteContribution"
+        @update-state="updateState"
       />
     </div>
     <b-pagination
@@ -64,6 +65,9 @@ export default {
     deleteContribution(item) {
       this.$emit('delete-contribution', item)
     },
+    updateState(id) {
+      this.$emit('update-state', id)
+    },
   },
   computed: {
     isPaginationVisible() {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 8fc742cd3..56f71bb66 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -68,6 +68,7 @@
                 :state="state"
                 :contributionId="contributionId"
                 @get-list-contribution-messages="getListContributionMessages"
+                @update-state="updateState"
               />
             </b-card>
           </b-collapse>
@@ -186,6 +187,9 @@ export default {
           this.toastError(error.message)
         })
     },
+    updateState(id) {
+      this.$emit('update-state', id)
+    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 5f9eb57f6..1753ca5d2 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -43,6 +43,7 @@
             @update-list-contributions="updateListContributions"
             @update-contribution-form="updateContributionForm"
             @delete-contribution="deleteContribution"
+            @update-state="updateState"
             :contributionCount="contributionCount"
             :showPagination="true"
             :pageSize="pageSize"
@@ -259,6 +260,9 @@ export default {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
+    updateState(id) {
+      this.items.find((item) => item.id === id).state = 'PENDING'
+    },
   },
   created() {
     // verifyLogin is important at this point so that creation is updated on reload if they are deleted in a session in the admin area.

From 40475ecb37953b3a06f0ee655235a57b85316466 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 10:20:12 +0200
Subject: [PATCH 076/163] add locales key form.replay

---
 frontend/src/locales/de.json | 1 +
 frontend/src/locales/en.json | 1 +
 frontend/src/locales/es.json | 1 +
 frontend/src/locales/fr.json | 1 +
 frontend/src/locales/nl.json | 1 +
 5 files changed, 5 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1296616d3..008dc7705 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -132,6 +132,7 @@
     "password_new_repeat": "Neues Passwort wiederholen",
     "password_old": "Altes Passwort",
     "recipient": "Empfänger",
+    "reply": "Antworten",
     "reset": "Zurücksetzen",
     "save": "Speichern",
     "scann_code": "<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ee31350ce..394f74a7a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -132,6 +132,7 @@
     "password_new_repeat": "Repeat new password",
     "password_old": "Old password",
     "recipient": "Recipient",
+    "reply": "Reply",
     "reset": "Reset",
     "save": "Save",
     "scann_code": "<strong>QR Code Scanner</strong> - Scan the QR Code of your partner",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index fa6613092..b871e7168 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -132,6 +132,7 @@
     "password_new_repeat": "Repetir contraseña nueva",
     "password_old": "contraseña antigua",
     "recipient": "Destinatario",
+    "reply": "Respuesta",
     "reset": "Restablecer",
     "save": "Guardar",
     "scann_code": "<strong>QR Code Scanner</strong> - Escanea el código QR de tu pareja",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 948f1b0fe..eea99d57c 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -132,6 +132,7 @@
     "password_new_repeat": "Répétez le nouveau mot de passe",
     "password_old": "Ancien mot de passe",
     "recipient": "Destinataire",
+    "reply": "Répondre",
     "reset": "Réinitialiser",
     "save": "Sauvegarder",
     "scann_code": "<strong>QR Code Scanner</strong> - Scannez le QR code de votre partenaire",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 69896cbea..13a1b2124 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -132,6 +132,7 @@
     "password_new_repeat": "Nieuw wachtwoord herhalen",
     "password_old": "Oud wachtwoord",
     "recipient": "Ontvanger",
+    "reply": "Antwoord",
     "reset": "Resetten",
     "save": "Opslaan",
     "scann_code": "<strong>QR Code Scanner</strong> - Scan de QR Code van uw partner",

From 0cfd0f00977c766a4a073055e043ad103bc5891c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 10:21:50 +0200
Subject: [PATCH 077/163] add locales key form.reply

---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 7ec3c4ff9..440f9781a 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -14,7 +14,7 @@
             <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
           </b-col>
           <b-col class="text-right">
-            <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+            <b-button type="submit" variant="primary">{{ $t('form.reply') }}</b-button>
           </b-col>
         </b-row>
       </b-form>

From 6bd02a2d4bf298d909b1532ff1010e212f397add Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 11:12:31 +0200
Subject: [PATCH 078/163] add method updateState and emits

---
 .../ContributionMessagesFormular.vue              |  1 +
 .../ContributionMessagesList.vue                  | 15 ++++-----------
 .../src/components/Tables/OpenCreationsTable.vue  | 10 ++++++++--
 admin/src/pages/CreationConfirm.vue               |  7 +++++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index c04f8a573..06085dec7 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -52,6 +52,7 @@ export default {
         })
         .then((result) => {
           this.$emit('get-list-contribution-messages', this.contributionId)
+          this.$emit('update-state', this.contributionId)
           this.form.text = ''
           this.toastSuccess(result)
         })
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 15762b18d..c5863cdc3 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -4,21 +4,13 @@
       {{ messages.lenght }}
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :message="message" />
-
-        <!-- <contribution-messages-list-item :typeId="message.isModerator">
-          <template #1>
-            <is-moderator :message="message"></is-moderator>
-          </template>
-          <template #0>
-            <is-not-moderator :message="message" class="text-right"></is-not-moderator>
-          </template>
-        </contribution-messages-list-item> -->
       </div>
     </b-container>
 
     <contribution-messages-formular
       :contributionId="contributionId"
       @get-list-contribution-messages="getListContributionMessages"
+      @update-state="updateState"
     />
   </div>
 </template>
@@ -46,7 +38,6 @@ export default {
   },
   methods: {
     getListContributionMessages(id) {
-      // console.log('getListContributionMessages', id)
       this.messages = []
       this.$apollo
         .query({
@@ -57,13 +48,15 @@ export default {
           fetchPolicy: 'no-cache',
         })
         .then((result) => {
-          // console.log('result', result.data.listContributionMessages)
           this.messages = result.data.listContributionMessages.messages
         })
         .catch((error) => {
           this.toastError(error.message)
         })
     },
+    updateState(id) {
+      this.$emit('update-state', id)
+    },
   },
   created() {
     this.getListContributionMessages(this.contributionId)
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 50ae6df97..86c5ecce6 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -57,11 +57,14 @@
                 :row="row"
                 :creationUserData="creationUserData"
                 @update-creation-data="updateCreationData"
-                @update-user-data="updateUserData"
               />
             </div>
             <div v-else>
-              <contribution-messages-list :contributionId="row.item.id" />
+              <contribution-messages-list
+                :contributionId="row.item.id"
+                @update-state="updateState"
+                @update-user-data="updateUserData"
+              />
             </div>
           </template>
         </row-details>
@@ -116,6 +119,9 @@ export default {
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation
     },
+    updateState(id) {
+      this.$emit('update-state', id)
+    },
   },
 }
 </script>
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index c07e6b351..c94d84cbd 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -9,6 +9,7 @@
       :fields="fields"
       @remove-creation="removeCreation"
       @show-overlay="showOverlay"
+      @update-state="updateState"
     />
   </div>
 </template>
@@ -79,6 +80,7 @@ export default {
         .then((result) => {
           this.$store.commit('resetOpenCreations')
           this.pendingCreations = result.data.listUnconfirmedContributions
+          console.log(this.pendingCreations)
           this.$store.commit('setOpenCreations', result.data.listUnconfirmedContributions.length)
         })
         .catch((error) => {
@@ -93,6 +95,11 @@ export default {
       this.overlay = true
       this.item = item
     },
+    updateState(id) {
+      console.log('admin updateState', id)
+      console.log(this.pendingCreations)
+      this.pendingCreations.find((item) => item.id === id).state = 'IN_PROGRESS'
+    },
   },
   computed: {
     fields() {

From 6acb944ac05a63b871b789eaa1526218c03c9a2d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 11:17:45 +0200
Subject: [PATCH 079/163] delete unused local keys

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index a9e18f165..b3b587e9a 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -159,6 +159,5 @@
   },
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
-  "user_search": "Nutzer-Suche",
-  "preview": "Vorschau"
+  "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 9b5ab107a..ee6ca1b63 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -159,6 +159,5 @@
   },
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
-  "user_search": "User search",
-  "preview": "Preview"
+  "user_search": "User search"
 }
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index c94d84cbd..595bd56b2 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -80,7 +80,6 @@ export default {
         .then((result) => {
           this.$store.commit('resetOpenCreations')
           this.pendingCreations = result.data.listUnconfirmedContributions
-          console.log(this.pendingCreations)
           this.$store.commit('setOpenCreations', result.data.listUnconfirmedContributions.length)
         })
         .catch((error) => {
@@ -96,8 +95,6 @@ export default {
       this.item = item
     },
     updateState(id) {
-      console.log('admin updateState', id)
-      console.log(this.pendingCreations)
       this.pendingCreations.find((item) => item.id === id).state = 'IN_PROGRESS'
     },
   },

From c76a58b59b041a1803c1563aae38e638de8e7a30 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 11:18:31 +0200
Subject: [PATCH 080/163] delete v-toogle from element

---
 frontend/src/components/Contributions/ContributionListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 56f71bb66..78ba6f0fe 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
   <div class="contribution-list-item">
     <slot>
       <div class="border p-3 w-100 mb-1" :class="`border-${variant}`">
-        <div v-b-toggle="messages.length ? collapsId : ''" @click="getListContributionMessages">
+        <div @click="getListContributionMessages">
           <div class="d-inline-flex">
             <div class="mr-2">
               <b-icon

From c9195e1f938fa2dbac09c9594a4e59603c977093 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 11:49:12 +0200
Subject: [PATCH 081/163] fix locales

---
 frontend/src/locales/de.json | 6 +++---
 frontend/src/locales/en.json | 6 +++---
 frontend/src/locales/es.json | 6 +++---
 frontend/src/locales/fr.json | 6 +++---
 frontend/src/locales/nl.json | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 008dc7705..4ebedf0a5 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -35,13 +35,13 @@
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
+      "answerQuestion": "Bitte beantworte die Nachfrage",
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
+      "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",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
-      "answerQuestion": "Bitte beantworte die Nachfrage"
+      "rejected": "abgelehnt"
     },
     "date": "Beitrag für:",
     "delete": "Beitrag löschen! Bist du sicher?",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 394f74a7a..f0cb341c0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -35,13 +35,13 @@
   "contribution": {
     "activity": "Activity",
     "alert": {
+      "answerQuestion": "Please answer the question",
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "pending": "Submitted and waiting for confirmation",
-      "rejected": "deleted",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
-      "answerQuestion": "Please answer the question"
+      "rejected": "deleted"
     },
     "date": "Contribution for:",
     "delete": "Delete Contribution! Are you sure?",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index b871e7168..4cefe2905 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -35,13 +35,13 @@
   "contribution": {
     "activity": "Actividad",
     "alert": {
+      "answerQuestion": "Please answer the question",
       "communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
       "confirm": "confirmado",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "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",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
-      "answerQuestion": "Please answer the question"
+      "rejected": "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 eea99d57c..a35e6ce30 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -35,13 +35,13 @@
   "contribution": {
     "activity": "Activité",
     "alert": {
+      "answerQuestion": "Please answer the question",
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": " Approuvé",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "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é",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
-      "answerQuestion": "Please answer the question"
+      "rejected": "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 13a1b2124..c301b9201 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -35,13 +35,13 @@
   "contribution": {
     "activity": "Activiteit",
     "alert": {
+      "answerQuestion": "Please answer the question",
       "communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
       "confirm": "bevestigt",
+      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
       "pending": "Ingediend en wacht op bevestiging",
-      "rejected": "afgewezen",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
-      "answerQuestion": "Please answer the question"
+      "rejected": "afgewezen"
     },
     "date": "Bijdrage voor:",
     "delete": "Bijdrage verwijderen! Weet je het zeker?",

From efaf02facc9f06cecd2f7f4c3869bd3a6de17e91 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 11:49:38 +0200
Subject: [PATCH 082/163] fix locales adminarea

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b3b587e9a..b8ad45af1 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -70,8 +70,8 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "submit": "absenden",
-    "reset": "löschen"
+    "reset": "löschen",
+    "submit": "absenden"
   },
   "GDD": "GDD",
   "hide_details": "Details verbergen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index ee6ca1b63..bc8c297f5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -70,8 +70,8 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "submit": "submit",
-    "reset": "reset"
+    "reset": "reset",
+    "submit": "submit"
   },
   "GDD": "GDD",
   "hide_details": "Hide details",

From 423989777b91898b5a9b698956c72537aacd1a8f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 12:19:25 +0200
Subject: [PATCH 083/163] Remove leftJoin on user, changed ContributionMessage
 array to count of ContributionMessage.

---
 backend/src/graphql/model/Contribution.ts            | 9 +++------
 backend/src/graphql/resolver/ContributionResolver.ts | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index c0e6d66f3..1f690a3d8 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -2,7 +2,6 @@ import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution as dbContribution } from '@entity/Contribution'
 import { User } from '@entity/User'
-import { ContributionMessage } from './ContributionMessage'
 
 @ObjectType()
 export class Contribution {
@@ -18,9 +17,7 @@ export class Contribution {
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
     this.state = contribution.contributionStatus
-    this.messages = contribution.messages
-      ? contribution.messages.map((message) => new ContributionMessage(message, message.user))
-      : []
+    this.messagesCount = contribution.messages ? contribution.messages.length : 0
   }
 
   @Field(() => Number)
@@ -53,8 +50,8 @@ export class Contribution {
   @Field(() => Date)
   contributionDate: Date
 
-  @Field(() => [ContributionMessage])
-  messages: ContributionMessage[]
+  @Field(() => Number)
+  messagesCount: number
 
   @Field(() => String)
   state: string
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index f8300f164..fc93880f1 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -97,7 +97,6 @@ export class ContributionResolver {
       .select('c')
       .from(dbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
-      .leftJoinAndSelect('m.user', 'u')
       .where(where)
       .orderBy('c.createdAt', order)
       .limit(pageSize)

From 214f85544b64c82911c1a5c85d8ac09578bb61ae Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 12:24:09 +0200
Subject: [PATCH 084/163] ContributionMessage is only defined in 0047 so remove
 the OneToMany relation from 0046 User and add it to 0047 User.

---
 .../User.ts                                   |   5 -
 database/entity/0047-messages_tables/User.ts  | 116 ++++++++++++++++++
 database/entity/User.ts                       |   2 +-
 3 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 database/entity/0047-messages_tables/User.ts

diff --git a/database/entity/0046-adapt_users_table_for_gradidoid/User.ts b/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
index a772a3c99..3f2547cad 100644
--- a/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
+++ b/database/entity/0046-adapt_users_table_for_gradidoid/User.ts
@@ -8,7 +8,6 @@ import {
   JoinColumn,
 } from 'typeorm'
 import { Contribution } from '../Contribution'
-import { ContributionMessage } from '../ContributionMessage'
 
 @Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
 export class User extends BaseEntity {
@@ -109,8 +108,4 @@ export class User extends BaseEntity {
   @OneToMany(() => Contribution, (contribution) => contribution.user)
   @JoinColumn({ name: 'user_id' })
   contributions?: Contribution[]
-
-  @OneToMany(() => ContributionMessage, (message) => message.user)
-  @JoinColumn({ name: 'user_id' })
-  messages?: ContributionMessage[]
 }
diff --git a/database/entity/0047-messages_tables/User.ts b/database/entity/0047-messages_tables/User.ts
new file mode 100644
index 000000000..a772a3c99
--- /dev/null
+++ b/database/entity/0047-messages_tables/User.ts
@@ -0,0 +1,116 @@
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  DeleteDateColumn,
+  OneToMany,
+  JoinColumn,
+} from 'typeorm'
+import { Contribution } from '../Contribution'
+import { ContributionMessage } from '../ContributionMessage'
+
+@Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
+export class User extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({
+    name: 'gradido_id',
+    length: 36,
+    nullable: false,
+    unique: true,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  gradidoID: string
+
+  @Column({
+    name: 'alias',
+    length: 20,
+    nullable: true,
+    unique: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  alias: string
+
+  @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true })
+  pubKey: Buffer
+
+  @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true })
+  privKey: Buffer
+
+  @Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  email: string
+
+  @Column({
+    name: 'first_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  firstName: string
+
+  @Column({
+    name: 'last_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  lastName: string
+
+  @DeleteDateColumn()
+  deletedAt: Date | null
+
+  @Column({ type: 'bigint', default: 0, unsigned: true })
+  password: BigInt
+
+  @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true })
+  emailHash: Buffer
+
+  @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false })
+  createdAt: Date
+
+  @Column({ name: 'email_checked', type: 'bool', nullable: false, default: false })
+  emailChecked: boolean
+
+  @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false })
+  language: string
+
+  @Column({ name: 'is_admin', type: 'datetime', nullable: true, default: null })
+  isAdmin: Date | null
+
+  @Column({ name: 'referrer_id', type: 'int', unsigned: true, nullable: true, default: null })
+  referrerId?: number | null
+
+  @Column({
+    name: 'contribution_link_id',
+    type: 'int',
+    unsigned: true,
+    nullable: true,
+    default: null,
+  })
+  contributionLinkId?: number | null
+
+  @Column({ name: 'publisher_id', default: 0 })
+  publisherId: number
+
+  @Column({
+    type: 'text',
+    name: 'passphrase',
+    collation: 'utf8mb4_unicode_ci',
+    nullable: true,
+    default: null,
+  })
+  passphrase: string
+
+  @OneToMany(() => Contribution, (contribution) => contribution.user)
+  @JoinColumn({ name: 'user_id' })
+  contributions?: Contribution[]
+
+  @OneToMany(() => ContributionMessage, (message) => message.user)
+  @JoinColumn({ name: 'user_id' })
+  messages?: ContributionMessage[]
+}
diff --git a/database/entity/User.ts b/database/entity/User.ts
index 02a99fcd1..7d15bf559 100644
--- a/database/entity/User.ts
+++ b/database/entity/User.ts
@@ -1 +1 @@
-export { User } from './0046-adapt_users_table_for_gradidoid/User'
+export { User } from './0047-messages_tables/User'

From 61d763030af88ffb0dc409659ec50ac6dd43bcda Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 12:54:32 +0200
Subject: [PATCH 085/163] change state if messagesCount 0

---
 admin/src/pages/CreationConfirm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 595bd56b2..f518e1f00 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -95,7 +95,10 @@ export default {
       this.item = item
     },
     updateState(id) {
-      this.pendingCreations.find((item) => item.id === id).state = 'IN_PROGRESS'
+      this.pendingCreations.find((value) => {
+        value.state = 'IN_PROGRESS'
+        value.messageCount = value.messageCount + 1
+      })
     },
   },
   computed: {

From 7156f1afd5a0c9a3166acc441eaf7fc61bd286d6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 12:58:01 +0200
Subject: [PATCH 086/163] Setup Test file for ContributionMessageResolver.

---
 .../ContributionMessageResolver.test.ts       | 47 +++++++++++++++++++
 backend/src/seeds/graphql/mutations.ts        | 28 +++++++++++
 backend/src/seeds/graphql/queries.ts          | 23 +++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 backend/src/graphql/resolver/ContributionMessageResolver.test.ts

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
new file mode 100644
index 000000000..f98e4f211
--- /dev/null
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -0,0 +1,47 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { GraphQLError } from 'graphql'
+import { userFactory } from '@/seeds/factory/user'
+import { creationFactory } from '@/seeds/factory/creation'
+import { creations } from '@/seeds/creation/index'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { createContributionMessage } from '@/seeds/graphql/mutations'
+
+let mutate: any, query: any, con: any
+let testEnv: any
+let result: any
+
+beforeAll(async () => {
+  testEnv = await testEnvironment()
+  mutate = testEnv.mutate
+  query = testEnv.query
+  con = testEnv.con
+  await cleanDB()
+})
+
+afterAll(async () => {
+  await cleanDB()
+  await con.close()
+})
+
+describe('ContributionMessageResolver', () => {
+  describe('createContributionMessage', () => {
+    describe('unauthenticated', () => {
+      it('returns an error', async () => {
+        await expect(
+          mutate({
+            mutation: createContributionMessage,
+            variables: { contributionId: 1, message: 'This is a test message' },
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('401 Unauthorized')],
+          }),
+        )
+      })
+    })
+  })
+})
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index bf898bd7d..e5f290645 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -261,3 +261,31 @@ export const deleteContribution = gql`
     deleteContribution(id: $id)
   }
 `
+
+export const createContributionMessage = gql`
+  mutation ($contributionId: Float!, $message: String!) {
+    createContributionMessage(contributionId: $contributionId, message: $message) {
+      id
+      message
+      createdAt
+      updatedAt
+      type
+      userFirstName
+      userLastName
+    }
+  }
+`
+
+export const adminCreateContributionMessage = gql`
+  mutation ($contributionId: Float!, $message: String!) {
+    adminCreateContributionMessage(contributionId: $contributionId, message: $message) {
+      id
+      message
+      createdAt
+      updatedAt
+      type
+      userFirstName
+      userLastName
+    }
+  }
+`
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 3bd042ac2..60dffa21b 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -292,3 +292,26 @@ export const searchAdminUsers = gql`
     }
   }
 `
+
+export const listContributionMessages = gql`
+  query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
+    listContributionMessages(
+      contributionId: $contributionId
+      pageSize: $pageSize
+      currentPage: $currentPage
+      order: $order
+    ) {
+      count
+      messages {
+        id
+        message
+        createdAt
+        updatedAt
+        type
+        userFirstName
+        userLastName
+        userId
+      }
+    }
+  }
+`

From 8b62696c91aaa8116dc5960360d586f99a6dc136 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 13:07:24 +0200
Subject: [PATCH 087/163] Add test that listContributionMessages throws error
 for non authenticated user.

---
 .../ContributionMessageResolver.test.ts       | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index f98e4f211..8d65db306 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -1,18 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { cleanDB, testEnvironment } from '@test/helpers'
 import { GraphQLError } from 'graphql'
-import { userFactory } from '@/seeds/factory/user'
-import { creationFactory } from '@/seeds/factory/creation'
-import { creations } from '@/seeds/creation/index'
-import { peterLustig } from '@/seeds/users/peter-lustig'
 import { createContributionMessage } from '@/seeds/graphql/mutations'
+import { listContributionMessages } from '@/seeds/graphql/queries'
 
 let mutate: any, query: any, con: any
 let testEnv: any
-let result: any
 
 beforeAll(async () => {
   testEnv = await testEnvironment()
@@ -44,4 +39,21 @@ describe('ContributionMessageResolver', () => {
       })
     })
   })
+
+  describe('listContributionMessages', () => {
+    describe('unauthenticated', () => {
+      it('returns an error', async () => {
+        await expect(
+          mutate({
+            mutation: listContributionMessages,
+            variables: { contributionId: 1 },
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('401 Unauthorized')],
+          }),
+        )
+      })
+    })
+  })
 })

From ac4f7dc04a193b4594cbf37740d3e81bf85d4794 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 13:16:44 +0200
Subject: [PATCH 088/163] Add test with non existing contributionId.

---
 .../ContributionMessageResolver.test.ts       | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 8d65db306..c66a85700 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -1,10 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { cleanDB, testEnvironment } from '@test/helpers'
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { GraphQLError } from 'graphql'
 import { createContributionMessage } from '@/seeds/graphql/mutations'
-import { listContributionMessages } from '@/seeds/graphql/queries'
+import { listContributionMessages, login } from '@/seeds/graphql/queries'
+import { userFactory } from '@/seeds/factory/user'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 
 let mutate: any, query: any, con: any
 let testEnv: any
@@ -38,6 +40,39 @@ describe('ContributionMessageResolver', () => {
         )
       })
     })
+
+    describe('authenticated', () => {
+      beforeAll(async () => {
+        await userFactory(testEnv, bibiBloxberg)
+        await query({
+          query: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+      })
+
+      afterAll(async () => {
+        await cleanDB()
+        resetToken()
+      })
+
+      describe('input not valid', () => {
+        it('throws error when contribution does not exist', async () => {
+          await expect(
+            mutate({
+              mutation: createContributionMessage,
+              variables: {
+                contributionId: -1,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [new GraphQLError('Contribution not found')],
+            }),
+          )
+        })
+      })
+    })
   })
 
   describe('listContributionMessages', () => {
@@ -55,5 +90,20 @@ describe('ContributionMessageResolver', () => {
         )
       })
     })
+
+    describe('authenticated', () => {
+      beforeAll(async () => {
+        await userFactory(testEnv, bibiBloxberg)
+        await query({
+          query: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+      })
+
+      afterAll(async () => {
+        await cleanDB()
+        resetToken()
+      })
+    })
   })
 })

From 4f02fcc9900875a4b1b7579e592268f23d300241 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 13:18:28 +0200
Subject: [PATCH 089/163] add close on contribution messages list box

---
 admin/src/pages/CreationConfirm.vue              |  1 +
 .../ContributionMessagesList.vue                 |  4 ++++
 .../Contributions/ContributionListItem.vue       | 16 +++++++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index f518e1f00..ffefe5d3f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -98,6 +98,7 @@ export default {
       this.pendingCreations.find((value) => {
         value.state = 'IN_PROGRESS'
         value.messageCount = value.messageCount + 1
+        return null
       })
     },
   },
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 896487160..5303b1f11 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -12,6 +12,10 @@
       @get-list-contribution-messages="getListContributionMessages"
       @update-state="updateState"
     />
+    <div v-b-toggle="'collapse' + String(contributionId)" class="text-center pointer h2">
+      <b-icon icon="arrow-up-short"></b-icon>
+      {{ $t('form.close') }}
+    </div>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 78ba6f0fe..03f025d51 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
   <div class="contribution-list-item">
     <slot>
       <div class="border p-3 w-100 mb-1" :class="`border-${variant}`">
-        <div @click="getListContributionMessages">
+        <div>
           <div class="d-inline-flex">
             <div class="mr-2">
               <b-icon
@@ -53,12 +53,22 @@
               <b-icon icon="trash" class="h2"></b-icon>
             </div>
             <div v-if="messages.length" class="pointer">
-              <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
+              <b-icon
+                v-b-toggle="collapsId"
+                icon="chat-dots"
+                class="h2 mr-5"
+                @click="getListContributionMessages"
+              ></b-icon>
             </div>
           </div>
         </div>
         <div v-if="messages">
-          <b-button v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="warning">
+          <b-button
+            v-if="state === 'IN_PROGRESS'"
+            v-b-toggle="collapsId"
+            variant="warning"
+            @click="getListContributionMessages"
+          >
             {{ $t('contribution.alert.answerQuestion') }}
           </b-button>
           <b-collapse :id="collapsId" class="mt-2">

From 4ce8ec5bedf59573aa2fb9cd0b1955a3853b1991 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 13:25:42 +0200
Subject: [PATCH 090/163] Change error message from createContributionMessage,
 remove describe block without tests.

---
 .../ContributionMessageResolver.test.ts       | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index c66a85700..dcf7d983e 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -67,7 +67,11 @@ describe('ContributionMessageResolver', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [new GraphQLError('Contribution not found')],
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Contribution not found',
+                ),
+              ],
             }),
           )
         })
@@ -90,20 +94,5 @@ describe('ContributionMessageResolver', () => {
         )
       })
     })
-
-    describe('authenticated', () => {
-      beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await query({
-          query: login,
-          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-        })
-      })
-
-      afterAll(async () => {
-        await cleanDB()
-        resetToken()
-      })
-    })
   })
 })

From 9736e1a77197d04abdb920d1f64075af09f28c1b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 14:16:23 +0200
Subject: [PATCH 091/163] change messages to messagesCount

---
 admin/src/pages/CreationConfirm.vue                   |  7 ++-----
 .../components/Contributions/ContributionListItem.vue | 11 ++++-------
 frontend/src/graphql/queries.js                       | 10 +---------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index ffefe5d3f..a85ca6b04 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -95,11 +95,8 @@ export default {
       this.item = item
     },
     updateState(id) {
-      this.pendingCreations.find((value) => {
-        value.state = 'IN_PROGRESS'
-        value.messageCount = value.messageCount + 1
-        return null
-      })
+      this.pendingCreations.find((obj) => obj.id === id).state = 'IN_PROGRESS'
+      this.pendingCreations.find((obj) => obj.id === id).obj.messagesCount++
     },
   },
   computed: {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 03f025d51..3fd20a5c4 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -52,7 +52,7 @@
             >
               <b-icon icon="trash" class="h2"></b-icon>
             </div>
-            <div v-if="messages.length" class="pointer">
+            <div v-if="messagesCount > 0" class="pointer">
               <b-icon
                 v-b-toggle="collapsId"
                 icon="chat-dots"
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-        <div v-if="messages">
+        <div v-if="messagesCount > 0">
           <b-button
             v-if="state === 'IN_PROGRESS'"
             v-b-toggle="collapsId"
@@ -136,12 +136,9 @@ export default {
       type: String,
       required: false,
     },
-    messages: {
-      type: Array,
+    messagesCount: {
+      type: Number,
       required: false,
-      default() {
-        return []
-      },
     },
     contributionId: {
       type: Number,
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index d7fc0ce98..07b016d0a 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -207,15 +207,7 @@ export const listContributions = gql`
         confirmedBy
         deletedAt
         state
-        messages {
-          id
-          message
-          createdAt
-          updatedAt
-          type
-          userFirstName
-          userLastName
-        }
+        messagesCount
       }
     }
   }

From 71a926970a0a50da0f222bf8ddabfcca3b985b53 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 18:04:04 +0200
Subject: [PATCH 092/163] first tests

---
 admin/src/pages/CreationConfirm.vue           |  2 +-
 .../ContributionMessagesFormular.spec.js      | 94 +++++++++++++++++++
 .../ContributionMessagesFormular.vue          | 10 +-
 .../ContributionMessagesList.spec.js          | 86 +++++++++++++++++
 .../ContributionMessagesList.vue              |  2 +-
 .../ContributionListItem.spec.js              | 25 ++---
 6 files changed, 195 insertions(+), 24 deletions(-)
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index a85ca6b04..1f82fafc4 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -95,8 +95,8 @@ export default {
       this.item = item
     },
     updateState(id) {
+      this.pendingCreations.find((obj) => obj.id === id).messagesCount++
       this.pendingCreations.find((obj) => obj.id === id).state = 'IN_PROGRESS'
-      this.pendingCreations.find((obj) => obj.id === id).obj.messagesCount++
     },
   },
   computed: {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
new file mode 100644
index 000000000..8f0721359
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -0,0 +1,94 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesFormular from './ContributionMessagesFormular.vue'
+import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
+
+const localVue = global.localVue
+
+const apolloMutateMock = jest.fn().mockResolvedValue()
+
+describe('ContributionMessagesFormular', () => {
+  let wrapper
+
+  const propsData = {
+    contributionId: 42,
+  }
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
+    $apollo: {
+      mutate: apolloMutateMock,
+    },
+    $i18n: {
+      locale: 'en',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesFormular, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .contribution-messages-formular', () => {
+      expect(wrapper.find('div.contribution-messages-formular').exists()).toBe(true)
+    })
+
+    describe('call onReset', () => {
+      it('form has the set data', () => {
+        beforeEach(() => {
+          wrapper.setData({
+            form: {
+              text: 'text form message',
+            },
+          })
+          wrapper.vm.onReset()
+        })
+        expect(wrapper.vm.form).toEqual({
+          text: '',
+        })
+      })
+    })
+
+    describe('call onSubmit', () => {
+      it('response with the contribution message', () => {
+        wrapper.vm.onSubmit()
+      })
+    })
+
+    describe('send createContributionLink with error', () => {
+      beforeEach(() => {
+        apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+        wrapper.vm.onSubmit()
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('OUCH!')
+      })
+    })
+
+    describe('send createContributionLink with success', () => {
+      beforeEach(() => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
+        })
+        wrapper = Wrapper()
+        wrapper.vm.onSubmit()
+      })
+
+      it('toasts an success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith(undefined)
+      })
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 440f9781a..69bbe5352 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="contribution-messages-formular">
     <div>
-      <b-form @submit="onSubmit" @reset="onReset">
+      <b-form @submit.prevent="onSubmit" @reset="onReset">
         <b-form-textarea
           id="textarea"
           v-model="form.text"
@@ -40,8 +40,7 @@ export default {
     }
   },
   methods: {
-    onSubmit(event) {
-      event.preventDefault()
+    onSubmit() {
       this.$apollo
         .mutate({
           mutation: createContributionMessage,
@@ -54,14 +53,13 @@ export default {
           this.$emit('get-list-contribution-messages', this.contributionId)
           this.$emit('update-state', this.contributionId)
           this.form.text = ''
-          this.toastSuccess(result)
+          this.toastSuccess(undefined)
         })
         .catch((error) => {
           this.toastError(error.message)
         })
     },
-    onReset(event) {
-      event.preventDefault()
+    onReset() {
       this.form.text = ''
     },
   },
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
new file mode 100644
index 000000000..f4007d021
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -0,0 +1,86 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesList from './ContributionMessagesList.vue'
+
+const localVue = global.localVue
+
+describe('ContributionMessagesList', () => {
+  let wrapper
+
+  const propsData = {
+    contributionId: 42,
+    state: 'IN_PROGRESS',
+    messages: [
+      // {
+      //   id: 111,
+      //   message: 'asd asda sda sda',
+      //   createdAt: '2022-08-29T12:23:27.000Z',
+      //   updatedAt: null,
+      //   type: 'DIALOG',
+      //   userFirstName: 'Peter',
+      //   userLastName: 'Lustig',
+      //   userId: 107,
+      //   __typename: 'ContributionMessage',
+      // },
+      // {
+      //   id: 113,
+      //   message: 'asda sdad ad asdasd ',
+      //   createdAt: '2022-08-29T12:25:34.000Z',
+      //   updatedAt: null,
+      //   type: 'DIALOG',
+      //   userFirstName: 'Bibi',
+      //   userLastName: 'Bloxberg',
+      //   userId: 108,
+      //   __typename: 'ContributionMessage',
+      // },
+    ],
+  }
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $i18n: {
+      locale: 'en',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesList, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .contribution-messages-list', () => {
+      expect(wrapper.find('div.contribution-messages-list').exists()).toBe(true)
+    })
+
+    it('has a Component ContributionMessagesFormular', () => {
+      expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
+    })
+
+    describe('get List Contribution Messages', () => {
+      beforeEach(() => {
+        wrapper.vm.getListContributionMessages()
+      })
+
+      it('emits getListContributionMessages', async () => {
+        expect(wrapper.vm.$emit('get-list-contribution-messages')).toBeTruthy()
+      })
+    })
+
+    describe('update State', () => {
+      beforeEach(() => {
+        wrapper.vm.updateState()
+      })
+
+      it('emits getListContributionMessages', async () => {
+        expect(wrapper.vm.$emit('update-state')).toBeTruthy()
+      })
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 5303b1f11..c5ee4b266 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -35,7 +35,7 @@ export default {
     },
     state: {
       type: String,
-      required: false,
+      required: true,
     },
     messages: {
       type: Array,
diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 59918e762..8c3296a2c 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -12,6 +12,9 @@ describe('ContributionListItem', () => {
   }
 
   const propsData = {
+    contributionId: 42,
+    state: 'PENDING',
+    messagesCount: 2,
     id: 1,
     createdAt: '26/07/2022',
     contributionDate: '07/06/2022',
@@ -37,21 +40,6 @@ describe('ContributionListItem', () => {
       expect(wrapper.find('div.contribution-list-item').exists()).toBe(true)
     })
 
-    describe('contribution type', () => {
-      it('is pending by default', () => {
-        expect(wrapper.vm.type).toBe('pending')
-      })
-
-      it('is deleted when deletedAt is present', async () => {
-        await wrapper.setProps({ deletedAt: new Date().toISOString() })
-        expect(wrapper.vm.type).toBe('deleted')
-      })
-
-      it('is confirmed when confirmedAt is present', async () => {
-        await wrapper.setProps({ confirmedAt: new Date().toISOString() })
-        expect(wrapper.vm.type).toBe('confirmed')
-      })
-    })
 
     describe('contribution icon', () => {
       it('is bell-fill by default', () => {
@@ -83,6 +71,11 @@ describe('ContributionListItem', () => {
         await wrapper.setProps({ confirmedAt: new Date().toISOString() })
         expect(wrapper.vm.variant).toBe('success')
       })
+
+      it('is warning at when state is IN_PROGRESS', async () => {
+        await wrapper.setProps({ state: 'IN_PROGRESS' })
+        expect(wrapper.vm.variant).toBe('warning')
+      })
     })
 
     describe('date', () => {
@@ -133,7 +126,7 @@ describe('ContributionListItem', () => {
         beforeEach(async () => {
           spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
           spy.mockImplementation(() => Promise.resolve(false))
-          await wrapper.findAll('div.pointer').at(1).trigger('click')
+          await wrapper.findAll('div.pointer').at(2).trigger('click')
         })
 
         it('does not emit delete contribution', () => {

From 5fefac0fd768aa791b767023e56cb1b9378f3609 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 18:05:17 +0200
Subject: [PATCH 093/163] fix lint

---
 .../src/components/Contributions/ContributionListItem.spec.js    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 8c3296a2c..0b0519dda 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -40,7 +40,6 @@ describe('ContributionListItem', () => {
       expect(wrapper.find('div.contribution-list-item').exists()).toBe(true)
     })
 
-
     describe('contribution icon', () => {
       it('is bell-fill by default', () => {
         expect(wrapper.vm.icon).toBe('bell-fill')

From c293a89166c80e7efb0ad942c416517f5c6fe963 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 29 Aug 2022 19:55:55 +0200
Subject: [PATCH 094/163] fix: Decay Calculation in Community Statistics

---
 frontend/src/pages/InfoStatistic.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 481e34dd6..63562a658 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -122,10 +122,10 @@ export default {
         })
         .then((result) => {
           this.totalUsers = result.data.communityStatistics.totalUsers
-          this.totalGradidoCreated =
-            Number(result.data.communityStatistics.totalGradidoCreated) -
+          this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
+          this.totalGradidoDecayed =
+            Number(result.data.communityStatistics.totalGradidoDecayed) +
             Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
-          this.totalGradidoDecayed = result.data.communityStatistics.totalGradidoDecayed
           this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
         })
         .catch(() => {

From 52fba0e0bcf6f737bf93c07af58e664171333a33 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 22:21:17 +0200
Subject: [PATCH 095/163] more tests

---
 .../ContributionMessagesListItem.spec.js      | 54 +++++++++++++++++++
 .../ContributionMessagesListItem.vue          |  2 +-
 .../slots/IsModerator.spec.js                 | 48 +++++++++++++++++
 .../slots/IsModerator.vue                     | 11 ++--
 .../slots/IsNotModerator.spec.js              | 48 +++++++++++++++++
 .../slots/IsNotModerator.vue                  | 10 ++--
 6 files changed, 163 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
 create mode 100644 frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
 create mode 100644 frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
new file mode 100644
index 000000000..0de18778f
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -0,0 +1,54 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesList from './ContributionMessagesList.vue'
+
+const localVue = global.localVue
+
+describe('ContributionMessagesList', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $store: {
+      state: {
+        firstName: 'Peter',
+        lastName: 'Lustig',
+      },
+    },
+  }
+
+  const propsData = {
+    contributionId: 42,
+    state: 'PENDING0',
+    messages: [
+      {
+        id: 111,
+        message: 'asd asda sda sda',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        __typename: 'ContributionMessage',
+      },
+    ],
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesList, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .contribution-messages-list-item', () => {
+      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index d28357a31..5fde8f825 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="contribution-messages-list-item">
     <is-not-moderator v-if="isNotModerator" :message="message"></is-not-moderator>
     <is-moderator v-else :message="message"></is-moderator>
   </div>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
new file mode 100644
index 000000000..b9706b543
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
@@ -0,0 +1,48 @@
+import { mount } from '@vue/test-utils'
+import IsModerator from './IsModerator.vue'
+
+const localVue = global.localVue
+
+describe('IsModerator', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+  }
+
+  const propsData = {
+    message: {
+      id: 111,
+      message: 'asd asda sda sda',
+      createdAt: '2022-08-29T12:23:27.000Z',
+      updatedAt: null,
+      type: 'DIALOG',
+      userFirstName: 'Peter',
+      userLastName: 'Lustig',
+      userId: 107,
+      __typename: 'ContributionMessage',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(IsModerator, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .slot-is-moderator', () => {
+      expect(wrapper.find('div.slot-is-moderator').exists()).toBe(true)
+    })
+
+    it('props.message.default', () => {
+      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 08ae8ab4f..59c059654 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="slot-is-moderator">
-    <b-avatar
-      square
-      :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
-      variant="warning"
-    ></b-avatar>
+    <b-avatar square :text="moderatorName" variant="warning"></b-avatar>
     <span class="ml-2 mr-2">
       {{ message.userFirstName }} {{ message.userLastName }}
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
@@ -22,6 +18,11 @@ export default {
       },
     },
   },
+  computed: {
+    moderatorName() {
+      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
+    },
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
new file mode 100644
index 000000000..434736993
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
@@ -0,0 +1,48 @@
+import { mount } from '@vue/test-utils'
+import IsNotModerator from './IsNotModerator.vue'
+
+const localVue = global.localVue
+
+describe('IsNotModerator', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+  }
+
+  const propsData = {
+    message: {
+      id: 113,
+      message: 'asda sdad ad asdasd ',
+      createdAt: '2022-08-29T12:25:34.000Z',
+      updatedAt: null,
+      type: 'DIALOG',
+      userFirstName: 'Bibi',
+      userLastName: 'Bloxberg',
+      userId: 108,
+      __typename: 'ContributionMessage',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(IsNotModerator, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .slot-is-not-moderator', () => {
+      expect(wrapper.find('div.slot-is-not-moderator').exists()).toBe(true)
+    })
+
+    it('props.message.default', () => {
+      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index d3cad8ca2..8ec4b36d5 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="slot-is-not-moderator">
     <div class="text-right">
-      <b-avatar
-        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
-        variant="info"
-      ></b-avatar>
+      <b-avatar :text="userName" variant="info"></b-avatar>
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
@@ -22,6 +19,11 @@ export default {
       },
     },
   },
+  computed: {
+    userName() {
+      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
+    },
+  },
 }
 </script>
 <style>

From e628045ab192a2facc715383464c16d6605ab477 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 22:47:41 +0200
Subject: [PATCH 096/163] first tests adminarea

---
 .../ContributionMessagesFormular.spec.js      | 93 +++++++++++++++++++
 .../ContributionMessagesFormular.vue          |  4 +-
 .../ContributionMessagesListItem.spec.js      | 57 ++++++++++++
 .../slots/ContributionMessagesListItem.vue    |  2 +-
 .../slots/IsModerator.spec.js                 | 48 ++++++++++
 .../slots/IsNotModerator.spec.js              | 48 ++++++++++
 6 files changed, 248 insertions(+), 4 deletions(-)
 create mode 100644 admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
 create mode 100644 admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
 create mode 100644 admin/src/components/ContributionMessages/slots/IsModerator.spec.js
 create mode 100644 admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
new file mode 100644
index 000000000..bc7886052
--- /dev/null
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -0,0 +1,93 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesFormular from './ContributionMessagesFormular.vue'
+import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
+
+const localVue = global.localVue
+
+const apolloMutateMock = jest.fn().mockResolvedValue()
+
+describe('ContributionMessagesFormular', () => {
+  let wrapper
+
+  const propsData = {
+    contributionId: 42,
+  }
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $apollo: {
+      mutate: apolloMutateMock,
+    },
+    $i18n: {
+      locale: 'en',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesFormular, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .contribution-messages-formular', () => {
+      expect(wrapper.find('div.contribution-messages-formular').exists()).toBe(true)
+    })
+
+    describe('call onReset', () => {
+      it('form has the set data', () => {
+        beforeEach(() => {
+          wrapper.setData({
+            form: {
+              text: 'text form message',
+            },
+          })
+          wrapper.vm.onReset()
+        })
+        expect(wrapper.vm.form).toEqual({
+          text: '',
+        })
+      })
+    })
+
+    describe('call onSubmit', () => {
+      it('response with the contribution message', () => {
+        wrapper.vm.onSubmit()
+      })
+    })
+
+    describe('send createContributionLink with error', () => {
+      beforeEach(() => {
+        apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+        wrapper.vm.onSubmit()
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('OUCH!')
+      })
+    })
+
+    describe('send createContributionLink with success', () => {
+      beforeEach(() => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
+        })
+        wrapper = Wrapper()
+        wrapper.vm.onSubmit()
+      })
+
+      it('toasts an success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith(undefined)
+      })
+    })
+  })
+})
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 06085dec7..38628fd11 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="contribution-messages-formular">
     <div>
-      <b-form @submit="onSubmit" @reset="onReset">
+      <b-form @submit.prevent="onSubmit" @reset.prevent="onReset">
         <b-form-textarea
           id="textarea"
           v-model="form.text"
@@ -41,7 +41,6 @@ export default {
   },
   methods: {
     onSubmit(event) {
-      event.preventDefault()
       this.$apollo
         .mutate({
           mutation: adminCreateContributionMessage,
@@ -61,7 +60,6 @@ export default {
         })
     },
     onReset(event) {
-      event.preventDefault()
       this.form.text = ''
     },
   },
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
new file mode 100644
index 000000000..4c12a4f59
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -0,0 +1,57 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesListItem from './ContributionMessagesListItem.vue'
+
+const localVue = global.localVue
+
+describe('ContributionMessagesListItem', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $store: {
+      state: {
+        moderator: {
+          id: 107,
+        },
+      },
+    },
+  }
+
+  const propsData = {
+    contributionId: 42,
+    state: 'PENDING0',
+    message: {
+      id: 111,
+      message: 'asd asda sda sda',
+      createdAt: '2022-08-29T12:23:27.000Z',
+      updatedAt: null,
+      type: 'DIALOG',
+      userFirstName: 'Peter',
+      userLastName: 'Lustig',
+      userId: 107,
+      __typename: 'ContributionMessage',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesListItem, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .contribution-messages-list-item', () => {
+      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
+    })
+
+    it('props.message.default', () => {
+      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    })
+  })
+})
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 3af14307c..7ee0134ac 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="contribution-messages-list-item">
     <is-moderator v-if="isModerator" :message="message"></is-moderator>
     <is-not-moderator v-else :message="message"></is-not-moderator>
   </div>
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
new file mode 100644
index 000000000..499ef0956
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
@@ -0,0 +1,48 @@
+import { mount } from '@vue/test-utils'
+import IsModerator from './IsModerator.vue'
+
+const localVue = global.localVue
+
+describe('IsModerator', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+  }
+
+  const propsData = {
+    message: {
+      id: 111,
+      message: 'asd asda sda sda',
+      createdAt: '2022-08-29T12:23:27.000Z',
+      updatedAt: null,
+      type: 'DIALOG',
+      userFirstName: 'Peter',
+      userLastName: 'Lustig',
+      userId: 107,
+      __typename: 'ContributionMessage',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(IsModerator, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .slot-is-moderator', () => {
+      expect(wrapper.find('div.slot-is-moderator').exists()).toBe(true)
+    })
+
+    it('props.message.default', () => {
+      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    })
+  })
+})
\ No newline at end of file
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
new file mode 100644
index 000000000..434736993
--- /dev/null
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
@@ -0,0 +1,48 @@
+import { mount } from '@vue/test-utils'
+import IsNotModerator from './IsNotModerator.vue'
+
+const localVue = global.localVue
+
+describe('IsNotModerator', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+  }
+
+  const propsData = {
+    message: {
+      id: 113,
+      message: 'asda sdad ad asdasd ',
+      createdAt: '2022-08-29T12:25:34.000Z',
+      updatedAt: null,
+      type: 'DIALOG',
+      userFirstName: 'Bibi',
+      userLastName: 'Bloxberg',
+      userId: 108,
+      __typename: 'ContributionMessage',
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(IsNotModerator, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV .slot-is-not-moderator', () => {
+      expect(wrapper.find('div.slot-is-not-moderator').exists()).toBe(true)
+    })
+
+    it('props.message.default', () => {
+      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    })
+  })
+})

From 1f95c9b6c6d4ffdb00e7f48e121dcfef3667744b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Aug 2022 23:16:15 +0200
Subject: [PATCH 097/163] fix lint adminarea

---
 .../components/ContributionMessages/slots/IsModerator.spec.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
index 499ef0956..b9706b543 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
@@ -45,4 +45,4 @@ describe('IsModerator', () => {
       expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
     })
   })
-})
\ No newline at end of file
+})

From d4ea39ce03da081a4d0c76abc9b20ad5f554e277 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 29 Aug 2022 13:25:42 +0200
Subject: [PATCH 098/163] Change error message from createContributionMessage,
 remove describe block without tests.

---
 .../ContributionMessageResolver.test.ts       | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index c66a85700..dcf7d983e 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -67,7 +67,11 @@ describe('ContributionMessageResolver', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [new GraphQLError('Contribution not found')],
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Contribution not found',
+                ),
+              ],
             }),
           )
         })
@@ -90,20 +94,5 @@ describe('ContributionMessageResolver', () => {
         )
       })
     })
-
-    describe('authenticated', () => {
-      beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await query({
-          query: login,
-          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-        })
-      })
-
-      afterAll(async () => {
-        await cleanDB()
-        resetToken()
-      })
-    })
   })
 })

From 005ff89e2088f5ea243a2089a47e4a9542f95a0d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 08:57:59 +0200
Subject: [PATCH 099/163] test for adminarea fix coverage

---
 .../ContributionMessagesList.spec.js          | 57 +++++++++++++++++++
 .../ContributionMessagesList.spec.js          | 25 +-------
 2 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 admin/src/components/ContributionMessages/ContributionMessagesList.spec.js

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
new file mode 100644
index 000000000..20e7f225e
--- /dev/null
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -0,0 +1,57 @@
+import { mount } from '@vue/test-utils'
+import ContributionMessagesList from './ContributionMessagesList.vue'
+import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValue()
+
+describe('ContributionMessagesList', () => {
+  let wrapper
+
+  const propsData = {
+    contributionId: 42,
+  }
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $i18n: {
+      locale: 'en',
+    },
+    $apollo: {
+      query: apolloQueryMock,
+    },
+  }
+
+  const Wrapper = () => {
+    return mount(ContributionMessagesList, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('sends query to Apollo when created', () => {
+      expect(apolloQueryMock).toBeCalledWith(
+        expect.objectContaining({
+          variables: {
+            contributionId: propsData.contributionId,
+          },
+        }),
+      )
+    })
+
+    it('has a DIV .contribution-messages-list', () => {
+      expect(wrapper.find('div.contribution-messages-list').exists()).toBe(true)
+    })
+
+    it('has a Component ContributionMessagesFormular', () => {
+      expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
+    })
+  })
+})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
index f4007d021..7798532b7 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -9,30 +9,7 @@ describe('ContributionMessagesList', () => {
   const propsData = {
     contributionId: 42,
     state: 'IN_PROGRESS',
-    messages: [
-      // {
-      //   id: 111,
-      //   message: 'asd asda sda sda',
-      //   createdAt: '2022-08-29T12:23:27.000Z',
-      //   updatedAt: null,
-      //   type: 'DIALOG',
-      //   userFirstName: 'Peter',
-      //   userLastName: 'Lustig',
-      //   userId: 107,
-      //   __typename: 'ContributionMessage',
-      // },
-      // {
-      //   id: 113,
-      //   message: 'asda sdad ad asdasd ',
-      //   createdAt: '2022-08-29T12:25:34.000Z',
-      //   updatedAt: null,
-      //   type: 'DIALOG',
-      //   userFirstName: 'Bibi',
-      //   userLastName: 'Bloxberg',
-      //   userId: 108,
-      //   __typename: 'ContributionMessage',
-      // },
-    ],
+    messages: [],
   }
 
   const mocks = {

From 39de672b5f60fe775ac28f1c1f92742ddc0d6e2b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 08:59:29 +0200
Subject: [PATCH 100/163] fix lint

---
 .../ContributionMessages/ContributionMessagesList.spec.js        | 1 -
 .../ContributionMessages/ContributionMessagesFormular.spec.js    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 20e7f225e..0bca08b2a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -1,6 +1,5 @@
 import { mount } from '@vue/test-utils'
 import ContributionMessagesList from './ContributionMessagesList.vue'
-import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
 
 const localVue = global.localVue
 
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index 8f0721359..bc7886052 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -15,7 +15,6 @@ describe('ContributionMessagesFormular', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
     $apollo: {
       mutate: apolloMutateMock,
     },

From d1f0c452d78f7f64195d2336395c221c6e8c9ee3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 09:55:16 +0200
Subject: [PATCH 101/163] success message if sent answer message

---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 frontend/src/locales/de.json                                    | 1 +
 frontend/src/locales/en.json                                    | 1 +
 frontend/src/locales/es.json                                    | 1 +
 frontend/src/locales/fr.json                                    | 1 +
 frontend/src/locales/nl.json                                    | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 69bbe5352..40727042f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -53,7 +53,7 @@ export default {
           this.$emit('get-list-contribution-messages', this.contributionId)
           this.$emit('update-state', this.contributionId)
           this.form.text = ''
-          this.toastSuccess(undefined)
+          this.toastSuccess(this.$t('message.reply'))
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4ebedf0a5..1525ed98c 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -222,6 +222,7 @@
     "email": "Wir haben dir eine E-Mail gesendet.",
     "errorTitle": "Achtung!",
     "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
+    "reply": "Danke, Deine Antwort wurde abgesendet.",
     "reset": "Dein Passwort wurde geändert.",
     "title": "Danke!",
     "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu."
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f0cb341c0..576a77e75 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -222,6 +222,7 @@
     "email": "We have sent you an email.",
     "errorTitle": "Attention!",
     "register": "You are registered now, please check your emails and click the activation link.",
+    "reply": "Thank you, your reply has been sent.",
     "reset": "Your password has been changed.",
     "title": "Thank you!",
     "unsetPassword": "Your password has not been set yet. Please set it again."
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 4cefe2905..96fe9a163 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -222,6 +222,7 @@
     "email": "Te hemos enviado un correo electrónico.",
     "errorTitle": "Atención!",
     "register": "Ya estás registrado, por favor revisa tu correo electrónico y haz clic en el enlace de activación.",
+    "reply": "Gracias, su respuesta ha sido enviada.",
     "reset": "Tu contraseña ha sido cambiada.",
     "title": "Gracias!",
     "unsetPassword": "Tu contraseña aún no ha sido configurada. Por favor reinícialo."
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index a35e6ce30..244db51b1 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -222,6 +222,7 @@
     "email": "Nous vous avons envoyé un email.",
     "errorTitle": "Attention!",
     "register": "Vous êtes enregistré maintenant, merci de vérifier votre boîte mail et cliquer sur le lien d´activation.",
+    "reply": "Merci, ta réponse a été envoyée.",
     "reset": "Votre mot de passe a été modifié.",
     "title": "Merci!",
     "unsetPassword": "Votre mot de passe n´a pas été accepté. Merci de le réinitialiser."
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index c301b9201..27af58f6d 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -222,6 +222,7 @@
     "email": "We hebben jou een email gestuurd.",
     "errorTitle": "Opgelet!",
     "register": "Je bent nu geregistreerd. Controleer alsjeblieft je emails en klik op de activeringslink.",
+    "reply": "Dank u, uw antwoord is verzonden.",
     "reset": "Jouw wachtwoord werd gewijzigd.",
     "title": "Dankjewel!",
     "unsetPassword": "Jouw wachtwoord werd nog niet ingesteld. Doe het alsjeblieft opnieuw."

From 5971813fae4719ad1a088e442fc60bb9144cc520 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 10:00:45 +0200
Subject: [PATCH 102/163] success message if sent answer message adminarea

---
 .../ContributionMessages/ContributionMessagesFormular.vue      | 2 +-
 admin/src/locales/de.json                                      | 3 +++
 admin/src/locales/en.json                                      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 38628fd11..a0ece1ab4 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -53,7 +53,7 @@ export default {
           this.$emit('get-list-contribution-messages', this.contributionId)
           this.$emit('update-state', this.contributionId)
           this.form.text = ''
-          this.toastSuccess(result)
+          this.toastSuccess(this.$t('message.request'))
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b8ad45af1..7e982d159 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -82,6 +82,9 @@
     "pipe": "|",
     "plus": "+"
   },
+  "message": {
+    "request": "Request has been sent."
+  },
   "moderator": "Moderator",
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
   "name": "Name",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index bc8c297f5..63148f471 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -82,6 +82,9 @@
     "pipe": "|",
     "plus": "+"
   },
+  "message": {
+    "request": "Request has been sent."
+  },
   "moderator": "Moderator",
   "multiple_creation_text": "Please select one or more members for which you would like to perform creations.",
   "name": "Name",

From 2d99a17470aa78597217a28c9030031b16965ea4 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:11:49 +0200
Subject: [PATCH 103/163] Update admin/src/locales/de.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 admin/src/locales/de.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 7e982d159..64799933e 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -70,8 +70,8 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "reset": "löschen",
-    "submit": "absenden"
+    "reset": "Abbrechen",
+    "submit": "Senden"
   },
   "GDD": "GDD",
   "hide_details": "Details verbergen",

From b2c815ebb7b48f31cfa423532567cea23021fd7b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:12:23 +0200
Subject: [PATCH 104/163] Update
 admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index a0ece1ab4..ad846a1bf 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -11,7 +11,7 @@
         ></b-form-textarea>
         <b-row class="mt-4 mb-6">
           <b-col>
-            <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+            <b-button type="reset" variant="danger">{{ $t('form.cancel') }}</b-button>
           </b-col>
           <b-col class="text-right">
             <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>

From 5bafd32064a1279ee7069d953c51cbe864f70e06 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:12:52 +0200
Subject: [PATCH 105/163] Update admin/src/locales/en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 admin/src/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 63148f471..3b172985c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -70,8 +70,8 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "reset": "reset",
-    "submit": "submit"
+    "reset": "Cancel",
+    "submit": "Send"
   },
   "GDD": "GDD",
   "hide_details": "Hide details",

From e4862bd9a8bbb5c595ab8a8fd73cedca5e2d47dd Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:13:17 +0200
Subject: [PATCH 106/163] Update
 frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 40727042f..c2e0537a2 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -11,7 +11,7 @@
         ></b-form-textarea>
         <b-row class="mt-4 mb-6">
           <b-col>
-            <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+            <b-button type="reset" variant="danger">{{ $t('form.cancel') }}</b-button>
           </b-col>
           <b-col class="text-right">
             <b-button type="submit" variant="primary">{{ $t('form.reply') }}</b-button>

From ff6cc7eb288455a03b5236e2aee295aed34ccd81 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:13:47 +0200
Subject: [PATCH 107/163] Update
 frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 .../ContributionMessagesFormular.spec.js        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index bc7886052..b8633615a 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -41,15 +41,16 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onReset', () => {
-      it('form has the set data', () => {
-        beforeEach(() => {
-          wrapper.setData({
-            form: {
-              text: 'text form message',
-            },
-          })
-          wrapper.vm.onReset()
+      beforeEach(() => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
         })
+        wrapper.vm.onReset()
+      })
+
+      it('form has the set data', () => {
         expect(wrapper.vm.form).toEqual({
           text: '',
         })

From 8e053773ca9c34b36ad964bf662e6f301c8de31e Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:14:08 +0200
Subject: [PATCH 108/163] Update
 admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 .../ContributionMessagesFormular.spec.js        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index bc7886052..b8633615a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -41,15 +41,16 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onReset', () => {
-      it('form has the set data', () => {
-        beforeEach(() => {
-          wrapper.setData({
-            form: {
-              text: 'text form message',
-            },
-          })
-          wrapper.vm.onReset()
+      beforeEach(() => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
         })
+        wrapper.vm.onReset()
+      })
+
+      it('form has the set data', () => {
         expect(wrapper.vm.form).toEqual({
           text: '',
         })

From ace7beb26bbe58fb0c9590d224051032efe19951 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 12:54:16 +0200
Subject: [PATCH 109/163] add placeholder on textarea

---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index ad846a1bf..15fc4f78d 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -5,7 +5,7 @@
         <b-form-textarea
           id="textarea"
           v-model="form.text"
-          placeholder="Enter something..."
+          :placeholder="$t('contributionLink.memo')"
           rows="3"
           max-rows="6"
         ></b-form-textarea>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index c2e0537a2..52240afa0 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -5,7 +5,7 @@
         <b-form-textarea
           id="textarea"
           v-model="form.text"
-          placeholder="Enter something..."
+          :placeholder="$t('form.memo')"
           rows="3"
           max-rows="6"
         ></b-form-textarea>

From 08e9aef36dd3e9df6eccf9f76f2e86b343eae85a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 12:58:58 +0200
Subject: [PATCH 110/163] edit 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 64799933e..b80977ae6 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -70,7 +70,7 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "reset": "Abbrechen",
+    "cancel": "Abbrechen",
     "submit": "Senden"
   },
   "GDD": "GDD",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 3b172985c..e99305e08 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -70,7 +70,7 @@
     "short_hash": "({shortHash})"
   },
   "form": {
-    "reset": "Cancel",
+    "cancel": "Cancel",
     "submit": "Send"
   },
   "GDD": "GDD",

From 0d3e96b42fa9c4af1f3d0824a5eeef3b9658dab3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 13:13:11 +0200
Subject: [PATCH 111/163] change test add trigger

---
 .../ContributionMessagesFormular.spec.js           | 14 +++++++-------
 .../ContributionMessagesFormular.spec.js           | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index b8633615a..b69f7cf24 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -41,13 +41,13 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onReset', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.setData({
           form: {
             text: 'text form message',
           },
         })
-        wrapper.vm.onReset()
+        await wrapper.find('form').trigger('reset')
       })
 
       it('form has the set data', () => {
@@ -64,10 +64,10 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('send createContributionLink with error', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
         wrapper = Wrapper()
-        wrapper.vm.onSubmit()
+        await wrapper.find('form').trigger('submit')
       })
 
       it('toasts an error message', () => {
@@ -76,18 +76,18 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('send createContributionLink with success', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.setData({
           form: {
             text: 'text form message',
           },
         })
         wrapper = Wrapper()
-        wrapper.vm.onSubmit()
+        await wrapper.find('form').trigger('submit')
       })
 
       it('toasts an success message', () => {
-        expect(toastSuccessSpy).toBeCalledWith(undefined)
+        expect(toastSuccessSpy).toBeCalledWith('message.request')
       })
     })
   })
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index b8633615a..3b97a1960 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -41,13 +41,13 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onReset', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.setData({
           form: {
             text: 'text form message',
           },
         })
-        wrapper.vm.onReset()
+        await wrapper.find('form').trigger('reset')
       })
 
       it('form has the set data', () => {
@@ -64,10 +64,10 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('send createContributionLink with error', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
         wrapper = Wrapper()
-        wrapper.vm.onSubmit()
+        await wrapper.find('form').trigger('submit')
       })
 
       it('toasts an error message', () => {
@@ -76,18 +76,18 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('send createContributionLink with success', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         wrapper.setData({
           form: {
             text: 'text form message',
           },
         })
         wrapper = Wrapper()
-        wrapper.vm.onSubmit()
+        await wrapper.find('form').trigger('submit')
       })
 
       it('toasts an success message', () => {
-        expect(toastSuccessSpy).toBeCalledWith(undefined)
+        expect(toastSuccessSpy).toBeCalledWith('message.reply')
       })
     })
   })

From a2a0e660f44a8e51158663a12fecf39a8aeadf75 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 30 Aug 2022 13:22:25 +0200
Subject: [PATCH 112/163] change tests add trigger event

---
 .../ContributionMessagesFormular.spec.js                  | 8 ++++----
 .../ContributionMessages/ContributionMessagesList.vue     | 1 -
 admin/src/locales/de.json                                 | 2 +-
 .../ContributionMessagesFormular.spec.js                  | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index b69f7cf24..a29b3df08 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -58,12 +58,12 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onSubmit', () => {
-      it('response with the contribution message', () => {
-        wrapper.vm.onSubmit()
+      it('response with the contribution message', async () => {
+        await wrapper.find('form').trigger('submit')
       })
     })
 
-    describe('send createContributionLink with error', () => {
+    describe('send contribution message with error', () => {
       beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
         wrapper = Wrapper()
@@ -75,7 +75,7 @@ describe('ContributionMessagesFormular', () => {
       })
     })
 
-    describe('send createContributionLink with success', () => {
+    describe('send contribution message with success', () => {
       beforeEach(async () => {
         wrapper.setData({
           form: {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index c5863cdc3..8f5a3e119 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -38,7 +38,6 @@ export default {
   },
   methods: {
     getListContributionMessages(id) {
-      this.messages = []
       this.$apollo
         .query({
           query: listContributionMessages,
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b80977ae6..c977a613e 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -83,7 +83,7 @@
     "plus": "+"
   },
   "message": {
-    "request": "Request has been sent."
+    "request": "Die Anfrage wurde gesendet."
   },
   "moderator": "Moderator",
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index 3b97a1960..a608035a8 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -58,12 +58,12 @@ describe('ContributionMessagesFormular', () => {
     })
 
     describe('call onSubmit', () => {
-      it('response with the contribution message', () => {
-        wrapper.vm.onSubmit()
+      it('response with the contribution message', async () => {
+        await wrapper.find('form').trigger('submit')
       })
     })
 
-    describe('send createContributionLink with error', () => {
+    describe('send contribution message with error', () => {
       beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
         wrapper = Wrapper()
@@ -75,7 +75,7 @@ describe('ContributionMessagesFormular', () => {
       })
     })
 
-    describe('send createContributionLink with success', () => {
+    describe('send contribution message with success', () => {
       beforeEach(async () => {
         wrapper.setData({
           form: {

From e85d6edc04cc49a31c1c9e17d41a996782e0cf26 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 09:02:37 +0200
Subject: [PATCH 113/163] add date on contribution messages

---
 .../components/ContributionMessages/slots/IsModerator.vue  | 7 +++----
 .../ContributionMessages/slots/IsNotModerator.vue          | 1 +
 .../components/ContributionMessages/slots/IsModerator.vue  | 7 +++----
 .../ContributionMessages/slots/IsNotModerator.vue          | 1 +
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index fd4d619d7..a930395e4 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -6,10 +6,9 @@
         :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
         variant="warning"
       ></b-avatar>
-      <span class="ml-2 mr-2">
-        {{ message.userFirstName }} {{ message.userLastName }}
-        <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      </span>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
       <div class="mt-2 text-bold h4">{{ message.message }}</div>
     </div>
   </div>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index bec99ae1e..19f5ab3ff 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -8,6 +8,7 @@
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <div class="mt-2 text-bold h4">{{ message.message }}</div>
     </div>
   </div>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 59c059654..a76c6f58c 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="slot-is-moderator">
     <b-avatar square :text="moderatorName" variant="warning"></b-avatar>
-    <span class="ml-2 mr-2">
-      {{ message.userFirstName }} {{ message.userLastName }}
-      <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    </span>
+    <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+    <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+    <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
     <div class="mt-2 h3">{{ message.message }}</div>
   </div>
 </template>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8ec4b36d5..f4dc6cdca 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -5,6 +5,7 @@
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
+      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <div class="mt-2 h3">{{ message.message }}</div>
     </div>
   </div>

From 8fb3b3d68c4f71a134971f03b87dfe9f7ac8fadf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 09:33:42 +0200
Subject: [PATCH 114/163] if question open list tab

---
 frontend/src/pages/Community.vue | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 1753ca5d2..7e53106d5 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -2,7 +2,7 @@
   <div class="community-page">
     <div>
       <b-tabs v-model="tabIndex" content-class="mt-3" align="center">
-        <b-tab :title="$t('community.submitContribution')" active>
+        <b-tab :title="$t('community.submitContribution')">
           <contribution-form
             @set-contribution="setContribution"
             @update-contribution="updateContribution"
@@ -10,7 +10,17 @@
             :updateAmount="updateAmount"
           />
         </b-tab>
-        <b-tab :title="$t('community.myContributions')">
+        <b-tab>
+          <template #title>
+            <b-icon
+              v-if="pleaseReply"
+              icon="circle-fill"
+              animation="throb"
+              font-scale="1"
+              variant="warning"
+            ></b-icon>
+            {{ $t('community.myContributions') }}
+          </template>
           <div>
             <b-alert show dismissible fade variant="secondary" class="text-dark">
               <h4 class="alert-heading">{{ $t('community.myContributions') }}</h4>
@@ -108,6 +118,7 @@ export default {
         amount: '',
       },
       updateAmount: '',
+      pleaseReply: false,
     }
   },
   methods: {
@@ -228,6 +239,13 @@ export default {
           } = result
           this.contributionCount = listContributions.contributionCount
           this.items = listContributions.contributionList
+          if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
+            this.tabIndex = 1
+            this.pleaseReply = true
+          } else {
+            this.tabIndex = 0
+            this.pleaseReply = false
+          }
         })
         .catch((err) => {
           this.toastError(err.message)
@@ -276,6 +294,7 @@ export default {
       pageSize: this.pageSize,
     })
     this.updateTransactions(0)
+    this.tabIndex = 1
   },
 }
 </script>

From 2a4c61fca0deabfc66ddd977fbad22654e9f1a3a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 10:19:27 +0200
Subject: [PATCH 115/163] delete icon on tab

---
 frontend/src/pages/Community.vue | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 7e53106d5..8906f40e7 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -10,17 +10,7 @@
             :updateAmount="updateAmount"
           />
         </b-tab>
-        <b-tab>
-          <template #title>
-            <b-icon
-              v-if="pleaseReply"
-              icon="circle-fill"
-              animation="throb"
-              font-scale="1"
-              variant="warning"
-            ></b-icon>
-            {{ $t('community.myContributions') }}
-          </template>
+        <b-tab :title="$t('community.myContributions')">
           <div>
             <b-alert show dismissible fade variant="secondary" class="text-dark">
               <h4 class="alert-heading">{{ $t('community.myContributions') }}</h4>
@@ -118,7 +108,6 @@ export default {
         amount: '',
       },
       updateAmount: '',
-      pleaseReply: false,
     }
   },
   methods: {
@@ -241,10 +230,8 @@ export default {
           this.items = listContributions.contributionList
           if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
             this.tabIndex = 1
-            this.pleaseReply = true
           } else {
             this.tabIndex = 0
-            this.pleaseReply = false
           }
         })
         .catch((err) => {

From 1f0bea76c5b71156afecfc66df91a3588577eeac Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 11:37:48 +0200
Subject: [PATCH 116/163] change tests

---
 .../ContributionMessagesFormular.spec.js      | 25 ++++++++++++++++---
 .../ContributionMessagesListItem.spec.js      |  1 +
 .../slots/IsModerator.spec.js                 |  1 +
 .../slots/IsNotModerator.spec.js              |  1 +
 .../ContributionMessagesFormular.spec.js      | 25 ++++++++++++++++---
 .../ContributionMessagesListItem.spec.js      |  1 +
 .../slots/IsModerator.spec.js                 |  1 +
 .../slots/IsNotModerator.spec.js              |  1 +
 frontend/src/pages/Community.spec.js          |  4 ---
 9 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index a29b3df08..62fcab505 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -40,7 +40,7 @@ describe('ContributionMessagesFormular', () => {
       expect(wrapper.find('div.contribution-messages-formular').exists()).toBe(true)
     })
 
-    describe('call onReset', () => {
+    describe('on trigger reset', () => {
       beforeEach(async () => {
         wrapper.setData({
           form: {
@@ -50,17 +50,34 @@ describe('ContributionMessagesFormular', () => {
         await wrapper.find('form').trigger('reset')
       })
 
-      it('form has the set data', () => {
+      it('form has empty text', () => {
         expect(wrapper.vm.form).toEqual({
           text: '',
         })
       })
     })
 
-    describe('call onSubmit', () => {
-      it('response with the contribution message', async () => {
+    describe('on trigger submit', () => {
+      beforeEach(async () => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
+        })
         await wrapper.find('form').trigger('submit')
       })
+
+      it('emitted "get-list-contribution-messages" with data', async () => {
+        expect(wrapper.emitted('get-list-contribution-messages')).toEqual(
+          expect.arrayContaining([expect.arrayContaining([42])]),
+        )
+      })
+
+      it('emitted "update-state" with data', async () => {
+        expect(wrapper.emitted('update-state')).toEqual(
+          expect.arrayContaining([expect.arrayContaining([42])]),
+        )
+      })
     })
 
     describe('send contribution message with error', () => {
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 4c12a4f59..7cca315d7 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -8,6 +8,7 @@ describe('ContributionMessagesListItem', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
     $store: {
       state: {
         moderator: {
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
index b9706b543..b1e09da94 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
@@ -8,6 +8,7 @@ describe('IsModerator', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
   }
 
   const propsData = {
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
index 434736993..24152ad1e 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
@@ -8,6 +8,7 @@ describe('IsNotModerator', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
   }
 
   const propsData = {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index a608035a8..aba5abc34 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -40,7 +40,7 @@ describe('ContributionMessagesFormular', () => {
       expect(wrapper.find('div.contribution-messages-formular').exists()).toBe(true)
     })
 
-    describe('call onReset', () => {
+    describe('on trigger reset', () => {
       beforeEach(async () => {
         wrapper.setData({
           form: {
@@ -50,17 +50,34 @@ describe('ContributionMessagesFormular', () => {
         await wrapper.find('form').trigger('reset')
       })
 
-      it('form has the set data', () => {
+      it('form has empty text', () => {
         expect(wrapper.vm.form).toEqual({
           text: '',
         })
       })
     })
 
-    describe('call onSubmit', () => {
-      it('response with the contribution message', async () => {
+    describe('on trigger submit', () => {
+      beforeEach(async () => {
+        wrapper.setData({
+          form: {
+            text: 'text form message',
+          },
+        })
         await wrapper.find('form').trigger('submit')
       })
+
+      it('emitted "get-list-contribution-messages" with data', async () => {
+        expect(wrapper.emitted('get-list-contribution-messages')).toEqual(
+          expect.arrayContaining([expect.arrayContaining([42])]),
+        )
+      })
+
+      it('emitted "update-state" with data', async () => {
+        expect(wrapper.emitted('update-state')).toEqual(
+          expect.arrayContaining([expect.arrayContaining([42])]),
+        )
+      })
     })
 
     describe('send contribution message with error', () => {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index 0de18778f..b9f6f0029 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -8,6 +8,7 @@ describe('ContributionMessagesList', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
     $store: {
       state: {
         firstName: 'Peter',
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
index b9706b543..b1e09da94 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
@@ -8,6 +8,7 @@ describe('IsModerator', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
   }
 
   const propsData = {
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
index 434736993..24152ad1e 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
@@ -8,6 +8,7 @@ describe('IsNotModerator', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $d: jest.fn((d) => d),
   }
 
   const propsData = {
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index b4aa43785..781277e31 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -92,10 +92,6 @@ describe('Community', () => {
       it('has three tabs', () => {
         expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3)
       })
-
-      it('has first tab active by default', () => {
-        expect(wrapper.findAll('div[role="tabpanel"]').at(0).classes('active')).toBe(true)
-      })
     })
 
     describe('API calls after creation', () => {

From d402b871e45e32f4955b9f5ba1eb408bb2fa7db3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 31 Aug 2022 12:26:29 +0200
Subject: [PATCH 117/163] Test that adminCreateContributionMessage,
 createContributionMessage & listContributionMessages gives the right values
 back.

---
 .../ContributionMessageResolver.test.ts       | 251 +++++++++++++++++-
 1 file changed, 250 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index dcf7d983e..bf61da47f 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -3,13 +3,19 @@
 
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { GraphQLError } from 'graphql'
-import { createContributionMessage } from '@/seeds/graphql/mutations'
+import {
+  adminCreateContributionMessage,
+  createContribution,
+  createContributionMessage,
+} from '@/seeds/graphql/mutations'
 import { listContributionMessages, login } from '@/seeds/graphql/queries'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { peterLustig } from '@/seeds/users/peter-lustig'
 
 let mutate: any, query: any, con: any
 let testEnv: any
+let result: any
 
 beforeAll(async () => {
   testEnv = await testEnvironment()
@@ -25,6 +31,99 @@ afterAll(async () => {
 })
 
 describe('ContributionMessageResolver', () => {
+  describe('adminCreateContributionMessage', () => {
+    describe('unauthenticated', () => {
+      it('returns an error', async () => {
+        await expect(
+          mutate({
+            mutation: adminCreateContributionMessage,
+            variables: { contributionId: 1, message: 'This is a test message' },
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('401 Unauthorized')],
+          }),
+        )
+      })
+    })
+
+    describe('authenticated', () => {
+      beforeAll(async () => {
+        await userFactory(testEnv, bibiBloxberg)
+        await userFactory(testEnv, peterLustig)
+        await query({
+          query: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+        result = await mutate({
+          mutation: createContribution,
+          variables: {
+            amount: 100.0,
+            memo: 'Test env contribution',
+            creationDate: new Date().toString(),
+          },
+        })
+        await query({
+          query: login,
+          variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+        })
+      })
+
+      afterAll(async () => {
+        await cleanDB()
+        resetToken()
+      })
+
+      describe('input not valid', () => {
+        it('throws error when contribution does not exist', async () => {
+          await expect(
+            mutate({
+              mutation: adminCreateContributionMessage,
+              variables: {
+                contributionId: -1,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Contribution not found',
+                ),
+              ],
+            }),
+          )
+        })
+      })
+
+      describe('valid input', () => {
+        it('creates ContributionMessage', async () => {
+          await expect(
+            mutate({
+              mutation: adminCreateContributionMessage,
+              variables: {
+                contributionId: result.data.createContribution.id,
+                message: 'Admin Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                adminCreateContributionMessage: expect.objectContaining({
+                  id: expect.any(Number),
+                  message: 'Admin Test',
+                  type: 'DIALOG',
+                  userFirstName: 'Peter',
+                  userLastName: 'Lustig',
+                }),
+              },
+            }),
+          )
+        })
+      })
+    })
+  })
+
   describe('createContributionMessage', () => {
     describe('unauthenticated', () => {
       it('returns an error', async () => {
@@ -44,10 +143,19 @@ describe('ContributionMessageResolver', () => {
     describe('authenticated', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
+        await userFactory(testEnv, peterLustig)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
+        result = await mutate({
+          mutation: createContribution,
+          variables: {
+            amount: 100.0,
+            memo: 'Test env contribution',
+            creationDate: new Date().toString(),
+          },
+        })
       })
 
       afterAll(async () => {
@@ -75,6 +183,68 @@ describe('ContributionMessageResolver', () => {
             }),
           )
         })
+
+        it('throws error when other user tries to send createContributionMessage', async () => {
+          await query({
+            query: login,
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          })
+          await expect(
+            mutate({
+              mutation: createContributionMessage,
+              variables: {
+                contributionId: result.data.createContribution.id,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Can not send message to contribution of another user',
+                ),
+              ],
+            }),
+          )
+        })
+      })
+
+      describe('valid input', () => {
+        beforeAll(async () => {
+          await query({
+            query: login,
+            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+          })
+        })
+
+        afterAll(async () => {
+          await cleanDB()
+          resetToken()
+        })
+
+        it('creates ContributionMessage', async () => {
+          await expect(
+            mutate({
+              mutation: createContributionMessage,
+              variables: {
+                contributionId: result.data.createContribution.id,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                createContributionMessage: expect.objectContaining({
+                  id: expect.any(Number),
+                  message: 'Test',
+                  type: 'DIALOG',
+                  userFirstName: 'Bibi',
+                  userLastName: 'Bloxberg',
+                }),
+              },
+            }),
+          )
+        })
       })
     })
   })
@@ -94,5 +264,84 @@ describe('ContributionMessageResolver', () => {
         )
       })
     })
+
+    describe('authenticated', () => {
+      beforeAll(async () => {
+        await userFactory(testEnv, bibiBloxberg)
+        await userFactory(testEnv, peterLustig)
+        await query({
+          query: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+        result = await mutate({
+          mutation: createContribution,
+          variables: {
+            amount: 100.0,
+            memo: 'Test env contribution',
+            creationDate: new Date().toString(),
+          },
+        })
+        await query({
+          query: login,
+          variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+        })
+        await mutate({
+          mutation: adminCreateContributionMessage,
+          variables: {
+            contributionId: result.data.createContribution.id,
+            message: 'Admin Test',
+          },
+        })
+        await query({
+          query: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+        await mutate({
+          mutation: createContributionMessage,
+          variables: {
+            contributionId: result.data.createContribution.id,
+            message: 'User Test',
+          },
+        })
+      })
+
+      afterAll(async () => {
+        await cleanDB()
+        resetToken()
+      })
+
+      it('returns a list of contributionmessages', async () => {
+        await expect(
+          mutate({
+            mutation: listContributionMessages,
+            variables: { contributionId: result.data.createContribution.id },
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            data: {
+              listContributionMessages: {
+                count: 2,
+                messages: expect.arrayContaining([
+                  expect.objectContaining({
+                    id: expect.any(Number),
+                    message: 'Admin Test',
+                    type: 'DIALOG',
+                    userFirstName: 'Peter',
+                    userLastName: 'Lustig',
+                  }),
+                  expect.objectContaining({
+                    id: expect.any(Number),
+                    message: 'User Test',
+                    type: 'DIALOG',
+                    userFirstName: 'Bibi',
+                    userLastName: 'Bloxberg',
+                  }),
+                ]),
+              },
+            },
+          }),
+        )
+      })
+    })
   })
 })

From e0d6714a3cb2e524833f12bce5f9e09edacf6d11 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 12:52:44 +0200
Subject: [PATCH 118/163] add computed initialLetters

---
 .../ContributionMessages/slots/IsModerator.vue        | 11 ++++++-----
 .../ContributionMessages/slots/IsNotModerator.vue     | 10 ++++++----
 .../ContributionMessages/slots/IsModerator.vue        |  4 ++--
 .../ContributionMessages/slots/IsNotModerator.vue     |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index a930395e4..37db5402e 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="slot-is-moderator">
     <div class="text-right">
-      <b-avatar
-        square
-        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
-        variant="warning"
-      ></b-avatar>
+      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
@@ -23,6 +19,11 @@ export default {
       },
     },
   },
+  computed: {
+    initialLetters() {
+      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
+    },
+  },
 }
 </script>
 <style>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 19f5ab3ff..8828fe5b0 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="slot-is-not-moderator">
     <div>
-      <b-avatar
-        :text="`${message.userFirstName[0]} ${message.userLastName[0]}`"
-        variant="info"
-      ></b-avatar>
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
@@ -23,6 +20,11 @@ export default {
       },
     },
   },
+  computed: {
+    initialLetters() {
+      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
+    },
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index a76c6f58c..2c7e20793 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="slot-is-moderator">
-    <b-avatar square :text="moderatorName" variant="warning"></b-avatar>
+    <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
     <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
     <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
     <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
@@ -18,7 +18,7 @@ export default {
     },
   },
   computed: {
-    moderatorName() {
+    initialLetters() {
       return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
     },
   },
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index f4dc6cdca..0f67f8bfc 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="slot-is-not-moderator">
     <div class="text-right">
-      <b-avatar :text="userName" variant="info"></b-avatar>
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
       <span class="ml-2 mr-2 text-bold">
         {{ message.userFirstName }} {{ message.userLastName }}
       </span>
@@ -21,7 +21,7 @@ export default {
     },
   },
   computed: {
-    userName() {
+    initialLetters() {
       return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
     },
   },

From 5b8b9c1a995f6c4c246ff2a5e2c01053ee6d67f0 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:18:16 +0200
Subject: [PATCH 119/163] Update frontend/src/locales/nl.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/locales/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 27af58f6d..f84cdaa2a 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -38,7 +38,7 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
       "confirm": "bevestigt",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
+      "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"

From d5153a3f60be2f6d45b0781fde4c399524e23446 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:20:25 +0200
Subject: [PATCH 120/163] Update
 frontend/src/components/ContributionMessages/ContributionMessagesList.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 .../ContributionMessages/ContributionMessagesList.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index c5ee4b266..6530a5a53 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -6,7 +6,7 @@
       </div>
     </b-container>
     <contribution-messages-formular
-      v-if="state === 'PENDING' || state === 'IN_PROGRESS'"
+      v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
       class="mt-5"
       :contributionId="contributionId"
       @get-list-contribution-messages="getListContributionMessages"

From 7b2eceaadaa4f0838f52edafd2f74532959b1fc3 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:21:55 +0200
Subject: [PATCH 121/163] Update
 frontend/src/components/Contributions/ContributionListItem.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/components/Contributions/ContributionListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 3fd20a5c4..dcee87666 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -46,7 +46,7 @@
               <b-icon icon="pencil" class="h2"></b-icon>
             </div>
             <div
-              v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
+              v-if="!['CONFIRMED', 'DELETED'].includes(state)"
               class="pointer"
               @click="deleteContribution({ id })"
             >

From 3387123a90d30d5482632f5fd58eb053ca1b2849 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:22:22 +0200
Subject: [PATCH 122/163] Update
 frontend/src/components/Contributions/ContributionListItem.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/components/Contributions/ContributionListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index dcee87666..80cb27c8f 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -32,7 +32,7 @@
             class="d-flex flex-row-reverse"
           >
             <div
-              v-if="state !== 'CONFIRMED' && state !== 'DELETED'"
+              v-if="!['CONFIRMED', 'DELETED'].includes(state)"
               class="pointer ml-5"
               @click="
                 $emit('update-contribution-form', {

From 633722a00d3902092cc4a9b174b5d639005f958d Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:23:19 +0200
Subject: [PATCH 123/163] Update
 frontend/src/components/Contributions/ContributionListItem.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/components/Contributions/ContributionListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 80cb27c8f..25aa00468 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -28,7 +28,7 @@
           </div>
           <div class="mr-2">{{ memo }}</div>
           <div
-            v-if="(state !== 'DELETED' && !firstName) || (state !== 'CONFIRMED' && !firstName)"
+            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !firstName"
             class="d-flex flex-row-reverse"
           >
             <div

From b817e36cd181a757807e518fadf3bbf11a79ab84 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:23:42 +0200
Subject: [PATCH 124/163] Update frontend/src/locales/en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 576a77e75..6ec9ef8b8 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -38,7 +38,7 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
+      "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"

From cd956f93464c3f7f4af057e727ec838b35fb95f8 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:24:09 +0200
Subject: [PATCH 125/163] Update frontend/src/locales/es.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/locales/es.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 96fe9a163..924669c20 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -38,7 +38,7 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
       "confirm": "confirmado",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "There is a question from the moderators.",
       "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"

From 0597da98cef80f97ffd68f537326407ae410e63c Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:24:39 +0200
Subject: [PATCH 126/163] Update frontend/src/locales/fr.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 frontend/src/locales/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 244db51b1..5c4f6ddb7 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -38,7 +38,7 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": " Approuvé",
-      "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
+      "in_progress": "There is a question from the moderators.",
       "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é"

From 56a56e3c1d2b8e2d08b7be491fb756fb32deb0ec Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 31 Aug 2022 14:58:35 +0200
Subject: [PATCH 127/163] add it todo in test

---
 frontend/src/pages/Community.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 781277e31..26d30c1d9 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -92,6 +92,8 @@ describe('Community', () => {
       it('has three tabs', () => {
         expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3)
       })
+
+      it.todo('check for correct tabIndex if state is "IN_PROGRESS" or not')
     })
 
     describe('API calls after creation', () => {

From 2177c501c37b9f809ea14673b6aefb4ea8b20fe7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 1 Sep 2022 10:24:42 +0200
Subject: [PATCH 128/163] Remove cleanDB in most afterAll so we don't need to
 seed contribution and contribution messages again in later tests.

---
 .../ContributionMessageResolver.test.ts       | 60 ++-----------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index bf61da47f..6c617acb4 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -69,8 +69,7 @@ describe('ContributionMessageResolver', () => {
         })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 
@@ -142,24 +141,13 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await userFactory(testEnv, peterLustig)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
-        result = await mutate({
-          mutation: createContribution,
-          variables: {
-            amount: 100.0,
-            memo: 'Test env contribution',
-            creationDate: new Date().toString(),
-          },
-        })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 
@@ -217,18 +205,13 @@ describe('ContributionMessageResolver', () => {
           })
         })
 
-        afterAll(async () => {
-          await cleanDB()
-          resetToken()
-        })
-
         it('creates ContributionMessage', async () => {
           await expect(
             mutate({
               mutation: createContributionMessage,
               variables: {
                 contributionId: result.data.createContribution.id,
-                message: 'Test',
+                message: 'User Test',
               },
             }),
           ).resolves.toEqual(
@@ -236,7 +219,7 @@ describe('ContributionMessageResolver', () => {
               data: {
                 createContributionMessage: expect.objectContaining({
                   id: expect.any(Number),
-                  message: 'Test',
+                  message: 'User Test',
                   type: 'DIALOG',
                   userFirstName: 'Bibi',
                   userLastName: 'Bloxberg',
@@ -267,46 +250,13 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await userFactory(testEnv, peterLustig)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
-        result = await mutate({
-          mutation: createContribution,
-          variables: {
-            amount: 100.0,
-            memo: 'Test env contribution',
-            creationDate: new Date().toString(),
-          },
-        })
-        await query({
-          query: login,
-          variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
-        })
-        await mutate({
-          mutation: adminCreateContributionMessage,
-          variables: {
-            contributionId: result.data.createContribution.id,
-            message: 'Admin Test',
-          },
-        })
-        await query({
-          query: login,
-          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-        })
-        await mutate({
-          mutation: createContributionMessage,
-          variables: {
-            contributionId: result.data.createContribution.id,
-            message: 'User Test',
-          },
-        })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 

From fbd3d412101ac917a13c65d00022b00a6b8fcc04 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 1 Sep 2022 10:25:41 +0200
Subject: [PATCH 129/163] Remove messages and replace it with messagesCount in
 the query listContributions.

---
 frontend/src/graphql/queries.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index f701ad8cf..88c312a3f 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -207,15 +207,7 @@ export const listContributions = gql`
         confirmedBy
         deletedAt
         state
-        messages {
-          id
-          message
-          createdAt
-          updatedAt
-          type
-          userFirstName
-          userLastName
-        }
+        messagesCount
       }
     }
   }

From aa27bb024f447d2817113652e6ade17655fd720f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:32:40 +0200
Subject: [PATCH 130/163] Update frontend/src/locales/es.json

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

diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 924669c20..397e75bf7 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -35,7 +35,7 @@
   "contribution": {
     "activity": "Actividad",
     "alert": {
-      "answerQuestion": "Please answer the question",
+      "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",
       "in_progress": "There is a question from the moderators.",

From cc4011b91906912f1fdad74251d60751875adad4 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:35:14 +0200
Subject: [PATCH 131/163] Update frontend/src/locales/es.json

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

diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 397e75bf7..70fce3c80 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -222,7 +222,7 @@
     "email": "Te hemos enviado un correo electrónico.",
     "errorTitle": "Atención!",
     "register": "Ya estás registrado, por favor revisa tu correo electrónico y haz clic en el enlace de activación.",
-    "reply": "Gracias, su respuesta ha sido enviada.",
+    "reply": "Gracias, tu respuesta ha sido enviada.",
     "reset": "Tu contraseña ha sido cambiada.",
     "title": "Gracias!",
     "unsetPassword": "Tu contraseña aún no ha sido configurada. Por favor reinícialo."

From 7839276ed0e2ea1636354a1216725dfa4f22d50b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:35:27 +0200
Subject: [PATCH 132/163] Update frontend/src/locales/es.json

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

diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 70fce3c80..939a877f7 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -38,7 +38,7 @@
       "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",
-      "in_progress": "There is a question from the moderators.",
+      "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"

From 2bc75916e1895de4960bae727845106e488e585f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 1 Sep 2022 15:00:27 +0200
Subject: [PATCH 133/163] Update frontend/src/locales/fr.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/locales/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 5c4f6ddb7..f698de992 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -35,7 +35,7 @@
   "contribution": {
     "activity": "Activité",
     "alert": {
-      "answerQuestion": "Please answer the question",
+      "answerQuestion": "S'il te plais répond à la question",
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": " Approuvé",
       "in_progress": "There is a question from the moderators.",

From 29b645827174de58427fdda35b1b039e9bdfb2af Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 1 Sep 2022 15:00:39 +0200
Subject: [PATCH 134/163] Update frontend/src/locales/fr.json

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/locales/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index f698de992..07237d16d 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -38,7 +38,7 @@
       "answerQuestion": "S'il te plais répond à la question",
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": " Approuvé",
-      "in_progress": "There is a question from the moderators.",
+      "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é"

From de2bd1113e0cc6ba833ef97d9570116c27a9cdc9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 15:38:05 +0200
Subject: [PATCH 135/163] refactor: Improve Statistics Query

---
 .../graphql/resolver/StatisticsResolver.ts    | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index 4c1500839..c2cebbed5 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -7,49 +7,49 @@ import { getConnection } from '@dbTools/typeorm'
 import Decimal from 'decimal.js-light'
 import { calculateDecay } from '@/util/decay'
 
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 @Resolver()
 export class StatisticsResolver {
   @Authorized([RIGHTS.COMMUNITY_STATISTICS])
   @Query(() => CommunityStatistics)
-  async communityStatistics(): Promise<CommunityStatistics> {
-    const allUsers = await DbUser.find({ withDeleted: true })
+  async communityStatistics(@Info() info: any): Promise<CommunityStatistics> {
 
-    let totalUsers = 0
-    let activeUsers = 0
-    let deletedUsers = 0
+    const allUsers = await DbUser.count({ withDeleted: true })
+    const totalUsers = await DbUser.count()
+    const deletedUsers = allUsers - totalUsers
 
     let totalGradidoAvailable: Decimal = new Decimal(0)
     let totalGradidoUnbookedDecayed: Decimal = new Decimal(0)
 
     const receivedCallDate = new Date()
 
-    for (let i = 0; i < allUsers.length; i++) {
-      if (allUsers[i].deletedAt) {
-        deletedUsers++
-      } else {
-        totalUsers++
-        const lastTransaction = await DbTransaction.findOne({
-          where: { userId: allUsers[i].id },
-          order: { balanceDate: 'DESC' },
-        })
-        if (lastTransaction) {
-          activeUsers++
-          const decay = calculateDecay(
-            lastTransaction.balance,
-            lastTransaction.balanceDate,
-            receivedCallDate,
-          )
-          if (decay) {
-            totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
-            totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
-          }
-        }
-      }
-    }
-
     const queryRunner = getConnection().createQueryRunner()
     await queryRunner.connect()
 
+    const lastUserTransactions = await queryRunner.manager
+      .createQueryBuilder(DbUser, 'user')
+      .select('transaction.balance', 'balance')
+      .addSelect('transaction.balance_date', 'balanceDate')
+      .innerJoin(DbTransaction, 'transaction', 'user.id = transaction.user_id')
+      .where(
+        `transaction.balance_date = (SELECT MAX(t.balance_date) FROM transactions AS t WHERE t.user_id = user.id)`,
+      )
+      .orderBy('transaction.balance_date', 'DESC')
+      .addOrderBy('transaction.id', 'DESC')
+      .getRawMany()
+
+    const activeUsers = lastUserTransactions.length
+
+    lastUserTransactions.forEach(({ balance, balanceDate }) => {
+      const decay = calculateDecay(new Decimal(balance), new Date(balanceDate), receivedCallDate)
+      if (decay) {
+        totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
+        totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
+      }
+    })
+
     const { totalGradidoCreated } = await queryRunner.manager
       .createQueryBuilder()
       .select('SUM(transaction.amount) AS totalGradidoCreated')

From 01f1633da0daa32215218b0384dc476b799ef45d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 16:19:31 +0200
Subject: [PATCH 136/163] only check locales for en and de

---
 frontend/.eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index f32eca810..7f7bc664d 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -68,7 +68,7 @@ module.exports = {
   },
   settings: {
     'vue-i18n': {
-      localeDir: './src/locales/*.json',
+      localeDir: './src/locales/{en,de}.json',
       // Specify the version of `vue-i18n` you are using.
       // If not specified, the message will be parsed twice.
       messageSyntaxVersion: '^8.22.4',

From 230afd73a162f22e3576ac93ed11dd465cc53eb2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 16:19:59 +0200
Subject: [PATCH 137/163] do not show and load the statistics

---
 frontend/src/pages/InfoStatistic.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 63562a658..a83f24b6f 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -43,6 +43,7 @@
       </ul>
       <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
     </b-container>
+    <!-- 
     <hr />
     <b-container>
       <div class="h3">{{ $t('community.statistic') }}</div>
@@ -65,6 +66,7 @@
         </div>
       </div>
     </b-container>
+    -->
   </div>
 </template>
 <script>
@@ -139,7 +141,7 @@ export default {
   created() {
     this.getContributionLinks()
     this.getAdminUsers()
-    this.getCommunityStatistics()
+    // this.getCommunityStatistics()
     this.updateTransactions(0)
   },
 }

From 1f4b7772c06d0d2ef15e90d2cf63b5062d49a67e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 16:20:10 +0200
Subject: [PATCH 138/163] remove unused locales

---
 frontend/src/locales/de.json | 7 -------
 frontend/src/locales/en.json | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1525ed98c..005b1b6a7 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -21,14 +21,12 @@
     "community": "Gemeinschaft",
     "continue-to-registration": "Weiter zur Registrierung",
     "current-community": "Aktuelle Gemeinschaft",
-    "members": "Mitglieder",
     "moderator": "Moderator",
     "moderators": "Moderatoren",
     "myContributions": "Meine Beiträge zum Gemeinwohl",
     "openContributionLinks": "öffentliche Beitrags-Linkliste",
     "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
     "other-communities": "Weitere Gemeinschaften",
-    "statistic": "Statistik",
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
@@ -307,11 +305,6 @@
       "uppercase": "Großbuchstabe erforderlich."
     }
   },
-  "statistic": {
-    "totalGradidoAvailable": "GDD insgesamt im Umlauf",
-    "totalGradidoCreated": "GDD insgesamt geschöpft",
-    "totalGradidoDecayed": "GDD insgesamt verfallen"
-  },
   "success": "Erfolg",
   "time": {
     "days": "Tage",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6ec9ef8b8..ebaf3eb70 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -21,14 +21,12 @@
     "community": "Community",
     "continue-to-registration": "Continue to registration",
     "current-community": "Current community",
-    "members": "Members",
     "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "My contributions to the common good",
     "openContributionLinks": "open Contribution links list",
     "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
     "other-communities": "Other communities",
-    "statistic": "Statistics",
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
@@ -307,11 +305,6 @@
       "uppercase": "One uppercase letter required."
     }
   },
-  "statistic": {
-    "totalGradidoAvailable": "Total GDD in circulation",
-    "totalGradidoCreated": "Total GDD created",
-    "totalGradidoDecayed": "Total GDD decayed"
-  },
   "success": "Success",
   "time": {
     "days": "Days",

From eb8a245c2d526758c2d9f751a0ebe4fee8a63369 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 16:26:57 +0200
Subject: [PATCH 139/163] fix resolver args

---
 backend/src/graphql/resolver/StatisticsResolver.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index c2cebbed5..b0c061d91 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -14,8 +14,7 @@ import { calculateDecay } from '@/util/decay'
 export class StatisticsResolver {
   @Authorized([RIGHTS.COMMUNITY_STATISTICS])
   @Query(() => CommunityStatistics)
-  async communityStatistics(@Info() info: any): Promise<CommunityStatistics> {
-
+  async communityStatistics(): Promise<CommunityStatistics> {
     const allUsers = await DbUser.count({ withDeleted: true })
     const totalUsers = await DbUser.count()
     const deletedUsers = allUsers - totalUsers

From a8bfa59c46706ac641fa7ce9fca41eb5b6364b46 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 1 Sep 2022 19:09:23 +0200
Subject: [PATCH 140/163] fix tests

---
 frontend/src/pages/InfoStatistic.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/InfoStatistic.spec.js b/frontend/src/pages/InfoStatistic.spec.js
index b7b7b4a5c..e6475ed41 100644
--- a/frontend/src/pages/InfoStatistic.spec.js
+++ b/frontend/src/pages/InfoStatistic.spec.js
@@ -98,7 +98,7 @@ describe('InfoStatistic', () => {
       )
     })
 
-    it('calls getCommunityStatistics', () => {
+    it.skip('calls getCommunityStatistics', () => {
       expect(apolloQueryMock).toBeCalledWith(
         expect.objectContaining({
           query: communityStatistics,
@@ -115,12 +115,12 @@ describe('InfoStatistic', () => {
         wrapper = Wrapper()
       })
 
-      it('toasts three error messages', () => {
+      it('toasts two error messages', () => {
         expect(toastErrorSpy).toBeCalledWith(
           'listContributionLinks has no result, use default data',
         )
         expect(toastErrorSpy).toBeCalledWith('searchAdminUsers has no result, use default data')
-        expect(toastErrorSpy).toBeCalledWith('communityStatistics has no result, use default data')
+        // expect(toastErrorSpy).toBeCalledWith('communityStatistics has no result, use default data')
       })
     })
   })

From 1e38994383a4b29ad706dce345dc43c718e538e4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Sep 2022 12:13:09 +0200
Subject: [PATCH 141/163] uncomment code for coverage

---
 frontend/src/pages/InfoStatistic.vue | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index a83f24b6f..309404f48 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -71,7 +71,8 @@
 </template>
 <script>
 import CONFIG from '@/config'
-import { listContributionLinks, communityStatistics, searchAdminUsers } from '@/graphql/queries'
+import { listContributionLinks, searchAdminUsers } from '@/graphql/queries'
+// , communityStatistics
 
 export default {
   name: 'InfoStatistic',
@@ -117,23 +118,25 @@ export default {
           this.toastError('searchAdminUsers has no result, use default data')
         })
     },
-    getCommunityStatistics() {
-      this.$apollo
+    /*
+        getCommunityStatistics() {
+        this.$apollo
         .query({
-          query: communityStatistics,
+        query: communityStatistics,
         })
         .then((result) => {
-          this.totalUsers = result.data.communityStatistics.totalUsers
-          this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
-          this.totalGradidoDecayed =
-            Number(result.data.communityStatistics.totalGradidoDecayed) +
-            Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
-          this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
+        this.totalUsers = result.data.communityStatistics.totalUsers
+        this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
+        this.totalGradidoDecayed =
+        Number(result.data.communityStatistics.totalGradidoDecayed) +
+        Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
+        this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
         })
         .catch(() => {
-          this.toastError('communityStatistics has no result, use default data')
+        this.toastError('communityStatistics has no result, use default data')
         })
-    },
+        },
+      */
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },

From bfbbd26a5704759c47c138a676b2181f74731e92 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 5 Sep 2022 10:55:28 +0200
Subject: [PATCH 142/163] fix locales for Nederlands

---
 frontend/src/locales/de.json  | 2 +-
 frontend/src/locales/en.json  | 2 +-
 frontend/src/locales/es.json  | 4 ++--
 frontend/src/locales/fr.json  | 8 ++++----
 frontend/src/locales/index.js | 2 +-
 frontend/src/locales/nl.json  | 8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 1525ed98c..1091088c6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -255,7 +255,7 @@
       "en": "English",
       "es": "Español",
       "fr": "Français",
-      "nl": "Dutch",
+      "nl": "Nederlands",
       "success": "Deine Sprache wurde erfolgreich geändert."
     },
     "name": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6ec9ef8b8..4971cdf39 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -255,7 +255,7 @@
       "en": "English",
       "es": "Español",
       "fr": "Français",
-      "nl": "Holandés",
+      "nl": "Nederlands",
       "success": "Your language has been successfully updated."
     },
     "name": {
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 939a877f7..987bb71ef 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -254,8 +254,8 @@
       "de": "Deutsch",
       "en": "English",
       "es": "Español",
-      "fr": "Francés",
-      "nl": "Holandés",
+      "fr": "Français",
+      "nl": "Nederlands",
       "success": "Tu idioma ha sido cambiado con éxito."
     },
     "name": {
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 07237d16d..61037af1a 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -251,11 +251,11 @@
   "settings": {
     "language": {
       "changeLanguage": "Changer la langue",
-      "de": "Allemand",
-      "en": "Anglais",
-      "es": "Espagnol",
+      "de": "Deutsch",
+      "en": "English",
+      "es": "Español",
       "fr": "Français",
-      "nl": "Néerlandais",
+      "nl": "Nederlands",
       "success": "Votre langue de préférence a bien été actualisée."
     },
     "name": {
diff --git a/frontend/src/locales/index.js b/frontend/src/locales/index.js
index aa27a2e32..eed77ec2a 100644
--- a/frontend/src/locales/index.js
+++ b/frontend/src/locales/index.js
@@ -24,7 +24,7 @@ const locales = [
     enabled: true,
   },
   {
-    name: 'Holandés',
+    name: 'Nederlands',
     code: 'nl',
     iso: 'nl-NL',
     enabled: true,
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index f84cdaa2a..99b972514 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -251,10 +251,10 @@
   "settings": {
     "language": {
       "changeLanguage": "Taal veranderen",
-      "de": "Duits",
-      "en": "Engels",
-      "es": "Spaans",
-      "fr": "Frans",
+      "de": "Deutsch",
+      "en": "English",
+      "es": "Español",
+      "fr": "Français",
       "nl": "Nederlands",
       "success": "Jouw taal werd succesvol veranderd."
     },

From 177fb4b14c23e7718ca1a30fa275fb5b27f22687 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 5 Sep 2022 10:58:53 +0200
Subject: [PATCH 143/163] adapt unit tests regarding locales

---
 frontend/src/components/LanguageSwitch.spec.js  | 12 ++++++------
 frontend/src/components/LanguageSwitch2.spec.js | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.spec.js b/frontend/src/components/LanguageSwitch.spec.js
index a6abc2359..13ba979d3 100644
--- a/frontend/src/components/LanguageSwitch.spec.js
+++ b/frontend/src/components/LanguageSwitch.spec.js
@@ -94,11 +94,11 @@ describe('LanguageSwitch', () => {
         describe('navigator language is "nl-NL"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
 
-          it('shows Dutch as language ', async () => {
+          it('shows Nederlands as language ', async () => {
             languageGetter.mockReturnValue('nl-NL')
             wrapper.vm.setCurrentLanguage()
             await wrapper.vm.$nextTick()
-            expect(wrapper.find('button.dropdown-toggle').text()).toBe('Holandés - nl')
+            expect(wrapper.find('button.dropdown-toggle').text()).toBe('Nederlands - nl')
           })
         })
 
@@ -153,11 +153,11 @@ describe('LanguageSwitch', () => {
       })
 
       describe('language "nl" in store', () => {
-        it('shows Dutch as language', async () => {
+        it('shows Nederlands as language', async () => {
           wrapper.vm.$store.state.language = 'nl'
           wrapper.vm.setCurrentLanguage()
           await wrapper.vm.$nextTick()
-          expect(wrapper.find('button.dropdown-toggle').text()).toBe('Holandés - nl')
+          expect(wrapper.find('button.dropdown-toggle').text()).toBe('Nederlands - nl')
         })
       })
 
@@ -182,8 +182,8 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('li').at(3).text()).toBe('Français')
         })
 
-        it('has Dutch as second language to choose', () => {
-          expect(wrapper.findAll('li').at(4).text()).toBe('Holandés')
+        it('has Nederlands as second language to choose', () => {
+          expect(wrapper.findAll('li').at(4).text()).toBe('Nederlands')
         })
       })
     })
diff --git a/frontend/src/components/LanguageSwitch2.spec.js b/frontend/src/components/LanguageSwitch2.spec.js
index 080cc9d42..23550e5d3 100644
--- a/frontend/src/components/LanguageSwitch2.spec.js
+++ b/frontend/src/components/LanguageSwitch2.spec.js
@@ -86,11 +86,11 @@ describe('LanguageSwitch', () => {
         })
         describe('navigator language is "nl-NL"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
-          it('shows Dutch as language ', async () => {
+          it('shows Nederlands as language ', async () => {
             languageGetter.mockReturnValue('nl-NL')
             wrapper.vm.setCurrentLanguage()
             await wrapper.vm.$nextTick()
-            expect(wrapper.findAll('span.locales').at(4).text()).toBe('Holandés')
+            expect(wrapper.findAll('span.locales').at(4).text()).toBe('Nederlands')
           })
         })
         describe('navigator language is "it-IT" (not supported)', () => {
@@ -137,7 +137,7 @@ describe('LanguageSwitch', () => {
         })
       })
       describe('language "nl" in store', () => {
-        it('shows Dutch as language', async () => {
+        it('shows Nederlands as language', async () => {
           wrapper.vm.$store.state.language = 'nl'
           wrapper.vm.setCurrentLanguage()
           await wrapper.vm.$nextTick()
@@ -149,7 +149,7 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('span.locales')).toHaveLength(5)
         })
         it('has English as first language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(0).text()).toBe('Holandés')
+          expect(wrapper.findAll('span.locales').at(0).text()).toBe('Nederlands')
         })
         it('has German as second language to choose', () => {
           expect(wrapper.findAll('span.locales').at(1).text()).toBe('English')
@@ -160,7 +160,7 @@ describe('LanguageSwitch', () => {
         it('has French as third language to choose', () => {
           expect(wrapper.findAll('span.locales').at(3).text()).toBe('Español')
         })
-        it('has Dutch as third language to choose', () => {
+        it('has Nederlands as third language to choose', () => {
           expect(wrapper.findAll('span.locales').at(4).text()).toBe('Français')
         })
       })

From cea6ef6988862619d43b1c058561dd0d83a82ba4 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 5 Sep 2022 13:51:49 +0200
Subject: [PATCH 144/163] update language switch unit tests to test for all
 current availlable languages

---
 .../src/components/LanguageSwitch.spec.js     | 10 +--
 .../src/components/LanguageSwitch2.spec.js    | 72 ++++++++++++++++---
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/LanguageSwitch.spec.js b/frontend/src/components/LanguageSwitch.spec.js
index 13ba979d3..7f37c535a 100644
--- a/frontend/src/components/LanguageSwitch.spec.js
+++ b/frontend/src/components/LanguageSwitch.spec.js
@@ -45,7 +45,7 @@ describe('LanguageSwitch', () => {
       expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
     })
 
-    describe('with locales en, de and es', () => {
+    describe('with locales en, de, es, fr, and nl', () => {
       describe('empty store', () => {
         describe('navigator language is "en-US"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
@@ -162,7 +162,7 @@ describe('LanguageSwitch', () => {
       })
 
       describe('dropdown menu', () => {
-        it('has English and German as languages to choose', () => {
+        it('has five languages to choose from', () => {
           expect(wrapper.findAll('li')).toHaveLength(5)
         })
 
@@ -174,15 +174,15 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('li').at(1).text()).toBe('Deutsch')
         })
 
-        it('has Español as second language to choose', () => {
+        it('has Español as third language to choose', () => {
           expect(wrapper.findAll('li').at(2).text()).toBe('Español')
         })
 
-        it('has French as second language to choose', () => {
+        it('has French as fourth language to choose', () => {
           expect(wrapper.findAll('li').at(3).text()).toBe('Français')
         })
 
-        it('has Nederlands as second language to choose', () => {
+        it('has Nederlands as fith language to choose', () => {
           expect(wrapper.findAll('li').at(4).text()).toBe('Nederlands')
         })
       })
diff --git a/frontend/src/components/LanguageSwitch2.spec.js b/frontend/src/components/LanguageSwitch2.spec.js
index 23550e5d3..0d2b485ec 100644
--- a/frontend/src/components/LanguageSwitch2.spec.js
+++ b/frontend/src/components/LanguageSwitch2.spec.js
@@ -46,10 +46,11 @@ describe('LanguageSwitch', () => {
       expect(wrapper.find('div.language-switch').exists()).toBe(true)
     })
 
-    describe('with locales en and de', () => {
+    describe('with locales en, de, es, fr, and nl', () => {
       describe('empty store', () => {
         describe('navigator language is "en-US"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows English as default navigator langauge', async () => {
             languageGetter.mockReturnValue('en-US')
             wrapper.vm.setCurrentLanguage()
@@ -57,8 +58,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
           })
         })
+
         describe('navigator language is "de-DE"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows Deutsch as language ', async () => {
             languageGetter.mockReturnValue('de-DE')
             wrapper.vm.setCurrentLanguage()
@@ -66,8 +69,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
           })
         })
+
         describe('navigator language is "es-ES"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows Español as language ', async () => {
             languageGetter.mockReturnValue('es-ES')
             wrapper.vm.setCurrentLanguage()
@@ -75,8 +80,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(2).text()).toBe('Español')
           })
         })
+
         describe('navigator language is "fr-FR"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows French as language ', async () => {
             languageGetter.mockReturnValue('fr-FR')
             wrapper.vm.setCurrentLanguage()
@@ -84,8 +91,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(3).text()).toBe('Français')
           })
         })
+
         describe('navigator language is "nl-NL"', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows Nederlands as language ', async () => {
             languageGetter.mockReturnValue('nl-NL')
             wrapper.vm.setCurrentLanguage()
@@ -93,8 +102,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(4).text()).toBe('Nederlands')
           })
         })
+
         describe('navigator language is "it-IT" (not supported)', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows English as language ', async () => {
             languageGetter.mockReturnValue('it-IT')
             wrapper.vm.setCurrentLanguage()
@@ -102,8 +113,10 @@ describe('LanguageSwitch', () => {
             expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
           })
         })
+
         describe('no navigator langauge', () => {
           const languageGetter = jest.spyOn(navigator, 'language', 'get')
+
           it('shows English as language ', async () => {
             languageGetter.mockReturnValue(null)
             wrapper.vm.setCurrentLanguage()
@@ -112,6 +125,7 @@ describe('LanguageSwitch', () => {
           })
         })
       })
+
       describe('language "de" in store', () => {
         it('shows Deutsch as language', async () => {
           wrapper.vm.$store.state.language = 'de'
@@ -120,6 +134,7 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('span.locales').at(1).text()).toBe('English')
         })
       })
+
       describe('language "es" in store', () => {
         it('shows Español as language', async () => {
           wrapper.vm.$store.state.language = 'es'
@@ -128,6 +143,7 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('span.locales').at(2).text()).toBe('Deutsch')
         })
       })
+
       describe('language "fr" in store', () => {
         it('shows French as language', async () => {
           wrapper.vm.$store.state.language = 'fr'
@@ -136,6 +152,7 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('span.locales').at(3).text()).toBe('Español')
         })
       })
+
       describe('language "nl" in store', () => {
         it('shows Nederlands as language', async () => {
           wrapper.vm.$store.state.language = 'nl'
@@ -144,35 +161,68 @@ describe('LanguageSwitch', () => {
           expect(wrapper.findAll('span.locales').at(4).text()).toBe('Français')
         })
       })
+
       describe('language menu', () => {
-        it('has English, German and Español as languages to choose', () => {
+        beforeAll(async () => {
+          wrapper.vm.$store.state.language = 'en'
+          wrapper.vm.setCurrentLanguage()
+          await wrapper.vm.$nextTick()
+        })
+
+        it('has five languages to choose from', () => {
           expect(wrapper.findAll('span.locales')).toHaveLength(5)
         })
+
         it('has English as first language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(0).text()).toBe('Nederlands')
+          expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
         })
-        it('has German as second language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(1).text()).toBe('English')
+
+        it('has Deutsch as second language to choose', () => {
+          expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
         })
+
         it('has Español as third language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(2).text()).toBe('Deutsch')
+          expect(wrapper.findAll('span.locales').at(2).text()).toBe('Español')
         })
-        it('has French as third language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(3).text()).toBe('Español')
+
+        it('has Français as fourth language to choose', () => {
+          expect(wrapper.findAll('span.locales').at(3).text()).toBe('Français')
         })
-        it('has Nederlands as third language to choose', () => {
-          expect(wrapper.findAll('span.locales').at(4).text()).toBe('Français')
+
+        it('has Nederlands as fifth language to choose', () => {
+          expect(wrapper.findAll('span.locales').at(4).text()).toBe('Nederlands')
         })
       })
     })
 
     describe('calls the API', () => {
       it("with locale 'de'", () => {
-        wrapper.findAll('span.locales').at(2).trigger('click')
+        wrapper.findAll('span.locales').at(1).trigger('click')
         expect(updateUserInfosMutationMock).toBeCalledWith(
           expect.objectContaining({ variables: { locale: 'de' } }),
         )
       })
+
+      it("with locale 'es'", () => {
+        wrapper.findAll('span.locales').at(2).trigger('click')
+        expect(updateUserInfosMutationMock).toBeCalledWith(
+          expect.objectContaining({ variables: { locale: 'es' } }),
+        )
+      })
+
+      it("with locale 'fr'", () => {
+        wrapper.findAll('span.locales').at(3).trigger('click')
+        expect(updateUserInfosMutationMock).toBeCalledWith(
+          expect.objectContaining({ variables: { locale: 'fr' } }),
+        )
+      })
+
+      it("with locale 'nl'", () => {
+        wrapper.findAll('span.locales').at(4).trigger('click')
+        expect(updateUserInfosMutationMock).toBeCalledWith(
+          expect.objectContaining({ variables: { locale: 'nl' } }),
+        )
+      })
     })
   })
 })

From 04b96bac2fcb90c25611abd856673fcc5b998081 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 10:39:20 +0200
Subject: [PATCH 145/163] Throw error if moderator tries to answer his own
 contribution in adminCreateContributionMessage.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index f4656aec8..6ed56e082 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -717,6 +717,9 @@ export class AdminResolver {
       if (!contribution) {
         throw new Error('Contribution not found')
       }
+      if (contribution.userId === user.id) {
+        throw new Error('Can not answer on own contribution')
+      }
       contributionMessage.contributionId = contributionId
       contributionMessage.createdAt = new Date()
       contributionMessage.message = message

From ced14bd752e00adb6635a34893f89cbd383662bf Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 10:59:32 +0200
Subject: [PATCH 146/163] Change error message Admin can not answer on own
 contribution.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 6ed56e082..65662e8eb 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -718,7 +718,7 @@ export class AdminResolver {
         throw new Error('Contribution not found')
       }
       if (contribution.userId === user.id) {
-        throw new Error('Can not answer on own contribution')
+        throw new Error('Admin can not answer on own contribution')
       }
       contributionMessage.contributionId = contributionId
       contributionMessage.createdAt = new Date()

From aa9d60c78c77d56c23461e45d107a1f7736ef672 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 11:07:23 +0200
Subject: [PATCH 147/163] Add test that admin can not call
 adminCreateContributionMessage on own contribution

---
 .../ContributionMessageResolver.test.ts       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 6c617acb4..c0e330750 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -93,6 +93,38 @@ describe('ContributionMessageResolver', () => {
             }),
           )
         })
+
+        it('throws error when contribution.userId equals user.id', async () => {
+          await query({
+            query: login,
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          })
+          const result2 = await mutate({
+            mutation: createContribution,
+            variables: {
+              amount: 100.0,
+              memo: 'Test env contribution',
+              creationDate: new Date().toString(),
+            },
+          })
+          await expect(
+            mutate({
+              mutation: adminCreateContributionMessage,
+              variables: {
+                contributionId: result2.data.createContribution.id,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Admin can not answer on own contribution',
+                ),
+              ],
+            }),
+          )
+        })
       })
 
       describe('valid input', () => {

From 0dc45d81c5f4b421f5bc880b2fabf44c412ca8c6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 11:22:16 +0200
Subject: [PATCH 148/163] Add is_moderator field to the contribution_messages
 table.

---
 database/entity/0047-messages_tables/ContributionMessage.ts | 3 +++
 database/migrations/0047-messages_tables.ts                 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/database/entity/0047-messages_tables/ContributionMessage.ts b/database/entity/0047-messages_tables/ContributionMessage.ts
index e5226043d..dd3787547 100644
--- a/database/entity/0047-messages_tables/ContributionMessage.ts
+++ b/database/entity/0047-messages_tables/ContributionMessage.ts
@@ -48,4 +48,7 @@ export class ContributionMessage extends BaseEntity {
 
   @Column({ length: 12, nullable: false, collation: 'utf8mb4_unicode_ci' })
   type: string
+
+  @Column({ name: 'is_moderator', type: 'bool', nullable: false, default: false })
+  isModerator: boolean
 }
diff --git a/database/migrations/0047-messages_tables.ts b/database/migrations/0047-messages_tables.ts
index 36fa42a8e..aafc3020f 100644
--- a/database/migrations/0047-messages_tables.ts
+++ b/database/migrations/0047-messages_tables.ts
@@ -20,6 +20,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
       \`deleted_at\` datetime DEFAULT NULL,
       \`deleted_by\` int(10) unsigned DEFAULT NULL,
       \`type\` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT "DIALOG",
+      \`is_moderator\` boolean NOT NULL DEFAULT false,
       PRIMARY KEY (\`id\`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
   `)

From ecc42b49fa65e186079ae9781988811f714e4bdb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 11:23:57 +0200
Subject: [PATCH 149/163] Add isModerator to the createContributionMessage
 calls.

---
 backend/src/graphql/resolver/AdminResolver.ts               | 1 +
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index f4656aec8..fbeea716c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -722,6 +722,7 @@ export class AdminResolver {
       contributionMessage.message = message
       contributionMessage.userId = user.id
       contributionMessage.type = ContributionMessageType.DIALOG
+      contributionMessage.isModerator = true
       await queryRunner.manager.insert(DbContributionMessage, contributionMessage)
 
       if (
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 408481513..fb92806d0 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -39,6 +39,7 @@ export class ContributionMessageResolver {
       contributionMessage.message = message
       contributionMessage.userId = user.id
       contributionMessage.type = ContributionMessageType.DIALOG
+      contributionMessage.isModerator = false
       await queryRunner.manager.insert(DbContributionMessage, contributionMessage)
 
       if (contribution.contributionStatus === ContributionStatus.IN_PROGRESS) {

From dfa97fd855157a14159f72e8be634dce51b4e7ae Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 6 Sep 2022 11:00:29 +0200
Subject: [PATCH 150/163] moderator cannot answer himself

---
 .../components/Tables/OpenCreationsTable.vue  | 59 +++++++++++--------
 .../graphql/listUnconfirmedContributions.js   |  1 +
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 86c5ecce6..af9947f85 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -12,33 +12,42 @@
         </b-button>
       </template>
       <template #cell(editCreation)="row">
-        <b-button
-          v-if="row.item.moderator"
-          variant="info"
-          size="md"
-          @click="rowToggleDetails(row, 0)"
-          class="mr-2"
-        >
-          <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
-        </b-button>
-        <b-button v-else @click="rowToggleDetails(row, 0)">
-          <b-icon icon="chat-dots"></b-icon>
-          <b-icon
-            v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
-            icon="exclamation-circle-fill"
-            variant="warning"
-          ></b-icon>
-          <b-icon
-            v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
-            icon="question-diamond"
-            variant="light"
-          ></b-icon>
-        </b-button>
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            v-if="row.item.moderator"
+            variant="info"
+            size="md"
+            @click="rowToggleDetails(row, 0)"
+            class="mr-2"
+          >
+            <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
+          </b-button>
+          <b-button v-else @click="rowToggleDetails(row, 0)">
+            <b-icon icon="chat-dots"></b-icon>
+            <b-icon
+              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              icon="exclamation-circle-fill"
+              variant="warning"
+            ></b-icon>
+            <b-icon
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              icon="question-diamond"
+              variant="light"
+            ></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #cell(confirm)="row">
-        <b-button variant="success" size="md" @click="$emit('show-overlay', row.item)" class="mr-2">
-          <b-icon icon="check" scale="2" variant=""></b-icon>
-        </b-button>
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            variant="success"
+            size="md"
+            @click="$emit('show-overlay', row.item)"
+            class="mr-2"
+          >
+            <b-icon icon="check" scale="2" variant=""></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #row-details="row">
         <row-details
diff --git a/admin/src/graphql/listUnconfirmedContributions.js b/admin/src/graphql/listUnconfirmedContributions.js
index dbaa52d81..1d7f9e21c 100644
--- a/admin/src/graphql/listUnconfirmedContributions.js
+++ b/admin/src/graphql/listUnconfirmedContributions.js
@@ -6,6 +6,7 @@ export const listUnconfirmedContributions = gql`
       id
       firstName
       lastName
+      userId
       email
       amount
       memo

From 3ec2fd8e0d17d111f72d23fdffc8d3a53e0863c0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 6 Sep 2022 11:22:33 +0200
Subject: [PATCH 151/163] fix test

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

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 352eba809..0ea1aeba2 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -14,21 +14,23 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         id: 1,
         firstName: 'Bibi',
         lastName: 'Bloxberg',
+        userId: 99,
         email: 'bibi@bloxberg.de',
         amount: 500,
         memo: 'Danke für alles',
         date: new Date(),
-        moderator: 2,
+        moderator: 1,
       },
       {
         id: 2,
         firstName: 'Räuber',
         lastName: 'Hotzenplotz',
+        userId: 100,
         email: 'raeuber@hotzenplotz.de',
         amount: 1000000,
         memo: 'Gut Ergattert',
         date: new Date(),
-        moderator: 2,
+        moderator: 1,
       },
     ],
   },
@@ -41,6 +43,15 @@ const mocks = {
   $d: jest.fn((d) => d),
   $store: {
     commit: storeCommitMock,
+    state: {
+      moderator: {
+        firstName: 'Peter',
+        lastName: 'Lustig',
+        isAdmin: '2022-08-30T07:41:31.000Z',
+        id: 263,
+        language: 'de',
+      },
+    },
   },
   $apollo: {
     query: apolloQueryMock,

From 96015a9b1b24cb2f4e79308a757f36248d3bd010 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 11:27:27 +0200
Subject: [PATCH 152/163] Add isModerator to the graphql ContributionMessage
 model.

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

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 1357c02cb..478afe024 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -13,6 +13,7 @@ export class ContributionMessage {
     this.userFirstName = user.firstName
     this.userLastName = user.lastName
     this.userId = user.id
+    this.isModerator = contributionMessage.isModerator
   }
 
   @Field(() => Number)
@@ -38,6 +39,9 @@ export class ContributionMessage {
 
   @Field(() => Number, { nullable: true })
   userId: number | null
+
+  @Field(() => Boolean, { nullable: true })
+  isModerator: boolean
 }
 @ObjectType()
 export class ContributionMessageListResult {

From 317f3182feae6cafcd88b9d95a0f79a2a4f178f7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 14:34:13 +0200
Subject: [PATCH 153/163] Remove is_moderator from 0047 and moved it to new
 migration 0048.

---
 .../ContributionMessage.ts                    |  3 --
 .../ContributionMessage.ts                    | 54 +++++++++++++++++++
 database/entity/ContributionMessage.ts        |  2 +-
 database/migrations/0047-messages_tables.ts   |  1 -
 ...d_is_moderator_to_contribution_messages.ts | 12 +++++
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 database/entity/0048-add_is_moderator_to_contribution_messages/ContributionMessage.ts
 create mode 100644 database/migrations/0048-add_is_moderator_to_contribution_messages.ts

diff --git a/database/entity/0047-messages_tables/ContributionMessage.ts b/database/entity/0047-messages_tables/ContributionMessage.ts
index dd3787547..e5226043d 100644
--- a/database/entity/0047-messages_tables/ContributionMessage.ts
+++ b/database/entity/0047-messages_tables/ContributionMessage.ts
@@ -48,7 +48,4 @@ export class ContributionMessage extends BaseEntity {
 
   @Column({ length: 12, nullable: false, collation: 'utf8mb4_unicode_ci' })
   type: string
-
-  @Column({ name: 'is_moderator', type: 'bool', nullable: false, default: false })
-  isModerator: boolean
 }
diff --git a/database/entity/0048-add_is_moderator_to_contribution_messages/ContributionMessage.ts b/database/entity/0048-add_is_moderator_to_contribution_messages/ContributionMessage.ts
new file mode 100644
index 000000000..dd3787547
--- /dev/null
+++ b/database/entity/0048-add_is_moderator_to_contribution_messages/ContributionMessage.ts
@@ -0,0 +1,54 @@
+import {
+  BaseEntity,
+  Column,
+  DeleteDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm'
+import { Contribution } from '../Contribution'
+import { User } from '../User'
+
+@Entity('contribution_messages', {
+  engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci',
+})
+export class ContributionMessage extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ name: 'contribution_id', unsigned: true, nullable: false })
+  contributionId: number
+
+  @ManyToOne(() => Contribution, (contribution) => contribution.messages)
+  @JoinColumn({ name: 'contribution_id' })
+  contribution: Contribution
+
+  @Column({ name: 'user_id', unsigned: true, nullable: false })
+  userId: number
+
+  @ManyToOne(() => User, (user) => user.messages)
+  @JoinColumn({ name: 'user_id' })
+  user: User
+
+  @Column({ length: 2000, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  message: string
+
+  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP', name: 'created_at' })
+  createdAt: Date
+
+  @Column({ type: 'datetime', default: null, nullable: true, name: 'updated_at' })
+  updatedAt: Date
+
+  @DeleteDateColumn({ name: 'deleted_at' })
+  deletedAt: Date | null
+
+  @Column({ name: 'deleted_by', default: null, unsigned: true, nullable: true })
+  deletedBy: number
+
+  @Column({ length: 12, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  type: string
+
+  @Column({ name: 'is_moderator', type: 'bool', nullable: false, default: false })
+  isModerator: boolean
+}
diff --git a/database/entity/ContributionMessage.ts b/database/entity/ContributionMessage.ts
index 9b6450811..8ba96e3f6 100644
--- a/database/entity/ContributionMessage.ts
+++ b/database/entity/ContributionMessage.ts
@@ -1 +1 @@
-export { ContributionMessage } from './0047-messages_tables/ContributionMessage'
+export { ContributionMessage } from './0048-add_is_moderator_to_contribution_messages/ContributionMessage'
diff --git a/database/migrations/0047-messages_tables.ts b/database/migrations/0047-messages_tables.ts
index aafc3020f..36fa42a8e 100644
--- a/database/migrations/0047-messages_tables.ts
+++ b/database/migrations/0047-messages_tables.ts
@@ -20,7 +20,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
       \`deleted_at\` datetime DEFAULT NULL,
       \`deleted_by\` int(10) unsigned DEFAULT NULL,
       \`type\` varchar(12) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT "DIALOG",
-      \`is_moderator\` boolean NOT NULL DEFAULT false,
       PRIMARY KEY (\`id\`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
   `)
diff --git a/database/migrations/0048-add_is_moderator_to_contribution_messages.ts b/database/migrations/0048-add_is_moderator_to_contribution_messages.ts
new file mode 100644
index 000000000..ff2e645c3
--- /dev/null
+++ b/database/migrations/0048-add_is_moderator_to_contribution_messages.ts
@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    `ALTER TABLE \`contribution_messages\` ADD COLUMN \`is_moderator\` boolean NOT NULL DEFAULT false;`,
+  )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(`ALTER TABLE \`contribution_messages\` DROP COLUMN \`is_moderator\`;`)
+}

From a41cd825e9963f414f127e0dbb84201070d8e296 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 14:34:32 +0200
Subject: [PATCH 154/163] Add new database version to the index file.

---
 backend/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index ae73fa8ac..6a2ebba87 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0047-messages_tables',
+  DB_VERSION: '0048-add_is_moderator_to_contribution_messages',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info

From 73db7707ce180822b5f9a0f81518f5be3d0f8667 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 6 Sep 2022 14:39:44 +0200
Subject: [PATCH 155/163] Remove nullable from graphql Field isModerator.

---
 backend/src/graphql/model/ContributionMessage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 478afe024..d757db136 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -40,7 +40,7 @@ export class ContributionMessage {
   @Field(() => Number, { nullable: true })
   userId: number | null
 
-  @Field(() => Boolean, { nullable: true })
+  @Field(() => Boolean)
   isModerator: boolean
 }
 @ObjectType()

From 0fb1dcdb3e6a080af8810239ab170f1e36086a3e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 7 Sep 2022 10:34:09 +0200
Subject: [PATCH 156/163] Moved klicktipp.ts to src/util

---
 backend/package.json                | 2 +-
 backend/src/{ => util}/klicktipp.ts | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename backend/src/{ => util}/klicktipp.ts (100%)

diff --git a/backend/package.json b/backend/package.json
index e1af5c0ed..858aa1328 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
     "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
-    "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/klicktipp.ts"
+    "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
diff --git a/backend/src/klicktipp.ts b/backend/src/util/klicktipp.ts
similarity index 100%
rename from backend/src/klicktipp.ts
rename to backend/src/util/klicktipp.ts

From e50b80997bcfc833e2bc3167af01d770c80e7340 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 7 Sep 2022 10:38:34 +0200
Subject: [PATCH 157/163] Fix imports.

---
 backend/src/graphql/resolver/KlicktippResolver.ts | 2 --
 backend/src/util/klicktipp.ts                     | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index 07b872c43..ce9a097e2 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -7,8 +7,6 @@ import {
 } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
 import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
-import { User } from '@entity/User'
-import { backendLogger } from '@/server/logger'
 
 @Resolver()
 export class KlicktippResolver {
diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
index 3139cd296..42ed1ea3e 100644
--- a/backend/src/util/klicktipp.ts
+++ b/backend/src/util/klicktipp.ts
@@ -1,7 +1,6 @@
 import connection from '@/typeorm/connection'
-import { getKlickTippUser } from './apis/KlicktippController'
-import { User } from '../../database/entity/User'
-import { getConnection } from '@dbTools/typeorm'
+import { getKlickTippUser } from '@/apis/KlicktippController'
+import { User } from '@entity/User'
 
 export async function retrieveNotRegisteredEmails(): Promise<string[]> {
   const con = await connection()

From ed0900b735b19dcc0235e85c244155626acfc4a1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 7 Sep 2022 11:34:08 +0200
Subject: [PATCH 158/163] Add lint command to ignore console.log statement.

---
 backend/src/util/klicktipp.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
index 42ed1ea3e..c8f83acc3 100644
--- a/backend/src/util/klicktipp.ts
+++ b/backend/src/util/klicktipp.ts
@@ -20,6 +20,7 @@ export async function retrieveNotRegisteredEmails(): Promise<string[]> {
     }
   }
   await con.close()
+  // eslint-disable-next-line no-console
   console.log('User die nicht bei KlickTipp vorhanden sind: ', notRegisteredUser)
   return notRegisteredUser
 }

From 1efee2bbd72ef46c8542ec4a34042fc0e67f358e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 7 Sep 2022 12:14:05 +0200
Subject: [PATCH 159/163] Call isModerator for messages so we can switch the
 messages & Remove computed isModerator and use message.isModerator to switch.

---
 .../slots/ContributionMessagesListItem.vue                 | 7 +------
 admin/src/graphql/listContributionMessages.js              | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 7ee0134ac..fa5bdd940 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-moderator v-if="isModerator" :message="message"></is-moderator>
+    <is-moderator v-if="message.isModerator" :message="message"></is-moderator>
     <is-not-moderator v-else :message="message"></is-not-moderator>
   </div>
 </template>
@@ -23,10 +23,5 @@ export default {
       },
     },
   },
-  computed: {
-    isModerator() {
-      return this.$store.state.moderator.id === this.message.userId
-    },
-  },
 }
 </script>
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index 2ae5943fa..c3ffdb0b9 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -18,6 +18,7 @@ export const listContributionMessages = gql`
         userFirstName
         userLastName
         userId
+        isModerator
       }
     }
   }

From 35f05d2f9c7a5939c459332183520cceb3bd2b48 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 8 Sep 2022 18:32:49 +0200
Subject: [PATCH 160/163] messages show if Confirmed

---
 .../src/components/Contributions/ContributionListItem.vue    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 25aa00468..d147965f6 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -27,10 +27,7 @@
             </span>
           </div>
           <div class="mr-2">{{ memo }}</div>
-          <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !firstName"
-            class="d-flex flex-row-reverse"
-          >
+          <div class="d-flex flex-row-reverse">
             <div
               v-if="!['CONFIRMED', 'DELETED'].includes(state)"
               class="pointer ml-5"

From 78a20ac9ba43e9faf26340a601141c88a6414ec6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 8 Sep 2022 18:52:16 +0200
Subject: [PATCH 161/163] text in messages smaller

---
 .../ContributionMessages/ContributionMessagesFormular.vue   | 2 +-
 .../components/ContributionMessages/slots/IsModerator.vue   | 2 +-
 .../ContributionMessages/slots/IsNotModerator.vue           | 6 ++----
 .../ContributionMessages/ContributionMessagesList.vue       | 1 -
 .../components/ContributionMessages/slots/IsModerator.vue   | 2 +-
 .../ContributionMessages/slots/IsNotModerator.vue           | 6 ++----
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 15fc4f78d..1582bd542 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-formular">
-    <div>
+    <div class="mt-5">
       <b-form @submit.prevent="onSubmit" @reset.prevent="onReset">
         <b-form-textarea
           id="textarea"
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index 37db5402e..0224e042f 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -5,7 +5,7 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2 text-bold h4">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8828fe5b0..64946c557 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,11 +2,9 @@
   <div class="slot-is-not-moderator">
     <div>
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">
-        {{ message.userFirstName }} {{ message.userLastName }}
-      </span>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2 text-bold h4">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 6530a5a53..5f1c03b22 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -7,7 +7,6 @@
     </b-container>
     <contribution-messages-formular
       v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
-      class="mt-5"
       :contributionId="contributionId"
       @get-list-contribution-messages="getListContributionMessages"
       @update-state="updateState"
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 2c7e20793..343b92d97 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -4,7 +4,7 @@
     <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
     <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
     <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    <div class="mt-2 h3">{{ message.message }}</div>
+    <div class="mt-2">{{ message.message }}</div>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 0f67f8bfc..8efca7270 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,11 +2,9 @@
   <div class="slot-is-not-moderator">
     <div class="text-right">
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">
-        {{ message.userFirstName }} {{ message.userLastName }}
-      </span>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2 h3">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>

From 6c39fe93623f0624c64c2c7d9098e18ba7dc643e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 9 Sep 2022 14:40:15 +0200
Subject: [PATCH 162/163] if message empty else disabled button

---
 .../ContributionMessagesFormular.vue                 | 12 +++++++++++-
 .../ContributionMessagesFormular.vue                 | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 1582bd542..a0e790abe 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -14,7 +14,9 @@
             <b-button type="reset" variant="danger">{{ $t('form.cancel') }}</b-button>
           </b-col>
           <b-col class="text-right">
-            <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+            <b-button type="submit" variant="primary" :disabled="disabled">
+              {{ $t('form.submit') }}
+            </b-button>
           </b-col>
         </b-row>
       </b-form>
@@ -63,5 +65,13 @@ export default {
       this.form.text = ''
     },
   },
+  computed: {
+    disabled() {
+      if (this.form.text !== '') {
+        return false
+      }
+      return true
+    },
+  },
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 52240afa0..e3f9fd5e7 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -14,7 +14,9 @@
             <b-button type="reset" variant="danger">{{ $t('form.cancel') }}</b-button>
           </b-col>
           <b-col class="text-right">
-            <b-button type="submit" variant="primary">{{ $t('form.reply') }}</b-button>
+            <b-button type="submit" variant="primary" :disabled="disabled">
+              {{ $t('form.reply') }}
+            </b-button>
           </b-col>
         </b-row>
       </b-form>
@@ -63,5 +65,13 @@ export default {
       this.form.text = ''
     },
   },
+  computed: {
+    disabled() {
+      if (this.form.text !== '') {
+        return false
+      }
+      return true
+    },
+  },
 }
 </script>

From 39d7de3d4be59a94c4dde2a0739d24a000cded3e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 12 Sep 2022 10:47:07 +0200
Subject: [PATCH 163/163] release: v1.12.0

---
 CHANGELOG.md          | 41 +++++++++++++++++++++++++++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63b0c2c90..352286e45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,49 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.12.0](https://github.com/gradido/gradido/compare/1.11.0...1.12.0)
+
+- if message empty else disabled button [`#2189`](https://github.com/gradido/gradido/pull/2189)
+- messages show if Confirmed [`#2185`](https://github.com/gradido/gradido/pull/2185)
+- text in messages smaller [`#2186`](https://github.com/gradido/gradido/pull/2186)
+- feat: 🍰 Klicktipp retrieve not registered email [`#2181`](https://github.com/gradido/gradido/pull/2181)
+- fix: 🍰 isModerator on messages to switch the messages side in the messages overview [`#2182`](https://github.com/gradido/gradido/pull/2182)
+- Refactor locales for Nederlands [`#2174`](https://github.com/gradido/gradido/pull/2174)
+- Add is moderator to contribution message [`#2180`](https://github.com/gradido/gradido/pull/2180)
+- feat: 🍰 Moderator Cannot Answer Himself [`#2178`](https://github.com/gradido/gradido/pull/2178)
+- refactor: Improve Statistics Query [`#2170`](https://github.com/gradido/gradido/pull/2170)
+- fix: Remove Statistics from Wallet [`#2171`](https://github.com/gradido/gradido/pull/2171)
+- feat: 🍰 Contribution Messages In Frontend [`#2164`](https://github.com/gradido/gradido/pull/2164)
+- feat: 🚀 CRUD For Contribution Messages [`#2149`](https://github.com/gradido/gradido/pull/2149)
+- fix: 🍰 Decay Calculation In Community Statistics [`#2167`](https://github.com/gradido/gradido/pull/2167)
+- chore: 🍰 Remove Fetch Policy Network Only From Statistics [`#2159`](https://github.com/gradido/gradido/pull/2159)
+- feat: 🍰 Remove Some Statistics Data From Frontend [`#2153`](https://github.com/gradido/gradido/pull/2153)
+- feat: 🍰 Add Toogle Collaps On Language Name [`#2156`](https://github.com/gradido/gradido/pull/2156)
+- 2145 corrections style for frontend [`#2147`](https://github.com/gradido/gradido/pull/2147)
+- 2072 feature usecase contribution messaging [`#2073`](https://github.com/gradido/gradido/pull/2073)
+- 2151 add hint to redeem link [`#2158`](https://github.com/gradido/gradido/pull/2158)
+- 🍰 Create `contribution messages` table [`#2137`](https://github.com/gradido/gradido/pull/2137)
+- feat: 🍰 Add The Languages French And Dutch [`#2138`](https://github.com/gradido/gradido/pull/2138)
+- 1973 list open contribution links in the wallet [`#1975`](https://github.com/gradido/gradido/pull/1975)
+- feat: 🍰 Admin Interface Displays Statistics [`#2124`](https://github.com/gradido/gradido/pull/2124)
+- feat: Statistics Resolver [`#2041`](https://github.com/gradido/gradido/pull/2041)
+- 2116 retrieve admin and moderators [`#2127`](https://github.com/gradido/gradido/pull/2127)
+- 2125 feature gradido id: new column gradidoid in users table [`#2126`](https://github.com/gradido/gradido/pull/2126)
+- 2119 new menu item gdt [`#2120`](https://github.com/gradido/gradido/pull/2120)
+- feat: Migrate Contributions Table [`#2136`](https://github.com/gradido/gradido/pull/2136)
+- chore: 🍰 Refactor Contribution Form Logic And Write Tests [`#2092`](https://github.com/gradido/gradido/pull/2092)
+- fix: 🍰 Add `emailChecked` Before Changing `optIn` State & Log Error On klicktipp Middleware [`#2107`](https://github.com/gradido/gradido/pull/2107)
+- Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER [`#2123`](https://github.com/gradido/gradido/pull/2123)
+- 2121 translate locales to spanish [`#2122`](https://github.com/gradido/gradido/pull/2122)
+- add formatter on input amount replace point and comma [`#2115`](https://github.com/gradido/gradido/pull/2115)
+- remove required from form.memo [`#2114`](https://github.com/gradido/gradido/pull/2114)
+- Fix pagination ellipsis [`#2104`](https://github.com/gradido/gradido/pull/2104)
+
 #### [1.11.0](https://github.com/gradido/gradido/compare/1.10.1...1.11.0)
 
+> 28 July 2022
+
+- release: Version 1.11.0 [`#2103`](https://github.com/gradido/gradido/pull/2103)
 - Fix navbar community item [`#2102`](https://github.com/gradido/gradido/pull/2102)
 - Add validation date info to copied text after transaction link creation [`#2101`](https://github.com/gradido/gradido/pull/2101)
 - Remove member area from menu (desktop and mobile), when user has no elopage account [`#2099`](https://github.com/gradido/gradido/pull/2099)
diff --git a/admin/package.json b/admin/package.json
index 9879064de..f31b43bbd 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 858aa1328..b826183b6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
diff --git a/database/package.json b/database/package.json
index 837e61438..40e5d0294 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 8121e2ca2..b3832b080 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 2bba1b52c..519c1b59c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",