From 641d2d4cc24f5276f3f1ccf3b8e6d2b79f67d625 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 09:58:41 +0200
Subject: [PATCH 01/54] creation date better represented

---
 .../components/CreationTransactionList.vue    | 23 ++++++++++++-------
 admin/src/locales/de.json                     | 15 +++++++++---
 admin/src/locales/en.json                     | 14 ++++++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ec5c12aa4..ba0c7be6a 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -2,6 +2,13 @@
   <div class="component-creation-transaction-list">
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
+    <div>
+      <b-button v-b-toggle.collapse-1 variant="light" size="sm">Hilfe</b-button>
+      <b-collapse id="collapse-1" class="mt-2">
+        <div>{{ $t('transactionlist.submitted') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.submitted') }}</div>
+        <div>{{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.confirmed') }}</div>
+      </b-collapse>
+    </div>
   </div>
 </template>
 <script>
@@ -16,7 +23,14 @@ export default {
       fields: [
         {
           key: 'creationDate',
-          label: this.$t('transactionlist.date'),
+          label: this.$t('transactionlist.submitted'),
+          formatter: (value, key, item) => {
+            return this.$d(new Date(value))
+          },
+        },
+        {
+          key: 'balanceDate',
+          label: this.$t('transactionlist.confirmed'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
@@ -36,13 +50,6 @@ export default {
           },
         },
         { key: 'memo', label: this.$t('transactionlist.memo') },
-        {
-          key: 'balanceDate',
-          label: this.$t('transactionlist.balanceDate'),
-          formatter: (value, key, item) => {
-            return this.$d(new Date(value))
-          },
-        },
       ],
       items: [],
     }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c977a613e..043a16e61 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -74,13 +74,21 @@
     "submit": "Senden"
   },
   "GDD": "GDD",
+  "help": {
+    "help":"Hilfe",
+    "transactionlist": {
+      "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
+      "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
+    }
+  },
   "hide_details": "Details verbergen",
   "lastname": "Nachname",
   "math": {
     "colon": ":",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+"
+    "plus": "+",
+    "equals":"="
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
@@ -133,9 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "balanceDate": "Schöpfungsdatum",
+    "confirmed": "Bestätigt",
+    "confirmed": "Bestätigt",
     "community": "Gemeinschaft",
-    "date": "Datum",
+    "submitted": "Eingereicht",
     "memo": "Nachricht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e99305e08..fd8ca69d3 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -74,13 +74,21 @@
     "submit": "Send"
   },
   "GDD": "GDD",
+  "help": {
+    "help":"Help",
+    "transactionlist": {
+      "confirmed": "When was it confirmed by a moderator / admin.",
+      "submitted": "For which period was submitted by the user."
+    }
+  },
   "hide_details": "Hide details",
   "lastname": "Lastname",
   "math": {
     "colon": ":",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+"
+    "plus": "+",
+    "equals":"="
   },
   "message": {
     "request": "Request has been sent."
@@ -133,9 +141,9 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "balanceDate": "Creation date",
+    "confirmed": "Confirmed",
     "community": "Community",
-    "date": "Date",
+    "submitted": "Submitted",
     "memo": "Message",
     "title": "All creation-transactions for the user"
   },

From 420296ca94339324df5192895578920810d38107 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 09:59:44 +0200
Subject: [PATCH 02/54] fix lint

---
 admin/src/components/CreationTransactionList.vue | 12 +++++++++---
 admin/src/locales/de.json                        |  4 ++--
 admin/src/locales/en.json                        |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ba0c7be6a..ed0b911a5 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -3,10 +3,16 @@
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
     <div>
-      <b-button v-b-toggle.collapse-1 variant="light" size="sm">Hilfe</b-button>
+      <b-button v-b-toggle.collapse-1 variant="light" size="sm">{{ $t('help.help') }}</b-button>
       <b-collapse id="collapse-1" class="mt-2">
-        <div>{{ $t('transactionlist.submitted') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.submitted') }}</div>
-        <div>{{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.confirmed') }}</div>
+        <div>
+          {{ $t('transactionlist.submitted') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.submitted') }}
+        </div>
+        <div>
+          {{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.confirmed') }}
+        </div>
       </b-collapse>
     </div>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 043a16e61..c68cf4e2d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -75,7 +75,7 @@
   },
   "GDD": "GDD",
   "help": {
-    "help":"Hilfe",
+    "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
       "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
@@ -88,7 +88,7 @@
     "exclaim": "!",
     "pipe": "|",
     "plus": "+",
-    "equals":"="
+    "equals": "="
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index fd8ca69d3..6d3a7e1f8 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -75,7 +75,7 @@
   },
   "GDD": "GDD",
   "help": {
-    "help":"Help",
+    "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "submitted": "For which period was submitted by the user."
@@ -88,7 +88,7 @@
     "exclaim": "!",
     "pipe": "|",
     "plus": "+",
-    "equals":"="
+    "equals": "="
   },
   "message": {
     "request": "Request has been sent."

From db2415e6171faf795c52176dcde66e09dd7aff12 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 10:22:19 +0200
Subject: [PATCH 03/54] fix locales

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c68cf4e2d..b688e95fc 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -85,10 +85,10 @@
   "lastname": "Nachname",
   "math": {
     "colon": ":",
+    "equals": "=",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+",
-    "equals": "="
+    "plus": "+"
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
@@ -141,11 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "confirmed": "Bestätigt",
-    "confirmed": "Bestätigt",
     "community": "Gemeinschaft",
-    "submitted": "Eingereicht",
+    "confirmed": "Bestätigt",
     "memo": "Nachricht",
+    "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
   "undelete_user": "Nutzer wiederherstellen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 6d3a7e1f8..7267fbeec 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -85,10 +85,10 @@
   "lastname": "Lastname",
   "math": {
     "colon": ":",
+    "equals": "=",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+",
-    "equals": "="
+    "plus": "+"
   },
   "message": {
     "request": "Request has been sent."
@@ -141,10 +141,10 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "confirmed": "Confirmed",
     "community": "Community",
-    "submitted": "Submitted",
+    "confirmed": "Confirmed",
     "memo": "Message",
+    "submitted": "Submitted",
     "title": "All creation-transactions for the user"
   },
   "undelete_user": "Undelete User",

From bc474e79ff5754ede0ea0c6e2b10d741049555e8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 12:03:11 +0200
Subject: [PATCH 04/54] delete contribution link and update contribution list

---
 admin/src/components/ContributionLink.vue     |  9 +++-
 admin/src/components/ContributionLinkForm.vue |  3 +-
 admin/src/components/ContributionLinkList.vue | 46 ++++++++++---------
 admin/src/locales/de.json                     |  2 +-
 admin/src/locales/en.json                     |  2 +-
 admin/src/pages/Overview.vue                  |  6 ++-
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink.vue
index 893e202f4..91c8ce95b 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink.vue
@@ -15,7 +15,10 @@
       <b-collapse v-model="visible" id="newContribution" class="mt-2">
         <b-card>
           <p class="h2 ml-5">{{ $t('contributionLink.contributionLinks') }}</p>
-          <contribution-link-form :contributionLinkData="contributionLinkData" />
+          <contribution-link-form
+            :contributionLinkData="contributionLinkData"
+            @get-contribution-links="getContributionLinks"
+          />
         </b-card>
       </b-collapse>
 
@@ -24,6 +27,7 @@
           v-if="count > 0"
           :items="items"
           @editContributionLinkData="editContributionLinkData"
+          @get-contribution-links="getContributionLinks"
         />
         <div v-else>{{ $t('contributionLink.noContributionLinks') }}</div>
       </b-card-text>
@@ -61,6 +65,9 @@ export default {
       if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
       this.contributionLinkData = data
     },
+    getContributionLinks() {
+      this.$emit('get-contribution-links')
+    },
   },
 }
 </script>
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue
index a159d33d3..6daf1e299 100644
--- a/admin/src/components/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLinkForm.vue
@@ -163,7 +163,6 @@ export default {
       if (this.form.validFrom === null)
         return this.toastError(this.$t('contributionLink.noStartDate'))
       if (this.form.validTo === null) return this.toastError(this.$t('contributionLink.noEndDate'))
-      // alert(JSON.stringify(this.form))
       this.$apollo
         .mutate({
           mutation: createContributionLink,
@@ -182,6 +181,8 @@ export default {
           this.link = result.data.createContributionLink.link
           this.toastSuccess(this.link)
           this.onReset()
+          this.$root.$emit('bv::toggle::collapse', 'newContribution')
+          this.$emit('get-contribution-links')
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 518d7d57e..18c136199 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="contribution-link-list">
     <b-table striped hover :items="items" :fields="fields">
-      <template #cell(delete)>
+      <template #cell(delete)="data">
         <b-button
           variant="danger"
           size="md"
           class="mr-2 test-delete-link"
-          @click="deleteContributionLink"
+          @click="deleteContributionLink(data.item.id, data.item.name)"
         >
           <b-icon icon="trash" variant="light"></b-icon>
         </b-button>
@@ -34,7 +34,7 @@
           <h6 class="mb-0">{{ modalData ? modalData.name : '' }}</h6>
         </template>
         <b-card-text>
-          {{ modalData }}
+          {{ modalData.memo ? modalData.memo : '' }}
           <figure-qr-code :link="modalData ? modalData.link : ''" />
         </b-card-text>
         <template #footer>
@@ -70,28 +70,30 @@ export default {
         'edit',
         'show',
       ],
-      modalData: null,
-      modalDataLink: null,
+      modalData: {},
     }
   },
   methods: {
-    deleteContributionLink() {
-      this.$bvModal.msgBoxConfirm(this.$t('contributionLink.deleteNow')).then(async (value) => {
-        if (value)
-          await this.$apollo
-            .mutate({
-              mutation: deleteContributionLink,
-              variables: {
-                id: this.id,
-              },
-            })
-            .then(() => {
-              this.toastSuccess('TODO: request message deleted ')
-            })
-            .catch((err) => {
-              this.toastError(err.message)
-            })
-      })
+    deleteContributionLink(id, name) {
+      this.$bvModal
+        .msgBoxConfirm(this.$t('contributionLink.deleteNow', { name: name }))
+        .then(async (value) => {
+          if (value)
+            await this.$apollo
+              .mutate({
+                mutation: deleteContributionLink,
+                variables: {
+                  id: id,
+                },
+              })
+              .then(() => {
+                this.toastSuccess('TODO: request message deleted ')
+                this.$emit('get-contribution-links')
+              })
+              .catch((err) => {
+                this.toastError(err.message)
+              })
+        })
     },
     editContributionLink(row) {
       this.$emit('editContributionLinkData', row)
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c977a613e..6b50d328d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
-    "deleteNow": "Automatische Creations wirklich löschen?",
+    "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e99305e08..2474b6cd2 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
-    "deleteNow": "Do you really delete automatic creations?",
+    "deleteNow": "Do you really delete automatic creations '{name}'?",
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 4c4ba47fa..cfa247b8e 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,7 +28,11 @@
         </b-link>
       </b-card-text>
     </b-card>
-    <contribution-link :items="items" :count="count" />
+    <contribution-link
+      :items="items"
+      :count="count"
+      @get-contribution-links="getContributionLinks"
+    />
     <community-statistic class="mt-5" v-model="statistics" />
   </div>
 </template>

From fbc9c6aa29683fe34fc3ac8fb588d9a5120b7b4f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 12:41:30 +0200
Subject: [PATCH 05/54] delete unused file graphql/showContributionLink.js

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

diff --git a/admin/src/graphql/showContributionLink.js b/admin/src/graphql/showContributionLink.js
deleted file mode 100644
index 8042db6b5..000000000
--- a/admin/src/graphql/showContributionLink.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import gql from 'graphql-tag'
-
-export const showContributionLink = gql`
-  query ($id: Int!) {
-    showContributionLink {
-      id
-      validFrom
-      validTo
-      name
-      memo
-      amount
-      cycle
-      maxPerCycle
-      maxAmountPerMonth
-      code
-    }
-  }
-`

From 6c88713f3430e9a406c478fe9738d3793533a8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Tue, 20 Sep 2022 16:20:52 +0200
Subject: [PATCH 06/54] start inserting logger.addContext for userid

---
 backend/src/graphql/resolver/UserResolver.ts | 6 +++++-
 backend/src/server/createServer.ts           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index f2fd048fc..e642117df 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -277,6 +277,8 @@ export class UserResolver {
       logger.error(`User with email=${email} does not exist`)
       throw new Error('No user with this credentials')
     })
+    logger.addContext('user', dbUser.id)
+    logger.info(`validation of user still ongoing...`)
     if (dbUser.deletedAt) {
       logger.error('The User was permanently deleted in database.')
       throw new Error('This user was permanently deleted. Contact support for questions.')
@@ -303,7 +305,7 @@ export class UserResolver {
     }
     // add pubKey in logger-context for layout-pattern X{user} to print it in each logging message
     logger.addContext('user', dbUser.id)
-    logger.debug('login credentials valid...')
+    logger.debug('validation of login credentials successful...')
 
     const user = new User(dbUser, await getUserCreation(dbUser.id))
     logger.debug('user=' + user)
@@ -348,6 +350,7 @@ export class UserResolver {
     @Args()
     { email, firstName, lastName, language, publisherId, redeemCode = null }: CreateUserArgs,
   ): Promise<User> {
+    logger.addContext('user', 'unknown')
     logger.info(
       `createUser(email=${email}, firstName=${firstName}, lastName=${lastName}, language=${language}, publisherId=${publisherId}, redeemCode =${redeemCode})`,
     )
@@ -483,6 +486,7 @@ export class UserResolver {
       }
 
       await queryRunner.commitTransaction()
+      logger.addContext('user', dbUser.id)
     } catch (e) {
       logger.error(`error during create user with ${e}`)
       await queryRunner.rollbackTransaction()
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index a0b294281..62ea93bf0 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -35,6 +35,7 @@ const createServer = async (
   context: any = serverContext,
   logger: Logger = apolloLogger,
 ): Promise<ServerDef> => {
+  logger.addContext('user', 'unknown')
   logger.debug('createServer...')
 
   // open mysql connection

From 542b069aa90b5b54cc237b8d906118350694651c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Wed, 21 Sep 2022 04:12:48 +0200
Subject: [PATCH 07/54] reconfig now with rollover feature and userid in
 logevent-message

---
 backend/log4js-config.json | 57 +++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/backend/log4js-config.json b/backend/log4js-config.json
index 848a4fa79..a096713ec 100644
--- a/backend/log4js-config.json
+++ b/backend/log4js-config.json
@@ -5,41 +5,66 @@
     {
       "type": "dateFile",
       "filename": "../logs/backend/access.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "apollo": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/apollo.log",
-      "pattern": "%d{ISO8601} %p %c %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "backend": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/backend.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "klicktipp": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/klicktipp.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "errorFile": 
     {
       "type": "dateFile",
       "filename": "../logs/backend/errors.log",
-      "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
+      "pattern": "yyyy-MM-dd",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+      },
       "keepFileExt" : true,
-      "fileNameSep" : "_" 
+      "fileNameSep" : "_",
+      "numBackups" : 30
     },
     "errors": 
     {
@@ -52,7 +77,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
       }
     },
     "apolloOut": 
@@ -60,7 +85,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
       }
     }    
   },
@@ -74,7 +99,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": true
+      "enableCallStack": false
     },
     "apollo":
     {
@@ -85,7 +110,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": true
+      "enableCallStack": false
     },
     "backend":
     {
@@ -96,7 +121,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": true
+      "enableCallStack": false
     },
     "klicktipp":
     {
@@ -107,7 +132,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": true
+      "enableCallStack": false
     },
     "http": 
     {

From 5aa499a07389fffa200f0cd2448e3e4fb7ad346d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:31:19 +0200
Subject: [PATCH 08/54] Change the result for the FE so that we get datas from
 the contribution table instead of the transaction table.

---
 backend/src/graphql/model/Contribution.ts     |  2 +-
 backend/src/graphql/resolver/AdminResolver.ts | 53 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 1f690a3d8..cf57e632f 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -5,7 +5,7 @@ import { User } from '@entity/User'
 
 @ObjectType()
 export class Contribution {
-  constructor(contribution: dbContribution, user: User) {
+  constructor(contribution: dbContribution, user?: User | null) {
     this.id = contribution.id
     this.firstName = user ? user.firstName : null
     this.lastName = user ? user.lastName : null
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index d71ffc72c..d5293dcce 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -17,6 +17,7 @@ import { AdminCreateContributions } from '@model/AdminCreateContributions'
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkList } from '@model/ContributionLinkList'
+import { Contribution } from '@model/Contribution'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { UserRepository } from '@repository/User'
 import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
@@ -30,7 +31,7 @@ import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
-import { Contribution } from '@entity/Contribution'
+import { Contribution as DbContribution } from '@entity/Contribution'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User as dbUser } from '@entity/User'
@@ -68,6 +69,7 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionMessage } from '@model/ContributionMessage'
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail'
+import { ContributionListResult } from '../model/Contribution'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -261,7 +263,7 @@ export class AdminResolver {
     logger.trace('creations', creations)
     const creationDateObj = new Date(creationDate)
     validateContribution(creations, amount, creationDateObj)
-    const contribution = Contribution.create()
+    const contribution = DbContribution.create()
     contribution.userId = user.id
     contribution.amount = amount
     contribution.createdAt = new Date()
@@ -272,7 +274,7 @@ export class AdminResolver {
     contribution.contributionStatus = ContributionStatus.PENDING
 
     logger.trace('contribution to save', contribution)
-    await Contribution.save(contribution)
+    await DbContribution.save(contribution)
     return getUserCreation(user.id)
   }
 
@@ -319,7 +321,7 @@ export class AdminResolver {
 
     const moderator = getUser(context)
 
-    const contributionToUpdate = await Contribution.findOne({
+    const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull() },
     })
 
@@ -349,7 +351,7 @@ export class AdminResolver {
     contributionToUpdate.moderatorId = moderator.id
     contributionToUpdate.contributionStatus = ContributionStatus.PENDING
 
-    await Contribution.save(contributionToUpdate)
+    await DbContribution.save(contributionToUpdate)
     const result = new AdminUpdateContribution()
     result.amount = amount
     result.memo = contributionToUpdate.memo
@@ -366,7 +368,7 @@ export class AdminResolver {
     const contributions = await getConnection()
       .createQueryBuilder()
       .select('c')
-      .from(Contribution, 'c')
+      .from(DbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
       .where({ confirmedAt: IsNull() })
       .getMany()
@@ -394,7 +396,7 @@ export class AdminResolver {
   @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION])
   @Mutation(() => Boolean)
   async adminDeleteContribution(@Arg('id', () => Int) id: number): Promise<boolean> {
-    const contribution = await Contribution.findOne(id)
+    const contribution = await DbContribution.findOne(id)
     if (!contribution) {
       throw new Error('Contribution not found for given id.')
     }
@@ -410,7 +412,7 @@ export class AdminResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const contribution = await Contribution.findOne(id)
+    const contribution = await DbContribution.findOne(id)
     if (!contribution) {
       throw new Error('Contribution not found to given id.')
     }
@@ -468,7 +470,7 @@ export class AdminResolver {
       contribution.confirmedBy = moderatorUser.id
       contribution.transactionId = transaction.id
       contribution.contributionStatus = ContributionStatus.CONFIRMED
-      await queryRunner.manager.update(Contribution, { id: contribution.id }, contribution)
+      await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
 
       await queryRunner.commitTransaction()
       logger.info('creation commited successfuly.')
@@ -493,24 +495,29 @@ export class AdminResolver {
   }
 
   @Authorized([RIGHTS.CREATION_TRANSACTION_LIST])
-  @Query(() => [Transaction])
+  @Query(() => ContributionListResult)
   async creationTransactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
     @Arg('userId', () => Int) userId: number,
-  ): Promise<Transaction[]> {
+  ): Promise<ContributionListResult> {
     const offset = (currentPage - 1) * pageSize
-    const transactionRepository = getCustomRepository(TransactionRepository)
-    const [userTransactions] = await transactionRepository.findByUserPaged(
-      userId,
-      pageSize,
-      offset,
-      order,
-      true,
-    )
+    const [contributionResult, count] = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(DbContribution, 'c')
+      .leftJoinAndSelect('c.user', 'u')
+      .where(`user_id = ${userId}`)
+      .limit(pageSize)
+      .offset(offset)
+      .orderBy('c.created_at', order)
+      .getManyAndCount()
 
-    const user = await dbUser.findOneOrFail({ id: userId })
-    return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
+    return new ContributionListResult(
+      count,
+      contributionResult.map((contribution) => new Contribution(contribution, contribution.user)),
+    )
+    // return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
   }
 
   @Authorized([RIGHTS.SEND_ACTIVATION_EMAIL])
@@ -725,7 +732,7 @@ export class AdminResolver {
     await queryRunner.startTransaction('READ UNCOMMITTED')
     const contributionMessage = DbContributionMessage.create()
     try {
-      const contribution = await Contribution.findOne({
+      const contribution = await DbContribution.findOne({
         where: { id: contributionId },
         relations: ['user'],
       })
@@ -749,7 +756,7 @@ export class AdminResolver {
         contribution.contributionStatus === ContributionStatus.PENDING
       ) {
         contribution.contributionStatus = ContributionStatus.IN_PROGRESS
-        await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
+        await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution)
       }
       await queryRunner.commitTransaction()
 

From 8989b6f50ed4314d5bb7b39c5e8494c696095b45 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:33:32 +0200
Subject: [PATCH 09/54] Change query of the creationTransactionList, add new
 parameters to CreationTransactionList and add translations.

---
 .../components/CreationTransactionList.vue    | 30 ++++++++++++-------
 admin/src/graphql/creationTransactionList.js  | 17 ++++++-----
 admin/src/locales/de.json                     |  2 ++
 admin/src/locales/en.json                     |  2 ++
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ed0b911a5..8bf27c275 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -28,19 +28,34 @@ export default {
     return {
       fields: [
         {
-          key: 'creationDate',
+          key: 'createdAt',
           label: this.$t('transactionlist.submitted'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
         },
         {
-          key: 'balanceDate',
-          label: this.$t('transactionlist.confirmed'),
+          key: 'contributionDate',
+          label: this.$t('transactionlist.period'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
         },
+        {
+          key: 'confirmedAt',
+          label: this.$t('transactionlist.confirmed'),
+          formatter: (value, key, item) => {
+            if (value) {
+              return this.$d(new Date(value))
+            } else {
+              return null
+            }
+          },
+        },
+        {
+          key: 'state',
+          label: this.$t('transactionlist.state'),
+        },
         {
           key: 'amount',
           label: this.$t('transactionlist.amount'),
@@ -48,13 +63,6 @@ export default {
             return `${value} GDD`
           },
         },
-        {
-          key: 'linkedUser',
-          label: this.$t('transactionlist.community'),
-          formatter: (value, key, item) => {
-            return `${value.firstName} ${value.lastName}`
-          },
-        },
         { key: 'memo', label: this.$t('transactionlist.memo') },
       ],
       items: [],
@@ -73,7 +81,7 @@ export default {
           },
         })
         .then((result) => {
-          this.items = result.data.creationTransactionList
+          this.items = result.data.creationTransactionList.contributionList
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/graphql/creationTransactionList.js b/admin/src/graphql/creationTransactionList.js
index 327221814..fc3a80b18 100644
--- a/admin/src/graphql/creationTransactionList.js
+++ b/admin/src/graphql/creationTransactionList.js
@@ -8,14 +8,15 @@ export const creationTransactionList = gql`
       order: $order
       userId: $userId
     ) {
-      id
-      amount
-      balanceDate
-      creationDate
-      memo
-      linkedUser {
-        firstName
-        lastName
+      contributionCount
+      contributionList {
+        id
+        amount
+        createdAt
+        confirmedAt
+        contributionDate
+        memo
+        state
       }
     }
   }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b688e95fc..8c5c3b40f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -144,6 +144,8 @@
     "community": "Gemeinschaft",
     "confirmed": "Bestätigt",
     "memo": "Nachricht",
+    "period": "Zeitraum",
+    "state": "Status",  
     "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 7267fbeec..0b428fa20 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -144,6 +144,8 @@
     "community": "Community",
     "confirmed": "Confirmed",
     "memo": "Message",
+    "period": "Period",
+    "state": "State",
     "submitted": "Submitted",
     "title": "All creation-transactions for the user"
   },

From 00d0068efcdf458eefb33ca2ec2c6df019922e85 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:44:42 +0200
Subject: [PATCH 10/54] Remove unused imports.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index d5293dcce..49b02a605 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -26,10 +26,8 @@ import SearchUsersArgs from '@arg/SearchUsersArgs'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { Transaction } from '@model/Transaction'
 import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
@@ -44,7 +42,6 @@ import { Decay } from '@model/Decay'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
-import { communityUser } from '@/util/communityUser'
 import { checkOptInCode, activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'

From a3a565ff01914781259e1ead4f250feaa2980ab5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:46:56 +0200
Subject: [PATCH 11/54] Removed unused locale key.

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 8c5c3b40f..4f80fde4f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -141,11 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "community": "Gemeinschaft",
     "confirmed": "Bestätigt",
     "memo": "Nachricht",
     "period": "Zeitraum",
-    "state": "Status",  
+    "state": "Status",
     "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0b428fa20..6acf3ae60 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -141,7 +141,6 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "community": "Community",
     "confirmed": "Confirmed",
     "memo": "Message",
     "period": "Period",

From 00ae91177e8f1e7ae2734408fcd0490f416c8577 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:55:37 +0200
Subject: [PATCH 12/54] Change the result of the query in test file.

---
 .../CreationTransactionList.spec.js           | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 3e2d5893e..01a18e325 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -6,30 +6,29 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    creationTransactionList: [
-      {
-        id: 1,
-        amount: 100,
-        balanceDate: 0,
-        creationDate: new Date(),
-        memo: 'Testing',
-        linkedUser: {
-          firstName: 'Gradido',
-          lastName: 'Akademie',
+    creationTransactionList: {
+      contributionCount: 2,
+      contributionList: [
+        {
+          id: 1,
+          amount: 5.8,
+          createdAt: '2022-09-21T11:09:51.000Z',
+          confirmedAt: null,
+          contributionDate: '2022-08-01T00:00:00.000Z',
+          memo: 'für deine Hilfe, Fräulein Rottenmeier',
+          state: 'PENDING',
         },
-      },
-      {
-        id: 2,
-        amount: 200,
-        balanceDate: 0,
-        creationDate: new Date(),
-        memo: 'Testing 2',
-        linkedUser: {
-          firstName: 'Gradido',
-          lastName: 'Akademie',
+        {
+          id: 2,
+          amount: '47',
+          createdAt: '2022-09-21T11:09:28.000Z',
+          confirmedAt: '2022-09-21T11:09:28.000Z',
+          contributionDate: '2022-08-01T00:00:00.000Z',
+          memo: 'für deine Hilfe, Frau Holle',
+          state: 'CONFIRMED',
         },
-      },
-    ],
+      ],
+    },
   },
 })
 

From d9e0a7d480ae0fb7fd8be9f7ca49f0f08eaa7596 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 22 Sep 2022 09:55:45 +0200
Subject: [PATCH 13/54] Update admin/src/locales/de.json

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 6b50d328d..bb010939d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
-    "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
+    "deleteNow": "Automatische Schöpfung '{name}' löschen?",
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",

From c89cb3b0d0bbc6ec8eae84f0443779ee4675c43a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 22 Sep 2022 09:55:53 +0200
Subject: [PATCH 14/54] Update admin/src/locales/en.json

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

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 2474b6cd2..5f82dabe3 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
-    "deleteNow": "Do you really delete automatic creations '{name}'?",
+    "deleteNow": "Delete automatic creations '{name}'?",
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",

From 487bcee1a78a8a9bd30db1e9ba9ec64ea1f7d198 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 22 Sep 2022 10:04:16 +0200
Subject: [PATCH 15/54] Update admin/src/components/ContributionLink.vue

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

diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink.vue
index 91c8ce95b..990ea8abc 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink.vue
@@ -27,7 +27,7 @@
           v-if="count > 0"
           :items="items"
           @editContributionLinkData="editContributionLinkData"
-          @get-contribution-links="getContributionLinks"
+          @get-contribution-links="$emit('get-contribution-links')"
         />
         <div v-else>{{ $t('contributionLink.noContributionLinks') }}</div>
       </b-card-text>

From 738a607f93b64f5beb575c32e17e62510ee1e411 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 22 Sep 2022 10:04:44 +0200
Subject: [PATCH 16/54] Update admin/src/components/ContributionLink.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/ContributionLink.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink.vue
index 990ea8abc..4e1f3dc7e 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink.vue
@@ -65,9 +65,6 @@ export default {
       if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
       this.contributionLinkData = data
     },
-    getContributionLinks() {
-      this.$emit('get-contribution-links')
-    },
   },
 }
 </script>

From 1bcfe14d702d60a8d28dc0063d5321796094c7ba Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:06:19 +0200
Subject: [PATCH 17/54] resolve conflicts

---
 admin/src/components/ContributionLinkList.spec.js | 2 +-
 admin/src/components/ContributionLinkList.vue     | 2 +-
 admin/src/locales/de.json                         | 5 +++++
 admin/src/locales/en.json                         | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionLinkList.spec.js b/admin/src/components/ContributionLinkList.spec.js
index 0b9d131bd..b2baf5e9b 100644
--- a/admin/src/components/ContributionLinkList.spec.js
+++ b/admin/src/components/ContributionLinkList.spec.js
@@ -95,7 +95,7 @@ describe('ContributionLinkList', () => {
         })
 
         it('toasts a success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith('TODO: request message deleted ')
+          expect(toastSuccessSpy).toBeCalledWith('contributionLink.deleted')
         })
       })
 
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 18c136199..48b7ce978 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -87,7 +87,7 @@ export default {
                 },
               })
               .then(() => {
-                this.toastSuccess('TODO: request message deleted ')
+                this.toastSuccess(this.$t('contributionLink.deleted'))
                 this.$emit('get-contribution-links')
               })
               .catch((err) => {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index bb010939d..5bf5163a7 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,7 +7,12 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
+<<<<<<< HEAD
     "deleteNow": "Automatische Schöpfung '{name}' löschen?",
+=======
+    "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
+    "deleted":"Automatische Schöpfung gelöscht!",
+>>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 5f82dabe3..af66de102 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,7 +7,12 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
+<<<<<<< HEAD
     "deleteNow": "Delete automatic creations '{name}'?",
+=======
+    "deleteNow": "Do you really delete automatic creations '{name}'?",
+    "deleted":"Automatic creation deleted!",
+>>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",

From e566ae8394b60533e618984621ae710138f96558 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:07:27 +0200
Subject: [PATCH 18/54] resolve conflicts

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 5bf5163a7..bbe4f8b2d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,12 +7,8 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
-<<<<<<< HEAD
-    "deleteNow": "Automatische Schöpfung '{name}' löschen?",
-=======
     "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
     "deleted":"Automatische Schöpfung gelöscht!",
->>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index af66de102..9a0f21747 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,12 +7,8 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
-<<<<<<< HEAD
-    "deleteNow": "Delete automatic creations '{name}'?",
-=======
     "deleteNow": "Do you really delete automatic creations '{name}'?",
     "deleted":"Automatic creation deleted!",
->>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",

From 8e63c573d76c8906da06b9523dcf7bc5eb947c3a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:08:13 +0200
Subject: [PATCH 19/54] fix locales and lint

---
 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 bbe4f8b2d..55b73bbe3 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,8 +7,8 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
+    "deleted": "Automatische Schöpfung gelöscht!",
     "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
-    "deleted":"Automatische Schöpfung gelöscht!",
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 9a0f21747..a7221c4cb 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,8 +7,8 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
+    "deleted": "Automatic creation deleted!",
     "deleteNow": "Do you really delete automatic creations '{name}'?",
-    "deleted":"Automatic creation deleted!",
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",

From c62f1af0bb15dfe23195868318dc7de908b9564c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:23:49 +0200
Subject: [PATCH 20/54] add pagination for CreationTransactionList.vue

---
 .../components/CreationTransactionList.vue    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 8bf27c275..5f906f1bf 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -3,6 +3,15 @@
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
     <div>
+      <b-pagination
+        pills
+        size="lg"
+        v-model="currentPage"
+        :per-page="perPage"
+        :total-rows="rows"
+        align="center"
+        :hide-ellipsis="true"
+      ></b-pagination>
       <b-button v-b-toggle.collapse-1 variant="light" size="sm">{{ $t('help.help') }}</b-button>
       <b-collapse id="collapse-1" class="mt-2">
         <div>
@@ -26,6 +35,10 @@ export default {
   },
   data() {
     return {
+      items: [],
+      rows: 0,
+      currentPage: 1,
+      perPage: 25,
       fields: [
         {
           key: 'createdAt',
@@ -65,7 +78,6 @@ export default {
         },
         { key: 'memo', label: this.$t('transactionlist.memo') },
       ],
-      items: [],
     }
   },
   methods: {
@@ -74,13 +86,14 @@ export default {
         .query({
           query: creationTransactionList,
           variables: {
-            currentPage: 1,
-            pageSize: 25,
+            currentPage: this.currentPage,
+            pageSize: this.perPage,
             order: 'DESC',
             userId: parseInt(this.userId),
           },
         })
         .then((result) => {
+          this.rows = result.data.creationTransactionList.contributionCount
           this.items = result.data.creationTransactionList.contributionList
         })
         .catch((error) => {
@@ -91,5 +104,10 @@ export default {
   created() {
     this.getTransactions()
   },
+  watch: {
+    currentPage() {
+      this.getTransactions()
+    },
+  },
 }
 </script>

From 1c2df858f78df042583c3d0dd62f99c76b141460 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:40:25 +0200
Subject: [PATCH 21/54] help text

---
 .../slots/ContributionMessagesListItem.spec.js            | 2 +-
 admin/src/components/CreationTransactionList.vue          | 8 ++++++++
 admin/src/locales/de.json                                 | 4 +++-
 admin/src/locales/en.json                                 | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 7cca315d7..f8575492a 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -20,7 +20,7 @@ describe('ContributionMessagesListItem', () => {
 
   const propsData = {
     contributionId: 42,
-    state: 'PENDING0',
+    state: 'PENDING',
     message: {
       id: 111,
       message: 'asd asda sda sda',
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 5f906f1bf..e9c885cdb 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -18,10 +18,18 @@
           {{ $t('transactionlist.submitted') }} {{ $t('math.equals') }}
           {{ $t('help.transactionlist.submitted') }}
         </div>
+        <div>
+          {{ $t('transactionlist.period') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.periods') }}
+        </div>
         <div>
           {{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }}
           {{ $t('help.transactionlist.confirmed') }}
         </div>
+        <div>
+          {{ $t('transactionlist.state') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.state') }}
+        </div>
       </b-collapse>
     </div>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 4f80fde4f..870ff31e4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -78,7 +78,9 @@
     "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
-      "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
+      "state":"[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+      "submitted": "Wann wurde es vom Mitglied eingereicht",
+      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht."
     }
   },
   "hide_details": "Details verbergen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 6acf3ae60..9ba6f50f4 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -78,7 +78,9 @@
     "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
-      "submitted": "For which period was submitted by the user."
+      "state":"[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "submitted": "When was it submitted by the member",
+      "periods": "For what period was it submitted by the member."
     }
   },
   "hide_details": "Hide details",

From 1043ec1061d42895d1f25b38ee0bd2eee1aef0ef Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:41:04 +0200
Subject: [PATCH 22/54] fix lint and locales

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 870ff31e4..f8251803a 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -78,9 +78,9 @@
     "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
-      "state":"[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
-      "submitted": "Wann wurde es vom Mitglied eingereicht",
-      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht."
+      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht.",
+      "state": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+      "submitted": "Wann wurde es vom Mitglied eingereicht"
     }
   },
   "hide_details": "Details verbergen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 9ba6f50f4..43073fff5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -78,9 +78,9 @@
     "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
-      "state":"[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
-      "submitted": "When was it submitted by the member",
-      "periods": "For what period was it submitted by the member."
+      "periods": "For what period was it submitted by the member.",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "submitted": "When was it submitted by the member"
     }
   },
   "hide_details": "Hide details",

From 976620e60359874178aeceebd6632ee1f737e025 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 12:48:08 +0200
Subject: [PATCH 23/54] the name of the month written out

---
 admin/src/components/CreationTransactionList.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index e9c885cdb..2ce143c7f 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -1,7 +1,14 @@
 <template>
   <div class="component-creation-transaction-list">
     <div class="h3">{{ $t('transactionlist.title') }}</div>
-    <b-table striped hover :fields="fields" :items="items"></b-table>
+    <b-table striped hover :fields="fields" :items="items">
+      <template #cell(contributionDate)="data">
+        <div class="font-weight-bold">
+          {{ $d(new Date(data.item.contributionDate), 'month') }}
+        </div>
+        <div>{{ $d(new Date(data.item.contributionDate)) }}</div>
+      </template>
+    </b-table>
     <div>
       <b-pagination
         pills
@@ -46,7 +53,7 @@ export default {
       items: [],
       rows: 0,
       currentPage: 1,
-      perPage: 25,
+      perPage: 10,
       fields: [
         {
           key: 'createdAt',
@@ -58,9 +65,6 @@ export default {
         {
           key: 'contributionDate',
           label: this.$t('transactionlist.period'),
-          formatter: (value, key, item) => {
-            return this.$d(new Date(value))
-          },
         },
         {
           key: 'confirmedAt',

From c961c47c0fbad9858e2081e6583fdbc21f0ab81c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 13:15:09 +0200
Subject: [PATCH 24/54] change methods to emit

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

diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink.vue
index 4e1f3dc7e..5621e4330 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink.vue
@@ -17,7 +17,7 @@
           <p class="h2 ml-5">{{ $t('contributionLink.contributionLinks') }}</p>
           <contribution-link-form
             :contributionLinkData="contributionLinkData"
-            @get-contribution-links="getContributionLinks"
+            @get-contribution-links="$emit('get-contribution-links')"
           />
         </b-card>
       </b-collapse>

From 347591783e116a502e31ff66390eb1182e463163 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 13:44:25 +0200
Subject: [PATCH 25/54] fix test

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

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 01a18e325..ff9607424 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -42,7 +42,7 @@ const mocks = {
 
 const propsData = {
   userId: 1,
-  fields: ['date', 'balance', 'name', 'memo', 'decay'],
+  fields: ['createdAt', 'contributionDate', 'confirmedAt', 'amount', 'memo'],
 }
 
 describe('CreationTransactionList', () => {
@@ -62,7 +62,7 @@ describe('CreationTransactionList', () => {
         expect.objectContaining({
           variables: {
             currentPage: 1,
-            pageSize: 25,
+            pageSize: 10,
             order: 'DESC',
             userId: 1,
           },

From 3f821d24bb0309e37aabab3f92589f87ae67517d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 14:47:34 +0200
Subject: [PATCH 26/54] style: add border-radius on send form

---
 frontend/src/components/GddSend/TransactionForm.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 62361c4d0..69c6b6b45 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -46,7 +46,7 @@
                 <label class="input-1 mt-4" for="input-1">{{ $t('form.recipient') }}</label>
                 <b-input-group
                   id="input-group-1"
-                  class="border border-default"
+                  class="border border-default border-radius"
                   description="We'll never share your email with anyone else."
                   size="lg"
                 >
@@ -81,7 +81,11 @@
                 v-slot="{ errors, valid }"
               >
                 <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
-                <b-input-group id="input-group-2" class="border border-default" size="lg">
+                <b-input-group
+                  id="input-group-2"
+                  class="border border-default border-radius"
+                  size="lg"
+                >
                   <b-input-group-prepend class="p-2 d-none d-md-block">
                     <div class="m-1 mt-2">{{ $t('GDD') }}</div>
                   </b-input-group-prepend>
@@ -115,7 +119,7 @@
                 v-slot="{ errors }"
               >
                 <label class="input-3" for="input-3">{{ $t('form.message') }}</label>
-                <b-input-group id="input-group-3" class="border border-default">
+                <b-input-group id="input-group-3" class="border border-default border-radius">
                   <b-input-group-prepend class="d-none d-md-block">
                     <b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
                   </b-input-group-prepend>
@@ -237,4 +241,7 @@ span.errors {
 #input-3:focus {
   font-weight: bold;
 }
+.border-radius {
+  border-radius: 10px;
+}
 </style>

From 52524120ba257d8bb77e7ab407a98aeafa89e31c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 15:11:55 +0200
Subject: [PATCH 27/54] style: deleted max-rows 6 from all forms textareas

---
 .../ContributionMessages/ContributionMessagesFormular.vue        | 1 -
 frontend/src/components/Contributions/ContributionForm.vue       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index a0e790abe..c9c285eef 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -7,7 +7,6 @@
           v-model="form.text"
           :placeholder="$t('contributionLink.memo')"
           rows="3"
-          max-rows="6"
         ></b-form-textarea>
         <b-row class="mt-4 mb-6">
           <b-col>
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 3a9010ec2..47f2be4c4 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -42,7 +42,6 @@
           id="contribution-memo"
           v-model="form.memo"
           rows="3"
-          max-rows="6"
           :placeholder="$t('contribution.yourActivity')"
           required
         ></b-form-textarea>

From 8b2a781be15ba34305e8ce755157acc6817be3d3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 15:14:58 +0200
Subject: [PATCH 28/54] style: deleted max-rows 6 from all forms textareas

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

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index e3f9fd5e7..1a5928cc3 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -7,7 +7,6 @@
           v-model="form.text"
           :placeholder="$t('form.memo')"
           rows="3"
-          max-rows="6"
         ></b-form-textarea>
         <b-row class="mt-4 mb-6">
           <b-col>

From 3dd66b4527cc37953c2fa6968153b40dc2b10084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Fri, 23 Sep 2022 00:31:33 +0200
Subject: [PATCH 29/54] small changes in log-pattern Merge remote-tracking
 branch 'origin/master' into 2220-feature-reconfigure-log4js

---
 backend/log4js-config.json                   | 22 ++++++++++----------
 backend/src/graphql/resolver/UserResolver.ts |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/backend/log4js-config.json b/backend/log4js-config.json
index a096713ec..e595e7c52 100644
--- a/backend/log4js-config.json
+++ b/backend/log4js-config.json
@@ -8,7 +8,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -21,7 +21,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -34,7 +34,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -47,7 +47,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -60,7 +60,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -77,7 +77,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       }
     },
     "apolloOut": 
@@ -85,7 +85,7 @@
       "type": "stdout",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       }
     }    
   },
@@ -99,7 +99,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": false
+      "enableCallStack": true
     },
     "apollo":
     {
@@ -110,7 +110,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": false
+      "enableCallStack": true
     },
     "backend":
     {
@@ -121,7 +121,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": false
+      "enableCallStack": true
     },
     "klicktipp":
     {
@@ -132,7 +132,7 @@
         "errors"
       ],
       "level": "debug",
-      "enableCallStack": false
+      "enableCallStack": true
     },
     "http": 
     {
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 647bf4fc1..1f05a5162 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -510,6 +510,7 @@ export class UserResolver {
   @Authorized([RIGHTS.SEND_RESET_PASSWORD_EMAIL])
   @Mutation(() => Boolean)
   async forgotPassword(@Arg('email') email: string): Promise<boolean> {
+    logger.addContext('user', 'unknown')
     logger.info(`forgotPassword(${email})...`)
     email = email.trim().toLowerCase()
     const user = await DbUser.findOne({ email })

From 209c61e5d84c848705561fb141203f73af6ab72c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 26 Sep 2022 08:48:04 +0200
Subject: [PATCH 30/54] Change call from Contribution to DbContribution and use
 Contribution as model.

---
 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 ddd3a7f76..16ab3671c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -248,7 +248,7 @@ export class AdminResolver {
     const creationDateObj = new Date(creationDate)
     logger.trace('creationDateObj:', creationDateObj)
     validateContribution(creations, amount, creationDateObj)
-    const contribution = Contribution.create()
+    const contribution = DbContribution.create()
     contribution.userId = emailContact.userId
     contribution.amount = amount
     contribution.createdAt = new Date()
@@ -259,7 +259,7 @@ export class AdminResolver {
     contribution.contributionStatus = ContributionStatus.PENDING
 
     logger.trace('contribution to save', contribution)
-    await Contribution.save(contribution)
+    await DbContribution.save(contribution)
     return getUserCreation(emailContact.userId)
   }
 

From 186e6711f55714302b9865145932e50a635cc360 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 26 Sep 2022 09:10:58 +0200
Subject: [PATCH 31/54] Remove unused import.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 16ab3671c..3435edb94 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -39,7 +39,6 @@ import { Decay } from '@model/Decay'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
-import { communityUser } from '@/util/communityUser'
 import { findUserByEmail, activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'

From 1a01c7df83f92c826c2378bba9d64023d770db1a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 27 Sep 2022 15:22:08 +0200
Subject: [PATCH 32/54] change cypress command in package.json to make "cypress
 open" available for local testing

---
 e2e-tests/cypress/tests/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/tests/package.json b/e2e-tests/cypress/tests/package.json
index a9979725e..a6f817503 100644
--- a/e2e-tests/cypress/tests/package.json
+++ b/e2e-tests/cypress/tests/package.json
@@ -14,7 +14,7 @@
     }
   },
   "scripts": {
-    "cypress": "cypress run",
+    "cypress-e2e": "cypress run",
     "lint": "eslint --max-warnings=0 --ext .js,.ts ."
   },
   "dependencies": {

From bb7e8d2b3de11c590a16800af83142fc48aaa264 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 27 Sep 2022 15:51:05 +0200
Subject: [PATCH 33/54] set default command wait timout higher in cypress
 configuration

---
 e2e-tests/cypress/tests/cypress.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/e2e-tests/cypress/tests/cypress.config.ts b/e2e-tests/cypress/tests/cypress.config.ts
index 815394c5e..ad6a8d7de 100644
--- a/e2e-tests/cypress/tests/cypress.config.ts
+++ b/e2e-tests/cypress/tests/cypress.config.ts
@@ -32,6 +32,7 @@ export default defineConfig({
     excludeSpecPattern: "*.js",
     baseUrl: "http://localhost:3000",
     chromeWebSecurity: false,
+    defaultCommandTimeout: 10000,
     supportFile: "cypress/support/index.ts",
     viewportHeight: 720,
     viewportWidth: 1280,

From 825b364a3b979ee26374cbe70dc220e4e2a8e6cd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 27 Sep 2022 19:13:32 +0200
Subject: [PATCH 34/54] fix user contact migration. Each user must have one
 contact, forget about that email_opt_in trash data

---
 .../0049-add_user_contacts_table.ts           | 55 ++++---------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index c3b89ed88..0a6d4c89f 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -14,8 +14,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
         \`type\` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
         \`user_id\` int(10) unsigned NOT NULL,
         \`email\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL UNIQUE,
-        \`email_verification_code\` bigint(20) unsigned NOT NULL UNIQUE,
-        \`email_opt_in_type_id\` int NOT NULL,
+        \`email_verification_code\` bigint(20) unsigned DEFAULT NULL UNIQUE,
+        \`email_opt_in_type_id\` int DEFAULT NULL,
         \`email_resend_count\` int DEFAULT '0',
         \`email_checked\` tinyint(4) NOT NULL DEFAULT 0,
         \`phone\` varchar(255) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
@@ -41,47 +41,10 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
   // merge values from login_email_opt_in table with users.email in new user_contacts table
   await queryFn(`
-  INSERT INTO user_contacts
-  (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
-  SELECT 
-    'EMAIL', 
-     u.id as user_id,
-     u.email,
-     e.verification_code as email_verification_code,
-     e.email_opt_in_type_id,
-     e.resend_count as email_resend_count,
-     u.email_checked,
-     e.created as created_at,
-     e.updated as updated_at,
-     u.deletedAt as deleted_at\
-   FROM 
-     users as u,
-     login_email_opt_in as e
-   WHERE 
-     u.id = e.user_id AND
-     e.id in (
-       WITH opt_in AS ( 
-         SELECT 
-           le.id, le.user_id, le.created, le.updated, ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
-         FROM 
-           login_email_opt_in as le
-       )
-       SELECT 
-         opt_in.id
-       FROM 
-         opt_in
-       WHERE
-         row_num = 1);`)
-  /*         
-      // SELECT 
-      //   le.id 
-      // FROM 
-      //   login_email_opt_in as le
-      // WHERE
-      //   le.user_id = u.id  
-      // ORDER BY 
-      //   le.updated DESC, le.created DESC LIMIT 1);`)
-      */
+    INSERT INTO \`user_contacts\`
+      (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
+      SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
+      FROM users LEFT JOIN (SELECT * FROM \`login_email_opt_in\` ORDER BY created DESC LIMIT 1) AS optin ON users.id = optin.\`user_id\`;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)
@@ -113,11 +76,13 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
   )
 
   // reconstruct the previous email back from contacts to users table
-  const contacts = await queryFn(`SELECT c.id, c.email, c.user_id FROM user_contacts as c`)
+  const contacts = await queryFn(
+    `SELECT c.id, c.email, c.user_id, c.email_checked FROM user_contacts as c`,
+  )
   for (const id in contacts) {
     const contact = contacts[id]
     await queryFn(
-      `UPDATE users SET email = "${contact.email}" WHERE id = "${contact.user_id}" and email_id = "${contact.id}"`,
+      `UPDATE users SET email = "${contact.email}", email_checked="${contact.email_checked}" WHERE id = "${contact.user_id}" and email_id = "${contact.id}"`,
     )
   }
   await queryFn('ALTER TABLE users MODIFY COLUMN email varchar(255) NOT NULL UNIQUE;')

From 480378a18267b6a026e7cebcb38d11e23417291c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 28 Sep 2022 10:38:46 +0200
Subject: [PATCH 35/54] fix language dependency of some selectors in login and
 user profile tests

---
 e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts   | 4 ++--
 e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts | 8 ++++----
 .../src/components/Inputs/InputPasswordConfirmation.vue   | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts b/e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts
index a16b93a11..9a0df62ee 100644
--- a/e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts
+++ b/e2e-tests/cypress/tests/cypress/e2e/models/LoginPage.ts
@@ -2,8 +2,8 @@
 
 export class LoginPage {
   // selectors
-  emailInput = "#Email-input-field";
-  passwordInput = "#Password-input-field";
+  emailInput = "input[type=email]";
+  passwordInput = "input[type=password]";
   submitBtn = "[type=submit]";
   emailHint = "#vee_Email";
   passwordHint = "#vee_Password";
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts b/e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts
index b280a0b2a..0532a7ff8 100644
--- a/e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts
+++ b/e2e-tests/cypress/tests/cypress/e2e/models/ProfilePage.ts
@@ -4,8 +4,8 @@ export class ProfilePage {
   // selectors
   openChangePassword = "[data-test=open-password-change-form]";
   oldPasswordInput = "#password-input-field";
-  newPasswordInput = "#New-password-input-field";
-  newPasswordRepeatInput = "#Repeat-new-password-input-field";
+  newPasswordInput = "#new-password-input-field";
+  newPasswordRepeatInput = "#repeat-new-password-input-field";
   submitNewPasswordBtn = "[data-test=submit-new-password-btn]";
 
   goto() {
@@ -19,12 +19,12 @@ export class ProfilePage {
   }
 
   enterNewPassword(password: string) {
-    cy.get(this.newPasswordInput).clear().type(password);
+    cy.get(this.newPasswordInput).find("input").clear().type(password);
     return this;
   }
 
   enterRepeatPassword(password: string) {
-    cy.get(this.newPasswordRepeatInput).clear().type(password);
+    cy.get(this.newPasswordRepeatInput).find("input").clear().type(password);
     return this;
   }
 
diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
index 3209018c3..56d58d9ad 100644
--- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue
+++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue
@@ -29,6 +29,7 @@
             required: true,
             samePassword: value.password,
           }"
+          id="repeat-new-password-input-field"
           :label="register ? $t('form.passwordRepeat') : $t('form.password_new_repeat')"
           :immediate="true"
           :name="createId(register ? $t('form.passwordRepeat') : $t('form.password_new_repeat'))"

From e7207da9ac56442068f8d3189f6ffaf79df5e7e4 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 28 Sep 2022 10:38:46 +0200
Subject: [PATCH 36/54] fix language dependency of some selectors in login and
 user profile tests

---
 e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts   |  3 +++
 .../cypress/support/step_definitions/common_steps.ts   | 10 +++++-----
 .../user_profile_change_password_steps.ts              | 10 +++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts b/e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts
index b2198bc8d..aabd0a45e 100644
--- a/e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts
+++ b/e2e-tests/cypress/tests/cypress/e2e/models/Toasts.ts
@@ -2,6 +2,9 @@
 
 export class Toasts {
   // selectors
+  toastSlot = ".b-toaster-slot";
+  toastTypeSuccess = ".b-toast-success";
+  toastTypeError = ".b-toast-danger";
   toastTitle = ".gdd-toaster-title";
   toastMessage = ".gdd-toaster-body";
 }
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts b/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
index 439974cda..f45358f3c 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
+++ b/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
@@ -25,11 +25,11 @@ Then("the user is logged in with username {string}", (username: string) => {
 
 Then("the user cannot login", () => {
   const toast = new Toasts();
-  cy.get(toast.toastTitle).should("contain.text", "Error!");
-  cy.get(toast.toastMessage).should(
-    "contain.text",
-    "No user with this credentials."
-  );
+  cy.get(toast.toastSlot).within(() => {
+    cy.get(toast.toastTypeError);
+    cy.get(toast.toastTitle).should("be.visible");
+    cy.get(toast.toastMessage).should("be.visible");
+  });
 });
 
 //
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
index cbe851f02..5396b66bb 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
+++ b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_profile_change_password_steps.ts
@@ -24,9 +24,9 @@ And("the user submits the password form", () => {
 
 When("the user is presented a {string} message", (type: string) => {
   const toast = new Toasts();
-  cy.get(toast.toastTitle).should("contain.text", "Success");
-  cy.get(toast.toastMessage).should(
-    "contain.text",
-    "Your password has been changed."
-  );
+  cy.get(toast.toastSlot).within(() => {
+    cy.get(toast.toastTypeSuccess);
+    cy.get(toast.toastTitle).should("be.visible");
+    cy.get(toast.toastMessage).should("be.visible");
+  });
 });

From 2a82faff47fbbb83886524d48b65cf74d31f5ccf Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 28 Sep 2022 13:01:27 +0200
Subject: [PATCH 37/54] fix error caused by missing files regarding rgistration
 tests

---
 .../cypress/e2e/User.Registration.feature     | 13 ++++++
 .../cypress/e2e/models/RegistrationPage.ts    | 42 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature
 create mode 100644 e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts

diff --git a/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature b/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature
new file mode 100644
index 000000000..9361d2b84
--- /dev/null
+++ b/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature
@@ -0,0 +1,13 @@
+Feature: User registration
+  As a user
+  I want to register to create an account
+
+  @skip
+  Scenario: Register successfully
+    Given the browser navigates to page "/register"
+    When the user fills name and email "Regina" "Register" "regina@register.com"
+    And the user agrees to the privacy policy
+    And the user submits the registration form
+    Then the user can use a provided activation link
+    And the user can set a password "Aa12345_"
+    And the user can login with the credentials "regina@register.com" "Aa12345_"
diff --git a/e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts b/e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts
new file mode 100644
index 000000000..27a9cb8cc
--- /dev/null
+++ b/e2e-tests/cypress/tests/cypress/e2e/models/RegistrationPage.ts
@@ -0,0 +1,42 @@
+/// <reference types="cypress" />
+
+export class RegistrationPage {
+  // selectors
+  firstnameInput = "#registerFirstname";
+  lastnameInput = "#registerLastname";
+  emailInput = "#Email-input-field";
+  checkbox = "#registerCheckbox";
+  submitBtn = "[type=submit]";
+
+  RegistrationThanxHeadline = ".test-message-headline";
+  RegistrationThanxText = ".test-message-subtitle";
+
+  goto() {
+    cy.visit("/register");
+    return this;
+  }
+
+  enterFirstname(firstname: string) {
+    cy.get(this.firstnameInput).clear().type(firstname);
+    return this;
+  }
+
+  enterLastname(lastname: string) {
+    cy.get(this.lastnameInput).clear().type(lastname);
+    return this;
+  }
+
+  enterEmail(email: string) {
+    cy.get(this.emailInput).clear().type(email);
+    return this;
+  }
+
+  checkPrivacyCheckbox() {
+    cy.get(this.checkbox).click({ force: true });
+  }
+
+  submitRegistrationPage() {
+    cy.get(this.submitBtn).should("be.enabled");
+    cy.get(this.submitBtn).click();
+  }
+}

From 5d24d1d51002359263796bd45a2c407b723ae0cf Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 28 Sep 2022 13:59:29 +0200
Subject: [PATCH 38/54] update cypress test readme

---
 e2e-tests/cypress/README.md | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md
index b1ddae514..e653413d6 100644
--- a/e2e-tests/cypress/README.md
+++ b/e2e-tests/cypress/README.md
@@ -1,24 +1,57 @@
 # Gradido End-to-End Testing with [Cypress](https://www.cypress.io/) (CI-ready via Docker)
 
+A setup to show-case Cypress as an end-to-end testing tool for Gradido running in a Docker container.
+The tests are organized in feature files written in Gherkin syntax.
+
+
+## Features under test
+
+So far these features are initially tested
+- [User authentication](https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/User.Authentication.feature)
+- [User profile - change password](https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/UserProfile.ChangePassword.feature)
+- [User registration]((https://github.com/gradido/gradido/blob/master/e2e-tests/cypress/tests/cypress/e2e/User.Registration.feature)) (WIP)
 
-A sample setup to show-case Cypress as an end-to-end testing tool for Gradido running in a Docker container.
-Here we have a simple UI-based happy path login test running against the DEV system.
 
 ## Precondition
-Since dependencies and configurations for Github Actions integration is not set up yet, please run in root directory
+
+Before running the test, change to the the repo's root directory (gradido) and boot up the system under test
 
 ```bash
 docker-compose up
 ```
 
-to boot up the DEV system, before running the test.
 
 ## Execute the test
 
+This setup will be integrated in the Gradido Github Actions to automatically support the CI/CD process.
+For now the test setup can only be use locally in two modes
+
+### Run Cypress directly from the code
+
 ```bash
+# change to the tests directory 
+cd /path/to/gradido/e2e-tests/cypress/tests
+
+# install all dependencies
+yarn install
+
+# a) run the tests on command line
+yarn cypress run
+
+# b) open the Cypress GUI to run the tests in interactive mode
+yarn cypress open
+```
+
+
+### Run Cyprss from a separate Docker container
+
+```bash
+# change to the cypress directory 
+cd /path/to/gradido/e2e-tests/cypress/
+
 # build a Docker image from the Dockerfile
 docker build -t gradido_e2e-tests-cypress .
 
-# run the Docker container and execute the given tests
-docker run -it --network=host gradido_e2e-tests-cypress yarn run cypress-e2e-tests
+# run the Docker image and execute the given tests
+docker run -it --network=host gradido_e2e-tests-cypress yarn cypress-e2e
 ```

From 5bb6fd048de04dd740d94a5fc65d115685e617f1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 28 Sep 2022 22:15:21 +0200
Subject: [PATCH 39/54] get email optin in a better way

---
 database/migrations/0049-add_user_contacts_table.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index 0a6d4c89f..964285420 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -44,7 +44,10 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     INSERT INTO \`user_contacts\`
       (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
       SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
-      FROM users LEFT JOIN (SELECT * FROM \`login_email_opt_in\` ORDER BY created DESC LIMIT 1) AS optin ON users.id = optin.\`user_id\`;`)
+      FROM users LEFT JOIN
+      (SELECT le.id, le.user_id, le.verification_code, le.email_opt_in_type_id, le.resend_count, le.created, le.updated,
+         ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
+       FROM login_email_opt_in as le) AS optin ON users.id = optin.\`user_id\` AND row_num = 1;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)

From 0ed12f878f70018069b6d2c4542ca9f3dfdf55c2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 29 Sep 2022 04:38:33 +0200
Subject: [PATCH 40/54] remove back ticks in sql statement

---
 database/migrations/0049-add_user_contacts_table.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index 964285420..acdd1af61 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -41,13 +41,13 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
   // merge values from login_email_opt_in table with users.email in new user_contacts table
   await queryFn(`
-    INSERT INTO \`user_contacts\`
+    INSERT INTO user_contacts
       (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
-      SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
+      SELECT 'EMAIL', users.id, users.email, optin.verification_code, optin.email_opt_in_type_id, optin.resend_count, users.email_checked, users.created, null, users.deletedAt
       FROM users LEFT JOIN
       (SELECT le.id, le.user_id, le.verification_code, le.email_opt_in_type_id, le.resend_count, le.created, le.updated,
          ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
-       FROM login_email_opt_in as le) AS optin ON users.id = optin.\`user_id\` AND row_num = 1;`)
+       FROM login_email_opt_in as le) AS optin ON users.id = optin.user_id AND row_num = 1;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)

From 07815e887f2625107c3cc39c86c2bdcfc24db127 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 11:12:06 +0200
Subject: [PATCH 41/54] update e2e-tests/cypress/README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 e2e-tests/cypress/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md
index e653413d6..72c3745ec 100644
--- a/e2e-tests/cypress/README.md
+++ b/e2e-tests/cypress/README.md
@@ -14,7 +14,7 @@ So far these features are initially tested
 
 ## Precondition
 
-Before running the test, change to the the repo's root directory (gradido) and boot up the system under test
+Before running the test, change to the repo's root directory (gradido) and boot up the system under test:
 
 ```bash
 docker-compose up

From 6796190f09ef0f5b817bab97c14bfadadcf3637b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 11:12:29 +0200
Subject: [PATCH 42/54] update e2e-tests/cypress/README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 e2e-tests/cypress/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md
index 72c3745ec..08ca5ee0c 100644
--- a/e2e-tests/cypress/README.md
+++ b/e2e-tests/cypress/README.md
@@ -24,7 +24,7 @@ docker-compose up
 ## Execute the test
 
 This setup will be integrated in the Gradido Github Actions to automatically support the CI/CD process.
-For now the test setup can only be use locally in two modes
+For now the test setup can only be used locally in two modes.
 
 ### Run Cypress directly from the code
 

From f780b1c431341cae1e075f8a97f88485cd407de9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 11:32:57 +0200
Subject: [PATCH 43/54] update e2e-tests/cypress/README.md

- hint about seeding the database before each test run
---
 e2e-tests/cypress/README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md
index 08ca5ee0c..6e4af822f 100644
--- a/e2e-tests/cypress/README.md
+++ b/e2e-tests/cypress/README.md
@@ -14,12 +14,28 @@ So far these features are initially tested
 
 ## Precondition
 
-Before running the test, change to the repo's root directory (gradido) and boot up the system under test:
+Before running the test, change to the repo's root directory (gradido)
+
+### Boot up the system under test
 
 ```bash
 docker-compose up
 ```
 
+### Seed the database
+
+The database has to be seeded upfront to every test run.
+
+```bash
+# change to the backend directory 
+cd /path/to/gradido/gradido/backend
+
+# install all dependencies
+yarn 
+
+# seed the database (everytime before running the tests)
+yarn seed
+```
 
 ## Execute the test
 

From b0e9550ffc1d7cfa0c13c5fc942a2336025505aa Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 12:21:49 +0200
Subject: [PATCH 44/54] update e2e-tests/cypress/README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 e2e-tests/cypress/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e-tests/cypress/README.md b/e2e-tests/cypress/README.md
index 6e4af822f..4ec1ebe51 100644
--- a/e2e-tests/cypress/README.md
+++ b/e2e-tests/cypress/README.md
@@ -14,7 +14,7 @@ So far these features are initially tested
 
 ## Precondition
 
-Before running the test, change to the repo's root directory (gradido)
+Before running the tests, change to the repo's root directory (gradido).
 
 ### Boot up the system under test
 

From 55453b217b35da34c3966ec9c5e696e1b4d6eda0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 12:37:30 +0200
Subject: [PATCH 45/54] admin frontend: merge components - functionality of
 slot compoments IsModerator and IsNotModerator is added to component
 ContributionMessagesListItem - the slot components are removed, since not
 required anymore

---
 .../slots/ContributionMessagesListItem.vue    | 37 +++++++++++++++----
 .../slots/IsModerator.vue                     | 37 -------------------
 .../slots/IsNotModerator.vue                  | 34 -----------------
 3 files changed, 29 insertions(+), 79 deletions(-)
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsModerator.vue
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsNotModerator.vue

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index fa5bdd940..b0630d0b4 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,19 +1,24 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-moderator v-if="message.isModerator" :message="message"></is-moderator>
-    <is-not-moderator v-else :message="message"></is-not-moderator>
+    <div v-if="message.isModerator" class="text-right is-moderator">
+      <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>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
+    <div v-else class="text-left is-not-moderator">
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <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">{{ message.message }}</div>
+    </div>
   </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: {
     message: {
       type: Object,
@@ -25,3 +30,19 @@ export default {
   },
 }
 </script>
+<style>
+.is-not-moderator {
+  clear: both;
+  width: 75%;
+  margin-top: 20px;
+  /* background-color: rgb(261, 204, 221); */
+}
+.is-moderator {
+  clear: both;
+  float: right;
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  /* background-color: rgb(255, 255, 128); */
+}
+</style>
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
deleted file mode 100644
index 0224e042f..000000000
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <div class="text-right">
-      <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>
-      <div class="mt-2">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<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
deleted file mode 100644
index 64946c557..000000000
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div>
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <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">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  clear: both;
-  width: 75%;
-  margin-top: 20px;
-}
-</style>

From 899b74d60a4b83317fc4c1e8fbcef5810e3d1cb8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 29 Sep 2022 12:39:21 +0200
Subject: [PATCH 46/54] wallet frontend: merge components - functionality of
 slot compoments IsModerator and IsNotModerator is added to component
 ContributionMessagesListItem - the slot components are removed, since not
 required anymore

---
 .../ContributionMessagesListItem.vue          | 39 ++++++++++++++-----
 .../slots/IsModerator.vue                     | 34 ----------------
 .../slots/IsNotModerator.vue                  | 36 -----------------
 3 files changed, 30 insertions(+), 79 deletions(-)
 delete mode 100644 frontend/src/components/ContributionMessages/slots/IsModerator.vue
 delete mode 100644 frontend/src/components/ContributionMessages/slots/IsNotModerator.vue

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 5fde8f825..85d371250 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,19 +1,24 @@
 <template>
   <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 v-if="isNotModerator" class="is-not-moderator text-right">
+      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <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">{{ message.message }}</div>
+    </div>
+    <div v-else class="is-moderator text-left">
+      <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>
+      <div class="mt-2">{{ message.message }}</div>
+    </div>
   </div>
 </template>
-<script>
-import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
-import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
 
+<script>
 export default {
   name: 'ContributionMessagesListItem',
-  components: {
-    IsModerator,
-    IsNotModerator,
-  },
   props: {
     message: {
       type: Object,
@@ -36,3 +41,19 @@ export default {
   },
 }
 </script>
+<style>
+.is-not-moderator {
+  float: right;
+  background-color: rgb(261, 204, 221);
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  clear: both;
+}
+.is-moderator {
+  clear: both;
+  background-color: rgb(255, 255, 128);
+  width: 75%;
+  margin-top: 20px;
+}
+</style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
deleted file mode 100644
index 343b92d97..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <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>
-    <div class="mt-2">{{ message.message }}</div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-moderator {
-  clear: both;
-  /* background-color: rgb(255, 242, 227); */
-  width: 75%;
-  margin-top: 20px;
-}
-</style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
deleted file mode 100644
index 8efca7270..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div class="text-right">
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <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">{{ message.message }}</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  float: right;
-  width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  clear: both;
-}
-</style>

From 14aa976e5a1c1ce19e6807a250f0dba54bfcfa3a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 4 Oct 2022 12:11:23 +0200
Subject: [PATCH 47/54] wallet frontend: adapt unit tests for merged components
 - add tests to ContributionMessagesListItem.spec.js - remove slots tests

---
 .../ContributionMessagesListItem.spec.js      | 127 +++++++++++++++---
 .../ContributionMessagesListItem.vue          |   4 +-
 .../slots/IsModerator.spec.js                 |  49 -------
 .../slots/IsNotModerator.spec.js              |  49 -------
 4 files changed, 110 insertions(+), 119 deletions(-)
 delete mode 100644 frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
 delete 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
index b9f6f0029..74cab882d 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -1,29 +1,29 @@
 import { mount } from '@vue/test-utils'
 import ContributionMessagesList from './ContributionMessagesList.vue'
+import ContributionMessagesListItem from './ContributionMessagesListItem.vue'
 
 const localVue = global.localVue
+let wrapper
+
+const mocks = {
+  $t: jest.fn((t) => t),
+  $d: jest.fn((d) => d),
+  $store: {
+    state: {
+      firstName: 'Peter',
+      lastName: 'Lustig',
+    },
+  },
+}
 
 describe('ContributionMessagesList', () => {
-  let wrapper
-
-  const mocks = {
-    $t: jest.fn((t) => t),
-    $d: jest.fn((d) => d),
-    $store: {
-      state: {
-        firstName: 'Peter',
-        lastName: 'Lustig',
-      },
-    },
-  }
-
   const propsData = {
     contributionId: 42,
-    state: 'PENDING0',
+    state: 'PENDING',
     messages: [
       {
         id: 111,
-        message: 'asd asda sda sda',
+        message: 'Lorem ipsum?',
         createdAt: '2022-08-29T12:23:27.000Z',
         updatedAt: null,
         type: 'DIALOG',
@@ -32,10 +32,21 @@ describe('ContributionMessagesList', () => {
         userId: 107,
         __typename: 'ContributionMessage',
       },
+      {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
     ],
   }
 
-  const Wrapper = () => {
+  const ListWrapper = () => {
     return mount(ContributionMessagesList, {
       localVue,
       mocks,
@@ -45,11 +56,89 @@ describe('ContributionMessagesList', () => {
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper()
+      wrapper = ListWrapper()
     })
 
-    it('has a DIV .contribution-messages-list-item', () => {
-      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
+    it('has two DIV .contribution-messages-list-item elements', () => {
+      expect(wrapper.findAll('div.contribution-messages-list-item').length).toBe(2)
+    })
+  })
+})
+
+describe('ContributionMessagesListItem', () => {
+  describe('if message author has moderator role', () => {
+    const propsData = {
+      message: {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ItemWrapper()
+      })
+
+      it('has a DIV .is-moderator.text-left', () => {
+        expect(wrapper.find('div.is-moderator.text-left').exists()).toBe(true)
+      })
+
+      it('props.message.default', () => {
+        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+      })
+    })
+  })
+
+  describe('if message author does not have moderator role', () => {
+    const propsData = {
+      message: {
+        id: 111,
+        message: 'Lorem ipsum?',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ModeratorItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ModeratorItemWrapper()
+      })
+
+      it('has a DIV .is-not-moderator.text-right', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right').exists()).toBe(true)
+      })
+
+      it('props.message.default', () => {
+        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+      })
     })
   })
 })
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 85d371250..e2bc50be6 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -44,7 +44,7 @@ export default {
 <style>
 .is-not-moderator {
   float: right;
-  background-color: rgb(261, 204, 221);
+  /* background-color: rgb(261, 204, 221); */
   width: 75%;
   margin-top: 20px;
   margin-bottom: 20px;
@@ -52,7 +52,7 @@ export default {
 }
 .is-moderator {
   clear: both;
-  background-color: rgb(255, 255, 128);
+  /* background-color: rgb(255, 255, 128); */
   width: 75%;
   margin-top: 20px;
 }
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
deleted file mode 100644
index b1e09da94..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-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),
-    $d: jest.fn((d) => d),
-  }
-
-  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/IsNotModerator.spec.js b/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
deleted file mode 100644
index 24152ad1e..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-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),
-    $d: jest.fn((d) => d),
-  }
-
-  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 b82bfb6b1259e6c2a407582e56a3111119dd3541 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 4 Oct 2022 17:12:11 +0200
Subject: [PATCH 48/54] admin frontend: adapt unit tests for merged components
 - add tests to ContributionMessagesListItem.spec.js - remove tests for
 removed components

---
 .../ContributionMessagesListItem.spec.js      | 110 ++++++++++++------
 .../slots/IsModerator.spec.js                 |  49 --------
 .../slots/IsNotModerator.spec.js              |  49 --------
 3 files changed, 73 insertions(+), 135 deletions(-)
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsModerator.spec.js
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 7cca315d7..bfb127bc4 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -9,50 +9,86 @@ describe('ContributionMessagesListItem', () => {
   const mocks = {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
-    $store: {
-      state: {
-        moderator: {
-          id: 107,
-        },
+  }
+
+  describe('if message author has moderator role', () => {
+    const propsData = {
+      contributionId: 42,
+      state: 'PENDING',
+      message: {
+        id: 111,
+        message: 'Lorem ipsum?',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        isModerator: true,
+        __typename: 'ContributionMessage',
       },
-    },
-  }
+    }
 
-  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 ModeratorItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
 
-  const Wrapper = () => {
-    return mount(ContributionMessagesListItem, {
-      localVue,
-      mocks,
-      propsData,
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ModeratorItemWrapper()
+      })
+
+      it('has a DIV .text-right.is-moderator', () => {
+        expect(wrapper.find('div.text-right.is-moderator').exists()).toBe(true)
+      })
+
+      it('props.message.default', () => {
+        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+      })
     })
-  }
+  })
 
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
+  describe('if message author does not have moderator role', () => {
+    const propsData = {
+      contributionId: 42,
+      state: 'PENDING',
+      message: {
+        id: 113,
+        message: 'Asda sdad ad asdasd, das Ass das Das. ',
+        createdAt: '2022-08-29T12:25:34.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Bibi',
+        userLastName: 'Bloxberg',
+        userId: 108,
+        __typename: 'ContributionMessage',
+      },
+    }
 
-    it('has a DIV .contribution-messages-list-item', () => {
-      expect(wrapper.find('div.contribution-messages-list-item').exists()).toBe(true)
-    })
+    const ItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
 
-    it('props.message.default', () => {
-      expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+    describe('mount', () => {
+      beforeAll(() => {
+        wrapper = ItemWrapper()
+      })
+
+      it('has a DIV .text-left.is-not-moderator', () => {
+        expect(wrapper.find('div.text-left.is-not-moderator').exists()).toBe(true)
+      })
+
+      it('props.message.default', () => {
+        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
+      })
     })
   })
 })
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
deleted file mode 100644
index b1e09da94..000000000
--- a/admin/src/components/ContributionMessages/slots/IsModerator.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-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),
-    $d: jest.fn((d) => d),
-  }
-
-  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/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js b/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
deleted file mode 100644
index 24152ad1e..000000000
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-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),
-    $d: jest.fn((d) => d),
-  }
-
-  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 5d3ec46d1ae61a8e591eaf4df7f178ce6200c709 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 4 Oct 2022 17:21:12 +0200
Subject: [PATCH 49/54] fix linting

---
 .../ContributionMessages/slots/ContributionMessagesListItem.vue  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index b0630d0b4..2b2d7ccab 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -16,7 +16,6 @@
   </div>
 </template>
 <script>
-
 export default {
   name: 'ContributionMessagesListItem',
   props: {

From d37b8d3e50ab9e87512c76e59b646ab097b0bd82 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 5 Oct 2022 17:08:39 +0200
Subject: [PATCH 50/54] remove default prop value from
 ContributionMessagesListItem

---
 .../slots/ContributionMessagesListItem.spec.js            | 8 --------
 .../slots/ContributionMessagesListItem.vue                | 3 ---
 .../ContributionMessagesListItem.spec.js                  | 8 --------
 .../ContributionMessages/ContributionMessagesListItem.vue | 3 ---
 4 files changed, 22 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index bfb127bc4..8357cabeb 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -45,10 +45,6 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .text-right.is-moderator', () => {
         expect(wrapper.find('div.text-right.is-moderator').exists()).toBe(true)
       })
-
-      it('props.message.default', () => {
-        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-      })
     })
   })
 
@@ -85,10 +81,6 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .text-left.is-not-moderator', () => {
         expect(wrapper.find('div.text-left.is-not-moderator').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 2b2d7ccab..796ff5f30 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -22,9 +22,6 @@ export default {
     message: {
       type: Object,
       required: true,
-      default() {
-        return {}
-      },
     },
   },
 }
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index 74cab882d..cdf60b7ab 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -97,10 +97,6 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .is-moderator.text-left', () => {
         expect(wrapper.find('div.is-moderator.text-left').exists()).toBe(true)
       })
-
-      it('props.message.default', () => {
-        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-      })
     })
   })
 
@@ -135,10 +131,6 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .is-not-moderator.text-right', () => {
         expect(wrapper.find('div.is-not-moderator.text-right').exists()).toBe(true)
       })
-
-      it('props.message.default', () => {
-        expect(wrapper.vm.$options.props.message.default.call()).toEqual({})
-      })
     })
   })
 })
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index e2bc50be6..6c2e555f2 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -23,9 +23,6 @@ export default {
     message: {
       type: Object,
       required: true,
-      default() {
-        return {}
-      },
     },
   },
   data() {

From 1bd90cf427776e44ea478a9a11dcfbdf8845239a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 6 Oct 2022 10:14:36 +0200
Subject: [PATCH 51/54] wallet frontend: add tests for
 ContributionMessagesListItem

---
 .../ContributionMessagesListItem.spec.js      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index cdf60b7ab..c05962d6f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -97,6 +97,30 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .is-moderator.text-left', () => {
         expect(wrapper.find('div.is-moderator.text-left').exists()).toBe(true)
       })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(2)').text()).toBe(
+          'Bibi Bloxberg',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(3)').text()).toBe(
+          'Mon Aug 29 2022 12:25:34 GMT+0000 (Koordinierte Weltzeit)',
+        )
+      })
+
+      it('has the moderator label', () => {
+        expect(wrapper.find('div.is-moderator.text-left > small:nth-child(4)').text()).toBe(
+          'community.moderator',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-moderator.text-left > div:nth-child(5)').text()).toBe(
+          'Asda sdad ad asdasd, das Ass das Das.',
+        )
+      })
     })
   })
 
@@ -131,6 +155,24 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .is-not-moderator.text-right', () => {
         expect(wrapper.find('div.is-not-moderator.text-right').exists()).toBe(true)
       })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(2)').text()).toBe(
+          'Peter Lustig',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(3)').text()).toBe(
+          'Mon Aug 29 2022 12:23:27 GMT+0000 (Koordinierte Weltzeit)',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)').text()).toBe(
+          'Lorem ipsum?',
+        )
+      })
     })
   })
 })

From 11f320ba3ffcac7ed1ef3810206a48f00adae27a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 6 Oct 2022 10:23:47 +0200
Subject: [PATCH 52/54] admin frontend: add tests for
 ContributionMessagesListItem

---
 .../ContributionMessagesListItem.spec.js      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 8357cabeb..0c9ba2739 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -45,6 +45,30 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .text-right.is-moderator', () => {
         expect(wrapper.find('div.text-right.is-moderator').exists()).toBe(true)
       })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(2)').text()).toBe(
+          'Peter Lustig',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toBe(
+          'Mon Aug 29 2022 12:23:27 GMT+0000 (Koordinierte Weltzeit)',
+        )
+      })
+
+      it('has the moderator label', () => {
+        expect(wrapper.find('div.text-right.is-moderator > small:nth-child(4)').text()).toBe(
+          'moderator',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.text-right.is-moderator > div:nth-child(5)').text()).toBe(
+          'Lorem ipsum?',
+        )
+      })
     })
   })
 
@@ -81,6 +105,24 @@ describe('ContributionMessagesListItem', () => {
       it('has a DIV .text-left.is-not-moderator', () => {
         expect(wrapper.find('div.text-left.is-not-moderator').exists()).toBe(true)
       })
+
+      it('has the complete user name', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(2)').text()).toBe(
+          'Bibi Bloxberg',
+        )
+      })
+
+      it('has the message creation date', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toBe(
+          'Mon Aug 29 2022 12:25:34 GMT+0000 (Koordinierte Weltzeit)',
+        )
+      })
+
+      it('has the message', () => {
+        expect(wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)').text()).toBe(
+          'Asda sdad ad asdasd, das Ass das Das.',
+        )
+      })
     })
   })
 })

From 40e505f6e550e2ca40585d7c5fe98f5dd740f4b0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 6 Oct 2022 10:39:42 +0200
Subject: [PATCH 53/54] fix unit test error

---
 .../slots/ContributionMessagesListItem.spec.js                | 4 ++--
 .../ContributionMessages/ContributionMessagesListItem.spec.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 0c9ba2739..bb116afbe 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -54,7 +54,7 @@ describe('ContributionMessagesListItem', () => {
 
       it('has the message creation date', () => {
         expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:23:27 GMT+0000 (Koordinierte Weltzeit)',
+          'Mon Aug 29 2022 12:23:27 GMT+0000 (Coordinated Universal Time)',
         )
       })
 
@@ -114,7 +114,7 @@ describe('ContributionMessagesListItem', () => {
 
       it('has the message creation date', () => {
         expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:25:34 GMT+0000 (Koordinierte Weltzeit)',
+          'Mon Aug 29 2022 12:25:34 GMT+0000 (Coordinated Universal Time)',
         )
       })
 
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index c05962d6f..5d5185e0f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -106,7 +106,7 @@ describe('ContributionMessagesListItem', () => {
 
       it('has the message creation date', () => {
         expect(wrapper.find('div.is-moderator.text-left > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:25:34 GMT+0000 (Koordinierte Weltzeit)',
+          'Mon Aug 29 2022 12:25:34 GMT+0000 (Coordinated Universal Time)',
         )
       })
 
@@ -164,7 +164,7 @@ describe('ContributionMessagesListItem', () => {
 
       it('has the message creation date', () => {
         expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:23:27 GMT+0000 (Koordinierte Weltzeit)',
+          'Mon Aug 29 2022 12:23:27 GMT+0000 (Coordinated Universal Time)',
         )
       })
 

From e93e8e6b0a4e8c7c7d9e13ed2db88ac18d2f96f5 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 6 Oct 2022 18:23:54 +0200
Subject: [PATCH 54/54] fix language dependency in unit tests for
 ContributionMessagesListItem

---
 .../slots/ContributionMessagesListItem.spec.js            | 8 ++++----
 .../ContributionMessagesListItem.spec.js                  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index bb116afbe..b8aaba502 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -53,8 +53,8 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:23:27 GMT+0000 (Coordinated Universal Time)',
+        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:23:27 GMT+0000',
         )
       })
 
@@ -113,8 +113,8 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:25:34 GMT+0000 (Coordinated Universal Time)',
+        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:25:34 GMT+0000',
         )
       })
 
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index 5d5185e0f..7504854d0 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -105,8 +105,8 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:25:34 GMT+0000 (Coordinated Universal Time)',
+        expect(wrapper.find('div.is-moderator.text-left > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:25:34 GMT+0000',
         )
       })
 
@@ -163,8 +163,8 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(3)').text()).toBe(
-          'Mon Aug 29 2022 12:23:27 GMT+0000 (Coordinated Universal Time)',
+        expect(wrapper.find('div.is-not-moderator.text-right > span:nth-child(3)').text()).toMatch(
+          'Mon Aug 29 2022 12:23:27 GMT+0000',
         )
       })