From 2146c98ee46e4cadd7a40d3b693ce2631d8e679d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 20:42:07 +0100
Subject: [PATCH 001/101] Add moderatorId for contribution object.

---
 admin/src/components/Tables/OpenCreationsTable.vue | 3 ++-
 admin/src/graphql/adminListAllContributions.js     | 1 +
 backend/src/graphql/model/Contribution.ts          | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a17d3a185..b76decdb5 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -27,9 +27,10 @@
       <template #cell(editCreation)="row">
         <div v-if="!myself(row.item)">
           <b-button
-            v-if="row.item.moderator"
+            v-if="row.item.moderatorId"
             variant="info"
             size="md"
+            :index="0"
             @click="rowToggleDetails(row, 0)"
             class="mr-2"
           >
diff --git a/admin/src/graphql/adminListAllContributions.js b/admin/src/graphql/adminListAllContributions.js
index cd47cd1d4..851cff7b8 100644
--- a/admin/src/graphql/adminListAllContributions.js
+++ b/admin/src/graphql/adminListAllContributions.js
@@ -30,6 +30,7 @@ export const adminListAllContributions = gql`
         deniedBy
         deletedAt
         deletedBy
+        moderatorId
       }
     }
   }
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index b966b714e..69b372e40 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -21,6 +21,7 @@ export class Contribution {
     this.deniedBy = contribution.deniedBy
     this.deletedAt = contribution.deletedAt
     this.deletedBy = contribution.deletedBy
+    this.moderatorId = contribution.moderatorId
   }
 
   @Field(() => Number)
@@ -67,6 +68,9 @@ export class Contribution {
 
   @Field(() => String)
   state: string
+
+  @Field(() => Number, { nullable: true })
+  moderatorId: number | null
 }
 
 @ObjectType()

From a240d76d15e4b86b3ac4a214b4214ef75e854352 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 00:21:03 +0100
Subject: [PATCH 002/101] remove unused interfaces

---
 database/src/interface/TransactionContext.ts | 12 --------
 database/src/interface/UserContext.ts        | 26 ----------------
 database/src/interface/UserInterface.ts      | 32 --------------------
 3 files changed, 70 deletions(-)
 delete mode 100644 database/src/interface/TransactionContext.ts
 delete mode 100644 database/src/interface/UserContext.ts
 delete mode 100644 database/src/interface/UserInterface.ts

diff --git a/database/src/interface/TransactionContext.ts b/database/src/interface/TransactionContext.ts
deleted file mode 100644
index 8eeb579a0..000000000
--- a/database/src/interface/TransactionContext.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Decimal from 'decimal.js-light'
-
-export interface TransactionContext {
-  typeId: number
-  userId: number
-  balance: Decimal
-  balanceDate: Date
-  amount: Decimal
-  memo: string
-  creationDate?: Date
-  sendReceiverUserId?: number
-}
diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts
deleted file mode 100644
index f3ccaecf4..000000000
--- a/database/src/interface/UserContext.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export interface UserContext {
-  pubKey?: Buffer
-  email?: string
-  firstName?: string
-  lastName?: string
-  deletedAt?: Date
-  password?: BigInt
-  privKey?: Buffer
-  emailHash?: Buffer
-  createdAt?: Date
-  emailChecked?: boolean
-  language?: string
-  publisherId?: number
-  passphrase?: string
-}
-
-export interface ServerUserContext {
-  username?: string
-  password?: string
-  email?: string
-  role?: string
-  activated?: number
-  lastLogin?: Date
-  created?: Date
-  modified?: Date
-}
diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts
deleted file mode 100644
index ca328c092..000000000
--- a/database/src/interface/UserInterface.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import Decimal from 'decimal.js-light'
-
-export interface UserInterface {
-  // from user
-  email?: string
-  firstName?: string
-  lastName?: string
-  password?: BigInt
-  pubKey?: Buffer
-  privKey?: Buffer
-  emailHash?: Buffer
-  createdAt?: Date
-  emailChecked?: boolean
-  language?: string
-  deletedAt?: Date
-  publisherId?: number
-  passphrase?: string
-  // from server user
-  serverUserPassword?: string
-  role?: string
-  activated?: number
-  lastLogin?: Date
-  modified?: Date
-  // flag for admin
-  isAdmin?: boolean
-  // flag for balance (creation of 1000 GDD)
-  addBalance?: boolean
-  // balance
-  recordDate?: Date
-  creationDate?: Date
-  amount?: Decimal
-}

From 66c09d0615ece9104dd553cfa7e8004f68ef2779 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 00:21:16 +0100
Subject: [PATCH 003/101] remove typeorm connection

---
 database/src/typeorm/connection.ts | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 database/src/typeorm/connection.ts

diff --git a/database/src/typeorm/connection.ts b/database/src/typeorm/connection.ts
deleted file mode 100644
index e3434c3aa..000000000
--- a/database/src/typeorm/connection.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createConnection, Connection } from 'typeorm'
-import CONFIG from '../config'
-import { entities } from '../../entity/index'
-
-const connection = async (): Promise<Connection | null> => {
-  let con = null
-  try {
-    con = await createConnection({
-      name: 'default',
-      type: 'mysql',
-      host: CONFIG.DB_HOST,
-      port: CONFIG.DB_PORT,
-      username: CONFIG.DB_USER,
-      password: CONFIG.DB_PASSWORD,
-      database: CONFIG.DB_DATABASE,
-      entities,
-      synchronize: false,
-    })
-  } catch (error) {
-    // eslint-disable-next-line no-console
-    console.log(error)
-  }
-
-  return con
-}
-
-export default connection

From 7d548968012e9a7ad6f0e855804c6042c07667f8 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 00:21:27 +0100
Subject: [PATCH 004/101] refactor all main scripts

---
 database/src/helpers.ts | 34 ----------------------------------
 database/src/index.ts   | 33 +++++++++++++++++++++------------
 database/src/prepare.ts | 16 +++++++---------
 3 files changed, 28 insertions(+), 55 deletions(-)
 delete mode 100644 database/src/helpers.ts

diff --git a/database/src/helpers.ts b/database/src/helpers.ts
deleted file mode 100644
index 710094548..000000000
--- a/database/src/helpers.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import CONFIG from './config'
-import { createPool, PoolConfig } from 'mysql'
-import { Migration } from 'ts-mysql-migrate'
-import path from 'path'
-
-const poolConfig: PoolConfig = {
-  host: CONFIG.DB_HOST,
-  port: CONFIG.DB_PORT,
-  user: CONFIG.DB_USER,
-  password: CONFIG.DB_PASSWORD,
-  database: CONFIG.DB_DATABASE,
-}
-
-// Pool?
-const pool = createPool(poolConfig)
-
-// Create & Initialize Migrations
-const migration = new Migration({
-  conn: pool,
-  tableName: CONFIG.MIGRATIONS_TABLE,
-  silent: true,
-  dir: path.join(__dirname, '..', 'migrations'),
-})
-
-const initialize = async (): Promise<void> => {
-  await migration.initialize()
-}
-
-const resetDB = async (closePool = false): Promise<void> => {
-  await migration.reset() // use for resetting database
-  if (closePool) pool.end()
-}
-
-export { resetDB, pool, migration, initialize }
diff --git a/database/src/index.ts b/database/src/index.ts
index a9504063e..2d83bc52b 100644
--- a/database/src/index.ts
+++ b/database/src/index.ts
@@ -1,18 +1,28 @@
 import 'reflect-metadata'
-import prepare from './prepare'
-import connection from './typeorm/connection'
-import { resetDB, pool, migration } from './helpers'
+import { createDatabase } from './prepare'
+import CONFIG from './config'
+
+import { createPool, Pool } from 'mysql'
+import { Migration } from 'ts-mysql-migrate'
+import path from 'path'
 
 const run = async (command: string) => {
   // Database actions not supported by our migration library
-  await prepare()
-
-  // Database connection for TypeORM
-  const con = await connection()
-  if (!con || !con.isConnected) {
-    throw new Error(`Couldn't open connection to database`)
-  }
+  await createDatabase()
 
+  const pool = createPool({
+    host: CONFIG.DB_HOST,
+    port: CONFIG.DB_PORT,
+    user: CONFIG.DB_USER,
+    password: CONFIG.DB_PASSWORD,
+    database: CONFIG.DB_DATABASE,
+  })
+  const migration = new Migration({
+    conn: pool,
+    tableName: CONFIG.MIGRATIONS_TABLE,
+    silent: true,
+    dir: path.join(__dirname, '..', 'migrations'),
+  })
   await migration.initialize()
 
   // Execute command
@@ -25,14 +35,13 @@ const run = async (command: string) => {
       break
     case 'reset':
       // TODO protect from production
-      await resetDB() // use for resetting database
+      await migration.reset()
       break
     default:
       throw new Error(`Unsupported command ${command}`)
   }
 
   // Terminate connections gracefully
-  await con.close()
   pool.end()
 }
 
diff --git a/database/src/prepare.ts b/database/src/prepare.ts
index 440289aea..de47f7336 100644
--- a/database/src/prepare.ts
+++ b/database/src/prepare.ts
@@ -1,15 +1,8 @@
-/* PREPARE SCRIPT
- *
- * This file ensures operations our migration library
- * can not take care of are done.
- * This applies to all Database Operations like
- * creating, deleting, renaming Databases.
- */
+import { createConnection } from 'mysql2/promise'
 
-import { createConnection, RowDataPacket } from 'mysql2/promise'
 import CONFIG from './config'
 
-export default async (): Promise<void> => {
+const createDatabase = async (): Promise<void> => {
   const con = await createConnection({
     host: CONFIG.DB_HOST,
     port: CONFIG.DB_PORT,
@@ -25,6 +18,8 @@ export default async (): Promise<void> => {
       DEFAULT CHARACTER SET utf8mb4
       DEFAULT COLLATE utf8mb4_unicode_ci;`)
 
+  /* LEGACY CODE
+  import { RowDataPacket } from 'mysql2/promise'
   // Check if old migration table is present, delete if needed
   const [rows] = await con.query(`SHOW TABLES FROM \`${CONFIG.DB_DATABASE}\` LIKE 'migrations';`)
   if ((<RowDataPacket>rows).length > 0) {
@@ -37,6 +32,9 @@ export default async (): Promise<void> => {
       console.log('Found and dropped old migrations table')
     }
   }
+  */
 
   await con.end()
 }
+
+export { createDatabase }

From 6a7dac0cc643ef953664d19172c80affd90f3099 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 00:21:37 +0100
Subject: [PATCH 005/101] cleaned test helpers

---
 backend/test/helpers.ts  | 2 --
 dht-node/test/helpers.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index 1935b01a0..50bd3eb3f 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -3,7 +3,6 @@
 
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../src/server/createServer'
-import { initialize } from '@dbTools/helpers'
 import { entities } from '@entity/index'
 import { i18n, logger } from './testSetup'
 
@@ -33,7 +32,6 @@ export const testEnvironment = async (testLogger: any = logger, testI18n: any =
   const testClient = createTestClient(server.apollo)
   const mutate = testClient.mutate
   const query = testClient.query
-  await initialize()
   return { mutate, query, con }
 }
 
diff --git a/dht-node/test/helpers.ts b/dht-node/test/helpers.ts
index f298bed1c..aa7f94964 100644
--- a/dht-node/test/helpers.ts
+++ b/dht-node/test/helpers.ts
@@ -4,7 +4,6 @@
 import CONFIG from '@/config'
 import connection from '@/typeorm/connection'
 import { checkDBVersion } from '@/typeorm/DBVersion'
-import { initialize } from '@dbTools/helpers'
 import { entities } from '@entity/index'
 import { logger } from './testSetup'
 
@@ -42,7 +41,6 @@ export const testEnvironment = async () => {
     logger.fatal('Fatal: Database Version incorrect')
     throw new Error('Fatal: Database Version incorrect')
   }
-  await initialize()
   return { con }
 }
 

From 331a4e12051dbe3be3c8c3303745129c8849751e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 00:24:00 +0100
Subject: [PATCH 006/101] lint fix

---
 database/src/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/src/index.ts b/database/src/index.ts
index 2d83bc52b..48056ab55 100644
--- a/database/src/index.ts
+++ b/database/src/index.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata'
 import { createDatabase } from './prepare'
 import CONFIG from './config'
 
-import { createPool, Pool } from 'mysql'
+import { createPool } from 'mysql'
 import { Migration } from 'ts-mysql-migrate'
 import path from 'path'
 
@@ -10,6 +10,7 @@ const run = async (command: string) => {
   // Database actions not supported by our migration library
   await createDatabase()
 
+  // Initialize Migrations
   const pool = createPool({
     host: CONFIG.DB_HOST,
     port: CONFIG.DB_PORT,

From b99874a2e78206adb3ef5895107fc12e677b84d7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Mar 2023 07:59:29 +0100
Subject: [PATCH 007/101] Change catch on moderatorId.

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

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index b76decdb5..b33d6b453 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -90,7 +90,7 @@
           @row-toggle-details="rowToggleDetails(row, 0)"
         >
           <template #show-creation>
-            <div v-if="row.item.moderator">
+            <div v-if="row.item.moderatorId">
               <edit-creation-formular
                 type="singleCreation"
                 :creation="row.item.creation"

From 7be971b81fd602d506539364cc472b7e839e9225 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 10:07:59 +0100
Subject: [PATCH 008/101] setup open creations query for admin

---
 admin/src/components/EditCreationFormular.vue | 25 ++++++++++++++++---
 .../components/Tables/OpenCreationsTable.vue  |  1 -
 admin/src/graphql/openCreations.js            | 11 ++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 admin/src/graphql/openCreations.js

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 084e44b87..4d7e52d6d 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -75,6 +75,7 @@
 </template>
 <script>
 import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
+import { openCreations } from '../graphql/openCreations'
 import { creationMonths } from '../mixins/creationMonths'
 
 export default {
@@ -96,10 +97,6 @@ export default {
       type: Object,
       required: true,
     },
-    creation: {
-      type: Array,
-      required: true,
-    },
   },
   data() {
     return {
@@ -108,6 +105,7 @@ export default {
       rangeMin: 0,
       rangeMax: 1000,
       selected: '',
+      creation: [0, 0, 0],
     }
   },
   methods: {
@@ -151,6 +149,25 @@ export default {
         })
     },
   },
+  apollo: {
+    OpenCreations: {
+      query() {
+        return openCreations
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return {
+          userId: this.item.userId,
+        }
+      },
+      update({ openCreations }) {
+        this.creation = openCreations.map((c) => c.amount)
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
   created() {
     if (this.creationUserData.date) {
       const month = this.$d(new Date(this.creationUserData.date), 'month')
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a17d3a185..fc68e2f7a 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -92,7 +92,6 @@
             <div v-if="row.item.moderator">
               <edit-creation-formular
                 type="singleCreation"
-                :creation="row.item.creation"
                 :item="row.item"
                 :row="row"
                 :creationUserData="creationUserData"
diff --git a/admin/src/graphql/openCreations.js b/admin/src/graphql/openCreations.js
new file mode 100644
index 000000000..f6da9600c
--- /dev/null
+++ b/admin/src/graphql/openCreations.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const openCreations = gql`
+  query ($userId: Int) {
+    openCreations(userId: $userID) {
+      year
+      month
+      amount
+    }
+  }
+`

From 774f9e6b814e135d5ec9a1de31fa778a72a9a603 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 11:35:08 +0100
Subject: [PATCH 009/101] first step to get edit working again

---
 admin/src/components/EditCreationFormular.vue | 48 ++++++++-----------
 .../components/Tables/OpenCreationsTable.vue  | 19 +++++++-
 .../src/graphql/adminListAllContributions.js  |  1 +
 admin/src/graphql/adminUpdateContribution.js  | 10 +---
 admin/src/graphql/openCreations.js            |  2 +-
 admin/src/pages/CreationConfirm.vue           |  2 +-
 6 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 4d7e52d6d..fbc60df15 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -97,15 +97,16 @@ export default {
       type: Object,
       required: true,
     },
+    creation: {
+      type: Array,
+      default: () => [1000, 1000, 1000],
+    },
   },
   data() {
     return {
       text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
       value: !this.creationUserData.amount ? 0 : Number(this.creationUserData.amount),
       rangeMin: 0,
-      rangeMax: 1000,
-      selected: '',
-      creation: [0, 0, 0],
     }
   },
   methods: {
@@ -115,14 +116,12 @@ export default {
           mutation: adminUpdateContribution,
           variables: {
             id: this.item.id,
-            email: this.item.email,
             creationDate: this.selected.date,
             amount: Number(this.value),
             memo: this.text,
           },
         })
         .then((result) => {
-          this.$emit('update-user-data', this.item, result.data.adminUpdateContribution.creation)
           this.$emit('update-creation-data', {
             amount: Number(result.data.adminUpdateContribution.amount),
             date: result.data.adminUpdateContribution.date,
@@ -149,32 +148,23 @@ export default {
         })
     },
   },
-  apollo: {
-    OpenCreations: {
-      query() {
-        return openCreations
-      },
-      fetchPolicy: 'network-only',
-      variables() {
-        return {
-          userId: this.item.userId,
-        }
-      },
-      update({ openCreations }) {
-        this.creation = openCreations.map((c) => c.amount)
-      },
-      error({ message }) {
-        this.toastError(message)
-      },
+  computed: {
+    creationIndex() {
+      const month = this.$d(new Date(this.item.contributionDate), 'month')
+      return this.radioOptions.findIndex((obj) => obj.item.short === month)
+    },
+    selected() {
+      return this.radioOptions[this.creationIndex].item
+    },
+    rangeMax() {
+      console.log('index', this.creationIndex, this.creation[this.creationIndex])
+      return Number(this.creation[this.creationIndex]) + Number(this.item.amount)
     },
   },
-  created() {
-    if (this.creationUserData.date) {
-      const month = this.$d(new Date(this.creationUserData.date), 'month')
-      const index = this.radioOptions.findIndex((obj) => obj.item.short === month)
-      this.selected = this.radioOptions[index].item
-      this.rangeMax = Number(this.creation[index]) + Number(this.creationUserData.amount)
-    }
+  watch: {
+    creation() {
+      console.log('watch', this.creation)
+    },
   },
 }
 </script>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 6900e9b4d..83150e236 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -95,6 +95,7 @@
                 type="singleCreation"
                 :item="row.item"
                 :row="row"
+                :creation="getOpenCreations(row.item.userId)"
                 :creationUserData="creationUserData"
                 @update-creation-data="updateCreationData"
               />
@@ -104,7 +105,6 @@
                 :contributionId="row.item.id"
                 :contributionState="row.item.state"
                 @update-state="updateState"
-                @update-user-data="updateUserData"
               />
             </div>
           </template>
@@ -119,6 +119,7 @@ import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails'
 import EditCreationFormular from '../EditCreationFormular'
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList'
+import { openCreations } from '../../graphql/openCreations'
 
 const iconMap = {
   IN_PROGRESS: 'question-square',
@@ -187,6 +188,22 @@ export default {
     updateState(id) {
       this.$emit('update-state', id)
     },
+    getOpenCreations(userId) {
+      this.$apollo
+        .query({
+          query: openCreations,
+          variables: {
+            userId,
+          },
+        })
+        .then(({ data: { openCreations } }) => {
+          console.log(openCreations.map((obj) => obj.amount))
+          return openCreations.map((obj) => obj.amount)
+        })
+        .catch((error) => {
+          console.log(error)
+        })
+    },
   },
 }
 </script>
diff --git a/admin/src/graphql/adminListAllContributions.js b/admin/src/graphql/adminListAllContributions.js
index 851cff7b8..9f360f6dc 100644
--- a/admin/src/graphql/adminListAllContributions.js
+++ b/admin/src/graphql/adminListAllContributions.js
@@ -31,6 +31,7 @@ export const adminListAllContributions = gql`
         deletedAt
         deletedBy
         moderatorId
+        userId
       }
     }
   }
diff --git a/admin/src/graphql/adminUpdateContribution.js b/admin/src/graphql/adminUpdateContribution.js
index b7c834109..7738640e7 100644
--- a/admin/src/graphql/adminUpdateContribution.js
+++ b/admin/src/graphql/adminUpdateContribution.js
@@ -1,14 +1,8 @@
 import gql from 'graphql-tag'
 
 export const adminUpdateContribution = gql`
-  mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
-    adminUpdateContribution(
-      id: $id
-      email: $email
-      amount: $amount
-      memo: $memo
-      creationDate: $creationDate
-    ) {
+  mutation ($id: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+    adminUpdateContribution(id: $id, amount: $amount, memo: $memo, creationDate: $creationDate) {
       amount
       date
       memo
diff --git a/admin/src/graphql/openCreations.js b/admin/src/graphql/openCreations.js
index f6da9600c..010ed62df 100644
--- a/admin/src/graphql/openCreations.js
+++ b/admin/src/graphql/openCreations.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export const openCreations = gql`
   query ($userId: Int) {
-    openCreations(userId: $userID) {
+    openCreations(userId: $userId) {
       year
       month
       amount
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55caf8677..faea501bb 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -44,7 +44,7 @@
       :fields="fields"
       @show-overlay="showOverlay"
       @update-state="updateStatus"
-      @update-contributions="$apollo.queries.AllContributions.refetch()"
+      @update-contributions="$apollo.queries.ListAllContributions.refetch()"
     />
 
     <b-pagination

From ac2ce5e6b1e9fa8ebde73d9bf18da950320c1043 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 11:36:08 +0100
Subject: [PATCH 010/101] remove email from admin update contribution

---
 .../arg/AdminUpdateContributionArgs.ts        |  3 --
 backend/src/graphql/model/Contribution.ts     |  6 +++-
 .../graphql/resolver/ContributionResolver.ts  | 28 ++++++-------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/backend/src/graphql/arg/AdminUpdateContributionArgs.ts b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
index 392365b38..65f1cf3f3 100644
--- a/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
+++ b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
@@ -6,9 +6,6 @@ export default class AdminUpdateContributionArgs {
   @Field(() => Int)
   id: number
 
-  @Field(() => String)
-  email: string
-
   @Field(() => Decimal)
   amount: Decimal
 
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 69b372e40..989dd32b2 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -22,6 +22,7 @@ export class Contribution {
     this.deletedAt = contribution.deletedAt
     this.deletedBy = contribution.deletedBy
     this.moderatorId = contribution.moderatorId
+    this.userId = contribution.userId
   }
 
   @Field(() => Number)
@@ -69,8 +70,11 @@ export class Contribution {
   @Field(() => String)
   state: string
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   moderatorId: number | null
+
+  @Field(() => Int, { nullable: true })
+  userId: number | null
 }
 
 @ObjectType()
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2469f60ba..561d5c88c 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -313,41 +313,27 @@ export class ContributionResolver {
   @Authorized([RIGHTS.ADMIN_UPDATE_CONTRIBUTION])
   @Mutation(() => AdminUpdateContribution)
   async adminUpdateContribution(
-    @Args() { id, email, amount, memo, creationDate }: AdminUpdateContributionArgs,
+    @Args() { id, amount, memo, creationDate }: AdminUpdateContributionArgs,
     @Ctx() context: Context,
   ): Promise<AdminUpdateContribution> {
     const clientTimezoneOffset = getClientTimezoneOffset(context)
-    const emailContact = await UserContact.findOne({
-      where: { email },
-      withDeleted: true,
-      relations: ['user'],
-    })
-    if (!emailContact || !emailContact.user) {
-      throw new LogError('Could not find User', email)
-    }
-    if (emailContact.deletedAt || emailContact.user.deletedAt) {
-      throw new LogError('User was deleted', email)
-    }
 
     const moderator = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
     })
+
     if (!contributionToUpdate) {
       throw new LogError('Contribution not found', id)
     }
 
-    if (contributionToUpdate.userId !== emailContact.user.id) {
-      throw new LogError('User of the pending contribution and send user does not correspond')
-    }
-
     if (contributionToUpdate.moderatorId === null) {
       throw new LogError('An admin is not allowed to update an user contribution')
     }
 
     const creationDateObj = new Date(creationDate)
-    let creations = await getUserCreation(emailContact.user.id, clientTimezoneOffset)
+    let creations = await getUserCreation(contributionToUpdate.userId, clientTimezoneOffset)
 
     // TODO: remove this restriction
     if (contributionToUpdate.contributionDate.getMonth() === creationDateObj.getMonth()) {
@@ -371,9 +357,13 @@ export class ContributionResolver {
     result.memo = contributionToUpdate.memo
     result.date = contributionToUpdate.contributionDate
 
-    result.creation = await getUserCreation(emailContact.user.id, clientTimezoneOffset)
+    result.creation = await getUserCreation(contributionToUpdate.userId, clientTimezoneOffset)
 
-    await EVENT_ADMIN_CONTRIBUTION_UPDATE(emailContact.user.id, contributionToUpdate.id, amount)
+    await EVENT_ADMIN_CONTRIBUTION_UPDATE(
+      contributionToUpdate.userId,
+      contributionToUpdate.id,
+      amount,
+    )
 
     return result
   }

From 5ac70867dfca0e51a5915adfecfdfb4712a260a4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 11:54:28 +0100
Subject: [PATCH 011/101] admin open creations query

---
 backend/src/auth/RIGHTS.ts                    |  1 +
 .../graphql/resolver/ContributionResolver.ts  | 24 ++++++++-----------
 .../src/graphql/resolver/util/creations.ts    | 18 +++++++++++++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 8b0e82c86..22be48e40 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -54,4 +54,5 @@ export enum RIGHTS {
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
   DENY_CONTRIBUTION = 'DENY_CONTRIBUTION',
+  ADMIN_OPEN_CREATIONS = 'ADMIN_OPEN_CREATIONS',
 }
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 561d5c88c..49ab5fd15 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -27,11 +27,11 @@ import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
 import {
-  getCreationDates,
   getUserCreation,
   validateContribution,
   updateCreations,
   isValidDateString,
+  getOpenCreations,
 } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import {
@@ -570,21 +570,17 @@ export class ContributionResolver {
 
   @Authorized([RIGHTS.OPEN_CREATIONS])
   @Query(() => [OpenCreation])
-  async openCreations(
-    @Arg('userId', () => Int, { nullable: true }) userId: number | null,
+  async openCreations(@Ctx() context: Context): Promise<OpenCreation[]> {
+    return getOpenCreations(getUser(context).id, getClientTimezoneOffset(context))
+  }
+
+  @Authorized([RIGHTS.ADMIN_OPEN_CREATIONS])
+  @Query(() => [OpenCreation])
+  async adminOpenCreations(
+    @Arg('userId', () => Int) userId: number,
     @Ctx() context: Context,
   ): Promise<OpenCreation[]> {
-    const id = userId || getUser(context).id
-    const clientTimezoneOffset = getClientTimezoneOffset(context)
-    const creationDates = getCreationDates(clientTimezoneOffset)
-    const creations = await getUserCreation(id, clientTimezoneOffset)
-    return creationDates.map((date, index) => {
-      return {
-        month: date.getMonth(),
-        year: date.getFullYear(),
-        amount: creations[index],
-      }
-    })
+    return getOpenCreations(userId, getClientTimezoneOffset(context))
   }
 
   @Authorized([RIGHTS.DENY_CONTRIBUTION])
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index b9ba2e69f..8453781ca 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -4,6 +4,7 @@ import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import Decimal from 'decimal.js-light'
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '../const/const'
+import { OpenCreation } from '@model/OpenCreation'
 
 interface CreationMap {
   id: number
@@ -100,7 +101,7 @@ const getCreationMonths = (timezoneOffset: number): number[] => {
   return getCreationDates(timezoneOffset).map((date) => date.getMonth() + 1)
 }
 
-export const getCreationDates = (timezoneOffset: number): Date[] => {
+const getCreationDates = (timezoneOffset: number): Date[] => {
   const clientNow = new Date()
   clientNow.setTime(clientNow.getTime() - timezoneOffset * 60 * 1000)
   logger.info(
@@ -152,3 +153,18 @@ export const updateCreations = (
 export const isValidDateString = (dateString: string): boolean => {
   return new Date(dateString).toString() !== 'Invalid Date'
 }
+
+export const getOpenCreations = async (
+  id: number,
+  timezoneOffset: number,
+): Promise<OpenCreation[]> => {
+  const creations = await getUserCreation(id, timezoneOffset)
+  const creationDates = getCreationDates(timezoneOffset)
+  return creationDates.map((date, index) => {
+    return {
+      month: date.getMonth(),
+      year: date.getFullYear(),
+      amount: creations[index],
+    }
+  })
+}

From e07da27414d630e41ab103a05c62953a3ef3e5ed Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 12:48:27 +0100
Subject: [PATCH 012/101] get it working again

---
 admin/src/components/CreationFormular.vue     |  9 +++---
 admin/src/components/EditCreationFormular.vue | 17 +++++-----
 .../components/Tables/OpenCreationsTable.vue  | 18 -----------
 admin/src/graphql/adminOpenCreations.js       | 11 +++++++
 admin/src/graphql/openCreations.js            | 11 -------
 admin/src/mixins/creationMonths.js            | 31 ++++++++++++++++---
 6 files changed, 50 insertions(+), 47 deletions(-)
 create mode 100644 admin/src/graphql/adminOpenCreations.js
 delete mode 100644 admin/src/graphql/openCreations.js

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 137b46400..c6bade1a1 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -117,10 +117,6 @@ export default {
         return {}
       },
     },
-    creation: {
-      type: Array,
-      required: true,
-    },
   },
   data() {
     return {
@@ -129,6 +125,7 @@ export default {
       rangeMin: 0,
       rangeMax: 1000,
       selected: '',
+      userId: this.item.userId,
     }
   },
   methods: {
@@ -167,6 +164,10 @@ export default {
           this.$refs.creationForm.reset()
           this.value = 0
         })
+        .finally(() => {
+          this.$apollo.queries.OpenCreations.refetch()
+          this.selected = ''
+        })
     },
   },
   watch: {
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index fbc60df15..1d22460c7 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -75,7 +75,6 @@
 </template>
 <script>
 import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
-import { openCreations } from '../graphql/openCreations'
 import { creationMonths } from '../mixins/creationMonths'
 
 export default {
@@ -97,16 +96,14 @@ export default {
       type: Object,
       required: true,
     },
-    creation: {
-      type: Array,
-      default: () => [1000, 1000, 1000],
-    },
   },
   data() {
     return {
       text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
       value: !this.creationUserData.amount ? 0 : Number(this.creationUserData.amount),
       rangeMin: 0,
+      selected: this.selectedComputed,
+      userId: this.item.userId,
     }
   },
   methods: {
@@ -146,6 +143,9 @@ export default {
           // Den geschöpften Wert auf o setzen
           this.value = 0
         })
+        .finally(() => {
+          this.$apollo.queries.OpenCreations.refetch()
+        })
     },
   },
   computed: {
@@ -153,17 +153,16 @@ export default {
       const month = this.$d(new Date(this.item.contributionDate), 'month')
       return this.radioOptions.findIndex((obj) => obj.item.short === month)
     },
-    selected() {
+    selectedComputed() {
       return this.radioOptions[this.creationIndex].item
     },
     rangeMax() {
-      console.log('index', this.creationIndex, this.creation[this.creationIndex])
       return Number(this.creation[this.creationIndex]) + Number(this.item.amount)
     },
   },
   watch: {
-    creation() {
-      console.log('watch', this.creation)
+    selectedComputed() {
+      this.selected = this.selectedComputed
     },
   },
 }
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 83150e236..3b89a7d8c 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -95,7 +95,6 @@
                 type="singleCreation"
                 :item="row.item"
                 :row="row"
-                :creation="getOpenCreations(row.item.userId)"
                 :creationUserData="creationUserData"
                 @update-creation-data="updateCreationData"
               />
@@ -119,7 +118,6 @@ import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 import RowDetails from '../RowDetails'
 import EditCreationFormular from '../EditCreationFormular'
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList'
-import { openCreations } from '../../graphql/openCreations'
 
 const iconMap = {
   IN_PROGRESS: 'question-square',
@@ -188,22 +186,6 @@ export default {
     updateState(id) {
       this.$emit('update-state', id)
     },
-    getOpenCreations(userId) {
-      this.$apollo
-        .query({
-          query: openCreations,
-          variables: {
-            userId,
-          },
-        })
-        .then(({ data: { openCreations } }) => {
-          console.log(openCreations.map((obj) => obj.amount))
-          return openCreations.map((obj) => obj.amount)
-        })
-        .catch((error) => {
-          console.log(error)
-        })
-    },
   },
 }
 </script>
diff --git a/admin/src/graphql/adminOpenCreations.js b/admin/src/graphql/adminOpenCreations.js
new file mode 100644
index 000000000..0e766c0f7
--- /dev/null
+++ b/admin/src/graphql/adminOpenCreations.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const adminOpenCreations = gql`
+  query ($userId: Int!) {
+    adminOpenCreations(userId: $userId) {
+      year
+      month
+      amount
+    }
+  }
+`
diff --git a/admin/src/graphql/openCreations.js b/admin/src/graphql/openCreations.js
deleted file mode 100644
index 010ed62df..000000000
--- a/admin/src/graphql/openCreations.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import gql from 'graphql-tag'
-
-export const openCreations = gql`
-  query ($userId: Int) {
-    openCreations(userId: $userId) {
-      year
-      month
-      amount
-    }
-  }
-`
diff --git a/admin/src/mixins/creationMonths.js b/admin/src/mixins/creationMonths.js
index c26dc5b02..57e0ab17e 100644
--- a/admin/src/mixins/creationMonths.js
+++ b/admin/src/mixins/creationMonths.js
@@ -1,9 +1,11 @@
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+
 export const creationMonths = {
-  props: {
-    creation: {
-      type: Array,
-      default: () => [1000, 1000, 1000],
-    },
+  data() {
+    return {
+      creation: [1000, 1000, 1000],
+      userId: 0,
+    }
   },
   computed: {
     creationDates() {
@@ -38,4 +40,23 @@ export const creationMonths = {
       return this.creationDates.map((date) => this.$d(date, 'monthShort')).join(' | ')
     },
   },
+  apollo: {
+    OpenCreations: {
+      query() {
+        return adminOpenCreations
+      },
+      variables() {
+        return {
+          userId: this.userId,
+        }
+      },
+      fetchPolicy: 'no-cache',
+      update({ adminOpenCreations }) {
+        this.creation = adminOpenCreations.map((obj) => obj.amount)
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
 }

From edd42f02edc4ab67e1b47b2a13221461347999b3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:08:08 +0100
Subject: [PATCH 013/101] fix edit contribution formular, remove unused methods

---
 .../components/EditCreationFormular.spec.js   | 120 ++++++++++--------
 admin/src/components/EditCreationFormular.vue |  12 +-
 .../Tables/OpenCreationsTable.spec.js         |   6 +-
 .../components/Tables/OpenCreationsTable.vue  |  22 +---
 admin/src/graphql/adminUpdateContribution.js  |   1 -
 5 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 4a304dc79..ee0458ba2 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -1,19 +1,18 @@
 import { mount } from '@vue/test-utils'
 import EditCreationFormular from './EditCreationFormular'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
-
-const apolloMutateMock = jest.fn().mockResolvedValue({
-  data: {
-    adminUpdateContribution: {
-      creation: [0, 0, 0],
-      amount: 500,
-      date: new Date(),
-      memo: 'Test Schöpfung 2',
-    },
-  },
-})
+localVue.use(VueApollo)
 
 const stateCommitMock = jest.fn()
 
@@ -23,22 +22,18 @@ const mocks = {
     const date = new Date(d)
     return date.toISOString().split('T')[0]
   }),
-  $apollo: {
-    mutate: apolloMutateMock,
-  },
   $store: {
     commit: stateCommitMock,
   },
 }
 
-const now = new Date(Date.now())
+const now = new Date()
 const getCreationDate = (sub) => {
   const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
   return date.toISOString().split('T')[0]
 }
 
 const propsData = {
-  creation: [200, 400, 600],
   creationUserData: {
     memo: 'Test schöpfung 1',
     amount: 100,
@@ -46,20 +41,65 @@ const propsData = {
   },
   item: {
     id: 0,
-    email: 'bob@baumeister.de',
+    amount: '300',
+    contributionDate: `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`,
   },
 }
 
+const data = () => {
+  return { creation: ['1000', '1000', '400'] }
+}
+
 describe('EditCreationFormular', () => {
   let wrapper
 
+  const adminUpdateContributionMock = jest.fn()
+  const adminOpenCreationsMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminOpenCreations,
+    adminOpenCreationsMock.mockResolvedValue({
+      data: {
+        adminOpenCreations: [
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: now.getMonth(),
+            year: now.getFullYear(),
+            amount: '400',
+          },
+        ],
+      },
+    }),
+  )
+  mockClient.setRequestHandler(
+    adminUpdateContribution,
+    adminUpdateContributionMock.mockResolvedValue({
+      data: {
+        adminUpdateContribution: {
+          amount: '600',
+          date: new Date(),
+          memo: 'This is my memo',
+        },
+      },
+    }),
+  )
+
   const Wrapper = () => {
-    return mount(EditCreationFormular, { localVue, mocks, propsData })
+    return mount(EditCreationFormular, { localVue, mocks, propsData, data, apolloProvider })
   }
 
   describe('mount', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper = Wrapper()
+      await wrapper.vm.$nextTick()
     })
 
     it('has a DIV element with the class.component-edit-creation-formular', () => {
@@ -89,42 +129,16 @@ describe('EditCreationFormular', () => {
         })
 
         it('calls the API', () => {
-          expect(apolloMutateMock).toBeCalledWith(
-            expect.objectContaining({
-              variables: {
-                id: 0,
-                email: 'bob@baumeister.de',
-                creationDate: getCreationDate(0),
-                amount: 500,
-                memo: 'Test Schöpfung 2',
-              },
-            }),
-          )
-        })
-
-        it('emits update-user-data', () => {
-          expect(wrapper.emitted('update-user-data')).toEqual([
-            [
-              {
-                id: 0,
-                email: 'bob@baumeister.de',
-              },
-              [0, 0, 0],
-            ],
-          ])
+          expect(adminUpdateContributionMock).toBeCalledWith({
+            id: 0,
+            creationDate: getCreationDate(0),
+            amount: 500,
+            memo: 'Test Schöpfung 2',
+          })
         })
 
         it('emits update-creation-data', () => {
-          expect(wrapper.emitted('update-creation-data')).toEqual([
-            [
-              {
-                amount: 500,
-                date: expect.any(Date),
-                memo: 'Test Schöpfung 2',
-                row: expect.any(Object),
-              },
-            ],
-          ])
+          expect(wrapper.emitted('update-creation-data')).toBeTruthy()
         })
 
         it('toasts a success message', () => {
@@ -134,7 +148,7 @@ describe('EditCreationFormular', () => {
 
       describe('change and save memo and value with error', () => {
         beforeEach(async () => {
-          apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+          adminUpdateContributionMock.mockRejectedValue({ message: 'Oh no!' })
           await wrapper.find('input[type="number"]').setValue(500)
           await wrapper.find('textarea').setValue('Test Schöpfung 2')
           await wrapper.find('.test-submit').trigger('click')
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 1d22460c7..994a734f6 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -108,6 +108,7 @@ export default {
   },
   methods: {
     submitCreation() {
+      // console.log('submitCreation', this.selected)
       this.$apollo
         .mutate({
           mutation: adminUpdateContribution,
@@ -119,12 +120,7 @@ export default {
           },
         })
         .then((result) => {
-          this.$emit('update-creation-data', {
-            amount: Number(result.data.adminUpdateContribution.amount),
-            date: result.data.adminUpdateContribution.date,
-            memo: result.data.adminUpdateContribution.memo,
-            row: this.row,
-          })
+          this.$emit('update-creation-data')
           this.toastSuccess(
             this.$t('creation_form.toasted_update', {
               value: this.value,
@@ -151,7 +147,9 @@ export default {
   computed: {
     creationIndex() {
       const month = this.$d(new Date(this.item.contributionDate), 'month')
-      return this.radioOptions.findIndex((obj) => obj.item.short === month)
+      return this.radioOptions.findIndex((obj) => {
+        return obj.item.short === month
+      })
     },
     selectedComputed() {
       return this.radioOptions[this.creationIndex].item
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 6542dab31..4cd40017c 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -17,7 +17,7 @@ const propsData = {
       amount: 300,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [700, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -29,7 +29,7 @@ const propsData = {
       amount: 210,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: null,
+      moderatorId: null,
       creation: [790, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -41,7 +41,7 @@ const propsData = {
       amount: 330,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [670, 1000, 1000],
       __typename: 'PendingCreation',
     },
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 3b89a7d8c..9e0f3c747 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -96,7 +96,7 @@
                 :item="row.item"
                 :row="row"
                 :creationUserData="creationUserData"
-                @update-creation-data="updateCreationData"
+                @update-creation-data="$emit('update-contributions')"
               />
             </div>
             <div v-else>
@@ -145,16 +145,6 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      creationUserData: {
-        amount: null,
-        date: null,
-        memo: null,
-        moderator: null,
-      },
-    }
-  },
   methods: {
     myself(item) {
       return (
@@ -173,16 +163,6 @@ export default {
       if (item.state === 'IN_PROGRESS') return 'table-primary'
       if (item.state === 'PENDING') return 'table-primary'
     },
-    updateCreationData(data) {
-      const row = data.row
-      this.$emit('update-contributions', data)
-      delete data.row
-      this.creationUserData = { ...this.creationUserData, ...data }
-      row.toggleDetails()
-    },
-    updateUserData(rowItem, newCreation) {
-      rowItem.creation = newCreation
-    },
     updateState(id) {
       this.$emit('update-state', id)
     },
diff --git a/admin/src/graphql/adminUpdateContribution.js b/admin/src/graphql/adminUpdateContribution.js
index 7738640e7..c52a0cbc4 100644
--- a/admin/src/graphql/adminUpdateContribution.js
+++ b/admin/src/graphql/adminUpdateContribution.js
@@ -6,7 +6,6 @@ export const adminUpdateContribution = gql`
       amount
       date
       memo
-      creation
     }
   }
 `

From 0f01027f6b8ae8cfc44c143511b18f05969d7d45 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:11:17 +0100
Subject: [PATCH 014/101] fix open creation tests. remove tests for removed
 methods

---
 .../Tables/OpenCreationsTable.spec.js         | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 4cd40017c..cfb91be0d 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -5,7 +5,6 @@ const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue({})
 const apolloQueryMock = jest.fn().mockResolvedValue({})
-const toggleDetailsMock = jest.fn()
 
 const propsData = {
   items: [
@@ -132,14 +131,6 @@ describe('OpenCreationsTable', () => {
       })
     })
 
-    describe('call updateUserData', () => {
-      it('user creations has updated data', async () => {
-        wrapper.vm.updateUserData(propsData.items[0], [444, 555, 666])
-        await wrapper.vm.$nextTick()
-        expect(wrapper.vm.items[0].creation).toEqual([444, 555, 666])
-      })
-    })
-
     describe('call updateState', () => {
       beforeEach(() => {
         wrapper.vm.updateState(4)
@@ -149,40 +140,5 @@ describe('OpenCreationsTable', () => {
         expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
       })
     })
-
-    describe('call updateCreationData', () => {
-      const date = new Date()
-      beforeEach(() => {
-        wrapper.vm.updateCreationData({
-          amount: Number(80.0),
-          date: date,
-          memo: 'Test memo',
-          row: {
-            item: {},
-            detailsShowing: false,
-            toggleDetails: toggleDetailsMock,
-          },
-        })
-      })
-
-      it('emits update-state', () => {
-        expect(
-          wrapper.vm.$emit('update-contributions', {
-            amount: Number(80.0),
-            date: date,
-            memo: 'Test memo',
-            row: {
-              item: {},
-              detailsShowing: false,
-              toggleDetails: toggleDetailsMock,
-            },
-          }),
-        ).toBeTruthy()
-      })
-
-      it('calls toggleDetails', () => {
-        expect(toggleDetailsMock).toBeCalled()
-      })
-    })
   })
 })

From cef0e00f6eec4451997a517cb6a0b496d8c87ef4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:22:07 +0100
Subject: [PATCH 015/101] fix tests

---
 admin/src/components/CreationFormular.spec.js | 79 +++++++++++++------
 admin/src/components/CreationFormular.vue     |  3 +-
 2 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index 5dba2d931..c22b319a9 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -2,14 +2,18 @@ import { mount } from '@vue/test-utils'
 import CreationFormular from './CreationFormular'
 import { adminCreateContribution } from '../graphql/adminCreateContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
-const apolloMutateMock = jest.fn().mockResolvedValue({
-  data: {
-    adminCreateContribution: [0, 0, 0],
-  },
-})
 const stateCommitMock = jest.fn()
 
 const mocks = {
@@ -18,9 +22,6 @@ const mocks = {
     const date = new Date(d)
     return date.toISOString().split('T')[0]
   }),
-  $apollo: {
-    mutate: apolloMutateMock,
-  },
   $store: {
     commit: stateCommitMock,
   },
@@ -31,7 +32,8 @@ const propsData = {
   creation: [],
 }
 
-const now = new Date(Date.now())
+const now = new Date()
+
 const getCreationDate = (sub) => {
   const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
   return date.toISOString().split('T')[0]
@@ -40,8 +42,43 @@ const getCreationDate = (sub) => {
 describe('CreationFormular', () => {
   let wrapper
 
+  const adminOpenCreationsMock = jest.fn()
+  const adminCreateContributionMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminOpenCreations,
+    adminOpenCreationsMock.mockResolvedValue({
+      data: {
+        adminOpenCreations: [
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
+            amount: '200',
+          },
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
+            amount: '400',
+          },
+          {
+            month: now.getMonth(),
+            year: now.getFullYear(),
+            amount: '600',
+          },
+        ],
+      },
+    }),
+  )
+  mockClient.setRequestHandler(
+    adminCreateContribution,
+    adminCreateContributionMock.mockResolvedValue({
+      data: {
+        adminCreateContribution: [0, 0, 0],
+      },
+    }),
+  )
+
   const Wrapper = () => {
-    return mount(CreationFormular, { localVue, mocks, propsData })
+    return mount(CreationFormular, { localVue, mocks, propsData, apolloProvider })
   }
 
   describe('mount', () => {
@@ -107,17 +144,11 @@ describe('CreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalledWith(
-                expect.objectContaining({
-                  mutation: adminCreateContribution,
-                  variables: {
-                    email: 'benjamin@bluemchen.de',
-                    creationDate: getCreationDate(2),
-                    amount: 90,
-                    memo: 'Test create coins',
-                  },
-                }),
-              )
+              expect(adminCreateContributionMock).toBeCalledWith({
+                creationDate: getCreationDate(2),
+                amount: 90,
+                memo: 'Test create coins',
+              })
             })
 
             it('emits update-user-data', () => {
@@ -144,7 +175,7 @@ describe('CreationFormular', () => {
 
           describe('sendForm with server error', () => {
             beforeEach(async () => {
-              apolloMutateMock.mockRejectedValueOnce({ message: 'Ouch!' })
+              adminCreateContributionMock.mockRejectedValueOnce({ message: 'Ouch!' })
               await wrapper.find('.test-submit').trigger('click')
             })
 
@@ -212,7 +243,7 @@ describe('CreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(adminCreateContributionMock).toBeCalled()
             })
           })
 
@@ -275,7 +306,7 @@ describe('CreationFormular', () => {
             })
 
             it('sends mutation to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(adminCreateContributionMock).toBeCalled()
             })
 
             it('toast success message', () => {
diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index c6bade1a1..aeaa84cc6 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -133,14 +133,13 @@ export default {
       // do we want to reset the memo everytime the month changes?
       this.text = this.$t('creation_form.creation_for') + ' ' + name.short + ' ' + name.year
       this.rangeMin = 0
-      this.rangeMax = name.creation
+      this.rangeMax = Number(name.creation)
     },
     submitCreation() {
       this.$apollo
         .mutate({
           mutation: adminCreateContribution,
           variables: {
-            email: this.item.email,
             creationDate: this.selected.date,
             amount: Number(this.value),
             memo: this.text,

From d56390bad0396058a4b1e31c7e4f6f216a8cae3a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:22:45 +0100
Subject: [PATCH 016/101] remove creation from admin update contribution

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 49ab5fd15..b9c73cec5 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -357,8 +357,6 @@ export class ContributionResolver {
     result.memo = contributionToUpdate.memo
     result.date = contributionToUpdate.contributionDate
 
-    result.creation = await getUserCreation(contributionToUpdate.userId, clientTimezoneOffset)
-
     await EVENT_ADMIN_CONTRIBUTION_UPDATE(
       contributionToUpdate.userId,
       contributionToUpdate.id,

From 3d41f1d9f36b7e32b4febc9d7864d29bb8339196 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:24:34 +0100
Subject: [PATCH 017/101] moderator to moderatorId

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

diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index beb5bc2dd..23585611c 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -42,7 +42,7 @@ const defaultData = () => {
           amount: 500,
           memo: 'Danke für alles',
           date: new Date(),
-          moderator: 1,
+          moderatorId: 1,
           state: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
@@ -64,7 +64,7 @@ const defaultData = () => {
           amount: 1000000,
           memo: 'Gut Ergattert',
           date: new Date(),
-          moderator: 1,
+          moderatorId: 1,
           state: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,

From d9f5c1e89e252f49aa3f2e06bca5259b74e104b6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 14:28:27 +0100
Subject: [PATCH 018/101] use moderator id to identify myself

---
 admin/src/components/Tables/OpenCreationsTable.spec.js | 2 +-
 admin/src/components/Tables/OpenCreationsTable.vue     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index cfb91be0d..8f91aca03 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -82,7 +82,7 @@ const mocks = {
   $store: {
     state: {
       moderator: {
-        id: 0,
+        id: 1,
         name: 'test moderator',
       },
     },
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 9e0f3c747..9d93eba60 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -147,10 +147,7 @@ export default {
   },
   methods: {
     myself(item) {
-      return (
-        `${item.firstName} ${item.lastName}` ===
-        `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
-      )
+      return item.userId === this.$store.state.moderator.id
     },
     getStatusIcon(status) {
       return iconMap[status] ? iconMap[status] : 'default-icon'

From f8cc681e06102b2d4e827c736e966c78f65c1311 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 10 Mar 2023 15:26:07 +0100
Subject: [PATCH 019/101] fix unit tests

---
 .../resolver/ContributionResolver.test.ts      | 18 +++---------------
 backend/src/seeds/graphql/mutations.ts         | 11 ++---------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 274067ba0..944d9a03c 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -434,7 +434,6 @@ describe('ContributionResolver', () => {
             mutation: adminUpdateContribution,
             variables: {
               id: pendingContribution.data.createContribution.id,
-              email: 'bibi@bloxberg.de',
               amount: 10.0,
               memo: 'Test env contribution',
               creationDate: new Date().toString(),
@@ -1667,7 +1666,6 @@ describe('ContributionResolver', () => {
               mutation: adminUpdateContribution,
               variables: {
                 id: 1,
-                email: 'bibi@bloxberg.de',
                 amount: new Decimal(300),
                 memo: 'Danke Bibi!',
                 creationDate: contributionDateFormatter(new Date()),
@@ -1746,7 +1744,6 @@ describe('ContributionResolver', () => {
                 mutation: adminUpdateContribution,
                 variables: {
                   id: 1,
-                  email: 'bibi@bloxberg.de',
                   amount: new Decimal(300),
                   memo: 'Danke Bibi!',
                   creationDate: contributionDateFormatter(new Date()),
@@ -2076,7 +2073,7 @@ describe('ContributionResolver', () => {
           // stephen@hawking.uk: [1000, 1000, 1000] - deleted
           // garrick@ollivander.com: [1000, 1000, 1000] - not activated
 
-          describe('user for creation to update does not exist', () => {
+          describe.skip('user for creation to update does not exist', () => {
             it('throws an error', async () => {
               jest.clearAllMocks()
               await expect(
@@ -2084,7 +2081,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: 1,
-                    email: 'bob@baumeister.de',
                     amount: new Decimal(300),
                     memo: 'Danke Bibi!',
                     creationDate: contributionDateFormatter(new Date()),
@@ -2102,7 +2098,7 @@ describe('ContributionResolver', () => {
             })
           })
 
-          describe('user for creation to update is deleted', () => {
+          describe.skip('user for creation to update is deleted', () => {
             it('throws an error', async () => {
               jest.clearAllMocks()
               await expect(
@@ -2110,7 +2106,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: 1,
-                    email: 'stephen@hawking.uk',
                     amount: new Decimal(300),
                     memo: 'Danke Bibi!',
                     creationDate: contributionDateFormatter(new Date()),
@@ -2136,7 +2131,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: -1,
-                    email: 'bibi@bloxberg.de',
                     amount: new Decimal(300),
                     memo: 'Danke Bibi!',
                     creationDate: contributionDateFormatter(new Date()),
@@ -2154,7 +2148,7 @@ describe('ContributionResolver', () => {
             })
           })
 
-          describe('user email does not match creation user', () => {
+          describe.skip('user email does not match creation user', () => {
             it('throws an error', async () => {
               jest.clearAllMocks()
               await expect(
@@ -2162,7 +2156,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: creation ? creation.id : -1,
-                    email: 'bibi@bloxberg.de',
                     amount: new Decimal(300),
                     memo: 'Danke Bibi!',
                     creationDate: creation
@@ -2197,7 +2190,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: creation ? creation.id : -1,
-                    email: 'peter@lustig.de',
                     amount: new Decimal(1900),
                     memo: 'Danke Peter!',
                     creationDate: creation
@@ -2233,7 +2225,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: creation ? creation.id : -1,
-                    email: 'peter@lustig.de',
                     amount: new Decimal(300),
                     memo: 'Danke Peter!',
                     creationDate: creation
@@ -2248,7 +2239,6 @@ describe('ContributionResolver', () => {
                       date: expect.any(String),
                       memo: 'Danke Peter!',
                       amount: '300',
-                      creation: ['1000', '700', '500'],
                     },
                   },
                 }),
@@ -2274,7 +2264,6 @@ describe('ContributionResolver', () => {
                   mutation: adminUpdateContribution,
                   variables: {
                     id: creation ? creation.id : -1,
-                    email: 'peter@lustig.de',
                     amount: new Decimal(200),
                     memo: 'Das war leider zu Viel!',
                     creationDate: creation
@@ -2289,7 +2278,6 @@ describe('ContributionResolver', () => {
                       date: expect.any(String),
                       memo: 'Das war leider zu Viel!',
                       amount: '200',
-                      creation: ['1000', '800', '1000'],
                     },
                   },
                 }),
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index 69d6d16d8..94b840815 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -127,18 +127,11 @@ export const unDeleteUser = gql`
 `
 
 export const adminUpdateContribution = gql`
-  mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
-    adminUpdateContribution(
-      id: $id
-      email: $email
-      amount: $amount
-      memo: $memo
-      creationDate: $creationDate
-    ) {
+  mutation ($id: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+    adminUpdateContribution(id: $id, amount: $amount, memo: $memo, creationDate: $creationDate) {
       amount
       date
       memo
-      creation
     }
   }
 `

From 6549fdea0b80038bb0c43a29ecd927005dd4cfcf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 19:19:57 +0100
Subject: [PATCH 020/101] more rules

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

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index d8d232b25..fe05b6f1b 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -57,7 +57,7 @@ module.exports = {
     'import/no-absolute-path': 'error',
     'import/no-cycle': 'error',
     'import/no-dynamic-require': 'error',
-    'import/no-internal-modules': 'off',
+    'import/no-internal-modules': 'off', // TODO
     'import/no-relative-packages': 'error',
     'import/no-relative-parent-imports': ['error', { ignore: ['@/*'] }],
     'import/no-self-import': 'error',

From 95ac9a8cc693cc4398ca451fa38e74bbb54d9812 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 18:40:39 +0100
Subject: [PATCH 021/101] eslint-plugin-n + fixes

---
 backend/.eslintrc.js                          | 41 ++++++++++++++++++-
 backend/jest.config.js                        |  2 +
 backend/package.json                          |  4 ++
 backend/src/config/index.ts                   |  1 +
 backend/src/index.ts                          |  7 +---
 backend/src/middleware/klicktippMiddleware.ts |  1 +
 backend/src/server/plugins.ts                 |  1 +
 backend/yarn.lock                             | 31 +++++++++++++-
 8 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index fe05b6f1b..f3c5f0b45 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
     node: true,
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import'],
+  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n'],
   extends: [
     'standard',
     'eslint:recommended',
@@ -78,6 +78,45 @@ module.exports = {
     'import/no-unassigned-import': 'error',
     'import/order': 'error',
     'import/prefer-default-export': 'off', // TODO
+    // n
+    'n/handle-callback-err': 'error',
+    'n/no-callback-literal': 'error',
+    'n/no-exports-assign': 'error',
+    'n/no-extraneous-import': 'error',
+    'n/no-extraneous-require': 'error',
+    'n/no-hide-core-modules': 'error',
+    'n/no-missing-import': 'off', // not compatible with typescript
+    'n/no-missing-require': 'error',
+    'n/no-new-require': 'error',
+    'n/no-path-concat': 'error',
+    'n/no-process-exit': 'error',
+    'n/no-unpublished-bin': 'error',
+    'n/no-unpublished-import': 'off', // TODO need to exclude seeds
+    'n/no-unpublished-require': 'error',
+    'n/no-unsupported-features': ['error', { ignores: ['modules'] }],
+    'n/no-unsupported-features/es-builtins': 'error',
+    'n/no-unsupported-features/es-syntax': 'error',
+    'n/no-unsupported-features/node-builtins': 'error',
+    'n/process-exit-as-throw': 'error',
+    'n/shebang': 'error',
+    'n/callback-return': 'error',
+    'n/exports-style': 'error',
+    'n/file-extension-in-import': ['error', 'never'],
+    'n/global-require': 'error',
+    'n/no-mixed-requires': 'error',
+    'n/no-process-env': 'error',
+    'n/no-restricted-import': 'error',
+    'n/no-restricted-require': 'error',
+    'n/no-sync': 'error',
+    'n/prefer-global/buffer': 'error',
+    'n/prefer-global/console': 'error',
+    'n/prefer-global/process': 'error',
+    'n/prefer-global/text-decoder': 'error',
+    'n/prefer-global/text-encoder': 'error',
+    'n/prefer-global/url': 'error',
+    'n/prefer-global/url-search-params': 'error',
+    'n/prefer-promises/dns': 'error',
+    'n/prefer-promises/fs': 'error',
   },
   overrides: [
     // only for ts files
diff --git a/backend/jest.config.js b/backend/jest.config.js
index a6ae81d5f..f5dc0c069 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -17,10 +17,12 @@ module.exports = {
     '@repository/(.*)': '<rootDir>/src/typeorm/repository/$1',
     '@test/(.*)': '<rootDir>/test/$1',
     '@entity/(.*)':
+      // eslint-disable-next-line n/no-process-env
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/entity/$1'
         : '<rootDir>/../database/build/entity/$1',
     '@dbTools/(.*)':
+      // eslint-disable-next-line n/no-process-env
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/src/$1'
         : '<rootDir>/../database/build/src/$1',
diff --git a/backend/package.json b/backend/package.json
index d48db9b51..256c1d5cd 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -65,6 +65,7 @@
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-promise": "^5.1.0",
@@ -83,5 +84,8 @@
     "ignore": [
       "**/*.test.ts"
     ]
+  },
+  "engines": {
+    "node": ">=19"
   }
 }
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index d4e5f56a8..942357c0b 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -1,5 +1,6 @@
 // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
 
+/* eslint-disable n/no-process-env */
 import dotenv from 'dotenv'
 import { Decimal } from 'decimal.js-light'
 
diff --git a/backend/src/index.ts b/backend/src/index.ts
index cd6d002cc..2917ac9b3 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,10 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
 import createServer from './server/createServer'
-
-// config
-import CONFIG from './config'
 import { startValidateCommunities } from './federation/validateCommunities'
+import CONFIG from '@/config'
 
 async function main() {
   const { app } = await createServer()
@@ -23,5 +20,5 @@ async function main() {
 main().catch((e) => {
   // eslint-disable-next-line no-console
   console.error(e)
-  process.exit(1)
+  throw e
 })
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 0469b4ccc..8ad0a6111 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -26,6 +26,7 @@ export const klicktippNewsletterStateMiddleware: MiddlewareFn = async (
   { root, args, context, info },
   next,
 ) => {
+  // eslint-disable-next-line n/callback-return
   const result = await next()
   let klickTipp = new KlickTipp({ status: 'Unsubscribed' })
   if (CONFIG.KLICKTIPP) {
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index bc2495b71..d113cb4b7 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -61,6 +61,7 @@ ${JSON.stringify(requestContext.response.errors, null, 2)}`)
 }
 
 const plugins =
+  // eslint-disable-next-line n/no-process-env
   process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin, logPlugin]
 
 export default plugins
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 2a611bd3f..3db6ab6ff 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1998,6 +1998,13 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+builtins@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
+
 busboy@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
@@ -2937,6 +2944,14 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
+eslint-plugin-es@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9"
+  integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==
+  dependencies:
+    eslint-utils "^2.0.0"
+    regexpp "^3.0.0"
+
 eslint-plugin-import@^2.27.5:
   version "2.27.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
@@ -2965,6 +2980,20 @@ eslint-plugin-jest@^27.2.1:
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"
 
+eslint-plugin-n@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz#f7e77f24abb92a550115cf11e29695da122c398c"
+  integrity sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==
+  dependencies:
+    builtins "^5.0.1"
+    eslint-plugin-es "^4.1.0"
+    eslint-utils "^3.0.0"
+    ignore "^5.1.1"
+    is-core-module "^2.11.0"
+    minimatch "^3.1.2"
+    resolve "^1.22.1"
+    semver "^7.3.8"
+
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
@@ -6293,7 +6322,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.7:
+semver@^7.0.0, semver@^7.3.7, semver@^7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==

From d6e4fceef969f367d876a749ed997c0f3dd61a36 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 12 Mar 2023 02:28:27 +0100
Subject: [PATCH 022/101] merge error

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

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index f3c5f0b45..b33a3e480 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -57,7 +57,7 @@ module.exports = {
     'import/no-absolute-path': 'error',
     'import/no-cycle': 'error',
     'import/no-dynamic-require': 'error',
-    'import/no-internal-modules': 'off', // TODO
+    'import/no-internal-modules': 'off',
     'import/no-relative-packages': 'error',
     'import/no-relative-parent-imports': ['error', { ignore: ['@/*'] }],
     'import/no-self-import': 'error',

From d01b78c74956dd2e38a0894c8d1dd9afcbdd2d95 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 12 Mar 2023 02:36:16 +0100
Subject: [PATCH 023/101] reduce minimum node version to 14

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

diff --git a/backend/package.json b/backend/package.json
index 256c1d5cd..afa4f367f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -86,6 +86,6 @@
     ]
   },
   "engines": {
-    "node": ">=19"
+    "node": ">=14"
   }
 }

From c0466745cca4344f635084b894fcb95347f53f70 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 12 Mar 2023 03:01:52 +0100
Subject: [PATCH 024/101] update eslint dependencies and fix resulting errors

---
 backend/package.json                          |  11 +-
 backend/src/apis/HttpRequest.ts               |   1 +
 backend/src/apis/KlicktippController.ts       |   1 +
 .../src/federation/client/GraphQLGetClient.ts |   1 +
 backend/src/graphql/directive/isAuthorized.ts |   2 +-
 .../resolver/ContributionLinkResolver.test.ts |   2 +-
 .../ContributionMessageResolver.test.ts       |   2 +-
 .../resolver/ContributionMessageResolver.ts   |   2 +-
 .../resolver/ContributionResolver.test.ts     |   2 +-
 backend/src/graphql/resolver/GdtResolver.ts   |   1 +
 .../graphql/resolver/StatisticsResolver.ts    |   1 +
 .../resolver/TransactionLinkResolver.test.ts  |   2 +-
 .../resolver/TransactionResolver.test.ts      |   2 +-
 .../src/graphql/resolver/UserResolver.test.ts |   6 +-
 backend/src/graphql/resolver/UserResolver.ts  |   5 +-
 .../src/graphql/resolver/semaphore.test.ts    |   2 +-
 .../graphql/resolver/util/creations.test.ts   |   2 +-
 .../src/graphql/resolver/util/creations.ts    |   1 +
 .../resolver/util/findContributions.ts        |   2 +-
 backend/src/graphql/scalar/Decimal.ts         |   1 +
 backend/src/middleware/klicktippMiddleware.ts |   1 +
 backend/src/password/EncryptorUtils.ts        |   1 +
 backend/src/server/LogError.ts                |   1 +
 backend/src/server/logger.ts                  |   1 +
 .../src/typeorm/repository/TransactionLink.ts |   1 +
 backend/src/webhook/elopage.ts                |   1 +
 backend/test/extensions.ts                    |   1 +
 backend/test/helpers.ts                       |   1 +
 backend/yarn.lock                             | 504 ++++++++----------
 29 files changed, 250 insertions(+), 311 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index afa4f367f..7d110c7df 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -56,19 +56,18 @@
     "@types/node": "^16.10.3",
     "@types/nodemailer": "^6.4.4",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
-    "@typescript-eslint/parser": "^4.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
     "apollo-server-testing": "^2.25.2",
-    "eslint": "^7.29.0",
+    "eslint": "^8.36.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.3",
+    "eslint-config-standard": "^17.0.0",
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-n": "^15.6.1",
-    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-type-graphql": "^1.0.0",
     "faker": "^5.5.3",
     "graphql-tag": "^2.12.6",
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index eff0c408a..ff4d3845d 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import axios from 'axios'
 
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts
index fe9ad563a..9dc19b4e0 100644
--- a/backend/src/apis/KlicktippController.ts
+++ b/backend/src/apis/KlicktippController.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { KlicktippConnector } from './klicktippConnector'
 import CONFIG from '@/config'
 
diff --git a/backend/src/federation/client/GraphQLGetClient.ts b/backend/src/federation/client/GraphQLGetClient.ts
index 7e2d89b6c..7b4225c9c 100644
--- a/backend/src/federation/client/GraphQLGetClient.ts
+++ b/backend/src/federation/client/GraphQLGetClient.ts
@@ -2,6 +2,7 @@ import { GraphQLClient } from 'graphql-request'
 import { PatchedRequestInit } from 'graphql-request/dist/types'
 
 export class GraphQLGetClient extends GraphQLClient {
+  // eslint-disable-next-line no-use-before-define
   private static instance: GraphQLGetClient
 
   /**
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 6cdac9b97..3adc79ff0 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { AuthChecker } from 'type-graphql'
 
 import { User } from '@entity/User'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 27846d0e2..697f1b5d2 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index df624ed0a..fec8c8a81 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { GraphQLError } from 'graphql'
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index e9258490e..ed05284e2 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -78,7 +78,7 @@ export class ContributionMessageResolver {
       .select('cm')
       .from(DbContributionMessage, 'cm')
       .leftJoinAndSelect('cm.user', 'u')
-      .where({ contributionId: contributionId })
+      .where({ contributionId })
       .orderBy('cm.createdAt', order)
       .limit(pageSize)
       .offset((currentPage - 1) * pageSize)
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 8288fde47..1086bfef6 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 import { EventProtocol } from '@entity/EventProtocol'
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index e12f92458..000168934 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
 
 import { GdtEntryList } from '@model/GdtEntryList'
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index d5ae9503c..d48d41cb5 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index f9c4835f0..d29a11d87 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { User } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index bc06406d4..9c4d65c21 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { EventProtocol } from '@entity/EventProtocol'
 import { Transaction } from '@entity/Transaction'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 54623e7f5..be21c872f 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { GraphQLError } from 'graphql'
 import { User } from '@entity/User'
 import { TransactionLink } from '@entity/TransactionLink'
@@ -1367,7 +1367,7 @@ describe('UserResolver', () => {
       })
 
       it('changes to gradidoID on login', async () => {
-        await mutate({ mutation: login, variables: variables })
+        await mutate({ mutation: login, variables })
 
         const usercontact = await UserContact.findOneOrFail(
           { email: 'bibi@bloxberg.de' },
@@ -1388,7 +1388,7 @@ describe('UserResolver', () => {
 
       it('can login after password change', async () => {
         resetToken()
-        expect(await mutate({ mutation: login, variables: variables })).toEqual(
+        expect(await mutate({ mutation: login, variables })).toEqual(
           expect.objectContaining({
             data: {
               login: {
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 6c59c251c..9f5a11f76 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -93,6 +93,7 @@ const newEmailContact = (email: string, userId: number): DbUserContact => {
   return emailContact
 }
 
+// eslint-disable-next-line @typescript-eslint/ban-types
 export const activationLink = (verificationCode: BigInt): string => {
   logger.debug(`activationLink(${verificationCode})...`)
   return CONFIG.EMAIL_LINK_SETPASSWORD.replace(/{optin}/g, verificationCode.toString())
@@ -815,7 +816,7 @@ export class UserResolver {
 
 export async function findUserByEmail(email: string): Promise<DbUser> {
   const dbUserContact = await DbUserContact.findOneOrFail(
-    { email: email },
+    { email },
     { withDeleted: true, relations: ['user'] },
   ).catch(() => {
     throw new LogError('No user with this credentials', email)
@@ -826,7 +827,7 @@ export async function findUserByEmail(email: string): Promise<DbUser> {
 }
 
 async function checkEmailExists(email: string): Promise<boolean> {
-  const userContact = await DbUserContact.findOne({ email: email }, { withDeleted: true })
+  const userContact = await DbUserContact.findOne({ email }, { withDeleted: true })
   if (userContact) {
     return true
   }
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index a770638fb..65af45b4d 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 7461401c8..9fe7bacf3 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { User } from '@entity/User'
 import { Contribution } from '@entity/Contribution'
 import { getUserCreation } from './creations'
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index c9be2c57c..21aaac15f 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 782ec73d5..c47fa5d60 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -17,7 +17,7 @@ export const findContributions = async (
       ...(statusFilter && statusFilter.length && { contributionStatus: In(statusFilter) }),
       ...(userId && { userId }),
     },
-    withDeleted: withDeleted,
+    withDeleted,
     order: {
       createdAt: order,
       id: order,
diff --git a/backend/src/graphql/scalar/Decimal.ts b/backend/src/graphql/scalar/Decimal.ts
index 586481a6d..5ed593f3f 100644
--- a/backend/src/graphql/scalar/Decimal.ts
+++ b/backend/src/graphql/scalar/Decimal.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { GraphQLScalarType, Kind } from 'graphql'
 import { Decimal } from 'decimal.js-light'
 
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 8ad0a6111..9fe615f54 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { MiddlewareFn } from 'type-graphql'
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import { KlickTipp } from '@model/KlickTipp'
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index b4531b3bb..ea34f5c93 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { User } from '@entity/User'
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts
index b753d204e..570b0acfa 100644
--- a/backend/src/server/LogError.ts
+++ b/backend/src/server/LogError.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { backendLogger as logger } from './logger'
 
 export default class LogError extends Error {
diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts
index 0887340d4..338025ae3 100644
--- a/backend/src/server/logger.ts
+++ b/backend/src/server/logger.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { readFileSync } from 'fs'
 import { configure, getLogger } from 'log4js'
 import CONFIG from '@/config'
diff --git a/backend/src/typeorm/repository/TransactionLink.ts b/backend/src/typeorm/repository/TransactionLink.ts
index d2458b386..8a66aa7cf 100644
--- a/backend/src/typeorm/repository/TransactionLink.ts
+++ b/backend/src/typeorm/repository/TransactionLink.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Repository, EntityRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { Decimal } from 'decimal.js-light'
diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts
index 6f3e3cbdb..af2f1256b 100644
--- a/backend/src/webhook/elopage.ts
+++ b/backend/src/webhook/elopage.ts
@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /*
     Elopage Webhook
 
diff --git a/backend/test/extensions.ts b/backend/test/extensions.ts
index 359597f4a..262a9bcdb 100644
--- a/backend/test/extensions.ts
+++ b/backend/test/extensions.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-empty-interface */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { Decimal } from 'decimal.js-light'
 
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index ad6d2c4e3..b27180b80 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -5,6 +5,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { createTestClient } from 'apollo-server-testing'
 import { initialize } from '@dbTools/helpers'
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 3db6ab6ff..ffe38c21d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -46,13 +46,6 @@
     http-errors "^1.7.3"
     object-path "^0.11.4"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
@@ -221,7 +214,7 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
+"@babel/highlight@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
   integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
@@ -389,21 +382,38 @@
   dependencies:
     "@cspotcode/source-map-consumer" "0.8.0"
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz#a831e6e468b4b2b5ae42bf658bea015bf10bc518"
+  integrity sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403"
+  integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==
+
+"@eslint/eslintrc@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.1.tgz#7888fe7ec8f21bc26d646dbd2c11cd776e21192d"
+  integrity sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.5.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.36.0":
+  version "8.36.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe"
+  integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==
+
 "@graphql-typed-document-node/core@^3.1.1":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
@@ -421,19 +431,24 @@
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-10.0.1.tgz#ee9da297fabc557e1c040a0f44ee89c266ccc306"
   integrity sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
+  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
 
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
-  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
@@ -704,7 +719,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1026,11 +1041,6 @@
     jest-diff "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@^7.0.7":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -1209,32 +1219,22 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
   integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
 
-"@typescript-eslint/eslint-plugin@^4.28.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
-  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
+"@typescript-eslint/eslint-plugin@^5.54.1":
+  version "5.54.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz#0c5091289ce28372e38ab8d28e861d2dbe1ab29e"
+  integrity sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.33.0"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    debug "^4.3.1"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.1.0"
-    semver "^7.3.5"
+    "@typescript-eslint/scope-manager" "5.54.1"
+    "@typescript-eslint/type-utils" "5.54.1"
+    "@typescript-eslint/utils" "5.54.1"
+    debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    regexpp "^3.2.0"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
-  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
-  dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
 "@typescript-eslint/experimental-utils@^5.9.0":
   version "5.53.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz#e249e3a47ace290ea3d83a5a08c8d90cd7fe2a53"
@@ -1242,23 +1242,15 @@
   dependencies:
     "@typescript-eslint/utils" "5.53.0"
 
-"@typescript-eslint/parser@^4.28.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
-  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+"@typescript-eslint/parser@^5.54.1":
+  version "5.54.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.54.1.tgz#05761d7f777ef1c37c971d3af6631715099b084c"
+  integrity sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    debug "^4.3.1"
-
-"@typescript-eslint/scope-manager@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
-  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
+    "@typescript-eslint/scope-manager" "5.54.1"
+    "@typescript-eslint/types" "5.54.1"
+    "@typescript-eslint/typescript-estree" "5.54.1"
+    debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.53.0":
   version "5.53.0"
@@ -1276,10 +1268,15 @@
     "@typescript-eslint/types" "5.54.1"
     "@typescript-eslint/visitor-keys" "5.54.1"
 
-"@typescript-eslint/types@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
-  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+"@typescript-eslint/type-utils@5.54.1":
+  version "5.54.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.54.1.tgz#4825918ec27e55da8bb99cd07ec2a8e5f50ab748"
+  integrity sha512-WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.54.1"
+    "@typescript-eslint/utils" "5.54.1"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
 
 "@typescript-eslint/types@5.53.0":
   version "5.53.0"
@@ -1291,19 +1288,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.1.tgz#29fbac29a716d0f08c62fe5de70c9b6735de215c"
   integrity sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==
 
-"@typescript-eslint/typescript-estree@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
-  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/typescript-estree@5.53.0":
   version "5.53.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690"
@@ -1344,7 +1328,7 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@^5.10.0":
+"@typescript-eslint/utils@5.54.1", "@typescript-eslint/utils@^5.10.0":
   version "5.54.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.54.1.tgz#7a3ee47409285387b9d4609ea7e1020d1797ec34"
   integrity sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==
@@ -1358,14 +1342,6 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
-  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
-  dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    eslint-visitor-keys "^2.0.0"
-
 "@typescript-eslint/visitor-keys@5.53.0":
   version "5.53.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
@@ -1415,7 +1391,7 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -1430,7 +1406,7 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -1440,6 +1416,11 @@ acorn@^8.2.4, acorn@^8.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
+acorn@^8.8.0:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -1457,16 +1438,6 @@ ajv@^6.10.0, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
-  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 ansi-align@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
@@ -1763,11 +1734,6 @@ assert-never@^1.2.1:
   resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
   integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-retry@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
@@ -2442,7 +2408,7 @@ debug@2.6.9, debug@^2.2.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -2456,7 +2422,7 @@ debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.3, debug@^4.3.4:
+debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2743,13 +2709,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -2902,10 +2861,10 @@ eslint-config-prettier@^8.3.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
   integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
-eslint-config-standard@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"
-  integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==
+eslint-config-standard@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
+  integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
 
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
@@ -2936,14 +2895,6 @@ eslint-module-utils@^2.7.4:
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-es@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
-  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
-  dependencies:
-    eslint-utils "^2.0.0"
-    regexpp "^3.0.0"
-
 eslint-plugin-es@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9"
@@ -2994,18 +2945,6 @@ eslint-plugin-n@^15.6.1:
     resolve "^1.22.1"
     semver "^7.3.8"
 
-eslint-plugin-node@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
-  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
-  dependencies:
-    eslint-plugin-es "^3.0.0"
-    eslint-utils "^2.0.0"
-    ignore "^5.1.1"
-    minimatch "^3.0.4"
-    resolve "^1.10.1"
-    semver "^6.1.0"
-
 eslint-plugin-prettier@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
@@ -3013,10 +2952,10 @@ eslint-plugin-prettier@^3.4.0:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-promise@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24"
-  integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==
+eslint-plugin-promise@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
+  integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
 
 eslint-plugin-type-graphql@^1.0.0:
   version "1.0.0"
@@ -3033,7 +2972,15 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-utils@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
@@ -3047,7 +2994,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -3062,70 +3009,70 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^7.29.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint@^8.36.0:
+  version "8.36.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf"
+  integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.0.1"
+    "@eslint/js" "8.36.0"
+    "@humanwhocodes/config-array" "^0.11.8"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^7.1.1"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.5.0"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113"
+  integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -3262,17 +3209,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.1.1:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
 fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -3350,6 +3286,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -3438,11 +3382,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -3544,6 +3483,13 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -3568,10 +3514,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
-  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -3587,18 +3533,6 @@ globalyzer@0.1.0:
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
   integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
 
-globby@^11.0.3:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
 globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -3675,6 +3609,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
     typeorm "^0.2.38"
     uuid "^8.3.2"
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 graphql-extensions@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817"
@@ -3980,12 +3919,7 @@ ignore-by-default@^1.0.1:
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
   integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
+ignore@^5.1.1:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -4230,7 +4164,7 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-inside@^3.0.2:
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -4803,6 +4737,11 @@ jest@^27.2.4:
     import-local "^3.0.2"
     jest-cli "^27.2.5"
 
+js-sdsl@^4.1.4:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
+  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
+
 js-stringify@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
@@ -4821,7 +4760,7 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.0.0:
+js-yaml@^4.0.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -4876,11 +4815,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -5047,6 +4981,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -5102,11 +5043,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash@4.x, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -5288,7 +5224,7 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.1.2:
+minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5391,6 +5327,11 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5673,6 +5614,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -5680,6 +5628,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-timeout@^3.0.0, p-timeout@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
@@ -5874,11 +5829,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 promise@^7.0.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -6139,7 +6089,7 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
+regexpp@^3.0.0, regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -6163,11 +6113,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -6185,14 +6130,6 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.10.1, resolve@^1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
 resolve@^1.15.1, resolve@^1.22.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
@@ -6202,6 +6139,14 @@ resolve@^1.15.1, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -6305,7 +6250,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.x, semver@^7.3.2, semver@^7.3.4:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -6317,7 +6262,7 @@ semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -6439,15 +6384,6 @@ slash@^4.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 slick@^1.12.2:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
@@ -6682,18 +6618,6 @@ synckit@^0.8.4:
     "@pkgr/utils" "^2.3.1"
     tslib "^2.5.0"
 
-table@^6.0.9:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
-  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -7141,11 +7065,6 @@ uuid@^8.0.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 v8-to-istanbul@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c"
@@ -7432,6 +7351,11 @@ yn@3.1.1:
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 zen-observable-ts@^0.8.21:
   version "0.8.21"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"

From 0936602cb6133f6e9ba4ec96f8fd9a59d378984b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 14 Mar 2023 12:17:10 +0100
Subject: [PATCH 025/101] feat(frontend): send coins via gradidoID

---
 frontend/src/components/GddSend/TransactionForm.vue | 13 ++++++++++++-
 frontend/src/components/TransactionRows/Name.vue    |  5 +++--
 frontend/src/graphql/mutations.js                   |  1 +
 frontend/src/graphql/queries.js                     |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index b560e0767..51e5c5ece 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -50,7 +50,7 @@
                 <b-col>
                   <b-row>
                     <b-col cols="12">
-                      <div v-if="radioSelected === sendTypes.send">
+                      <div v-if="radioSelected === sendTypes.send && !gradidoID">
                         <input-email
                           :name="$t('form.recipient')"
                           :label="$t('form.recipient')"
@@ -60,6 +60,14 @@
                           @onValidation="onValidation"
                         />
                       </div>
+                      <div v-else-if="gradidoID" class="mb-4">
+                        <b-row>
+                          <b-col>{{ $t('form.recipient') }}</b-col>
+                        </b-row>
+                        <b-row>
+                          <b-col>{{ gradidoID }}</b-col>
+                        </b-row>
+                      </div>
                     </b-col>
                     <b-col cols="12" lg="6">
                       <input-amount
@@ -196,6 +204,9 @@ export default {
     recipientEmail() {
       return this.getTunneledEmail()
     },
+    gradidoID() {
+      return this.$route.query && this.$route.query.gradidoID
+    },
   },
   created() {
     this.setNewRecipientEmail()
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index 4b7f8bc6d..84b235cb3 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="name">
     <div class="gdd-transaction-list-item-name">
-      <div v-if="linkedUser && linkedUser.email">
+      <div v-if="linkedUser && linkedUser.gradidoID">
         <b-link @click.stop="tunnelEmail" :class="fontColor">
           {{ itemText }}
         </b-link>
@@ -36,7 +36,8 @@ export default {
   methods: {
     tunnelEmail() {
       this.$emit('set-tunneled-email', this.linkedUser.email)
-      if (this.$router.history.current.fullPath !== '/send') this.$router.push({ path: '/send' })
+      if (this.$router.history.current.fullPath !== '/send')
+        this.$router.push({ path: '/send', query: { gradidoID: this.linkedUser.gradidoID } })
     },
   },
   computed: {
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 55858b09b..0f173d3b9 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -144,6 +144,7 @@ export const createContributionMessage = gql`
 export const login = gql`
   mutation($email: String!, $password: String!, $publisherId: Int) {
     login(email: $email, password: $password, publisherId: $publisherId) {
+      gradidoID
       email
       firstName
       lastName
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 7193eded0..45f360610 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -38,6 +38,7 @@ export const transactionsQuery = gql`
         linkedUser {
           firstName
           lastName
+          gradidoID
           email
         }
         decay {

From 8db5c055e5ae39777ef164349c35b4a03b32a58c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 14 Mar 2023 13:08:51 +0100
Subject: [PATCH 026/101] simple user query and test

---
 backend/src/auth/RIGHTS.ts                    |   1 +
 backend/src/auth/ROLES.ts                     |   1 +
 .../src/graphql/resolver/UserResolver.test.ts | 104 +++++++++++++++++-
 backend/src/graphql/resolver/UserResolver.ts  |  15 +++
 backend/src/seeds/graphql/queries.ts          |   9 ++
 5 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 22be48e40..3f39f1424 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -36,6 +36,7 @@ export enum RIGHTS {
   CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE',
   LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES',
   OPEN_CREATIONS = 'OPEN_CREATIONS',
+  USER = 'USER',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
   SET_USER_ROLE = 'SET_USER_ROLE',
diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts
index 2f3b4e081..df1ee0271 100644
--- a/backend/src/auth/ROLES.ts
+++ b/backend/src/auth/ROLES.ts
@@ -34,6 +34,7 @@ export const ROLE_USER = new Role('user', [
   RIGHTS.CREATE_CONTRIBUTION_MESSAGE,
   RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES,
   RIGHTS.OPEN_CREATIONS,
+  RIGHTS.USER,
 ])
 export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights
 
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index a57346583..c75678439 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -26,7 +26,13 @@ import {
   unDeleteUser,
   sendActivationEmail,
 } from '@/seeds/graphql/mutations'
-import { verifyLogin, queryOptIn, searchAdminUsers, searchUsers } from '@/seeds/graphql/queries'
+import {
+  verifyLogin,
+  queryOptIn,
+  searchAdminUsers,
+  searchUsers,
+  user as userQuery,
+} from '@/seeds/graphql/queries'
 import { GraphQLError } from 'graphql'
 import { User } from '@entity/User'
 import CONFIG from '@/config'
@@ -2189,6 +2195,102 @@ describe('UserResolver', () => {
       })
     })
   })
+
+  describe('user', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    describe('unauthenticated', () => {
+      it('throws and logs "401 Unauthorized" error', async () => {
+        await expect(
+          query({
+            query: userQuery,
+            variables: {
+              identifier: 'identifier',
+            },
+          }),
+        ).resolves.toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('401 Unauthorized')],
+          }),
+        )
+        expect(logger.error).toBeCalledWith('401 Unauthorized')
+      })
+    })
+
+    describe('authenticated', () => {
+      beforeAll(async () => {
+        user = await userFactory(testEnv, bibiBloxberg)
+        await mutate({
+          mutation: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+      })
+
+      describe('identifier is no gradido ID', () => {
+        it('throws and logs "No valid gradido ID" error', async () => {
+          await expect(
+            query({
+              query: userQuery,
+              variables: {
+                identifier: 'identifier',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [new GraphQLError('No valid gradido ID')],
+            }),
+          )
+          expect(logger.error).toBeCalledWith('No valid gradido ID', 'identifier')
+        })
+      })
+
+      describe('identifier is not found', () => {
+        it('throws and logs "No user found to given identifier" error', async () => {
+          await expect(
+            query({
+              query: userQuery,
+              variables: {
+                identifier: '00000000-0000-0000-0000-000000000000',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [new GraphQLError('No user found to given identifier')],
+            }),
+          )
+          expect(logger.error).toBeCalledWith(
+            'No user found to given identifier',
+            '00000000-0000-0000-0000-000000000000',
+          )
+        })
+      })
+
+      describe('identifier is found', () => {
+        it('returns user', async () => {
+          await expect(
+            query({
+              query: userQuery,
+              variables: {
+                identifier: user.gradidoID,
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                user: {
+                  firstName: 'Bibi',
+                  lastName: 'Bloxberg',
+                },
+              },
+              errors: undefined,
+            }),
+          )
+        })
+      })
+    })
+  })
 })
 
 describe('printTimeDuration', () => {
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 078a29a8e..c07946f0b 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -811,6 +811,21 @@ export class UserResolver {
 
     return true
   }
+
+  @Authorized([RIGHTS.USER])
+  @Query(() => User, { nullable: true })
+  async user(@Arg('identifier') identifier: string): Promise<User | null> {
+    const isGradidoID =
+      /^[0-9a-f]{8,8}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{12,12}$/.exec(identifier)
+    if (!isGradidoID) {
+      throw new LogError('No valid gradido ID', identifier)
+    }
+    const user = await DbUser.findOne({ where: { gradidoID: identifier } })
+    if (!user) {
+      throw new LogError('No user found to given identifier', identifier)
+    }
+    return new User(user)
+  }
 }
 
 export async function findUserByEmail(email: string): Promise<DbUser> {
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 299a0103d..7c893586a 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -322,3 +322,12 @@ export const listContributionMessages = gql`
     }
   }
 `
+
+export const user = gql`
+  query ($identifier: String!) {
+    user(identifier: $identifier) {
+      firstName
+      lastName
+    }
+  }
+`

From 7232780baed4d76bfcf02012386b6c0b1bea4fe9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 14 Mar 2023 19:25:06 +0100
Subject: [PATCH 027/101] send form with gradido id via url query

---
 .../components/GddSend/TransactionForm.vue    | 25 ++++++++++++++++++-
 .../src/components/TransactionRows/Name.vue   |  4 +--
 frontend/src/graphql/queries.js               |  9 +++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 51e5c5ece..8620337d6 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -65,7 +65,7 @@
                           <b-col>{{ $t('form.recipient') }}</b-col>
                         </b-row>
                         <b-row>
-                          <b-col>{{ gradidoID }}</b-col>
+                          <b-col class="font-weight-bold">{{ userName }}</b-col>
                         </b-row>
                       </div>
                     </b-col>
@@ -129,6 +129,7 @@ import { SEND_TYPES } from '@/pages/Send'
 import InputEmail from '@/components/Inputs/InputEmail'
 import InputAmount from '@/components/Inputs/InputAmount'
 import InputTextarea from '@/components/Inputs/InputTextarea'
+import { user as userQuery } from '@/graphql/queries'
 
 export default {
   name: 'TransactionForm',
@@ -153,6 +154,7 @@ export default {
         memo: this.memo,
       },
       radioSelected: this.selected,
+      userName: '',
     }
   },
   methods: {
@@ -173,11 +175,32 @@ export default {
       this.form.amount = ''
       this.form.memo = ''
       this.$refs.formValidator.validate()
+      if (this.$route.query && !this.$route.query === {}) this.$router.replace({ query: undefined })
     },
     setNewRecipientEmail() {
       this.form.email = this.recipientEmail ? this.recipientEmail : this.form.email
     },
   },
+  apollo: {
+    UserName: {
+      query() {
+        return userQuery
+      },
+      fetchPolicy: 'network-only',
+      variables() {
+        return { identifier: this.gradidoID }
+      },
+      skip() {
+        return !this.gradidoID
+      },
+      update({ user }) {
+        this.userName = `${user.firstName} ${user.lastName}`
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
   watch: {
     recipientEmail() {
       this.setNewRecipientEmail()
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index 84b235cb3..de87c0ad1 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -36,8 +36,8 @@ export default {
   methods: {
     tunnelEmail() {
       this.$emit('set-tunneled-email', this.linkedUser.email)
-      if (this.$router.history.current.fullPath !== '/send')
-        this.$router.push({ path: '/send', query: { gradidoID: this.linkedUser.gradidoID } })
+      if (this.$router.history.current.fullPath !== '/send') this.$router.push({ path: '/send' })
+      this.$router.push({ query: { gradidoID: this.linkedUser.gradidoID } })
     },
   },
   computed: {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 45f360610..ceaa6043b 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -268,3 +268,12 @@ export const openCreations = gql`
     }
   }
 `
+
+export const user = gql`
+  query($identifier: String!) {
+    user(identifier: $identifier) {
+      firstName
+      lastName
+    }
+  }
+`

From 4c15669c4b38041cc77a250bc85c1323385d8610 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 14 Mar 2023 19:48:16 +0100
Subject: [PATCH 028/101] remove unused listeners, remove tunneled email and
 its methods

---
 .../src/components/GddSend/TransactionForm.vue    | 15 ---------------
 frontend/src/components/GddTransactionList.vue    |  3 ---
 .../Template/RightSide/LastTransactions.vue       |  6 +-----
 frontend/src/components/TransactionRows/Name.vue  |  1 -
 .../Transactions/TransactionReceive.vue           |  1 -
 .../components/Transactions/TransactionSend.vue   |  1 -
 frontend/src/layouts/DashboardLayout.vue          | 12 ------------
 frontend/src/pages/Transactions.vue               |  1 -
 8 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 8620337d6..a4e527d95 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -145,7 +145,6 @@ export default {
     memo: { type: String, default: '' },
     selected: { type: String, default: 'send' },
   },
-  inject: ['getTunneledEmail'],
   data() {
     return {
       form: {
@@ -177,9 +176,6 @@ export default {
       this.$refs.formValidator.validate()
       if (this.$route.query && !this.$route.query === {}) this.$router.replace({ query: undefined })
     },
-    setNewRecipientEmail() {
-      this.form.email = this.recipientEmail ? this.recipientEmail : this.form.email
-    },
   },
   apollo: {
     UserName: {
@@ -201,11 +197,6 @@ export default {
       },
     },
   },
-  watch: {
-    recipientEmail() {
-      this.setNewRecipientEmail()
-    },
-  },
   computed: {
     disabled() {
       if (
@@ -224,16 +215,10 @@ export default {
     sendTypes() {
       return SEND_TYPES
     },
-    recipientEmail() {
-      return this.getTunneledEmail()
-    },
     gradidoID() {
       return this.$route.query && this.$route.query.gradidoID
     },
   },
-  created() {
-    this.setNewRecipientEmail()
-  },
   mounted() {
     if (this.form.email !== '') this.$refs.formValidator.validate()
   },
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index deed0dedb..63e203f31 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -37,7 +37,6 @@
               <transaction-send
                 v-bind="transactions[index]"
                 :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
               />
             </template>
 
@@ -45,7 +44,6 @@
               <transaction-receive
                 v-bind="transactions[index]"
                 :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
               />
             </template>
 
@@ -53,7 +51,6 @@
               <transaction-creation
                 v-bind="transactions[index]"
                 :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
               />
             </template>
 
diff --git a/frontend/src/components/Template/RightSide/LastTransactions.vue b/frontend/src/components/Template/RightSide/LastTransactions.vue
index 54e959436..b08fbf89a 100644
--- a/frontend/src/components/Template/RightSide/LastTransactions.vue
+++ b/frontend/src/components/Template/RightSide/LastTransactions.vue
@@ -32,11 +32,7 @@
           <b-row>
             <b-col>
               <div class="font-weight-bold">
-                <name
-                  :linkedUser="transaction.linkedUser"
-                  v-on="$listeners"
-                  fontColor="text-dark"
-                />
+                <name :linkedUser="transaction.linkedUser" fontColor="text-dark" />
               </div>
               <div class="d-flex mt-3">
                 <div class="small">
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index de87c0ad1..8695645d8 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -35,7 +35,6 @@ export default {
   },
   methods: {
     tunnelEmail() {
-      this.$emit('set-tunneled-email', this.linkedUser.email)
       if (this.$router.history.current.fullPath !== '/send') this.$router.push({ path: '/send' })
       this.$router.push({ query: { gradidoID: this.linkedUser.gradidoID } })
     },
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 9d6f0207a..1d7c99ff3 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -14,7 +14,6 @@
         <div>
           <name
             class="font-weight-bold"
-            v-on="$listeners"
             :amount="amount"
             :linkedUser="linkedUser"
             :linkId="linkId"
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index f150dd320..8440a5ade 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -13,7 +13,6 @@
         <div>
           <name
             class="font-weight-bold"
-            v-on="$listeners"
             :amount="amount"
             :linkedUser="linkedUser"
             :linkId="linkId"
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index b8e868f3d..9db576f1f 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -127,7 +127,6 @@
                     :transactions="transactions"
                     :transactionCount="transactionCount"
                     :transactionLinkCount="transactionLinkCount"
-                    @set-tunneled-email="setTunneledEmail"
                   />
                 </template>
                 <template #community>
@@ -149,7 +148,6 @@
                     :transactionLinkCount="transactionLinkCount"
                     :pending="pending"
                     @update-transactions="updateTransactions"
-                    @set-tunneled-email="setTunneledEmail"
                   ></router-view>
                 </fade-transition>
               </div>
@@ -164,7 +162,6 @@
                 :transactions="transactions"
                 :transactionCount="transactionCount"
                 :transactionLinkCount="transactionLinkCount"
-                @set-tunneled-email="setTunneledEmail"
               />
             </template>
             <template #empty />
@@ -234,18 +231,12 @@ export default {
       transactionLinkCount: 0,
       pending: true,
       visible: false,
-      tunneledEmail: null,
       hamburger: true,
       darkMode: false,
       skeleton: true,
       totalUsers: null,
     }
   },
-  provide() {
-    return {
-      getTunneledEmail: () => this.tunneledEmail,
-    }
-  },
   created() {
     this.updateTransactions(0)
     this.getCommunityStatistics()
@@ -319,9 +310,6 @@ export default {
     setVisible(bool) {
       this.visible = bool
     },
-    setTunneledEmail(email) {
-      this.tunneledEmail = email
-    },
   },
 }
 </script>
diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index dd7228bf9..95c1c3400 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/frontend/src/pages/Transactions.vue
@@ -17,7 +17,6 @@
         :showPagination="true"
         :pageSize="pageSize"
         @update-transactions="updateTransactions"
-        v-on="$listeners"
       />
     </div>
   </div>

From 761ff80b97d010fc626b45713d0af11c5c6e785c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 14 Mar 2023 21:14:41 +0100
Subject: [PATCH 029/101] use findUserByIdentifier for emails, use it in send
 coins

---
 .../src/graphql/arg/TransactionSendArgs.ts    |  2 +-
 .../resolver/TransactionResolver.test.ts      | 46 +++++++++----------
 .../graphql/resolver/TransactionResolver.ts   | 15 ++----
 .../src/graphql/resolver/UserResolver.test.ts | 33 +++++++++++--
 backend/src/graphql/resolver/UserResolver.ts  | 13 ++----
 .../src/graphql/resolver/semaphore.test.ts    |  4 +-
 .../resolver/util/findUserByIdentifier.ts     | 36 +++++++++++++++
 backend/src/seeds/graphql/mutations.ts        |  4 +-
 8 files changed, 99 insertions(+), 54 deletions(-)
 create mode 100644 backend/src/graphql/resolver/util/findUserByIdentifier.ts

diff --git a/backend/src/graphql/arg/TransactionSendArgs.ts b/backend/src/graphql/arg/TransactionSendArgs.ts
index e75921383..c83e30252 100644
--- a/backend/src/graphql/arg/TransactionSendArgs.ts
+++ b/backend/src/graphql/arg/TransactionSendArgs.ts
@@ -4,7 +4,7 @@ import Decimal from 'decimal.js-light'
 @ArgsType()
 export default class TransactionSendArgs {
   @Field(() => String)
-  email: string
+  identifier: string
 
   @Field(() => Decimal)
   amount: Decimal
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index c660a72da..c3cd484ea 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -24,7 +24,6 @@ import { User } from '@entity/User'
 import { cleanDB, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 import { GraphQLError } from 'graphql'
-import { findUserByEmail } from './UserResolver'
 
 let mutate: any, query: any, con: any
 let testEnv: any
@@ -81,7 +80,7 @@ describe('send coins', () => {
         await mutate({
           mutation: sendCoins,
           variables: {
-            email: 'wrong@email.com',
+            identifier: 'wrong@email.com',
             amount: 100,
             memo: 'test',
           },
@@ -109,22 +108,20 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'stephen@hawking.uk',
+              identifier: 'stephen@hawking.uk',
               amount: 100,
               memo: 'test',
             },
           }),
         ).toEqual(
           expect.objectContaining({
-            errors: [new GraphQLError('The recipient account was deleted')],
+            errors: [new GraphQLError('No user to given contact')],
           }),
         )
       })
 
-      it('logs the error thrown', async () => {
-        // find peter to check the log
-        const user = await findUserByEmail('stephen@hawking.uk')
-        expect(logger.error).toBeCalledWith('The recipient account was deleted', user)
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith('No user to given contact', 'stephen@hawking.uk')
       })
     })
 
@@ -140,22 +137,23 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'garrick@ollivander.com',
+              identifier: 'garrick@ollivander.com',
               amount: 100,
               memo: 'test',
             },
           }),
         ).toEqual(
           expect.objectContaining({
-            errors: [new GraphQLError('The recipient account is not activated')],
+            errors: [new GraphQLError('No user with this credentials')],
           }),
         )
       })
 
-      it('logs the error thrown', async () => {
-        // find peter to check the log
-        const user = await findUserByEmail('garrick@ollivander.com')
-        expect(logger.error).toBeCalledWith('The recipient account is not activated', user)
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith(
+          'No user with this credentials',
+          'garrick@ollivander.com',
+        )
       })
     })
   })
@@ -175,7 +173,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'bob@baumeister.de',
+              identifier: 'bob@baumeister.de',
               amount: 100,
               memo: 'test',
             },
@@ -199,7 +197,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 100,
               memo: 'test',
             },
@@ -223,7 +221,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 100,
               memo: 'test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test t',
             },
@@ -247,7 +245,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 100,
               memo: 'testing',
             },
@@ -297,7 +295,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: -50,
               memo: 'testing negative',
             },
@@ -320,7 +318,7 @@ describe('send coins', () => {
           await mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 50,
               memo: 'unrepeatable memo',
             },
@@ -375,7 +373,7 @@ describe('send coins', () => {
           mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 10,
               memo: 'first transaction',
             },
@@ -391,7 +389,7 @@ describe('send coins', () => {
           mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 20,
               memo: 'second transaction',
             },
@@ -407,7 +405,7 @@ describe('send coins', () => {
           mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 30,
               memo: 'third transaction',
             },
@@ -423,7 +421,7 @@ describe('send coins', () => {
           mutate({
             mutation: sendCoins,
             variables: {
-              email: 'peter@lustig.de',
+              identifier: 'peter@lustig.de',
               amount: 40,
               memo: 'fourth transaction',
             },
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a11c5b377..203b10b0a 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -34,7 +34,7 @@ import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event
 
 import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { findUserByEmail } from './UserResolver'
+import { findUserByIdentifier } from './util/findUserByIdentifier'
 
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
@@ -307,10 +307,9 @@ export class TransactionResolver {
   @Authorized([RIGHTS.SEND_COINS])
   @Mutation(() => Boolean)
   async sendCoins(
-    @Args() { email, amount, memo }: TransactionSendArgs,
+    @Args() { identifier, amount, memo }: TransactionSendArgs,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    logger.info(`sendCoins(email=${email}, amount=${amount}, memo=${memo})`)
     if (amount.lte(0)) {
       throw new LogError('Amount to send must be positive', amount)
     }
@@ -319,13 +318,9 @@ export class TransactionResolver {
     const senderUser = getUser(context)
 
     // validate recipient user
-    const recipientUser = await findUserByEmail(email)
-    if (recipientUser.deletedAt) {
-      throw new LogError('The recipient account was deleted', recipientUser)
-    }
-    const emailContact = recipientUser.emailContact
-    if (!emailContact.emailChecked) {
-      throw new LogError('The recipient account is not activated', recipientUser)
+    const recipientUser = await findUserByIdentifier(identifier)
+    if (!recipientUser) {
+      throw new LogError('The recipient user was not found', recipientUser)
     }
 
     await executeTransaction(amount, memo, senderUser, recipientUser)
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index c75678439..036004db8 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -2228,8 +2228,8 @@ describe('UserResolver', () => {
         })
       })
 
-      describe('identifier is no gradido ID', () => {
-        it('throws and logs "No valid gradido ID" error', async () => {
+      describe('identifier is no gradido ID and no email', () => {
+        it('throws and logs "Unknown identifier type" error', async () => {
           await expect(
             query({
               query: userQuery,
@@ -2239,10 +2239,10 @@ describe('UserResolver', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [new GraphQLError('No valid gradido ID')],
+              errors: [new GraphQLError('Unknown identifier type')],
             }),
           )
-          expect(logger.error).toBeCalledWith('No valid gradido ID', 'identifier')
+          expect(logger.error).toBeCalledWith('Unknown identifier type', 'identifier')
         })
       })
 
@@ -2267,7 +2267,30 @@ describe('UserResolver', () => {
         })
       })
 
-      describe('identifier is found', () => {
+      describe('identifier is found via email', () => {
+        it('returns user', async () => {
+          await expect(
+            query({
+              query: userQuery,
+              variables: {
+                identifier: 'bibi@bloxberg.de',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                user: {
+                  firstName: 'Bibi',
+                  lastName: 'Bloxberg',
+                },
+              },
+              errors: undefined,
+            }),
+          )
+        })
+      })
+
+      describe('identifier is found via gradidoID', () => {
         it('returns user', async () => {
           await expect(
             query({
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index c07946f0b..6125b418a 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -68,6 +68,7 @@ import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
 import { PasswordEncryptionType } from '../enum/PasswordEncryptionType'
 import LogError from '@/server/LogError'
 import { EventProtocolType } from '@/event/EventProtocolType'
+import { findUserByIdentifier } from './util/findUserByIdentifier'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const sodium = require('sodium-native')
@@ -815,16 +816,8 @@ export class UserResolver {
   @Authorized([RIGHTS.USER])
   @Query(() => User, { nullable: true })
   async user(@Arg('identifier') identifier: string): Promise<User | null> {
-    const isGradidoID =
-      /^[0-9a-f]{8,8}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{12,12}$/.exec(identifier)
-    if (!isGradidoID) {
-      throw new LogError('No valid gradido ID', identifier)
-    }
-    const user = await DbUser.findOne({ where: { gradidoID: identifier } })
-    if (!user) {
-      throw new LogError('No user found to given identifier', identifier)
-    }
-    return new User(user)
+    const user = await findUserByIdentifier(identifier)
+    return user ? new User(user) : null
   }
 }
 
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index b3c99ba7d..28d311a7b 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -152,7 +152,7 @@ describe('semaphore', () => {
     })
     const bibisTransaction = mutate({
       mutation: sendCoins,
-      variables: { email: 'bob@baumeister.de', amount: '50', memo: 'Das ist für dich, Bob' },
+      variables: { identifier: 'bob@baumeister.de', amount: '50', memo: 'Das ist für dich, Bob' },
     })
     await mutate({
       mutation: login,
@@ -168,7 +168,7 @@ describe('semaphore', () => {
     })
     const bobsTransaction = mutate({
       mutation: sendCoins,
-      variables: { email: 'bibi@bloxberg.de', amount: '50', memo: 'Das ist für dich, Bibi' },
+      variables: { identifier: 'bibi@bloxberg.de', amount: '50', memo: 'Das ist für dich, Bibi' },
     })
     await mutate({
       mutation: login,
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
new file mode 100644
index 000000000..7f8ae4a7a
--- /dev/null
+++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
@@ -0,0 +1,36 @@
+import { User as DbUser } from '@entity/User'
+import { UserContact as DbUserContact } from '@entity/UserContact'
+import LogError from '@/server/LogError'
+
+export const findUserByIdentifier = async (identifier: string): Promise<DbUser | null> => {
+  let user: DbUser | undefined
+  if (
+    /^[0-9a-f]{8,8}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{12,12}$/.exec(identifier)
+  ) {
+    user = await DbUser.findOne({ where: { gradidoID: identifier } })
+    if (!user) {
+      throw new LogError('No user found to given identifier', identifier)
+    }
+  } else if (/^.{2,}@.{2,}\..{2,}$/.exec(identifier)) {
+    const userContact = await DbUserContact.findOne(
+      {
+        email: identifier,
+        emailChecked: true,
+      },
+      { relations: ['user'] },
+    )
+    if (!userContact) {
+      throw new LogError('No user with this credentials', identifier)
+    }
+    if (!userContact.user) {
+      throw new LogError('No user to given contact', identifier)
+    }
+    user = userContact.user
+    user.emailContact = userContact
+  } else {
+    // last is alias when implemented
+    throw new LogError('Unknown identifier type', identifier)
+  }
+
+  return user
+}
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index 1aa12a32f..6625be62e 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -75,8 +75,8 @@ export const sendActivationEmail = gql`
 `
 
 export const sendCoins = gql`
-  mutation ($email: String!, $amount: Decimal!, $memo: String!) {
-    sendCoins(email: $email, amount: $amount, memo: $memo)
+  mutation ($identifier: String!, $amount: Decimal!, $memo: String!) {
+    sendCoins(identifier: $identifier, amount: $amount, memo: $memo)
   }
 `
 

From 74d2d43ab2d098841e999476cd398dee33dda908 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 08:39:05 +0100
Subject: [PATCH 030/101] get send coin partially working again

---
 frontend/src/components/GddSend/TransactionForm.vue | 6 +++---
 frontend/src/graphql/mutations.js                   | 4 ++--
 frontend/src/pages/Send.vue                         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index a4e527d95..9cc696878 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -140,7 +140,7 @@ export default {
   },
   props: {
     balance: { type: Number, default: 0 },
-    email: { type: String, default: '' },
+    identifier: { type: String, default: '' },
     amount: { type: Number, default: 0 },
     memo: { type: String, default: '' },
     selected: { type: String, default: 'send' },
@@ -148,7 +148,7 @@ export default {
   data() {
     return {
       form: {
-        email: this.email,
+        email: this.identifier,
         amount: this.amount ? String(this.amount) : '',
         memo: this.memo,
       },
@@ -163,7 +163,7 @@ export default {
     onSubmit() {
       this.$emit('set-transaction', {
         selected: this.radioSelected,
-        email: this.form.email,
+        identifier: this.form.email,
         amount: Number(this.form.amount.replace(',', '.')),
         memo: this.form.memo,
       })
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 0f173d3b9..f1c920611 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -69,8 +69,8 @@ export const createUser = gql`
 `
 
 export const sendCoins = gql`
-  mutation($email: String!, $amount: Decimal!, $memo: String!) {
-    sendCoins(email: $email, amount: $amount, memo: $memo)
+  mutation($identifier: String!, $amount: Decimal!, $memo: String!) {
+    sendCoins(identifier: $identifier, amount: $amount, memo: $memo)
   }
 `
 
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 65677ecdd..f8a09ee29 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -62,7 +62,7 @@ import TransactionResultLink from '@/components/GddSend/TransactionResultLink'
 import { sendCoins, createTransactionLink } from '@/graphql/mutations.js'
 
 const EMPTY_TRANSACTION_DATA = {
-  email: '',
+  identifier: '',
   amount: 0,
   memo: '',
 }

From c140e04310d5b7c8577818d7c55b02d6d64219c4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Mar 2023 14:47:33 +0100
Subject: [PATCH 031/101] ass user relation to allow event

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ea84e3ba9..0f7663ddf 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -322,7 +322,8 @@ export class ContributionResolver {
     const moderator = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
-      where: { id, confirmedAt: IsNull(), deniedAt: IsNull(), relations: ['user'] },
+      where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
+      relations: ['user'],
     })
 
     if (!contributionToUpdate) {

From 9d79a92f3fdd73cc0545808499fe741334eabb7d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 11:34:39 +0100
Subject: [PATCH 032/101] relation to emailContact

---
 backend/src/graphql/resolver/TransactionResolver.ts       | 1 -
 backend/src/graphql/resolver/util/findUserByIdentifier.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 203b10b0a..fe90b28d2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -157,7 +157,6 @@ export const executeTransaction = async (
     } finally {
       await queryRunner.release()
     }
-    logger.debug(`prepare Email for transaction received...`)
     await sendTransactionReceivedEmail({
       firstName: recipient.firstName,
       lastName: recipient.lastName,
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
index 7f8ae4a7a..8643bce72 100644
--- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts
+++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
@@ -7,7 +7,7 @@ export const findUserByIdentifier = async (identifier: string): Promise<DbUser |
   if (
     /^[0-9a-f]{8,8}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{12,12}$/.exec(identifier)
   ) {
-    user = await DbUser.findOne({ where: { gradidoID: identifier } })
+    user = await DbUser.findOne({ where: { gradidoID: identifier }, relations: ['emailContact'] })
     if (!user) {
       throw new LogError('No user found to given identifier', identifier)
     }

From a60f99a5e5024d81eb2947c7028a2731fc3b0456 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 11:49:12 +0100
Subject: [PATCH 033/101] send coins works with gradido ID and email

---
 .../GddSend/TransactionConfirmationSend.vue        |  7 +++----
 .../src/components/GddSend/TransactionForm.vue     | 14 ++++++++------
 frontend/src/pages/Send.vue                        |  6 ++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index b7c35f089..a9058558c 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -5,9 +5,7 @@
       <b-row class="mt-5">
         <b-col cols="2"></b-col>
         <b-col>
-          <div class="h4">
-            {{ email }}
-          </div>
+          <div class="h4">{{ userName ? userName : identifier }}</div>
           <div class="mt-3 h5">{{ $t('form.memo') }}</div>
           <div>{{ memo }}</div>
         </b-col>
@@ -64,9 +62,10 @@ export default {
   name: 'TransactionConfirmationSend',
   props: {
     balance: { type: Number, required: true },
-    email: { type: String, required: false, default: '' },
+    identifier: { type: String, required: false, default: '' },
     amount: { type: Number, required: true },
     memo: { type: String, required: true },
+    userName: { type: String, default: '' },
   },
   data() {
     return {
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 9cc696878..7d2a0aae4 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -55,7 +55,7 @@
                           :name="$t('form.recipient')"
                           :label="$t('form.recipient')"
                           :placeholder="$t('form.email')"
-                          v-model="form.email"
+                          v-model="form.identifier"
                           :disabled="isBalanceDisabled"
                           @onValidation="onValidation"
                         />
@@ -148,7 +148,7 @@ export default {
   data() {
     return {
       form: {
-        email: this.identifier,
+        identifier: this.identifier,
         amount: this.amount ? String(this.amount) : '',
         memo: this.memo,
       },
@@ -161,16 +161,18 @@ export default {
       this.$refs.formValidator.validate()
     },
     onSubmit() {
+      if (this.gradidoID) this.form.identifier = this.gradidoID
       this.$emit('set-transaction', {
         selected: this.radioSelected,
-        identifier: this.form.email,
+        identifier: this.form.identifier,
         amount: Number(this.form.amount.replace(',', '.')),
         memo: this.form.memo,
+        userName: this.userName,
       })
     },
     onReset(event) {
       event.preventDefault()
-      this.form.email = ''
+      this.form.identifier = ''
       this.form.amount = ''
       this.form.memo = ''
       this.$refs.formValidator.validate()
@@ -200,7 +202,7 @@ export default {
   computed: {
     disabled() {
       if (
-        this.form.email.length > 5 &&
+        this.form.identifier.length > 5 &&
         parseInt(this.form.amount) <= parseInt(this.balance) &&
         this.form.memo.length > 5 &&
         this.form.memo.length <= 255
@@ -220,7 +222,7 @@ export default {
     },
   },
   mounted() {
-    if (this.form.email !== '') this.$refs.formValidator.validate()
+    if (this.form.identifier !== '') this.$refs.formValidator.validate()
   },
 }
 </script>
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index f8a09ee29..f64fc9045 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -11,9 +11,7 @@
       <template #transactionConfirmationSend>
         <transaction-confirmation-send
           :balance="balance"
-          :email="transactionData.email"
-          :amount="transactionData.amount"
-          :memo="transactionData.memo"
+          v-bind="transactionData"
           @send-transaction="sendTransaction"
           @on-back="onBack"
         ></transaction-confirmation-send>
@@ -21,7 +19,7 @@
       <template #transactionConfirmationLink>
         <transaction-confirmation-link
           :balance="balance"
-          :email="transactionData.email"
+          :email="transactionData.identifier"
           :amount="transactionData.amount"
           :memo="transactionData.memo"
           :loading="loading"

From 45be7a5b0734765ac568e899cc8bd938472f8bea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 11:56:48 +0100
Subject: [PATCH 034/101] remove gradido ID query after executing transaction

---
 frontend/src/pages/Send.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index f64fc9045..30ffc06ed 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -166,6 +166,7 @@ export default {
           throw new Error(`undefined transactionData.selected : ${this.transactionData.selected}`)
       }
       this.loading = false
+      this.$router.push({ query: { gradidoID: undefined } })
     },
     onBack() {
       this.currentTransactionStep = TRANSACTION_STEPS.transactionForm

From 99bf3df215a4259d7f1702309a8d71fe92e95b6b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 12:14:45 +0100
Subject: [PATCH 035/101] test send coins via gradido ID

---
 frontend/src/pages/Send.spec.js | 72 +++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 0a0d5da71..3aae5a83e 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -10,6 +10,7 @@ const apolloMutationMock = jest.fn()
 apolloMutationMock.mockResolvedValue('success')
 
 const navigatorClipboardMock = jest.fn()
+const routerPushMock = jest.fn()
 
 const localVue = global.localVue
 
@@ -38,6 +39,9 @@ describe('Send', () => {
     $route: {
       query: {},
     },
+    $router: {
+      push: routerPushMock,
+    },
   }
 
   const Wrapper = () => {
@@ -85,8 +89,8 @@ describe('Send', () => {
           it('shows the transaction formular again', () => {
             expect(wrapper.findComponent({ name: 'TransactionForm' }).exists()).toBe(true)
           })
-          // TODO:SKIPED at this point, a check must be made in the components ?
-          it.skip('restores the previous data in the formular', () => {
+
+          it('restores the previous data in the formular', () => {
             expect(wrapper.find("input[type='email']").vm.$el.value).toBe('user@example.org')
             expect(wrapper.find("input[type='text']").vm.$el.value).toBe('23.45')
             expect(wrapper.find('textarea').vm.$el.value).toBe('Make the best of it!')
@@ -107,10 +111,11 @@ describe('Send', () => {
               expect.objectContaining({
                 mutation: sendCoins,
                 variables: {
-                  email: 'user@example.org',
+                  identifier: 'user@example.org',
                   amount: 23.45,
                   memo: 'Make the best of it!',
                   selected: SEND_TYPES.send,
+                  userName: '',
                 },
               }),
             )
@@ -162,6 +167,67 @@ describe('Send', () => {
       })
     })
 
+    describe('with gradidoID query', () => {
+      beforeEach(() => {
+        mocks.$route.query.gradidoID = 'gradido-ID'
+        wrapper = Wrapper()
+      })
+
+      it('has no email input field', () => {
+        expect(
+          wrapper.findComponent({ name: 'TransactionForm' }).find('input[type="email"]').exists(),
+        ).toBe(false)
+      })
+
+      describe('submit form', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          const transactionForm = wrapper.findComponent({ name: 'TransactionForm' })
+          await transactionForm.find('input[type="text"]').setValue('34.56')
+          await transactionForm.find('textarea').setValue('Make the best of it!')
+          await transactionForm.find('form').trigger('submit')
+          await flushPromises()
+        })
+
+        it('steps forward in the dialog', () => {
+          expect(wrapper.findComponent({ name: 'TransactionConfirmationSend' }).exists()).toBe(true)
+        })
+
+        describe('confirm transaction', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper
+              .findComponent({ name: 'TransactionConfirmationSend' })
+              .find('button.btn-gradido')
+              .trigger('click')
+          })
+
+          it('calls the API', async () => {
+            expect(apolloMutationMock).toBeCalledWith(
+              expect.objectContaining({
+                mutation: sendCoins,
+                variables: {
+                  identifier: 'gradido-ID',
+                  amount: 34.56,
+                  memo: 'Make the best of it!',
+                  selected: SEND_TYPES.send,
+                  userName: '',
+                },
+              }),
+            )
+          })
+
+          it('resets the gradido ID query in route', () => {
+            expect(routerPushMock).toBeCalledWith({
+              query: {
+                gradidoID: undefined,
+              },
+            })
+          })
+        })
+      })
+    })
+
     describe('transaction form link', () => {
       const now = new Date().toISOString()
       beforeEach(async () => {

From dec5a6f61f029ae473e9b704e8b856d797905134 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 12:48:42 +0100
Subject: [PATCH 036/101] test transaction form with gradido ID

---
 .../GddSend/TransactionForm.spec.js           | 57 +++++++++++++++++--
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index 1594d3d72..41f69960e 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -2,9 +2,17 @@ import { mount } from '@vue/test-utils'
 import TransactionForm from './TransactionForm'
 import flushPromises from 'flush-promises'
 import { SEND_TYPES } from '@/pages/Send'
-import DashboardLayout from '@/layouts/DashboardLayout'
+import { createMockClient } from 'mock-apollo-client'
+import VueApollo from 'vue-apollo'
+import { user as userQuery } from '@/graphql/queries'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
 describe('TransactionForm', () => {
   let wrapper
@@ -22,6 +30,7 @@ describe('TransactionForm', () => {
     },
     $route: {
       params: {},
+      query: {},
     },
   }
 
@@ -34,10 +43,24 @@ describe('TransactionForm', () => {
       localVue,
       mocks,
       propsData,
-      provide: DashboardLayout.provide,
+      apolloProvider,
     })
   }
 
+  const userQueryMock = jest.fn()
+
+  mockClient.setRequestHandler(
+    userQuery,
+    userQueryMock.mockRejectedValueOnce({ message: 'Query user name fails!' }).mockResolvedValue({
+      data: {
+        user: {
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
+        },
+      },
+    }),
+  )
+
   describe('mount', () => {
     beforeEach(() => {
       wrapper = Wrapper()
@@ -139,7 +162,7 @@ describe('TransactionForm', () => {
               .setValue('  valid@email.com  ')
             await wrapper.find('div[data-test="input-email"]').find('input').trigger('blur')
             await flushPromises()
-            expect(wrapper.vm.form.email).toBe('valid@email.com')
+            expect(wrapper.vm.form.identifier).toBe('valid@email.com')
           })
         })
 
@@ -290,12 +313,12 @@ Die ganze Welt bezwingen.“`)
               .find('textarea')
               .setValue('Long enough')
             await flushPromises()
-            expect(wrapper.vm.form.email).toBe('someone@watches.tv')
+            expect(wrapper.vm.form.identifier).toBe('someone@watches.tv')
             expect(wrapper.vm.form.amount).toBe('87.23')
             expect(wrapper.vm.form.memo).toBe('Long enough')
             await wrapper.find('button[type="reset"]').trigger('click')
             await flushPromises()
-            expect(wrapper.vm.form.email).toBe('')
+            expect(wrapper.vm.form.identifier).toBe('')
             expect(wrapper.vm.form.amount).toBe('')
             expect(wrapper.vm.form.memo).toBe('')
           })
@@ -321,10 +344,11 @@ Die ganze Welt bezwingen.“`)
             expect(wrapper.emitted('set-transaction')).toEqual([
               [
                 {
-                  email: 'someone@watches.tv',
+                  identifier: 'someone@watches.tv',
                   amount: 87.23,
                   memo: 'Long enough',
                   selected: 'send',
+                  userName: '',
                 },
               ],
             ])
@@ -346,5 +370,26 @@ Die ganze Welt bezwingen.“`)
         })
       })
     })
+
+    describe('with gradido ID', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        mocks.$route.query.gradidoID = 'gradido-ID'
+        wrapper = Wrapper()
+        await wrapper.vm.$nextTick()
+      })
+
+      describe('query for username with success', () => {
+        it('has no email input field', () => {
+          expect(wrapper.find('div[data-test="input-email"]').exists()).toBe(false)
+        })
+
+        it('queries the username', () => {
+          expect(userQueryMock).toBeCalledWith({
+            identifier: 'gradido-ID',
+          })
+        })
+      })
+    })
   })
 })

From ce3784ddbe741d763c605b87e1285a2d04081546 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 13:13:57 +0100
Subject: [PATCH 037/101] tests for links with gradido ID

---
 .../components/TransactionRows/Name.spec.js   | 20 ++++++++++++-------
 frontend/src/layouts/DashboardLayout.spec.js  |  9 ---------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/TransactionRows/Name.spec.js b/frontend/src/components/TransactionRows/Name.spec.js
index 839a698ae..2c370bafc 100644
--- a/frontend/src/components/TransactionRows/Name.spec.js
+++ b/frontend/src/components/TransactionRows/Name.spec.js
@@ -3,9 +3,11 @@ import Name from './Name'
 
 const localVue = global.localVue
 
+const routerPushMock = jest.fn()
+
 const mocks = {
   $router: {
-    push: jest.fn(),
+    push: routerPushMock,
     history: {
       current: {
         fullPath: '/transactions',
@@ -47,7 +49,7 @@ describe('Name', () => {
     describe('with linked user', () => {
       beforeEach(async () => {
         await wrapper.setProps({
-          linkedUser: { firstName: 'Bibi', lastName: 'Bloxberg', email: 'bibi@bloxberg.de' },
+          linkedUser: { firstName: 'Bibi', lastName: 'Bloxberg', gradidoID: 'gradido-ID' },
         })
       })
 
@@ -64,13 +66,17 @@ describe('Name', () => {
           await wrapper.find('div.gdd-transaction-list-item-name').find('a').trigger('click')
         })
 
-        it('emits  set tunneled email', () => {
-          expect(wrapper.emitted('set-tunneled-email')).toEqual([['bibi@bloxberg.de']])
+        it('pushes router to send', () => {
+          expect(routerPushMock).toBeCalledWith({
+            path: '/send',
+          })
         })
 
-        it('pushes the route with query for email', () => {
-          expect(mocks.$router.push).toBeCalledWith({
-            path: '/send',
+        it('pushes query for gradidoID', () => {
+          expect(routerPushMock).toBeCalledWith({
+            query: {
+              gradidoID: 'gradido-ID',
+            },
           })
         })
       })
diff --git a/frontend/src/layouts/DashboardLayout.spec.js b/frontend/src/layouts/DashboardLayout.spec.js
index 68fcb5ad5..9f68199da 100644
--- a/frontend/src/layouts/DashboardLayout.spec.js
+++ b/frontend/src/layouts/DashboardLayout.spec.js
@@ -174,15 +174,6 @@ describe('DashboardLayout', () => {
         })
       })
 
-      describe('set tunneled email', () => {
-        it('updates tunneled email', async () => {
-          await wrapper
-            .findComponent({ ref: 'router-view' })
-            .vm.$emit('set-tunneled-email', 'bibi@bloxberg.de')
-          expect(wrapper.vm.tunneledEmail).toBe('bibi@bloxberg.de')
-        })
-      })
-
       it('has a component Navbar', () => {
         expect(wrapper.findComponent({ name: 'Navbar' }).exists()).toBe(true)
       })

From b64c080447120919951ef1afe2b50f9f4619727b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 13:27:47 +0100
Subject: [PATCH 038/101] changes requested

---
 admin/src/components/EditCreationFormular.vue |  1 -
 .../resolver/ContributionResolver.test.ts     | 33 -------------------
 .../graphql/resolver/ContributionResolver.ts  |  3 +-
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 994a734f6..6dbe22ebb 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -108,7 +108,6 @@ export default {
   },
   methods: {
     submitCreation() {
-      // console.log('submitCreation', this.selected)
       this.$apollo
         .mutate({
           mutation: adminUpdateContribution,
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 19d19080a..5a6e6d7c6 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -2152,39 +2152,6 @@ describe('ContributionResolver', () => {
             })
           })
 
-          describe.skip('user email does not match creation user', () => {
-            it('throws an error', async () => {
-              jest.clearAllMocks()
-              await expect(
-                mutate({
-                  mutation: adminUpdateContribution,
-                  variables: {
-                    id: creation ? creation.id : -1,
-                    amount: new Decimal(300),
-                    memo: 'Danke Bibi!',
-                    creationDate: creation
-                      ? contributionDateFormatter(creation.contributionDate)
-                      : contributionDateFormatter(new Date()),
-                  },
-                }),
-              ).resolves.toEqual(
-                expect.objectContaining({
-                  errors: [
-                    new GraphQLError(
-                      'User of the pending contribution and send user does not correspond',
-                    ),
-                  ],
-                }),
-              )
-            })
-
-            it('logs the error thrown', () => {
-              expect(logger.error).toBeCalledWith(
-                'User of the pending contribution and send user does not correspond',
-              )
-            })
-          })
-
           describe('creation update is not valid', () => {
             // as this test has not clearly defined that date, it is a false positive
             it('throws an error', async () => {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2a9d96790..ab1c25d2e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -321,7 +321,6 @@ export class ContributionResolver {
 
     const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
-      relations: ['user'],
     })
 
     if (!contributionToUpdate) {
@@ -358,7 +357,7 @@ export class ContributionResolver {
     result.date = contributionToUpdate.contributionDate
 
     await EVENT_ADMIN_CONTRIBUTION_UPDATE(
-      contributionToUpdate.user,
+      { id: contributionToUpdate.userId } as DbUser,
       moderator,
       contributionToUpdate,
       amount,

From 6d18fce4e8d2991744a837c1ed09b3142a940a80 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 23 Mar 2023 15:41:13 +0100
Subject: [PATCH 039/101] remove toggle and add confirm modal to user
 (un)deletion in admin interface

---
 admin/src/components/DeletedUserFormular.vue | 54 +++++++++++++++++---
 admin/src/locales/de.json                    | 10 ++++
 admin/src/locales/en.json                    | 10 ++++
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 576ac9f93..bdffc2e54 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -4,19 +4,36 @@
       {{ $t('removeNotSelf') }}
     </div>
     <div v-else class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked">
-        <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
-      </b-form-checkbox>
-
       <div class="mt-3 mb-5">
-        <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
+        <b-button
+          v-if="item.deletedAt === null"
+          variant="danger"
+          v-b-modal.delete-user-modal
+          @click="showModal('deleteUser')"
+        >
           {{ $t('delete_user') }}
         </b-button>
-        <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
+        <b-button
+          v-if="item.deletedAt !== null"
+          variant="success"
+          v-b-modal.delete-user-modal
+          @click="showModal('undeleteUser')"
+        >
           {{ $t('undelete_user') }}
         </b-button>
       </div>
     </div>
+    <b-modal
+      id="delete-user-modal"
+      hide-header-close
+      :title="modalTitle"
+      :cancel-title="$t('overlay.cancel')"
+      :ok-title="modalOkTitle"
+      :ok-variant="variant"
+      @ok="modalEvent"
+    >
+      <p class="my-4">{{ modalQuestion }}</p>
+    </b-modal>
   </div>
 </template>
 <script>
@@ -34,9 +51,34 @@ export default {
   data() {
     return {
       checked: false,
+      modalTitle: '',
+      modalQuestion: '',
+      modalOkTitle: '',
+      modalEvent: null,
+      username: '',
+      variant: 'danger',
     }
   },
   methods: {
+    showModal(type) {
+      this.username = `${this.item.firstName} ${this.item.lastName}`
+
+      if (type === 'deleteUser') {
+        this.variant = 'danger'
+        this.modalTitle = this.$t('overlay.deleteUser.title')
+        this.modalQuestion = this.$t('overlay.deleteUser.question', { username: this.username })
+        this.modalOkTitle = this.$t('overlay.deleteUser.yes')
+        this.modalEvent = this.deleteUser
+      }
+
+      if (type === 'undeleteUser') {
+        this.variant = 'success'
+        this.modalTitle = this.$t('overlay.undeleteUser.title')
+        this.modalQuestion = this.$t('overlay.undeleteUser.question', { username: this.username })
+        this.modalOkTitle = this.$t('overlay.undeleteUser.yes')
+        this.modalEvent = this.unDeleteUser
+      }
+    },
     deleteUser() {
       this.$apollo
         .mutate({
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 0d05eaa88..b981da5ef 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -126,11 +126,21 @@
       "title": "Gemeinwohl-Beitrag löschen!",
       "yes": "Ja, Beitrag löschen!"
     },
+    "deleteUser": {
+      "question": "Willst du {username} wirklich löschen?",
+      "title": "Nutzer löschen",
+      "yes": "Ja, Nutzer löschen"
+    },
     "deny": {
       "question": "Willst du diesen Gemeinwohl-Beitrag  wirklich ablehnen?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.",
       "title": "Gemeinwohl-Beitrag ablehnen!",
       "yes": "Ja, Beitrag ablehnen und speichern!"
+    },
+    "undeleteUser": {
+      "question": "Willst du wirklich {username} wiederherstellen?",
+      "title": "Nutzer wiederherstellen",
+      "yes": "Ja, Nutzer wiederherstellen"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f36944a63..7602aafb1 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -126,11 +126,21 @@
       "title": "Delete creation!",
       "yes": "Yes, delete and save creation!"
     },
+    "deleteUser": {
+      "question": "Do you really want to delete {username}?",
+      "title": "Delete user",
+      "yes": "Yes, delete user"
+    },
     "deny": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.",
       "title": "Reject creation!",
       "yes": "Yes, reject and save creation!"
+    },
+    "undeleteUser": {
+      "question": "Do you really want to undelete {username}",
+      "title": "Undelete user",
+      "yes": "Yes,undelete user"
     }
   },
   "redeemed": "redeemed",

From be978184c7b37856529451478704db63d76dba49 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 18:36:31 +0100
Subject: [PATCH 040/101] validate and version from uuid

---
 backend/src/graphql/resolver/UserResolver.test.ts     | 11 +++++------
 .../src/graphql/resolver/util/findUserByIdentifier.ts |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 0c4f94330..2c52963f0 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -6,6 +6,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { v4 as uuidv4, validate as validateUUID, version as versionUUID } from 'uuid'
 import { objectValuesToArray } from '@/util/utilities'
 import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
@@ -47,7 +48,6 @@ import { ContributionLink } from '@model/ContributionLink'
 import { TransactionLink } from '@entity/TransactionLink'
 import { EventType } from '@/event/Event'
 import { Event as DbEvent } from '@entity/Event'
-import { validate as validateUUID, version as versionUUID } from 'uuid'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { UserContact } from '@entity/UserContact'
 import { OptInType } from '../enum/OptInType'
@@ -2230,6 +2230,8 @@ describe('UserResolver', () => {
     })
 
     describe('authenticated', () => {
+      const uuid = uuidv4()
+
       beforeAll(async () => {
         user = await userFactory(testEnv, bibiBloxberg)
         await mutate({
@@ -2262,7 +2264,7 @@ describe('UserResolver', () => {
             query({
               query: userQuery,
               variables: {
-                identifier: '00000000-0000-0000-0000-000000000000',
+                identifier: uuid,
               },
             }),
           ).resolves.toEqual(
@@ -2270,10 +2272,7 @@ describe('UserResolver', () => {
               errors: [new GraphQLError('No user found to given identifier')],
             }),
           )
-          expect(logger.error).toBeCalledWith(
-            'No user found to given identifier',
-            '00000000-0000-0000-0000-000000000000',
-          )
+          expect(logger.error).toBeCalledWith('No user found to given identifier', uuid)
         })
       })
 
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
index 8643bce72..e5907552e 100644
--- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts
+++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
@@ -1,12 +1,11 @@
 import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import LogError from '@/server/LogError'
+import { validate, version } from 'uuid'
 
 export const findUserByIdentifier = async (identifier: string): Promise<DbUser | null> => {
   let user: DbUser | undefined
-  if (
-    /^[0-9a-f]{8,8}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]{12,12}$/.exec(identifier)
-  ) {
+  if (validate(identifier) && version(identifier) === 4) {
     user = await DbUser.findOne({ where: { gradidoID: identifier }, relations: ['emailContact'] })
     if (!user) {
       throw new LogError('No user found to given identifier', identifier)

From af0a4d7e57ec5f8367795a590033f8693b90d268 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 18:40:03 +0100
Subject: [PATCH 041/101] undo remove logger info

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

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 3146c77da..5c1fa04d3 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -304,6 +304,7 @@ export class TransactionResolver {
     @Args() { identifier, amount, memo }: TransactionSendArgs,
     @Ctx() context: Context,
   ): Promise<boolean> {
+    logger.info(`sendCoins(email=${email}, amount=${amount}, memo=${memo})`)
     if (amount.lte(0)) {
       throw new LogError('Amount to send must be positive', amount)
     }

From 5e7520246be0abebaac57c35dcab09b1961b20f0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 23 Mar 2023 20:26:35 +0100
Subject: [PATCH 042/101] add modal to user role change in admin interface

---
 .../src/components/ChangeUserRoleFormular.vue | 58 ++++++++++++++-----
 admin/src/locales/de.json                     |  6 ++
 admin/src/locales/en.json                     |  6 ++
 3 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 1217ce7f0..42695256e 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -4,19 +4,35 @@
       <div v-if="item.userId === $store.state.moderator.id" class="m-3 mb-4">
         {{ $t('userRole.notChangeYourSelf') }}
       </div>
-      <div class="m-3">
+      <div v-else class="m-3">
         <label for="role" class="mr-3">{{ $t('userRole.selectLabel') }}</label>
-        <b-form-select
-          class="role-select"
-          v-model="roleSelected"
-          :options="roles"
-          :disabled="item.userId === $store.state.moderator.id"
-        />
+        <b-form-select class="role-select" v-model="roleSelected" :options="roles" />
+        <div class="mt-3 mb-5">
+          <b-button
+            variant="danger"
+            v-b-modal.user-role-modal
+            :disabled="currentRole === roleSelected"
+            @click="showModal('changeUserRole')"
+          >
+            {{ $t('change_user_role') }}
+          </b-button>
+        </div>
       </div>
     </div>
+
+    <b-modal
+      id="user-role-modal"
+      hide-header-close
+      ok-variant="danger"
+      :title="modalTitle"
+      :cancel-title="$t('overlay.cancel')"
+      :ok-title="modalOkTitle"
+      @ok="modalEvent"
+    >
+      <p class="my-4">{{ modalQuestion }}</p>
+    </b-modal>
   </div>
 </template>
-
 <script>
 import { setUserRole } from '../graphql/setUserRole'
 
@@ -35,21 +51,37 @@ export default {
   },
   data() {
     return {
+      currentRole: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roleSelected: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roles: [
         { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
         { value: rolesValues.admin, text: this.$t('userRole.selectRoles.admin') },
       ],
+      modalTitle: '',
+      modalQuestion: '',
+      modalOkTitle: '',
+      modalEvent: null,
+      username: '',
     }
   },
   watch: {
-    roleSelected(newRole, oldRole) {
-      if (newRole !== oldRole) {
-        this.setUserRole(newRole, oldRole)
-      }
-    },
+    // roleSelected(newRole, oldRole) {
+    //   if (newRole !== oldRole) {
+    //     // this.setUserRole(newRole, oldRole)
+    //   }
+    // },
   },
   methods: {
+    showModal() {
+      this.username = `${this.item.firstName} ${this.item.lastName}`
+      this.modalTitle = this.$t('overlay.changeUserRole.title')
+      this.modalQuestion = this.$t('overlay.changeUserRole.question', {
+        username: this.username,
+        newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
+      })
+      this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
+      this.modalEvent = this.setUserRole(this.roleSelected, this.currentRole)
+    },
     setUserRole(newRole, oldRole) {
       this.$apollo
         .mutate({
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b981da5ef..ad754c456 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,6 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "chat": "Chat",
+  "change_user_role": "Nutzerrolle ändern",
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -141,6 +142,11 @@
       "question": "Willst du wirklich {username} wiederherstellen?",
       "title": "Nutzer wiederherstellen",
       "yes": "Ja, Nutzer wiederherstellen"
+    },
+    "changeUserRole": {
+      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+      "title": "Nutzerrolle ändern",
+      "yes": "Ja, Nutzerrolle ändern"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 7602aafb1..888f93cf9 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,6 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "chat": "Chat",
+  "change_user_role": "Change user role",
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -141,6 +142,11 @@
       "question": "Do you really want to undelete {username}",
       "title": "Undelete user",
       "yes": "Yes,undelete user"
+    },
+    "changeUserRole": {
+      "question": "Do you really want to change {username}'s role to {newRole}?",
+      "title": "Change user role",
+      "yes": "Yes, change user role"
     }
   },
   "redeemed": "redeemed",

From a87acfbd14c697e484db3289bf3d4fd1ab7576cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Thu, 23 Mar 2023 22:05:03 +0100
Subject: [PATCH 043/101] adapt document to new rules and conventions

---
 .../BusinessRequirements/UC_Set_UserAlias.md  | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/docu/Concepts/BusinessRequirements/UC_Set_UserAlias.md b/docu/Concepts/BusinessRequirements/UC_Set_UserAlias.md
index a5cb07e0e..6340b04a4 100644
--- a/docu/Concepts/BusinessRequirements/UC_Set_UserAlias.md
+++ b/docu/Concepts/BusinessRequirements/UC_Set_UserAlias.md
@@ -26,18 +26,51 @@ Dies ist ein rein technischer Key und wird nur **innerhalb** der Anwendung zur I
 
 Die GradidoID ist zwar auch ein rein technischer Key, doch wird dieser als eine UUID der Version 4 erstellt. Dies basiert auf einer (pseudo)zufällig generierten Zahl aus 16 Bytes mit einer theoretischen Konfliktfreiheit von ![2^{{122}}\approx 5{,}3169\cdot 10^{{36}}](https://wikimedia.org/api/rest_v1/media/math/render/svg/1924927d783e2d3969734633e134f643b6f9a8cd) in hexadezimaler Notation nach einem Pattern von fünf Gruppen durch Bindestrich getrennt - z.B. `550e8400-e29b-41d4-a716-446655440000`
 
-Somit kann die GradidoID auch System übergreifend zwischen Communities ausgetauscht werden und bietet dennoch eine weitestgehende eindeutige theoretisch konfliktfreie Identifikation des Users. System intern ist die Eindeutigkeit bei der Erstellung eines neuen Users auf jedenfall sichergestellt. Sollte ein User den Wechsel von einer Community in eine andere gradido-Community wünschen, so soll falls möglich die GradidoID für den User erhalten bleiben und übernommen werden können. Dies muss beim Umzug in der Ziel-Community geprüft werden. Falls diese GradidoID aus der Quell-Community wider erwarten existieren sollte, dann muss doch einen neue GradidoID für den User erzeugt werden.
+Somit kann die GradidoID auch System übergreifend zwischen Communities ausgetauscht werden und bietet dennoch eine weitestgehende eindeutige theoretisch konfliktfreie Identifikation des Users. System intern ist die Eindeutigkeit bei der Erstellung eines neuen Users auf jedenfall sichergestellt. Sollte ein User den Wechsel von einer Community in eine andere gradido-Community wünschen, so soll falls möglich die GradidoID für den User erhalten bleiben und übernommen werden können. Dies muss beim Umzug in der Ziel-Community geprüft werden. Falls diese GradidoID aus der Quell-Community wider erwarten existieren sollte, dann muss doch einen neue GradidoID für den User in der Ziel-Community erzeugt werden.
 
 #### Alias
 
 Der Alias eines Users ist als rein fachlicher Key ausgelegt, der frei vom User definiert werden kann. Bei der Definition dieses frei definierbaren und menschenlesbaren Schlüsselwertes stellt die Gradido-Anwendung sicher, dass der vom User eingegebene Wert nicht schon von einem anderen User dieser Community verwendet wird. Für die Anlage eines Alias gelten folgende Konventionen:
 
-- mindestens 5 Zeichen
-  * alphanumerisch
-  * keine Umlaute
-  * nach folgender Regel erlaubt (RegEx: [a-zA-Z0-9]-|_[a-zA-Z0-9])
-- Blacklist für Schlüsselworte, die frei definiert werden können
-- vordefinierte/reservierte System relevante Namen dürfen maximal aus 4 Zeichen bestehen
+* alpha-nummerisch
+* 2 <= Länge des alias <=20
+* beginnt mit einem Buchstaben
+* keine Umlaute
+* keine Sonderzeichen ausser dem Bindestrich "-" und dem Unterstrich "_"
+* nicht mehr als 2 Wiederholungen des gleichen Zeichens direkt hintereinander
+* kein Unterscheidung von Groß-Kleinschreibung, es findet eine Konvertierung auf Kleinschreibung statt
+
+Blackliste für nicht vom User verwendbare alias-Definitionen:
+
+Notation: das %-Zeichen dient als Platzhalter für 0 oder beliebig viele der erlaubten Zeichen
+
+* %gradido%		(= die Sequenz gradido darf nicht enthalten sein)
+* %community%	(= die Sequenz community darf nicht enthalten sein)
+* %communities%	(= die Sequenz communities darf nicht enthalten sein)
+* %admin%		(= die Sequenz admin darf nicht enthalten sein)
+* %gast%			(= die Sequenz gast darf nicht enthalten sein)
+* %guest%			(= die Sequenz guest darf nicht enthalten sein)
+* support%		(= darf nicht mit der Sequenz support beginnen)
+* user%			(= darf nicht mit der Sequenz user beginnen)
+* usr%			(= darf nicht mit der Sequenz usr beginnen)
+* home%			(= darf nicht mit der Sequenz home beginnen)
+* chief%			(= darf nicht mit der Sequenz chief beginnen)
+* chef%			(= darf nicht mit der Sequenz chef beginnen)
+* master%			(= darf nicht mit der Sequenz master beginnen)
+* email%			(= darf nicht mit der Sequenz email beginnen)
+* mail%			(= darf nicht mit der Sequenz mail beginnen)
+* root%			(= darf nicht mit der Sequenz root beginnen)
+* tmp%			(= darf nicht mit der Sequenz tmp beginnen)
+* temp%			(= darf nicht mit der Sequenz temp beginnen)
+* gdd%			(= darf nicht mit der Sequenz gdd beginnen)
+* gdt%			(= darf nicht mit der Sequenz gdt beginnen)
+* gdb%			(= darf nicht mit der Sequenz gdb beginnen)
+* age				(= darf nicht age lauten)
+* gmw			(= darf nicht gmw lauten)
+* auf				(= darf nicht auf lauten)
+* ...
+
+Um für die Zukunft für eine Community im Rahmen der Dreifachen-Geldschöpfung und deren Verwaltung bestimmte Alias-Werte nicht an allgemeine User zu verlieren, werden in der Blackliste jetzt schon solche Belegungen reserviert. Damit können diese ggf. später wieder für system relevante User der Community wieder freigegeben werden.
 
 #### Email
 
@@ -49,7 +82,7 @@ Die Email wird weiterhin als Kommunikationskanal ausserhalb der Gradido-Anwendun
 
 Die Erfassung des Alias erfolgt als zusätzliche Eingabe direkt bei der Registrierung eines neuen Users oder als weiterer Schritt direkt nach dem Login.
 
-Dieser UseCase ist in die **Ausbaustufe-1** und **Ausbaustufe-x** unterteilt. 
+Dieser UseCase ist in die **Ausbaustufe-1** und **Ausbaustufe-x** unterteilt.
 
 Alle beschriebenen Anforderungen der **Ausbaustufe-1** können mit Produktivsetzung des Issues #1798 - [GradidoID 1: adapt and migrate database schema](https://github.com/gradido/gradido/issues/1798) und dem [PR #2058 - GradidoID 1: adapt and migrate database schema](https://github.com/gradido/gradido/pull/2058) umgesetzt werden.
 
@@ -63,7 +96,7 @@ In der Eingabemaske der Registrierung wird nun zusätzlich das Feld *Alias* ange
 
 ![img](./image/RegisterWithAlias.png)
 
-Mit dem (optionalen ?) Button "Eindeutigkeit prüfen" wird dem User die Möglichkeit gegeben vorab die Eindeutigkeit seiner *Alias*-Eingabe zu verifizieren ohne den Dialog über den "Registrieren"-Button zu verlassen. Denn es muss sichergestellt sein, dass noch kein existierender User der Community genau diesen *Alias* evtl. schon verwendet. 
+Mit dem (optionalen ?) Button "Eindeutigkeit prüfen" wird dem User die Möglichkeit gegeben vorab die Eindeutigkeit seiner *Alias*-Eingabe zu verifizieren ohne den Dialog über den "Registrieren"-Button zu verlassen. Denn es muss sichergestellt sein, dass noch kein existierender User der Community genau diesen *Alias* evtl. schon verwendet.
 
 Wird diese Prüfung vom User nicht ausgeführt bevor er den Dialog mit dem "Registrieren"-Button abschließt, so erfolgt die *Alias*-Eindeutigkeitsprüfung als erster Schritt bevor die anderen Eingaben als neuer User geprüft und angelegt werden.
 
@@ -93,20 +126,8 @@ Der Sprung nach der Login-Seite nach erfolgreichem Login auf die Profil-Seite ö
 Im Eingabe-Modus der Alias-Gruppe hat das Eingabefeld den Fokus und darin wird:
 
 * wenn noch kein Alias für den User in der Datenbank vorhanden ist, vom System ein Vorschlag unterbreitet. Der Vorschlag basiert auf dem Vornamen des Users und wird durch folgende Logik ermittelt:
-  * es wird mit dem Vorname des Users eine Datenbankabfrage durchgeführt, die zählt, wieviele User-Aliase es schon mit diesem Vornamen gibt und falls notwendig direkt mit einer nachfolgenden Nummer als Postfix versehen sind.
-  * Aufgrund der Konvention, dass ein Alias mindestens 5 Zeichen lang sein muss, sind ggf. führende Nullen mitzuberücksichten.
-    * **Beispiel-1**: *Max* als Vorname
-      * in der Datenbank gibt es schon mehrer User mit den Aliasen: *Maximilian*, *Max01*, *Max_M*, *Max-M*, *MaxMu* und *Max02*.
-      * Dann  schlägt das System den Alias *Max03* vor, da *Max* nur 3 Zeichen lang ist und es schon zwei Aliase *Max* gefolgt mit einer Nummer gibt (*Max01* und *Max02*)
-      * Die Aliase *Maximilian*, *Max_M*, *Max-M* und *MaxMu* werden nicht mitgezählt, das diese nach *Max* keine direkt folgende Ziffern haben
-    * **Beispiel-2**: *August* als Vorname
-      * in der Datenbank gibt es schon mehrer User mit den Aliasen: *Augusta*, *Augustus*, *Augustinus*
-      * Dann schlägt das System den Alias *August* vor, da *August* schon 6 Zeichen lang ist und es noch keinen anderen User mit Alias *August* gibt
-      * die Aliase *Augusta*, *Augustus* und *Augustinus* werden nicht mit gezählt, da diese länger als 5 Zeichen sind und sich von *August* unterscheiden
-    * **Beispiel-3**: *Nick* als Vorname
-      * in der Datenbank gibt es schon mehrer User mit den Aliasen: *Nicko*, *Nickodemus*
-      * Dann schlägt das System den Alias *Nick1* vor, da *Nick* kürzer als 5 Zeichen ist und es noch keinen anderen User mit dem Alias *Nick1* gibt
-      * die Aliase *Nicko* und *Nickodemus* werden nicht mit gezählt, da diese länger als 5 Zeichen sind und sich von *Nick* unterscheiden
+  * es wird mit dem Vorname des Users eine Datenbankabfrage durchgeführt, die zählt, wieviele User-Aliase es schon mit diesem Vornamen gibt und falls notwendig direkt mit einer nachfolgenden Nummer als Postfix versehen.
+  * Aufgrund der Konvention für eine Alias-Definition könnte ein Vorname ggf. gegen die Alias-Regeln verstossen oder aber auch evtl. zu kurz oder lang sein. Auch ein mögliches Blockieren durch die Blacklist könnte den Vornamen des Users als alias verhindern. Dann muss der User selbst manuell seinen alias vollständig erfassen ohne, dass das System einen Vorschlag unterbreiten könnte.
 * wenn schon ein Alias für den User in der Datenbank vorhanden ist, dann wird dieser unverändert aus der Datenbank und ohne Systemvorschlag einfach angezeigt.
 
 Der User kann nun den im Eingabefeld angezeigten Alias verändern, wobei die Alias-Konventionen, wie oben im ersten Kapitel beschrieben einzuhalten und zu validieren sind.

From b3d935af4a43cd5c3f1947190fb1892fba2fbd75 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 24 Mar 2023 12:23:32 +0100
Subject: [PATCH 044/101] feat(frontend): add link to download QR-Code

---
 frontend/src/components/QrCode/FigureQrCode.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.vue b/frontend/src/components/QrCode/FigureQrCode.vue
index 00f1b54b9..71570f79d 100644
--- a/frontend/src/components/QrCode/FigureQrCode.vue
+++ b/frontend/src/components/QrCode/FigureQrCode.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="figure-qr-code">
     <div class="qrbox">
-      <q-r-canvas :options="options" class="canvas" />
+      <q-r-canvas :options="options" class="canvas mb-4" id="qrcanvas" />
+      <a id="download" download="GradidoLinkQRCode.png" href="" @click="downloadImg(this)">
+        {{ $t('download') }}
+      </a>
     </div>
   </div>
 </template>
@@ -37,6 +40,13 @@ export default {
       }
     }
   },
+  methods: {
+    downloadImg() {
+      const canvas = document.getElementById('qrcanvas')
+      const image = canvas.toDataURL('image/png')
+      document.getElementById('download').href = image
+    },
+  },
 }
 </script>
 <style scoped>

From 0ae9b9e9082eabf1c0a231156933e3e337841e8f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 24 Mar 2023 12:24:57 +0100
Subject: [PATCH 045/101] add download key to locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 719ed4cad..b8635f44a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -100,6 +100,7 @@
     }
   },
   "delete": "Löschen",
+  "download": "Herunterladen",
   "edit": "bearbeiten",
   "em-dash": "—",
   "error": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index a0c06dc56..15449a208 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -100,6 +100,7 @@
     }
   },
   "delete": "Delete",
+  "download": "Download",
   "edit": "edit",
   "em-dash": "—",
   "error": {
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 102825acc..2240e8b31 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -88,6 +88,7 @@
     }
   },
   "delete": "Supprimer",
+  "download": "Télécharger",
   "edit": "modifier",
   "em-dash": "—",
   "error": {

From e359fa59b366970969c0c5f08ad808940e569baa Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 24 Mar 2023 12:39:09 +0100
Subject: [PATCH 046/101] Add mock for .

---
 frontend/src/components/QrCode/FigureQrCode.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.spec.js b/frontend/src/components/QrCode/FigureQrCode.spec.js
index 715a5d5d5..30a8277e1 100644
--- a/frontend/src/components/QrCode/FigureQrCode.spec.js
+++ b/frontend/src/components/QrCode/FigureQrCode.spec.js
@@ -6,12 +6,15 @@ const localVue = global.localVue
 const propsData = {
   link: '',
 }
+const mocks = {
+  $t: jest.fn((t) => t),
+}
 
 describe('FigureQrCode', () => {
   let wrapper
 
   const Wrapper = () => {
-    return mount(FigureQrCode, { localVue, propsData })
+    return mount(FigureQrCode, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {

From c08b5387c5a6df9f1a28d97974364be49a7b1f9f Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 24 Mar 2023 14:36:02 +0100
Subject: [PATCH 047/101] fix user role change modal

---
 admin/src/components/ChangeUserRoleFormular.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 42695256e..8690ba26c 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -27,7 +27,7 @@
       :title="modalTitle"
       :cancel-title="$t('overlay.cancel')"
       :ok-title="modalOkTitle"
-      @ok="modalEvent"
+      @ok="setUserRole(roleSelected, currentRole)"
     >
       <p class="my-4">{{ modalQuestion }}</p>
     </b-modal>
@@ -60,17 +60,9 @@ export default {
       modalTitle: '',
       modalQuestion: '',
       modalOkTitle: '',
-      modalEvent: null,
       username: '',
     }
   },
-  watch: {
-    // roleSelected(newRole, oldRole) {
-    //   if (newRole !== oldRole) {
-    //     // this.setUserRole(newRole, oldRole)
-    //   }
-    // },
-  },
   methods: {
     showModal() {
       this.username = `${this.item.firstName} ${this.item.lastName}`
@@ -80,7 +72,6 @@ export default {
         newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
       })
       this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
-      this.modalEvent = this.setUserRole(this.roleSelected, this.currentRole)
     },
     setUserRole(newRole, oldRole) {
       this.$apollo

From a81b364fef2a20900c1e75aaad97579006ae2738 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Mar 2023 12:57:34 +0200
Subject: [PATCH 048/101] fix admin create contribution

---
 admin/src/components/CreationFormular.spec.js | 1 +
 admin/src/components/CreationFormular.vue     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index c22b319a9..8f8cc03b0 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -145,6 +145,7 @@ describe('CreationFormular', () => {
 
             it('sends ... to apollo', () => {
               expect(adminCreateContributionMock).toBeCalledWith({
+                email: 'benjamin@bluemchen.de',
                 creationDate: getCreationDate(2),
                 amount: 90,
                 memo: 'Test create coins',
diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index aeaa84cc6..df8611c3b 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -140,6 +140,7 @@ export default {
         .mutate({
           mutation: adminCreateContribution,
           variables: {
+            email: this.item.email,
             creationDate: this.selected.date,
             amount: Number(this.value),
             memo: this.text,

From a4c82ae1456360b7c164731b21ab5ae6e997a315 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Mar 2023 13:06:37 +0200
Subject: [PATCH 049/101] remove skipped tests as thay are depreciated

---
 .../resolver/ContributionResolver.test.ts     | 50 -------------------
 1 file changed, 50 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 3c9241d7d..dcd24529e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -2077,56 +2077,6 @@ describe('ContributionResolver', () => {
           // stephen@hawking.uk: [1000, 1000, 1000] - deleted
           // garrick@ollivander.com: [1000, 1000, 1000] - not activated
 
-          describe.skip('user for creation to update does not exist', () => {
-            it('throws an error', async () => {
-              jest.clearAllMocks()
-              await expect(
-                mutate({
-                  mutation: adminUpdateContribution,
-                  variables: {
-                    id: 1,
-                    amount: new Decimal(300),
-                    memo: 'Danke Bibi!',
-                    creationDate: contributionDateFormatter(new Date()),
-                  },
-                }),
-              ).resolves.toEqual(
-                expect.objectContaining({
-                  errors: [new GraphQLError('Could not find User')],
-                }),
-              )
-            })
-
-            it('logs the error "Could not find User"', () => {
-              expect(logger.error).toBeCalledWith('Could not find User', 'bob@baumeister.de')
-            })
-          })
-
-          describe.skip('user for creation to update is deleted', () => {
-            it('throws an error', async () => {
-              jest.clearAllMocks()
-              await expect(
-                mutate({
-                  mutation: adminUpdateContribution,
-                  variables: {
-                    id: 1,
-                    amount: new Decimal(300),
-                    memo: 'Danke Bibi!',
-                    creationDate: contributionDateFormatter(new Date()),
-                  },
-                }),
-              ).resolves.toEqual(
-                expect.objectContaining({
-                  errors: [new GraphQLError('User was deleted')],
-                }),
-              )
-            })
-
-            it('logs the error "User was deleted"', () => {
-              expect(logger.error).toBeCalledWith('User was deleted', 'stephen@hawking.uk')
-            })
-          })
-
           describe('creation does not exist', () => {
             it('throws an error', async () => {
               jest.clearAllMocks()

From d7919ea10f468dce4342e247b41275513a88c4e5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 28 Mar 2023 13:32:47 +0200
Subject: [PATCH 050/101] changes requested

---
 backend/src/graphql/resolver/TransactionResolver.ts       | 2 +-
 backend/src/graphql/resolver/UserResolver.ts              | 7 +++----
 backend/src/graphql/resolver/util/findUserByIdentifier.ts | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 5c1fa04d3..0fb78747b 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -304,7 +304,7 @@ export class TransactionResolver {
     @Args() { identifier, amount, memo }: TransactionSendArgs,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    logger.info(`sendCoins(email=${email}, amount=${amount}, memo=${memo})`)
+    logger.info(`sendCoins(identifier=${identifier}, amount=${amount}, memo=${memo})`)
     if (amount.lte(0)) {
       throw new LogError('Amount to send must be positive', amount)
     }
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 71dc440de..5ed9e0c52 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -823,10 +823,9 @@ export class UserResolver {
   }
 
   @Authorized([RIGHTS.USER])
-  @Query(() => User, { nullable: true })
-  async user(@Arg('identifier') identifier: string): Promise<User | null> {
-    const user = await findUserByIdentifier(identifier)
-    return user ? new User(user) : null
+  @Query(() => User)
+  async user(@Arg('identifier') identifier: string): Promise<User> {
+    return new User(await findUserByIdentifier(identifier))
   }
 }
 
diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
index e5907552e..1bb6b3b95 100644
--- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts
+++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts
@@ -3,7 +3,7 @@ import { UserContact as DbUserContact } from '@entity/UserContact'
 import LogError from '@/server/LogError'
 import { validate, version } from 'uuid'
 
-export const findUserByIdentifier = async (identifier: string): Promise<DbUser | null> => {
+export const findUserByIdentifier = async (identifier: string): Promise<DbUser> => {
   let user: DbUser | undefined
   if (validate(identifier) && version(identifier) === 4) {
     user = await DbUser.findOne({ where: { gradidoID: identifier }, relations: ['emailContact'] })

From 44f57779b813f277f49832bb77307e154ef49dc6 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 17:53:08 +0200
Subject: [PATCH 051/101] use msgBoxConfirm for user role change modal

---
 .../src/components/ChangeUserRoleFormular.vue | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 8690ba26c..677a12f56 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -12,25 +12,13 @@
             variant="danger"
             v-b-modal.user-role-modal
             :disabled="currentRole === roleSelected"
-            @click="showModal('changeUserRole')"
+            @click="showModal()"
           >
             {{ $t('change_user_role') }}
           </b-button>
         </div>
       </div>
     </div>
-
-    <b-modal
-      id="user-role-modal"
-      hide-header-close
-      ok-variant="danger"
-      :title="modalTitle"
-      :cancel-title="$t('overlay.cancel')"
-      :ok-title="modalOkTitle"
-      @ok="setUserRole(roleSelected, currentRole)"
-    >
-      <p class="my-4">{{ modalQuestion }}</p>
-    </b-modal>
   </div>
 </template>
 <script>
@@ -57,21 +45,36 @@ export default {
         { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
         { value: rolesValues.admin, text: this.$t('userRole.selectRoles.admin') },
       ],
-      modalTitle: '',
-      modalQuestion: '',
-      modalOkTitle: '',
-      username: '',
     }
   },
   methods: {
     showModal() {
-      this.username = `${this.item.firstName} ${this.item.lastName}`
-      this.modalTitle = this.$t('overlay.changeUserRole.title')
-      this.modalQuestion = this.$t('overlay.changeUserRole.question', {
-        username: this.username,
-        newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
-      })
-      this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.changeUserRole.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+            newRole:
+              this.roleSelected === 'admin'
+                ? this.$t('userRole.selectRoles.admin')
+                : this.$t('userRole.selectRoles.user'),
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.changeUserRole.title'),
+            okTitle: this.$t('overlay.changeUserRole.yes'),
+            okVariant: 'danger',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.setUserRole(this.roleSelected, this.currentRole)
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     setUserRole(newRole, oldRole) {
       this.$apollo

From 17f7e8adf0ce2928c5b4f3bb9a1c3c13c69066a7 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 18:10:27 +0200
Subject: [PATCH 052/101] use msgBoxConfirm for user deletion modal

---
 admin/src/components/DeletedUserFormular.vue | 86 +++++++++++---------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index bdffc2e54..a24be3d72 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -9,7 +9,7 @@
           v-if="item.deletedAt === null"
           variant="danger"
           v-b-modal.delete-user-modal
-          @click="showModal('deleteUser')"
+          @click="showDeleteModal()"
         >
           {{ $t('delete_user') }}
         </b-button>
@@ -17,23 +17,12 @@
           v-if="item.deletedAt !== null"
           variant="success"
           v-b-modal.delete-user-modal
-          @click="showModal('undeleteUser')"
+          @click="showUndeleteModal()"
         >
           {{ $t('undelete_user') }}
         </b-button>
       </div>
     </div>
-    <b-modal
-      id="delete-user-modal"
-      hide-header-close
-      :title="modalTitle"
-      :cancel-title="$t('overlay.cancel')"
-      :ok-title="modalOkTitle"
-      :ok-variant="variant"
-      @ok="modalEvent"
-    >
-      <p class="my-4">{{ modalQuestion }}</p>
-    </b-modal>
   </div>
 </template>
 <script>
@@ -51,33 +40,56 @@ export default {
   data() {
     return {
       checked: false,
-      modalTitle: '',
-      modalQuestion: '',
-      modalOkTitle: '',
-      modalEvent: null,
-      username: '',
-      variant: 'danger',
     }
   },
   methods: {
-    showModal(type) {
-      this.username = `${this.item.firstName} ${this.item.lastName}`
-
-      if (type === 'deleteUser') {
-        this.variant = 'danger'
-        this.modalTitle = this.$t('overlay.deleteUser.title')
-        this.modalQuestion = this.$t('overlay.deleteUser.question', { username: this.username })
-        this.modalOkTitle = this.$t('overlay.deleteUser.yes')
-        this.modalEvent = this.deleteUser
-      }
-
-      if (type === 'undeleteUser') {
-        this.variant = 'success'
-        this.modalTitle = this.$t('overlay.undeleteUser.title')
-        this.modalQuestion = this.$t('overlay.undeleteUser.question', { username: this.username })
-        this.modalOkTitle = this.$t('overlay.undeleteUser.yes')
-        this.modalEvent = this.unDeleteUser
-      }
+    showDeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.deleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.deleteUser.title'),
+            okTitle: this.$t('overlay.deleteUser.yes'),
+            okVariant: 'danger',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.deleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
+    showUndeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.undeleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.undeleteUser.title'),
+            okTitle: this.$t('overlay.undeleteUser.yes'),
+            okVariant: 'success',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.unDeleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     deleteUser() {
       this.$apollo

From e106f85086035b62b4b95601b8e1f70090c71cdc Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 20:01:52 +0200
Subject: [PATCH 053/101] fix locales sorting

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index ad754c456..f98dc90f3 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,8 +1,8 @@
 {
   "all_emails": "Alle Nutzer",
   "back": "zurück",
-  "chat": "Chat",
   "change_user_role": "Nutzerrolle ändern",
+  "chat": "Chat",
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -115,6 +115,11 @@
   "open_creations": "Offene Schöpfungen",
   "overlay": {
     "cancel": "Abbrechen",
+    "changeUserRole": {
+      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+      "title": "Nutzerrolle ändern",
+      "yes": "Ja, Nutzerrolle ändern"
+    },
     "confirm": {
       "question": "Willst du diesen Gemeinwohl-Beitrag wirklich bestätigen und gutschreiben?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar. Bitte überprüfe genau, dass alles stimmt.",
@@ -142,11 +147,6 @@
       "question": "Willst du wirklich {username} wiederherstellen?",
       "title": "Nutzer wiederherstellen",
       "yes": "Ja, Nutzer wiederherstellen"
-    },
-    "changeUserRole": {
-      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
-      "title": "Nutzerrolle ändern",
-      "yes": "Ja, Nutzerrolle ändern"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 888f93cf9..358c62a15 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,8 +1,8 @@
 {
   "all_emails": "All users",
   "back": "back",
-  "chat": "Chat",
   "change_user_role": "Change user role",
+  "chat": "Chat",
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -115,6 +115,11 @@
   "open_creations": "Open creations",
   "overlay": {
     "cancel": "Cancel",
+    "changeUserRole": {
+      "question": "Do you really want to change {username}'s role to {newRole}?",
+      "title": "Change user role",
+      "yes": "Yes, change user role"
+    },
     "confirm": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed. Please check carefully that everything is correct.",
@@ -142,11 +147,6 @@
       "question": "Do you really want to undelete {username}",
       "title": "Undelete user",
       "yes": "Yes,undelete user"
-    },
-    "changeUserRole": {
-      "question": "Do you really want to change {username}'s role to {newRole}?",
-      "title": "Change user role",
-      "yes": "Yes, change user role"
     }
   },
   "redeemed": "redeemed",

From a1bcf7515adf3b3543d0087cb7664f1708842be9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Mar 2023 10:54:41 +0100
Subject: [PATCH 054/101] removed more obsolete data

---
 database/.env.dist     |  2 --
 database/.env.template |  2 --
 database/ormconfig.js  | 15 ---------------
 3 files changed, 19 deletions(-)
 delete mode 100644 database/ormconfig.js

diff --git a/database/.env.dist b/database/.env.dist
index 689e4f509..0b2c342ca 100644
--- a/database/.env.dist
+++ b/database/.env.dist
@@ -4,5 +4,3 @@ DB_USER=root
 DB_PASSWORD=
 DB_DATABASE=gradido_community
 MIGRATIONS_TABLE=migrations
-
-TYPEORM_SEEDING_FACTORIES=src/factories/**/*{.ts,.js}
diff --git a/database/.env.template b/database/.env.template
index f2517a397..e21d4548c 100644
--- a/database/.env.template
+++ b/database/.env.template
@@ -6,5 +6,3 @@ DB_USER=$DB_USER
 DB_PASSWORD=$DB_PASSWORD
 DB_DATABASE=gradido_community
 MIGRATIONS_TABLE=migrations
-
-TYPEORM_SEEDING_FACTORIES=src/factories/**/*{.ts,.js}
diff --git a/database/ormconfig.js b/database/ormconfig.js
deleted file mode 100644
index 71e444061..000000000
--- a/database/ormconfig.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-const CONFIG = require('./src/config')
-
-module.export = {
-  name: 'default',
-  type: 'mysql',
-  host: CONFIG.DB_HOST,
-  port: CONFIG.DB_PORT,
-  username: CONFIG.DB_USER,
-  password: CONFIG.DB_PASSWORD,
-  database: CONFIG.DB_DATABASE,
-  seeds: ['src/seeds/**/*{.ts,.js}'],
-  factories: ['src/factories/**/*{.ts,.js}'],
-}

From d801a8957f0092677397138802e7d14f3b2a724a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 15:50:12 +0200
Subject: [PATCH 055/101] delete nodemoduels folders to prevent corruption,
 delete yarn tmp files

---
 deployment/bare_metal/start.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 6c3c07766..9363cedca 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -118,6 +118,18 @@ case "$NGINX_SSL" in
 esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
+# Clean tmp folder - remove yarn files
+rm -R /tmp/yarn--*
+
+# Remove node_modules folders
+# we had problems with corrupted node_modules folder
+rm -R $PROJECT_ROOT/database/node_modules
+rm -R $PROJECT_ROOT/backend/node_modules
+rm -R $PROJECT_ROOT/frontend/node_modules
+rm -R $PROJECT_ROOT/admin/node_modules
+rm -R $PROJECT_ROOT/dht-node/node_modules
+rm -R $PROJECT_ROOT/federation/node_modules
+
 # Regenerate .env files
 cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak
 cp -f $PROJECT_ROOT/backend/.env $PROJECT_ROOT/backend/.env.bak

From c96ed73996862753718b39c5a7a36212d13cc99a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 15:58:53 +0200
Subject: [PATCH 056/101] force delete node_modules

---
 deployment/bare_metal/start.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 9363cedca..f386fab2a 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -123,12 +123,12 @@ rm -R /tmp/yarn--*
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder
-rm -R $PROJECT_ROOT/database/node_modules
-rm -R $PROJECT_ROOT/backend/node_modules
-rm -R $PROJECT_ROOT/frontend/node_modules
-rm -R $PROJECT_ROOT/admin/node_modules
-rm -R $PROJECT_ROOT/dht-node/node_modules
-rm -R $PROJECT_ROOT/federation/node_modules
+rm -Rf $PROJECT_ROOT/database/node_modules
+rm -Rf $PROJECT_ROOT/backend/node_modules
+rm -Rf $PROJECT_ROOT/frontend/node_modules
+rm -Rf $PROJECT_ROOT/admin/node_modules
+rm -Rf $PROJECT_ROOT/dht-node/node_modules
+rm -Rf $PROJECT_ROOT/federation/node_modules
 
 # Regenerate .env files
 cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak

From 8b15eba252ef01b079f9178c667be040e59d884d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 16:01:35 +0200
Subject: [PATCH 057/101] replace delete command by find

---
 deployment/bare_metal/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index f386fab2a..45ae3451b 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -119,7 +119,7 @@ esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
 # Clean tmp folder - remove yarn files
-rm -R /tmp/yarn--*
+find /tmp -name "yarn--*" -exec rm -r {} 
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder

From c274b85bb3a60ed68d0283fc9bb66cedbc5fc29b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 16:04:02 +0200
Subject: [PATCH 058/101] fix find

---
 deployment/bare_metal/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 45ae3451b..b30d90f19 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -119,7 +119,7 @@ esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
 # Clean tmp folder - remove yarn files
-find /tmp -name "yarn--*" -exec rm -r {} 
+find /tmp -name "yarn--*" -exec rm -r {} \;
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder

From 28cbf13062a936625e4e5b57ed050df00eb46ea3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 16:23:55 +0200
Subject: [PATCH 059/101] solution to enable import/no-cycle

---
 backend/.eslintrc.js                          |  2 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts |  3 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts  |  3 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts  |  3 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_DENY.ts    |  3 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts   |  3 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts   |  3 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts   |  3 +-
 ...EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts |  3 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts  |  3 +-
 backend/src/event/EVENT_ADMIN_USER_DELETE.ts  |  3 +-
 .../src/event/EVENT_ADMIN_USER_ROLE_SET.ts    |  3 +-
 .../src/event/EVENT_ADMIN_USER_UNDELETE.ts    |  3 +-
 .../src/event/EVENT_CONTRIBUTION_CREATE.ts    |  3 +-
 .../src/event/EVENT_CONTRIBUTION_DELETE.ts    |  3 +-
 .../event/EVENT_CONTRIBUTION_LINK_REDEEM.ts   |  3 +-
 .../EVENT_CONTRIBUTION_MESSAGE_CREATE.ts      |  3 +-
 .../src/event/EVENT_CONTRIBUTION_UPDATE.ts    |  3 +-
 .../EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts  |  3 +-
 .../event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts   |  3 +-
 backend/src/event/EVENT_EMAIL_CONFIRMATION.ts |  3 +-
 .../src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts  |  3 +-
 .../event/EVENT_TRANSACTION_LINK_CREATE.ts    |  3 +-
 .../event/EVENT_TRANSACTION_LINK_DELETE.ts    |  3 +-
 .../event/EVENT_TRANSACTION_LINK_REDEEM.ts    |  3 +-
 .../src/event/EVENT_TRANSACTION_RECEIVE.ts    |  3 +-
 backend/src/event/EVENT_TRANSACTION_SEND.ts   |  3 +-
 .../src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts  |  3 +-
 backend/src/event/EVENT_USER_INFO_UPDATE.ts   |  3 +-
 backend/src/event/EVENT_USER_LOGIN.ts         |  3 +-
 backend/src/event/EVENT_USER_LOGOUT.ts        |  3 +-
 backend/src/event/EVENT_USER_REGISTER.ts      |  3 +-
 backend/src/event/Event.ts                    | 34 -------------------
 backend/src/event/Events.ts                   | 33 ++++++++++++++++++
 .../resolver/ContributionLinkResolver.test.ts |  2 +-
 .../resolver/ContributionLinkResolver.ts      |  2 +-
 .../ContributionMessageResolver.test.ts       |  2 +-
 .../resolver/ContributionMessageResolver.ts   |  2 +-
 .../resolver/ContributionResolver.test.ts     |  2 +-
 .../graphql/resolver/ContributionResolver.ts  |  2 +-
 .../resolver/TransactionLinkResolver.test.ts  |  2 +-
 .../resolver/TransactionLinkResolver.ts       |  2 +-
 .../resolver/TransactionResolver.test.ts      |  2 +-
 .../graphql/resolver/TransactionResolver.ts   |  2 +-
 .../src/graphql/resolver/UserResolver.test.ts |  2 +-
 backend/src/graphql/resolver/UserResolver.ts  |  2 +-
 46 files changed, 108 insertions(+), 78 deletions(-)
 create mode 100644 backend/src/event/Events.ts

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 79276ef9d..2654104dc 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -55,7 +55,7 @@ module.exports = {
     'import/named': 'error',
     'import/namespace': 'error',
     'import/no-absolute-path': 'error',
-    'import/no-cycle': 'off',
+    'import/no-cycle': 'error',
     'import/no-dynamic-require': 'error',
     'import/no-internal-modules': 'off',
     'import/no-relative-packages': 'error',
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
index 33c9ae36e..cb1f8b32b 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CONFIRM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
index bf85345cf..64797fc26 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
index dd37c76b5..a2770b34d 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
index 8d34be87f..cb9e32fbf 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
index b7ee39c36..93bfdbf4b 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_CREATE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
index b5816e45d..2794f5fa3 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
@@ -1,7 +1,8 @@
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_DELETE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
index 1cd998e26..810cecf29 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
index f07d38e98..ab96b78f6 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,7 +2,8 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
index 7d1bc175e..6bea692fd 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
index bfd5be740..1eb7399aa 100644
--- a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_DELETE = async (user: DbUser, moderator: DbUser): Promise<DbEvent> =>
   Event(EventType.ADMIN_USER_DELETE, user, moderator).save()
diff --git a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
index 3be825ad4..37c840475 100644
--- a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_ROLE_SET = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
index eb861dbf1..121662ea8 100644
--- a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_UNDELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
index f1469c725..6842bc4eb 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
index 8c62e3ae6..30130662f 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
index 9f44de95d..5138548a6 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
@@ -4,7 +4,8 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_LINK_REDEEM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
index b06685a6d..1200834de 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,7 +2,8 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_MESSAGE_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
index c2e6951cc..38df20a4c 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_UPDATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
index c16bbfac3..ad9d27596 100644
--- a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_ACCOUNT_MULTIREGISTRATION, user, { id: 0 } as DbUser).save()
diff --git a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
index ae10f9fba..2ba31af9d 100644
--- a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_ADMIN_CONFIRMATION = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
index 9d64207e0..5edef7f20 100644
--- a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_CONFIRMATION = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_CONFIRMATION, user, user).save()
diff --git a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
index f7e328369..72d3b2b2c 100644
--- a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
+++ b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_FORGOT_PASSWORD = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_FORGOT_PASSWORD, user, { id: 0 } as DbUser).save()
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
index e766fe38e..74e4c1b42 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
index d15c786a8..70e06bbd4 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
@@ -1,7 +1,8 @@
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
index 5f8cd5c4d..75bc87916 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_REDEEM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
index c6e06ccb7..a09e1c4b2 100644
--- a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_RECEIVE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_SEND.ts b/backend/src/event/EVENT_TRANSACTION_SEND.ts
index 888162747..71c70a425 100644
--- a/backend/src/event/EVENT_TRANSACTION_SEND.ts
+++ b/backend/src/event/EVENT_TRANSACTION_SEND.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_SEND = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
index 2e224d550..9b2ce31ee 100644
--- a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
+++ b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_ACTIVATE_ACCOUNT, user, user).save()
diff --git a/backend/src/event/EVENT_USER_INFO_UPDATE.ts b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
index 681ecd473..6b9d89738 100644
--- a/backend/src/event/EVENT_USER_INFO_UPDATE.ts
+++ b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_INFO_UPDATE = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_INFO_UPDATE, user, user).save()
diff --git a/backend/src/event/EVENT_USER_LOGIN.ts b/backend/src/event/EVENT_USER_LOGIN.ts
index 351ec5a95..81477b8a6 100644
--- a/backend/src/event/EVENT_USER_LOGIN.ts
+++ b/backend/src/event/EVENT_USER_LOGIN.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_LOGIN = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_LOGIN, user, user).save()
diff --git a/backend/src/event/EVENT_USER_LOGOUT.ts b/backend/src/event/EVENT_USER_LOGOUT.ts
index 4f5650fc6..c6c63405a 100644
--- a/backend/src/event/EVENT_USER_LOGOUT.ts
+++ b/backend/src/event/EVENT_USER_LOGOUT.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_LOGOUT = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_LOGOUT, user, user).save()
diff --git a/backend/src/event/EVENT_USER_REGISTER.ts b/backend/src/event/EVENT_USER_REGISTER.ts
index cdb8b22e2..45bc6b6f4 100644
--- a/backend/src/event/EVENT_USER_REGISTER.ts
+++ b/backend/src/event/EVENT_USER_REGISTER.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_REGISTER = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_REGISTER, user, user).save()
diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index feb167adf..d19177b53 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -33,37 +33,3 @@ export const Event = (
   event.amount = amount
   return event
 }
-
-export { EventType }
-
-export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
-export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
-export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
-export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
-export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
-export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
-export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
-export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
-export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
-export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
-export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
-export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
-export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
-export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
-export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
-export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
-export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
-export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
-export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
-export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
-export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
-export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
-export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'
diff --git a/backend/src/event/Events.ts b/backend/src/event/Events.ts
new file mode 100644
index 000000000..d217cde28
--- /dev/null
+++ b/backend/src/event/Events.ts
@@ -0,0 +1,33 @@
+export { EventType } from './EventType'
+export { Event } from './Event'
+export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
+export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
+export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
+export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
+export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
+export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
+export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
+export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
+export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
+export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
+export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
+export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
+export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
+export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
+export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
+export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
+export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
+export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
+export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
+export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
+export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
+export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
+export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 6a69e257e..d89edc695 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -20,7 +20,7 @@ import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 55a23187f..6328bd3bc 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -25,7 +25,7 @@ import {
   EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
   EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
-} from '@/event/Event'
+} from '@/event/Events'
 
 @Resolver()
 export class ContributionLinkResolver {
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 6b2c7c4d8..b8125f8cb 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -21,7 +21,7 @@ import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 jest.mock('@/emails/sendEmailVariants', () => {
   const originalModule = jest.requireActual('@/emails/sendEmailVariants')
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 999ccc2b1..276183894 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -21,7 +21,7 @@ import LogError from '@/server/LogError'
 import {
   EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE,
   EVENT_CONTRIBUTION_MESSAGE_CREATE,
-} from '@/event/Event'
+} from '@/event/Events'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index df8524a0c..b99c6b0c7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -51,7 +51,7 @@ import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { logger, i18n as localization } from '@test/testSetup'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 83cf29fc7..e5112e8b4 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -46,7 +46,7 @@ import {
   EVENT_ADMIN_CONTRIBUTION_DELETE,
   EVENT_ADMIN_CONTRIBUTION_CONFIRM,
   EVENT_ADMIN_CONTRIBUTION_DENY,
-} from '@/event/Event'
+} from '@/event/Events'
 import { calculateDecay } from '@/util/decay'
 import {
   sendContributionConfirmedEmail,
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 5c2fff0ad..1a15a65a9 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -35,7 +35,7 @@ import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { logger } from '@test/testSetup'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 // mock semaphore to allow use fake timers
 jest.mock('@/util/TRANSACTIONS_LOCK')
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 6aa829ac1..3b2f7704a 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -38,7 +38,7 @@ import {
   EVENT_TRANSACTION_LINK_CREATE,
   EVENT_TRANSACTION_LINK_DELETE,
   EVENT_TRANSACTION_LINK_REDEEM,
-} from '@/event/Event'
+} from '@/event/Events'
 
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index f26234363..0ac1f724a 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -11,7 +11,7 @@ import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
 import { findUserByEmail } from './UserResolver'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { userFactory } from '@/seeds/factory/user'
 import {
   confirmContribution,
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f38a4a07b..3620dbcef 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -34,7 +34,7 @@ import {
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
-import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
+import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Events'
 
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index aebd0f0eb..735c27950 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -45,7 +45,7 @@ import {
 import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
 import { ContributionLink } from '@model/ContributionLink'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 54d4f583f..8f72b3bcf 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -70,7 +70,7 @@ import {
   EVENT_ADMIN_USER_ROLE_SET,
   EVENT_ADMIN_USER_DELETE,
   EVENT_ADMIN_USER_UNDELETE,
-} from '@/event/Event'
+} from '@/event/Events'
 import { isValidPassword } from '@/password/EncryptorUtils'
 import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
 import LogError from '@/server/LogError'

From c0680d332d36d8b45102d8dd39431950bfc07df7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 29 Mar 2023 16:43:03 +0200
Subject: [PATCH 060/101] Transaction info, right-justified, so that the commas

---
 .../DecayInformation-Long.vue                 | 20 +++++++++++--------
 .../TransactionRows/DurationRow.vue           |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 782fe049c..0fd6b7f5c 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -14,7 +14,7 @@
           <b-col cols="12" lg="4" md="4">
             <div>{{ $t('decay.last_transaction') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
             <div>
               <span>
                 {{ $d(new Date(decay.start), 'long') }}
@@ -25,11 +25,13 @@
         <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
         <!-- Decay-->
-        <b-row>
-          <b-col cols="12" lg="4" md="4">
+        <b-row class="mt-2">
+          <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.decay') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">{{ decay.decay | GDD }}</b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ decay.decay | GDD }}
+          </b-col>
         </b-row>
       </b-col>
     </b-row>
@@ -38,15 +40,17 @@
       <b-col>
         <b-row>
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-          <b-col cols="12" lg="4" md="4">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">{{ amount | GDD }}</b-col>
+          <b-col cols="12" lg="3" md="3">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ amount | GDD }}
+          </b-col>
         </b-row>
         <!-- Total-->
         <b-row>
-          <b-col cols="12" lg="4" md="4">
+          <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.total') }}</div>
           </b-col>
-          <b-col offset="1" offset-md="0" offset-lg="0">
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
             <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
           </b-col>
         </b-row>
diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue
index 9cadf8c24..aa20132d7 100644
--- a/frontend/src/components/TransactionRows/DurationRow.vue
+++ b/frontend/src/components/TransactionRows/DurationRow.vue
@@ -4,7 +4,7 @@
       <b-col cols="12" lg="4" md="4">
         <div>{{ $t('decay.past_time') }}</div>
       </b-col>
-      <b-col offset="1" offset-md="0" offset-lg="0">
+      <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
         <span v-if="duration">{{ durationText }}</span>
       </b-col>
     </b-row>

From cdfcaefa840b589f98937adf5644c802901605ae Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 15:50:20 +0200
Subject: [PATCH 061/101] show moderator id

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

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 46995e9f7..3c1a1e67e 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -212,7 +212,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'moderator', label: this.$t('moderator') },
+          { key: 'moderatorId', label: this.$t('moderator') },
           { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],

From 64d896f9734bfa5c005289d6353b98d9d06a8d6e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 16:14:36 +0200
Subject: [PATCH 062/101] do not allow user to edit admin contributions

---
 .../Contributions/ContributionListItem.vue         | 14 +++++++++-----
 frontend/src/graphql/queries.js                    |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 56546d183..27e8459bd 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -47,7 +47,7 @@
           <div v-else class="font-weight-bold">{{ amount | GDD }}</div>
         </b-col>
         <b-col cols="12" md="1" lg="1" class="text-right align-items-center">
-          <div v-if="messagesCount > 0" @click="visible = !visible">
+          <div v-if="messagesCount > 0 && !moderatorId" @click="visible = !visible">
             <collapse-icon class="text-right" :visible="visible" />
           </div>
         </b-col>
@@ -58,7 +58,7 @@
       >
         <b-col cols="3" class="mr-auto text-center">
           <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
+            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution && !moderatorId"
             class="test-delete-contribution pointer mr-3"
             @click="deleteContribution({ id })"
           >
@@ -69,7 +69,7 @@
         </b-col>
         <b-col cols="3" class="text-center">
           <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
+            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution && !moderatorId"
             class="test-edit-contribution pointer mr-3"
             @click="
               $emit('update-contribution-form', {
@@ -84,9 +84,8 @@
             <div>{{ $t('edit') }}</div>
           </div>
         </b-col>
-
         <b-col cols="6" class="text-center">
-          <div v-if="messagesCount > 0" class="pointer" @click="visible = !visible">
+          <div v-if="messagesCount > 0 && !moderatorId" class="pointer" @click="visible = !visible">
             <b-icon icon="chat-dots"></b-icon>
             <div>{{ $t('moderatorChat') }}</div>
           </div>
@@ -180,6 +179,11 @@ export default {
       required: false,
       default: false,
     },
+    moderatorId: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
   },
   data() {
     return {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 7193eded0..87e861752 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -187,6 +187,7 @@ export const listContributions = gql`
         messagesCount
         deniedAt
         deniedBy
+        moderatorId
       }
     }
   }

From 43e2f5fbc839921b5b0fe3deadc85c15baeb104f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 16:40:07 +0200
Subject: [PATCH 063/101] do not allow user to edit admin contributions

---
 .../src/graphql/resolver/BalanceResolver.ts   |  1 -
 .../resolver/CommunityResolver.test.ts        |  2 +-
 .../resolver/ContributionLinkResolver.test.ts |  2 +-
 .../resolver/ContributionLinkResolver.ts      |  6 +-
 .../resolver/ContributionResolver.test.ts     | 68 +++++++++++++++----
 .../graphql/resolver/ContributionResolver.ts  |  9 ++-
 .../resolver/TransactionLinkResolver.test.ts  |  6 +-
 .../resolver/TransactionLinkResolver.ts       |  8 +--
 .../resolver/TransactionResolver.test.ts      |  4 +-
 .../graphql/resolver/TransactionResolver.ts   |  8 +--
 .../src/graphql/resolver/UserResolver.test.ts |  4 +-
 backend/src/graphql/resolver/UserResolver.ts  | 15 ++--
 .../src/graphql/resolver/semaphore.test.ts    |  2 +-
 .../src/graphql/resolver/util/creations.ts    |  2 +-
 backend/src/middleware/klicktippMiddleware.ts |  2 +-
 backend/src/password/EncryptorUtils.ts        |  2 +-
 backend/src/seeds/factory/contributionLink.ts |  2 +-
 backend/src/util/communityUser.ts             |  2 +-
 backend/src/util/decay.ts                     |  2 +-
 backend/src/util/validate.ts                  |  2 +-
 20 files changed, 97 insertions(+), 52 deletions(-)

diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 7600f12b9..31e2384d4 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -9,7 +9,6 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { GdtResolver } from './GdtResolver'
 import { getLastTransaction } from './util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
-
 import { Balance } from '@model/Balance'
 
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index f4352c095..5513a73b8 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -6,8 +6,8 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Community as DbCommunity } from '@entity/Community'
-import { getCommunities } from '@/seeds/graphql/queries'
 import { testEnvironment } from '@test/helpers'
+import { getCommunities } from '@/seeds/graphql/queries'
 
 let query: any
 
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 6a69e257e..7dfb44e55 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -9,6 +9,7 @@ import { GraphQLError } from 'graphql'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
 import { logger } from '@test/testSetup'
+import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import {
   login,
   createContributionLink,
@@ -16,7 +17,6 @@ import {
   updateContributionLink,
 } from '@/seeds/graphql/mutations'
 import { listContributionLinks } from '@/seeds/graphql/queries'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 55a23187f..4b19c36e1 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -3,20 +3,20 @@ import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type
 import { MoreThan, IsNull } from '@dbTools/typeorm'
 
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
+import { isStartEndDateValid } from './util/creations'
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,
   CONTRIBUTIONLINK_NAME_MIN_CHARS,
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
-import { isStartEndDateValid } from './util/creations'
-import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
 import { ContributionLinkList } from '@model/ContributionLinkList'
 import { ContributionLink } from '@model/ContributionLink'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
-import { RIGHTS } from '@/auth/RIGHTS'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
+import { RIGHTS } from '@/auth/RIGHTS'
 
 // TODO: this is a strange construct
 import LogError from '@/server/LogError'
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 201d04db1..5570f953f 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -13,6 +13,18 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { UserInputError } from 'apollo-server-express'
 import { Event as DbEvent } from '@entity/Event'
+import {
+  cleanDB,
+  resetToken,
+  testEnvironment,
+  contributionDateFormatter,
+  resetEntity,
+} from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { ContributionListResult } from '@model/Contribution'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { Order } from '@enum/Order'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
@@ -40,24 +52,12 @@ import {
   sendContributionDeletedEmail,
   sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
-import {
-  cleanDB,
-  resetToken,
-  testEnvironment,
-  contributionDateFormatter,
-  resetEntity,
-} from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { EventType } from '@/event/Event'
-import { logger, i18n as localization } from '@test/testSetup'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { ContributionListResult } from '@model/Contribution'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { Order } from '@enum/Order'
 
 jest.mock('@/emails/sendEmailVariants')
 
@@ -2040,6 +2040,50 @@ describe('ContributionResolver', () => {
                   }),
                 )
               })
+
+              describe('user tries to update admin contribution', () => {
+                beforeAll(async () => {
+                  await mutate({
+                    mutation: login,
+                    variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+                  })
+                })
+
+                afterAll(async () => {
+                  await mutate({
+                    mutation: login,
+                    variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+                  })
+                })
+
+                it('logs and throws "Cannot update contribution of moderator" error', async () => {
+                  jest.clearAllMocks()
+                  const adminContribution = await Contribution.findOne({
+                    where: {
+                      moderatorId: admin.id,
+                      userId: bibi.id,
+                    },
+                  })
+                  await expect(
+                    mutate({
+                      mutation: updateContribution,
+                      variables: {
+                        contributionId: (adminContribution && adminContribution.id) || -1,
+                        amount: 100.0,
+                        memo: 'Test Test Test',
+                        creationDate: new Date().toString(),
+                      },
+                    }),
+                  ).resolves.toMatchObject({
+                    errors: [new GraphQLError('Cannot update contribution of moderator')],
+                  })
+                  expect(logger.error).toBeCalledWith(
+                    'Cannot update contribution of moderator',
+                    expect.any(Object),
+                    bibi.id,
+                  )
+                })
+              })
             })
 
             describe('second creation surpasses the available amount ', () => {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index a9446db7f..f756b3a0d 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -9,9 +9,6 @@ import { UserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { getLastTransaction } from './util/getLastTransaction'
-import { findContributions } from './util/findContributions'
 import {
   getUserCreation,
   validateContribution,
@@ -19,6 +16,9 @@ import {
   isValidDateString,
   getOpenCreations,
 } from './util/creations'
+import { findContributions } from './util/findContributions'
+import { getLastTransaction } from './util/getLastTransaction'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { Decay } from '@model/Decay'
@@ -201,6 +201,9 @@ export class ContributionResolver {
         user.id,
       )
     }
+    if (contributionToUpdate.moderatorId) {
+      throw new LogError('Cannot update contribution of moderator', contributionToUpdate, user.id)
+    }
     if (
       contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
       contributionToUpdate.contributionStatus !== ContributionStatus.PENDING
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index fd2a44b4b..4f72276d4 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -14,9 +14,11 @@ import { Transaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
 import { UserContact } from '@entity/UserContact'
 import { transactionLinkCode } from './TransactionLinkResolver'
+import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { logger } from '@test/testSetup'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { userFactory } from '@/seeds/factory/user'
@@ -33,9 +35,7 @@ import {
   confirmContribution,
 } from '@/seeds/graphql/mutations'
 import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
-import { logger } from '@test/testSetup'
 import { EventType } from '@/event/Event'
 
 // mock semaphore to allow use fake timers
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 6aa829ac1..3ff6fd36a 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -10,10 +10,10 @@ import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
-import { getUserCreation, validateContribution } from './util/creations'
-import { executeTransaction } from './TransactionResolver'
-import { getLastTransaction } from './util/getLastTransaction'
 import transactionLinkList from './util/transactionLinkList'
+import { getLastTransaction } from './util/getLastTransaction'
+import { executeTransaction } from './TransactionResolver'
+import { getUserCreation, validateContribution } from './util/creations'
 import { User } from '@model/User'
 import { ContributionLink } from '@model/ContributionLink'
 import { Decay } from '@model/Decay'
@@ -25,12 +25,12 @@ import { ContributionCycleType } from '@enum/ContributionCycleType'
 import TransactionLinkArgs from '@arg/TransactionLinkArgs'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
+import QueryLinkResult from '@union/QueryLinkResult'
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import { calculateBalance } from '@/util/validate'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
-import QueryLinkResult from '@union/QueryLinkResult'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
 import {
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index f26234363..6d039784e 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -11,6 +11,8 @@ import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
 import { findUserByEmail } from './UserResolver'
+import { cleanDB, testEnvironment } from '@test/helpers'
+import { logger } from '@test/testSetup'
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -23,8 +25,6 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
-import { cleanDB, testEnvironment } from '@test/helpers'
-import { logger } from '@test/testSetup'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f38a4a07b..a699e7291 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -9,10 +9,10 @@ import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { BalanceResolver } from './BalanceResolver'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { findUserByEmail } from './UserResolver'
 import { getLastTransaction } from './util/getLastTransaction'
+import { findUserByEmail } from './UserResolver'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { BalanceResolver } from './BalanceResolver'
 import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
@@ -21,9 +21,9 @@ import { Transaction } from '@model/Transaction'
 import { TransactionList } from '@model/TransactionList'
 import { Order } from '@enum/Order'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { calculateBalance } from '@/util/validate'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
 import Paginated from '@arg/Paginated'
+import { calculateBalance } from '@/util/validate'
 
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser } from '@/server/context'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index aebd0f0eb..1b6239fea 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -15,9 +15,10 @@ import { Event as DbEvent } from '@entity/Event'
 import { OptInType } from '@enum/OptInType'
 import { UserContactType } from '@enum/UserContactType'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
-import { objectValuesToArray } from '@/util/utilities'
 import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
+import { ContributionLink } from '@model/ContributionLink'
+import { objectValuesToArray } from '@/util/utilities'
 import { printTimeDuration } from '@/util/time'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
@@ -44,7 +45,6 @@ import {
 } from '@/emails/sendEmailVariants'
 import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
-import { ContributionLink } from '@model/ContributionLink'
 import { EventType } from '@/event/Event'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 54d4f583f..0c1cefd12 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -21,8 +21,8 @@ import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { getUserCreations } from './util/creations'
 import { FULL_CREATION_AVAILABLE } from './const/const'
+import { getUserCreations } from './util/creations'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import { UserRepository } from '@repository/User'
 
@@ -33,18 +33,17 @@ import { OptInType } from '@enum/OptInType'
 import { Order } from '@enum/Order'
 import { UserContactType } from '@enum/UserContactType'
 
-import {
-  sendAccountActivationEmail,
-  sendAccountMultiRegistrationEmail,
-  sendResetPasswordEmail,
-} from '@/emails/sendEmailVariants'
-
-import { getTimeDurationObject, printTimeDuration } from '@/util/time'
 import CreateUserArgs from '@arg/CreateUserArgs'
 import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
 import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
 import Paginated from '@arg/Paginated'
 import SearchUsersArgs from '@arg/SearchUsersArgs'
+import { getTimeDurationObject, printTimeDuration } from '@/util/time'
+import {
+  sendAccountActivationEmail,
+  sendAccountMultiRegistrationEmail,
+  sendResetPasswordEmail,
+} from '@/emails/sendEmailVariants'
 
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index 6b1976021..cc4d589dc 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -5,12 +5,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Decimal } from 'decimal.js-light'
+import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation'
-import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 import {
   confirmContribution,
   createContribution,
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 6ebeae8b9..dba0c8c81 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -3,9 +3,9 @@
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
+import { OpenCreation } from '@model/OpenCreation'
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
 import { backendLogger as logger } from '@/server/logger'
-import { OpenCreation } from '@model/OpenCreation'
 import LogError from '@/server/LogError'
 
 interface CreationMap {
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 0469b4ccc..568120fe8 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -3,8 +3,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { MiddlewareFn } from 'type-graphql'
-import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import { KlickTipp } from '@model/KlickTipp'
+import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import CONFIG from '@/config'
 import { klickTippLogger as logger } from '@/server/logger'
 
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index b4531b3bb..ab8a333d2 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -2,10 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { User } from '@entity/User'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const sodium = require('sodium-native')
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 5925cdcfe..6e1d9bd50 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
-import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLink } from '@model/ContributionLink'
+import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 
 export const contributionLinkFactory = async (
diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts
index dfa477da9..d086727bf 100644
--- a/backend/src/util/communityUser.ts
+++ b/backend/src/util/communityUser.ts
@@ -3,9 +3,9 @@
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { UserContact } from '@entity/UserContact'
+import { User } from '@model/User'
 import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType'
 // import { UserContact as EmailContact } from '@entity/UserContact'
-import { User } from '@model/User'
 
 const communityDbUser: dbUser = {
   id: -1,
diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts
index d35eb83a4..3c76b0995 100644
--- a/backend/src/util/decay.ts
+++ b/backend/src/util/decay.ts
@@ -1,6 +1,6 @@
 import { Decimal } from 'decimal.js-light'
-import CONFIG from '@/config'
 import { Decay } from '@model/Decay'
+import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 
 // TODO: externalize all those definitions and functions into an external decay library
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index ec28dfa13..aaadbdd31 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -2,9 +2,9 @@ import { Decimal } from 'decimal.js-light'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { calculateDecay } from './decay'
-import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Decay } from '@model/Decay'
+import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()

From cc98227de02e40b499a85d3b73cca68b72515fed Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 30 Mar 2023 16:40:56 +0200
Subject: [PATCH 064/101] use default values for undefined .env database values

---
 federation/.env.template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/federation/.env.template b/federation/.env.template
index af6e8f627..5713a7f3f 100644
--- a/federation/.env.template
+++ b/federation/.env.template
@@ -5,12 +5,11 @@ LOG_LEVEL=$LOG_LEVEL
 GRAPHIQL=false
 
 # Database
-DB_HOST=$DB_HOST
-DB_PORT=$DB_PORT
-DB_DATABASE=$DB_DATABASE
+DB_HOST=localhost
+DB_PORT=3306
 DB_USER=$DB_USER
 DB_PASSWORD=$DB_PASSWORD
+DB_DATABASE=gradido_community
 
 # Federation
 FEDERATION_COMMUNITY_URL=$FEDERATION_COMMUNITY_URL
-

From 769e36bea5d80dd64472bb382a665362c56eefbf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 16:55:00 +0200
Subject: [PATCH 065/101] no Float in query

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

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 87e861752..1a37d082b 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -237,7 +237,7 @@ export const searchAdminUsers = gql`
 `
 
 export const listContributionMessages = gql`
-  query($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
+  query($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
     listContributionMessages(
       contributionId: $contributionId
       pageSize: $pageSize

From b0c19eda477e78a345217d7c81188de5bacbc0d4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 30 Mar 2023 17:28:03 +0200
Subject: [PATCH 066/101] fix import order

---
 backend/.eslintrc.js                          | 16 ++++++++++++-
 backend/src/apis/HttpRequest.ts               |  1 -
 backend/src/apis/KlicktippController.ts       |  3 ++-
 backend/src/auth/JWT.ts                       |  3 ++-
 .../src/emails/sendEmailTranslated.test.ts    |  3 ++-
 backend/src/emails/sendEmailTranslated.ts     |  1 +
 backend/src/emails/sendEmailVariants.test.ts  |  9 +++----
 backend/src/emails/sendEmailVariants.ts       |  3 ++-
 .../event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts |  1 +
 .../event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts  |  1 +
 .../event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts  |  1 +
 .../event/EVENT_ADMIN_CONTRIBUTION_DENY.ts    |  1 +
 .../EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts   |  1 +
 .../EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts   |  1 +
 .../EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts   |  1 +
 ...EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts |  1 +
 .../event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts  |  1 +
 backend/src/event/EVENT_ADMIN_USER_DELETE.ts  |  1 +
 .../src/event/EVENT_ADMIN_USER_ROLE_SET.ts    |  1 +
 .../src/event/EVENT_ADMIN_USER_UNDELETE.ts    |  1 +
 .../src/event/EVENT_CONTRIBUTION_CREATE.ts    |  1 +
 .../src/event/EVENT_CONTRIBUTION_DELETE.ts    |  1 +
 .../event/EVENT_CONTRIBUTION_LINK_REDEEM.ts   |  1 +
 .../EVENT_CONTRIBUTION_MESSAGE_CREATE.ts      |  1 +
 .../src/event/EVENT_CONTRIBUTION_UPDATE.ts    |  1 +
 .../EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts  |  1 +
 .../event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts   |  1 +
 backend/src/event/EVENT_EMAIL_CONFIRMATION.ts |  1 +
 .../src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts  |  1 +
 .../event/EVENT_TRANSACTION_LINK_CREATE.ts    |  1 +
 .../event/EVENT_TRANSACTION_LINK_DELETE.ts    |  1 +
 .../event/EVENT_TRANSACTION_LINK_REDEEM.ts    |  1 +
 .../src/event/EVENT_TRANSACTION_RECEIVE.ts    |  1 +
 backend/src/event/EVENT_TRANSACTION_SEND.ts   |  1 +
 .../src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts  |  1 +
 backend/src/event/EVENT_USER_INFO_UPDATE.ts   |  1 +
 backend/src/event/EVENT_USER_LOGIN.ts         |  1 +
 backend/src/event/EVENT_USER_LOGOUT.ts        |  1 +
 backend/src/event/EVENT_USER_REGISTER.ts      |  1 +
 backend/src/event/Event.ts                    |  1 +
 .../federation/validateCommunities.test.ts    |  3 ++-
 backend/src/federation/validateCommunities.ts |  5 ++--
 backend/src/graphql/directive/isAuthorized.ts |  1 -
 backend/src/graphql/model/GdtEntryList.ts     |  1 +
 backend/src/graphql/model/Transaction.ts      |  3 ++-
 backend/src/graphql/model/TransactionLink.ts  |  3 ++-
 backend/src/graphql/model/TransactionList.ts  |  1 +
 backend/src/graphql/model/User.ts             |  1 +
 .../src/graphql/resolver/BalanceResolver.ts   |  9 +++----
 .../src/graphql/resolver/CommunityResolver.ts |  2 --
 .../resolver/ContributionLinkResolver.ts      | 19 +++++++--------
 .../resolver/ContributionMessageResolver.ts   |  3 ---
 .../graphql/resolver/ContributionResolver.ts  | 24 +++++++++----------
 backend/src/graphql/resolver/GdtResolver.ts   |  2 --
 .../src/graphql/resolver/KlicktippResolver.ts |  1 -
 .../graphql/resolver/StatisticsResolver.ts    |  3 ---
 .../resolver/TransactionLinkResolver.test.ts  |  3 ++-
 .../resolver/TransactionLinkResolver.ts       | 13 +++++-----
 .../resolver/TransactionResolver.test.ts      |  3 ++-
 .../graphql/resolver/TransactionResolver.ts   | 13 ++++------
 backend/src/graphql/resolver/UserResolver.ts  | 10 +++-----
 .../graphql/resolver/util/creations.test.ts   |  3 ++-
 backend/src/graphql/schema.ts                 |  3 ++-
 backend/src/index.ts                          |  1 -
 backend/src/password/PasswordEncryptor.ts     |  1 +
 backend/src/seeds/creation/index.ts           |  3 ++-
 backend/src/seeds/index.ts                    |  6 ++---
 backend/src/server/LogError.test.ts           |  3 ++-
 backend/src/server/context.ts                 |  3 ++-
 backend/src/server/createServer.ts            | 11 +++++----
 backend/src/server/localization.ts            |  2 ++
 backend/src/server/logger.ts                  |  1 +
 backend/src/util/decay.test.ts                |  1 +
 backend/src/util/validate.ts                  |  3 ++-
 backend/src/util/virtualTransactions.ts       |  3 ++-
 backend/test/helpers.ts                       |  3 ++-
 76 files changed, 144 insertions(+), 97 deletions(-)

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 79276ef9d..59bd53ca6 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -76,7 +76,21 @@ module.exports = {
     'import/no-named-default': 'error',
     'import/no-namespace': 'error',
     'import/no-unassigned-import': 'error',
-    'import/order': 'error',
+    'import/order': [
+      'error',
+      {
+        groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
+        'newlines-between': 'always',
+        pathGroups: [
+          {
+            pattern: '@*/**',
+            group: 'external',
+            position: 'after',
+          },
+        ],
+        distinctGroup: false,
+      },
+    ],
     'import/prefer-default-export': 'off', // TODO
   },
   overrides: [
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index eff0c408a..af7e40dd7 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import axios from 'axios'
-
 import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
 
diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts
index 70c0f95b1..309cf56ee 100644
--- a/backend/src/apis/KlicktippController.ts
+++ b/backend/src/apis/KlicktippController.ts
@@ -4,9 +4,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import CONFIG from '@/config'
+
 // eslint-disable-next-line import/no-relative-parent-imports
 import KlicktippConnector from 'klicktipp-api'
-import CONFIG from '@/config'
 
 const klicktippConnector = new KlicktippConnector()
 
diff --git a/backend/src/auth/JWT.ts b/backend/src/auth/JWT.ts
index 3da1f1d3e..f0a320efb 100644
--- a/backend/src/auth/JWT.ts
+++ b/backend/src/auth/JWT.ts
@@ -1,8 +1,9 @@
 import { verify, sign } from 'jsonwebtoken'
-import { CustomJwtPayload } from './CustomJwtPayload'
 import CONFIG from '@/config/'
 import LogError from '@/server/LogError'
 
+import { CustomJwtPayload } from './CustomJwtPayload'
+
 export const decode = (token: string): CustomJwtPayload | null => {
   if (!token) throw new LogError('401 Unauthorized')
   try {
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index 762b88cf0..5eea352fb 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -1,10 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
-import { sendEmailTranslated } from './sendEmailTranslated'
 import { logger, i18n } from '@test/testSetup'
 import CONFIG from '@/config'
 
+import { sendEmailTranslated } from './sendEmailTranslated'
+
 CONFIG.EMAIL = false
 CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'
 CONFIG.EMAIL_SMTP_PORT = '1234'
diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts
index d865bac8f..5cc136edc 100644
--- a/backend/src/emails/sendEmailTranslated.ts
+++ b/backend/src/emails/sendEmailTranslated.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import path from 'path'
+
 import { createTransport } from 'nodemailer'
 import Email from 'email-templates'
 import i18n from 'i18n'
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 399ed89ac..76d8f9a26 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -4,6 +4,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Decimal } from 'decimal.js-light'
+import { testEnvironment } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
+import CONFIG from '@/config'
+
+import { sendEmailTranslated } from './sendEmailTranslated'
 import {
   sendAddedContributionMessageEmail,
   sendAccountActivationEmail,
@@ -15,10 +20,6 @@ import {
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
 } from './sendEmailVariants'
-import { sendEmailTranslated } from './sendEmailTranslated'
-import { testEnvironment } from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
-import CONFIG from '@/config'
 
 let con: any
 let testEnv: any
diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index 2294ebdd5..7da0424dc 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -1,8 +1,9 @@
 import { Decimal } from 'decimal.js-light'
-import { sendEmailTranslated } from './sendEmailTranslated'
 import CONFIG from '@/config'
 import { decimalSeparatorByLanguage } from '@/util/utilities'
 
+import { sendEmailTranslated } from './sendEmailTranslated'
+
 export const sendAddedContributionMessageEmail = (data: {
   firstName: string
   lastName: string
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
index 33c9ae36e..e53a56c11 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_CONFIRM = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
index bf85345cf..530c896ca 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
index dd37c76b5..1d776a9e0 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
index 8d34be87f..98d42fcdc 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
index b7ee39c36..3cd55a40c 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_CREATE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
index b5816e45d..d6eb5f205 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_DELETE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
index 1cd998e26..deb7bb574 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
index f07d38e98..68a59da27 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,6 +2,7 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE = async (
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
index 7d1bc175e..06a5da0c0 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (
diff --git a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
index bfd5be740..6c022ad2c 100644
--- a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_DELETE = async (user: DbUser, moderator: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
index 3be825ad4..e6951d062 100644
--- a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_ROLE_SET = async (
diff --git a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
index eb861dbf1..303c4d260 100644
--- a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_UNDELETE = async (
diff --git a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
index f1469c725..b01bad47a 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_CREATE = async (
diff --git a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
index 8c62e3ae6..fdfc12448 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_DELETE = async (
diff --git a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
index 9f44de95d..3ce38cf03 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
@@ -4,6 +4,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_LINK_REDEEM = async (
diff --git a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
index b06685a6d..b977f90da 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,6 +2,7 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_MESSAGE_CREATE = async (
diff --git a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
index c2e6951cc..be1d3d4ed 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_UPDATE = async (
diff --git a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
index c16bbfac3..0133ab715 100644
--- a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
index ae10f9fba..6132484da 100644
--- a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_ADMIN_CONFIRMATION = async (
diff --git a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
index 9d64207e0..44eb9323d 100644
--- a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_CONFIRMATION = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
index f7e328369..20eb5f1fe 100644
--- a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
+++ b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_FORGOT_PASSWORD = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
index e766fe38e..dd97a0641 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_CREATE = async (
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
index d15c786a8..de4511b9e 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_DELETE = async (
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
index 5f8cd5c4d..d699f3d41 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_REDEEM = async (
diff --git a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
index c6e06ccb7..d82bbd31c 100644
--- a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_RECEIVE = async (
diff --git a/backend/src/event/EVENT_TRANSACTION_SEND.ts b/backend/src/event/EVENT_TRANSACTION_SEND.ts
index 888162747..d2fd615a5 100644
--- a/backend/src/event/EVENT_TRANSACTION_SEND.ts
+++ b/backend/src/event/EVENT_TRANSACTION_SEND.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_SEND = async (
diff --git a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
index 2e224d550..602acb880 100644
--- a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
+++ b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_USER_INFO_UPDATE.ts b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
index 681ecd473..080c68e2c 100644
--- a/backend/src/event/EVENT_USER_INFO_UPDATE.ts
+++ b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_INFO_UPDATE = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_USER_LOGIN.ts b/backend/src/event/EVENT_USER_LOGIN.ts
index 351ec5a95..ba09bc02c 100644
--- a/backend/src/event/EVENT_USER_LOGIN.ts
+++ b/backend/src/event/EVENT_USER_LOGIN.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_LOGIN = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_USER_LOGOUT.ts b/backend/src/event/EVENT_USER_LOGOUT.ts
index 4f5650fc6..2e6c54841 100644
--- a/backend/src/event/EVENT_USER_LOGOUT.ts
+++ b/backend/src/event/EVENT_USER_LOGOUT.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_LOGOUT = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/EVENT_USER_REGISTER.ts b/backend/src/event/EVENT_USER_REGISTER.ts
index cdb8b22e2..990ac396f 100644
--- a/backend/src/event/EVENT_USER_REGISTER.ts
+++ b/backend/src/event/EVENT_USER_REGISTER.ts
@@ -1,5 +1,6 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_REGISTER = async (user: DbUser): Promise<DbEvent> =>
diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index feb167adf..1ff8ba995 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -6,6 +6,7 @@ import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Decimal } from 'decimal.js-light'
+
 import { EventType } from './EventType'
 
 export const Event = (
diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts
index a99bb3274..919a99547 100644
--- a/backend/src/federation/validateCommunities.test.ts
+++ b/backend/src/federation/validateCommunities.test.ts
@@ -6,10 +6,11 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Community as DbCommunity } from '@entity/Community'
-import { validateCommunities } from './validateCommunities'
 import { logger } from '@test/testSetup'
 import { testEnvironment, cleanDB } from '@test/helpers'
 
+import { validateCommunities } from './validateCommunities'
+
 let con: any
 let testEnv: any
 
diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts
index 19185e4d9..c4a9f3b1d 100644
--- a/backend/src/federation/validateCommunities.ts
+++ b/backend/src/federation/validateCommunities.ts
@@ -1,12 +1,13 @@
 import { Community as DbCommunity } from '@entity/Community'
 import { IsNull } from '@dbTools/typeorm'
+import { backendLogger as logger } from '@/server/logger'
+import LogError from '@/server/LogError'
+
 // eslint-disable-next-line camelcase
 import { requestGetPublicKey as v1_0_requestGetPublicKey } from './client/1_0/FederationClient'
 // eslint-disable-next-line camelcase
 import { requestGetPublicKey as v1_1_requestGetPublicKey } from './client/1_1/FederationClient'
 import { ApiVersionType } from './enum/apiVersionType'
-import { backendLogger as logger } from '@/server/logger'
-import LogError from '@/server/LogError'
 
 export function startValidateCommunities(timerInterval: number): void {
   logger.info(
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 6cdac9b97..845593de6 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -3,7 +3,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { AuthChecker } from 'type-graphql'
-
 import { User } from '@entity/User'
 import { decode, encode } from '@/auth/JWT'
 import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts
index d992de54c..06f77f532 100644
--- a/backend/src/graphql/model/GdtEntryList.ts
+++ b/backend/src/graphql/model/GdtEntryList.ts
@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field, Int, Float } from 'type-graphql'
+
 import { GdtEntry } from './GdtEntry'
 
 @ObjectType()
diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 8f0d1eadc..0a31cd8d6 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -1,9 +1,10 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+
 import { Decay } from './Decay'
 import { User } from './User'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
 
 @ObjectType()
 export class Transaction {
diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index ddd22f36f..1ed02b476 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -1,9 +1,10 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { User } from './User'
 import CONFIG from '@/config'
 
+import { User } from './User'
+
 @ObjectType()
 export class TransactionLink {
   constructor(transactionLink: dbTransactionLink, user: User, redeemedBy: User | null = null) {
diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts
index 888c30dc7..36e51242d 100644
--- a/backend/src/graphql/model/TransactionList.ts
+++ b/backend/src/graphql/model/TransactionList.ts
@@ -1,4 +1,5 @@
 import { ObjectType, Field } from 'type-graphql'
+
 import { Transaction } from './Transaction'
 import { Balance } from './Balance'
 
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 85c6de798..6797b0767 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -1,5 +1,6 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { User as dbUser } from '@entity/User'
+
 import { KlickTipp } from './KlickTipp'
 import { UserContact } from './UserContact'
 
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 7600f12b9..0a9b651a9 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -2,21 +2,18 @@
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
-
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-
-import { GdtResolver } from './GdtResolver'
-import { getLastTransaction } from './util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
-
 import { Balance } from '@model/Balance'
-
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser } from '@/server/context'
 import { calculateDecay } from '@/util/decay'
 import { RIGHTS } from '@/auth/RIGHTS'
 
+import { getLastTransaction } from './util/getLastTransaction'
+import { GdtResolver } from './GdtResolver'
+
 @Resolver()
 export class BalanceResolver {
   @Authorized([RIGHTS.BALANCE])
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 6aca41472..37c42dd89 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,8 +1,6 @@
 import { Resolver, Query, Authorized } from 'type-graphql'
-
 import { Community as DbCommunity } from '@entity/Community'
 import { Community } from '@model/Community'
-
 import { RIGHTS } from '@/auth/RIGHTS'
 
 @Resolver()
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 55a23187f..5febb95c5 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -1,23 +1,13 @@
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 import { MoreThan, IsNull } from '@dbTools/typeorm'
-
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import {
-  CONTRIBUTIONLINK_NAME_MAX_CHARS,
-  CONTRIBUTIONLINK_NAME_MIN_CHARS,
-  MEMO_MAX_CHARS,
-  MEMO_MIN_CHARS,
-} from './const/const'
-import { isStartEndDateValid } from './util/creations'
-import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
 import { ContributionLinkList } from '@model/ContributionLinkList'
 import { ContributionLink } from '@model/ContributionLink'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
-
 // TODO: this is a strange construct
 import LogError from '@/server/LogError'
 import { Context, getUser } from '@/server/context'
@@ -27,6 +17,15 @@ import {
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
 } from '@/event/Event'
 
+import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
+import { isStartEndDateValid } from './util/creations'
+import {
+  CONTRIBUTIONLINK_NAME_MAX_CHARS,
+  CONTRIBUTIONLINK_NAME_MIN_CHARS,
+  MEMO_MAX_CHARS,
+  MEMO_MIN_CHARS,
+} from './const/const'
+
 @Resolver()
 export class ContributionLinkResolver {
   @Authorized([RIGHTS.CREATE_CONTRIBUTION_LINK])
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 999ccc2b1..63cf2fd9c 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -1,19 +1,16 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
-
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
-
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
-
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 83cf29fc7..026793b5f 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -2,23 +2,11 @@
 import { Decimal } from 'decimal.js-light'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { IsNull, getConnection } from '@dbTools/typeorm'
-
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage } from '@entity/ContributionMessage'
 import { UserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
-
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { getLastTransaction } from './util/getLastTransaction'
-import { findContributions } from './util/findContributions'
-import {
-  getUserCreation,
-  validateContribution,
-  updateCreations,
-  isValidDateString,
-  getOpenCreations,
-} from './util/creations'
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { Decay } from '@model/Decay'
@@ -33,7 +21,6 @@ import ContributionArgs from '@arg/ContributionArgs'
 import Paginated from '@arg/Paginated'
 import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
 import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
-
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
@@ -56,6 +43,17 @@ import {
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
 
+import {
+  getUserCreation,
+  validateContribution,
+  updateCreations,
+  isValidDateString,
+  getOpenCreations,
+} from './util/creations'
+import { findContributions } from './util/findContributions'
+import { getLastTransaction } from './util/getLastTransaction'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+
 @Resolver()
 export class ContributionResolver {
   @Authorized([RIGHTS.CREATE_CONTRIBUTION])
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index e12f92458..e5ad56f2d 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -2,11 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
-
 import { GdtEntryList } from '@model/GdtEntryList'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
-
 import { Context, getUser } from '@/server/context'
 import CONFIG from '@/config'
 import { apiGet, apiPost } from '@/apis/HttpRequest'
diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index 31bde0581..f8aee5e2c 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Authorized, Arg, Mutation, Ctx } from 'type-graphql'
-
 import {
   getKlickTippUser,
   getKlicktippTagMap,
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index d5ae9503c..f16a2fd56 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -3,12 +3,9 @@
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
-
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'
-
 import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
-
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
 
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index fd2a44b4b..0ac73cbcf 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -13,7 +13,6 @@ import { GraphQLError } from 'graphql'
 import { Transaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
 import { UserContact } from '@entity/UserContact'
-import { transactionLinkCode } from './TransactionLinkResolver'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
@@ -38,6 +37,8 @@ import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { logger } from '@test/testSetup'
 import { EventType } from '@/event/Event'
 
+import { transactionLinkCode } from './TransactionLinkResolver'
+
 // mock semaphore to allow use fake timers
 jest.mock('@/util/TRANSACTIONS_LOCK')
 TRANSACTIONS_LOCK.acquire = jest.fn().mockResolvedValue(jest.fn())
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 6aa829ac1..e9a388cde 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -1,19 +1,13 @@
 import { randomBytes } from 'crypto'
+
 import { Decimal } from 'decimal.js-light'
-
 import { getConnection } from '@dbTools/typeorm'
-
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
-import { getUserCreation, validateContribution } from './util/creations'
-import { executeTransaction } from './TransactionResolver'
-import { getLastTransaction } from './util/getLastTransaction'
-import transactionLinkList from './util/transactionLinkList'
 import { User } from '@model/User'
 import { ContributionLink } from '@model/ContributionLink'
 import { Decay } from '@model/Decay'
@@ -40,6 +34,11 @@ import {
   EVENT_TRANSACTION_LINK_REDEEM,
 } from '@/event/Event'
 
+import transactionLinkList from './util/transactionLinkList'
+import { getLastTransaction } from './util/getLastTransaction'
+import { executeTransaction } from './TransactionResolver'
+import { getUserCreation, validateContribution } from './util/creations'
+
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
   const time = date.getTime().toString(16)
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index f26234363..baa50e171 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -10,7 +10,6 @@ import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
-import { findUserByEmail } from './UserResolver'
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -26,6 +25,8 @@ import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { cleanDB, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 
+import { findUserByEmail } from './UserResolver'
+
 let mutate: any, query: any, con: any
 let testEnv: any
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f38a4a07b..7f3f1c5f1 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -5,17 +5,11 @@
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
-
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { BalanceResolver } from './BalanceResolver'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
-import { findUserByEmail } from './UserResolver'
-import { getLastTransaction } from './util/getLastTransaction'
 import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
-
 import { User } from '@model/User'
 import { Transaction } from '@model/Transaction'
 import { TransactionList } from '@model/TransactionList'
@@ -24,7 +18,6 @@ import { TransactionTypeId } from '@enum/TransactionTypeId'
 import { calculateBalance } from '@/util/validate'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
 import Paginated from '@arg/Paginated'
-
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser } from '@/server/context'
 import { RIGHTS } from '@/auth/RIGHTS'
@@ -35,10 +28,14 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
-
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
 
+import { getLastTransaction } from './util/getLastTransaction'
+import { findUserByEmail } from './UserResolver'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { BalanceResolver } from './BalanceResolver'
+
 export const executeTransaction = async (
   amount: Decimal,
   memo: string,
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 54d4f583f..5f66e7725 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -16,36 +16,29 @@ import {
   Int,
 } from 'type-graphql'
 import { getConnection, getCustomRepository, IsNull, Not } from '@dbTools/typeorm'
-
 import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { getUserCreations } from './util/creations'
-import { FULL_CREATION_AVAILABLE } from './const/const'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import { UserRepository } from '@repository/User'
-
 import { User } from '@model/User'
 import { SearchAdminUsersResult } from '@model/AdminUser'
 import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
 import { OptInType } from '@enum/OptInType'
 import { Order } from '@enum/Order'
 import { UserContactType } from '@enum/UserContactType'
-
 import {
   sendAccountActivationEmail,
   sendAccountMultiRegistrationEmail,
   sendResetPasswordEmail,
 } from '@/emails/sendEmailVariants'
-
 import { getTimeDurationObject, printTimeDuration } from '@/util/time'
 import CreateUserArgs from '@arg/CreateUserArgs'
 import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
 import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
 import Paginated from '@arg/Paginated'
 import SearchUsersArgs from '@arg/SearchUsersArgs'
-
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import CONFIG from '@/config'
@@ -75,6 +68,9 @@ import { isValidPassword } from '@/password/EncryptorUtils'
 import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
 import LogError from '@/server/LogError'
 
+import { FULL_CREATION_AVAILABLE } from './const/const'
+import { getUserCreations } from './util/creations'
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const sodium = require('sodium-native')
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 7461401c8..a35b37891 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -6,13 +6,14 @@
 
 import { User } from '@entity/User'
 import { Contribution } from '@entity/Contribution'
-import { getUserCreation } from './creations'
 import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
 import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations'
 
+import { getUserCreation } from './creations'
+
 let mutate: any, con: any
 let testEnv: any
 
diff --git a/backend/src/graphql/schema.ts b/backend/src/graphql/schema.ts
index 194a24c00..1aae117d0 100644
--- a/backend/src/graphql/schema.ts
+++ b/backend/src/graphql/schema.ts
@@ -1,8 +1,9 @@
 import path from 'path'
+
 import { GraphQLSchema } from 'graphql'
 import { buildSchema } from 'type-graphql'
-
 import { Decimal } from 'decimal.js-light'
+
 import isAuthorized from './directive/isAuthorized'
 import DecimalScalar from './scalar/Decimal'
 
diff --git a/backend/src/index.ts b/backend/src/index.ts
index cd6d002cc..d3ebc42cf 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import createServer from './server/createServer'
-
 // config
 import CONFIG from './config'
 import { startValidateCommunities } from './federation/validateCommunities'
diff --git a/backend/src/password/PasswordEncryptor.ts b/backend/src/password/PasswordEncryptor.ts
index 1735106c1..1c7457a40 100644
--- a/backend/src/password/PasswordEncryptor.ts
+++ b/backend/src/password/PasswordEncryptor.ts
@@ -1,4 +1,5 @@
 import { User } from '@entity/User'
+
 // import { logger } from '@test/testSetup' getting error "jest is not defined"
 import { getUserCryptographicSalt, SecretKeyCryptographyCreateKey } from './EncryptorUtils'
 
diff --git a/backend/src/seeds/creation/index.ts b/backend/src/seeds/creation/index.ts
index 757407438..3f2a545a4 100644
--- a/backend/src/seeds/creation/index.ts
+++ b/backend/src/seeds/creation/index.ts
@@ -1,6 +1,7 @@
-import { CreationInterface } from './CreationInterface'
 import { nMonthsBefore } from '@/seeds/factory/creation'
 
+import { CreationInterface } from './CreationInterface'
+
 const bobsSendings = [
   {
     amount: 10,
diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index 19f936d16..9f945086c 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -8,6 +8,9 @@
 import { createTestClient } from 'apollo-server-testing'
 import { name, internet, datatype } from 'faker'
 import { entities } from '@entity/index'
+import createServer from '@/server/createServer'
+import { backendLogger as logger } from '@/server/logger'
+import CONFIG from '@/config'
 
 import { users } from './users/index'
 import { creations } from './creation/index'
@@ -17,9 +20,6 @@ import { userFactory } from './factory/user'
 import { creationFactory } from './factory/creation'
 import { transactionLinkFactory } from './factory/transactionLink'
 import { contributionLinkFactory } from './factory/contributionLink'
-import createServer from '@/server/createServer'
-import { backendLogger as logger } from '@/server/logger'
-import CONFIG from '@/config'
 
 CONFIG.EMAIL = false
 
diff --git a/backend/src/server/LogError.test.ts b/backend/src/server/LogError.test.ts
index 318a477ef..5aa1cae21 100644
--- a/backend/src/server/LogError.test.ts
+++ b/backend/src/server/LogError.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/unbound-method */
-import LogError from './LogError'
 import { logger } from '@test/testSetup'
 
+import LogError from './LogError'
+
 describe('LogError', () => {
   it('logs an Error when created', () => {
     /* eslint-disable-next-line no-new */
diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts
index 570865587..1990100dd 100644
--- a/backend/src/server/context.ts
+++ b/backend/src/server/context.ts
@@ -2,9 +2,10 @@ import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
 import { ExpressContext } from 'apollo-server-express'
-import LogError from './LogError'
 import { Role } from '@/auth/Role'
 
+import LogError from './LogError'
+
 export interface Context {
   token: string | null
   setHeaders: { key: string; value: string }[]
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index f23e90b56..23e1ad0d2 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -5,17 +5,18 @@ import { ApolloServer } from 'apollo-server-express'
 import express, { Express, json, urlencoded } from 'express'
 import { Connection } from '@dbTools/typeorm'
 import { Logger } from 'log4js'
-import cors from './cors'
-import serverContext from './context'
-import plugins from './plugins'
-import { apolloLogger } from './logger'
-import { i18n } from './localization'
 import connection from '@/typeorm/connection'
 import { checkDBVersion } from '@/typeorm/DBVersion'
 import CONFIG from '@/config'
 import schema from '@/graphql/schema'
 import { elopageWebhook } from '@/webhook/elopage'
 
+import cors from './cors'
+import serverContext from './context'
+import plugins from './plugins'
+import { apolloLogger } from './logger'
+import { i18n } from './localization'
+
 // TODO implement
 // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity";
 
diff --git a/backend/src/server/localization.ts b/backend/src/server/localization.ts
index 22616fcf0..59ba4cfce 100644
--- a/backend/src/server/localization.ts
+++ b/backend/src/server/localization.ts
@@ -1,5 +1,7 @@
 import path from 'path'
+
 import i18n from 'i18n'
+
 import { backendLogger } from './logger'
 
 i18n.configure({
diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts
index 0887340d4..35587e9c6 100644
--- a/backend/src/server/logger.ts
+++ b/backend/src/server/logger.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { readFileSync } from 'fs'
+
 import { configure, getLogger } from 'log4js'
 import CONFIG from '@/config'
 
diff --git a/backend/src/util/decay.test.ts b/backend/src/util/decay.test.ts
index b33d18d42..1d4ebab3b 100644
--- a/backend/src/util/decay.test.ts
+++ b/backend/src/util/decay.test.ts
@@ -1,4 +1,5 @@
 import { Decimal } from 'decimal.js-light'
+
 import { decayFormula, calculateDecay } from './decay'
 
 describe('utils/decay', () => {
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index ec28dfa13..02128cb87 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -1,11 +1,12 @@
 import { Decimal } from 'decimal.js-light'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { calculateDecay } from './decay'
 import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Decay } from '@model/Decay'
 
+import { calculateDecay } from './decay'
+
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()
   if (lowerValue === 'true' || lowerValue === 'false') {
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 7810ad871..442c06b21 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -2,11 +2,12 @@
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
-import { calculateDecay } from './decay'
 import { Transaction } from '@model/Transaction'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 import { User } from '@model/User'
 
+import { calculateDecay } from './decay'
+
 const defaultModelFunctions = {
   hasId: function (): boolean {
     throw new Error('Function not implemented.')
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index ad6d2c4e3..b118f7b9d 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -9,9 +9,10 @@
 import { createTestClient } from 'apollo-server-testing'
 import { initialize } from '@dbTools/helpers'
 import { entities } from '@entity/index'
-import { i18n, logger } from './testSetup'
 import createServer from '@/server/createServer'
 
+import { i18n, logger } from './testSetup'
+
 export const headerPushMock = jest.fn((t) => {
   context.token = t.value
 })

From d685a01742d1131e33df73cfc47c964a0b39f318 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 30 Mar 2023 17:34:00 +0200
Subject: [PATCH 067/101] remove check data from delete user formular

---
 admin/src/components/DeletedUserFormular.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index a24be3d72..93ec12d8d 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -37,11 +37,6 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      checked: false,
-    }
-  },
   methods: {
     showDeleteModal() {
       this.$bvModal
@@ -56,6 +51,7 @@ export default {
             title: this.$t('overlay.deleteUser.title'),
             okTitle: this.$t('overlay.deleteUser.yes'),
             okVariant: 'danger',
+            static: true,
           },
         )
         .then((okClicked) => {
@@ -104,7 +100,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.deleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)
@@ -123,7 +118,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.unDeleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)

From 941663af368e47f01a2b3648938527113dd40739 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 30 Mar 2023 17:35:55 +0200
Subject: [PATCH 068/101] adapt delete user formular unit tests to changes

---
 .../components/DeletedUserFormular.spec.js    | 94 +++++++------------
 1 file changed, 33 insertions(+), 61 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.spec.js b/admin/src/components/DeletedUserFormular.spec.js
index f4a9da39e..1711222bf 100644
--- a/admin/src/components/DeletedUserFormular.spec.js
+++ b/admin/src/components/DeletedUserFormular.spec.js
@@ -35,6 +35,7 @@ const propsData = {
 
 describe('DeletedUserFormular', () => {
   let wrapper
+  let spy
 
   const Wrapper = () => {
     return mount(DeletedUserFormular, { localVue, mocks, propsData })
@@ -62,6 +63,10 @@ describe('DeletedUserFormular', () => {
       it('shows a text that you cannot delete yourself', () => {
         expect(wrapper.text()).toBe('removeNotSelf')
       })
+
+      it('has no "delete_user" button', () => {
+        expect(wrapper.find('button').exists()).toBe(false)
+      })
     })
 
     describe('delete other user', () => {
@@ -71,35 +76,32 @@ describe('DeletedUserFormular', () => {
             userId: 1,
             deletedAt: null,
           },
+          static: true,
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "delete_user"', () => {
         expect(wrapper.text()).toBe('delete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "delete_user" button', () => {
+        expect(wrapper.find('button').text()).toBe('delete_user')
+      })
+
+      describe('click on "delete_user" button', () => {
         beforeEach(async () => {
-          await wrapper.find('input[type="checkbox"]').setChecked()
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
-        it('has a confirmation button', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
-        })
-
-        it('has the button text "delete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('delete_user')
+        it('calls the modal', () => {
+          expect(wrapper.emitted('showDeleteModal'))
+          expect(spy).toHaveBeenCalled()
         })
 
         describe('confirm delete with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -123,32 +125,20 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm delete with error', () => {
           beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
             apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
             await wrapper.find('button').trigger('click')
+            await wrapper.vm.$nextTick()
           })
 
           it('toasts an error message', () => {
             expect(toastErrorSpy).toBeCalledWith('Oh no!')
           })
         })
-
-        describe('click on checkbox again', () => {
-          beforeEach(async () => {
-            await wrapper.find('input[type="checkbox"]').setChecked(false)
-          })
-
-          it('has no confirmation button anymore', () => {
-            expect(wrapper.find('button').exists()).toBe(false)
-          })
-        })
       })
     })
 
@@ -162,37 +152,33 @@ describe('DeletedUserFormular', () => {
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "undelete_user"', () => {
         expect(wrapper.text()).toBe('undelete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "undelete_user" button', () => {
+        expect(wrapper.find('button').text()).toBe('undelete_user')
+      })
+
+      describe('click on "undelete_user" button', () => {
         beforeEach(async () => {
           apolloMutateMock.mockResolvedValue({
             data: {
               unDeleteUser: null,
             },
           })
-          await wrapper.find('input[type="checkbox"]').setChecked()
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
-        it('has a confirmation button', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
-        })
-
-        it('has the button text "undelete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('undelete_user')
+        it('calls the modal', () => {
+          expect(wrapper.emitted('showUndeleteModal'))
+          expect(spy).toHaveBeenCalled()
         })
 
         describe('confirm recover with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -205,7 +191,7 @@ describe('DeletedUserFormular', () => {
           })
 
           it('emits update deleted At', () => {
-            expect(wrapper.emitted('updateDeletedAt')).toEqual(
+            expect(wrapper.emitted('updateDeletedAt')).toMatchObject(
               expect.arrayContaining([
                 expect.arrayContaining([
                   {
@@ -216,10 +202,6 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm recover with error', () => {
@@ -232,16 +214,6 @@ describe('DeletedUserFormular', () => {
             expect(toastErrorSpy).toBeCalledWith('Oh no!')
           })
         })
-
-        describe('click on checkbox again', () => {
-          beforeEach(async () => {
-            await wrapper.find('input[type="checkbox"]').setChecked(false)
-          })
-
-          it('has no confirmation button anymore', () => {
-            expect(wrapper.find('button').exists()).toBe(false)
-          })
-        })
       })
     })
   })

From 80ff97e72a552a07c5e622b98b5932c5d7198532 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 30 Mar 2023 17:39:09 +0200
Subject: [PATCH 069/101] more lint fixes

---
 backend/.eslintrc.js                                            | 2 +-
 backend/src/apis/HttpRequest.ts                                 | 1 +
 backend/src/auth/JWT.ts                                         | 1 +
 backend/src/emails/sendEmailTranslated.test.ts                  | 1 +
 backend/src/emails/sendEmailTranslated.ts                       | 1 +
 backend/src/emails/sendEmailVariants.test.ts                    | 1 +
 backend/src/emails/sendEmailVariants.ts                         | 1 +
 backend/src/federation/client/1_0/FederationClient.ts           | 1 +
 backend/src/federation/client/1_1/FederationClient.ts           | 1 +
 backend/src/federation/validateCommunities.test.ts              | 1 +
 backend/src/federation/validateCommunities.ts                   | 1 +
 backend/src/graphql/arg/Paginated.ts                            | 1 +
 backend/src/graphql/arg/SearchUsersArgs.ts                      | 1 +
 backend/src/graphql/directive/isAuthorized.ts                   | 1 +
 backend/src/graphql/model/ContributionLink.ts                   | 1 +
 backend/src/graphql/model/ContributionLinkList.ts               | 1 +
 backend/src/graphql/model/GdtEntry.ts                           | 1 +
 backend/src/graphql/model/Transaction.ts                        | 1 +
 backend/src/graphql/model/TransactionLink.ts                    | 1 +
 backend/src/graphql/resolver/BalanceResolver.ts                 | 1 +
 backend/src/graphql/resolver/CommunityResolver.test.ts          | 1 +
 backend/src/graphql/resolver/CommunityResolver.ts               | 1 +
 backend/src/graphql/resolver/ContributionLinkResolver.test.ts   | 1 +
 backend/src/graphql/resolver/ContributionLinkResolver.ts        | 1 +
 .../src/graphql/resolver/ContributionMessageResolver.test.ts    | 1 +
 backend/src/graphql/resolver/ContributionMessageResolver.ts     | 1 +
 backend/src/graphql/resolver/ContributionResolver.test.ts       | 1 +
 backend/src/graphql/resolver/ContributionResolver.ts            | 1 +
 backend/src/graphql/resolver/EmailOptinCodes.test.ts            | 1 +
 backend/src/graphql/resolver/GdtResolver.ts                     | 1 +
 backend/src/graphql/resolver/KlicktippResolver.ts               | 1 +
 backend/src/graphql/resolver/StatisticsResolver.ts              | 1 +
 backend/src/graphql/resolver/TransactionLinkResolver.test.ts    | 1 +
 backend/src/graphql/resolver/TransactionLinkResolver.ts         | 1 +
 backend/src/graphql/resolver/TransactionResolver.test.ts        | 1 +
 backend/src/graphql/resolver/TransactionResolver.ts             | 1 +
 backend/src/graphql/resolver/UserResolver.test.ts               | 1 +
 backend/src/graphql/resolver/UserResolver.ts                    | 1 +
 backend/src/graphql/resolver/semaphore.test.ts                  | 1 +
 backend/src/graphql/resolver/util/creations.test.ts             | 1 +
 backend/src/graphql/resolver/util/creations.ts                  | 1 +
 backend/src/graphql/resolver/util/findContributions.ts          | 1 +
 backend/src/graphql/resolver/util/transactionLinkList.ts        | 1 +
 backend/src/graphql/union/QueryLinkResult.ts                    | 1 +
 backend/src/middleware/klicktippMiddleware.ts                   | 1 +
 backend/src/password/EncryptorUtils.ts                          | 1 +
 backend/src/seeds/factory/contributionLink.ts                   | 1 +
 backend/src/seeds/factory/creation.ts                           | 1 +
 backend/src/seeds/factory/transactionLink.ts                    | 1 +
 backend/src/seeds/factory/user.ts                               | 1 +
 backend/src/seeds/index.ts                                      | 1 +
 backend/src/server/context.ts                                   | 1 +
 backend/src/server/createServer.ts                              | 1 +
 backend/src/server/logger.ts                                    | 1 +
 backend/src/typeorm/DBVersion.ts                                | 1 +
 backend/src/typeorm/connection.ts                               | 1 +
 backend/src/typeorm/repository/Transaction.ts                   | 1 +
 backend/src/typeorm/repository/User.ts                          | 1 +
 backend/src/util/communityUser.ts                               | 1 +
 backend/src/util/decay.ts                                       | 1 +
 backend/src/util/klicktipp.ts                                   | 1 +
 backend/src/util/validate.ts                                    | 1 +
 backend/src/util/virtualTransactions.ts                         | 1 +
 backend/src/webhook/elopage.ts                                  | 1 +
 backend/test/helpers.ts                                         | 1 +
 65 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 59bd53ca6..6b6db0486 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -88,7 +88,7 @@ module.exports = {
             position: 'after',
           },
         ],
-        distinctGroup: false,
+        distinctGroup: true,
       },
     ],
     'import/prefer-default-export': 'off', // TODO
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index af7e40dd7..eff0c408a 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import axios from 'axios'
+
 import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
 
diff --git a/backend/src/auth/JWT.ts b/backend/src/auth/JWT.ts
index f0a320efb..93a6a8868 100644
--- a/backend/src/auth/JWT.ts
+++ b/backend/src/auth/JWT.ts
@@ -1,4 +1,5 @@
 import { verify, sign } from 'jsonwebtoken'
+
 import CONFIG from '@/config/'
 import LogError from '@/server/LogError'
 
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index 5eea352fb..5a095f563 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
+
 import { logger, i18n } from '@test/testSetup'
 import CONFIG from '@/config'
 
diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts
index 5cc136edc..96fd27d83 100644
--- a/backend/src/emails/sendEmailTranslated.ts
+++ b/backend/src/emails/sendEmailTranslated.ts
@@ -4,6 +4,7 @@ import path from 'path'
 import { createTransport } from 'nodemailer'
 import Email from 'email-templates'
 import i18n from 'i18n'
+
 import { backendLogger as logger } from '@/server/logger'
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 76d8f9a26..849b9d7f1 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Decimal } from 'decimal.js-light'
+
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
 import CONFIG from '@/config'
diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts
index 7da0424dc..b45e7fc67 100644
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@@ -1,4 +1,5 @@
 import { Decimal } from 'decimal.js-light'
+
 import CONFIG from '@/config'
 import { decimalSeparatorByLanguage } from '@/util/utilities'
 
diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index ce0d708bc..7261bae45 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { gql } from 'graphql-request'
 import { Community as DbCommunity } from '@entity/Community'
+
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts
index 579a9701c..7dca9b465 100644
--- a/backend/src/federation/client/1_1/FederationClient.ts
+++ b/backend/src/federation/client/1_1/FederationClient.ts
@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { gql } from 'graphql-request'
 import { Community as DbCommunity } from '@entity/Community'
+
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts
index 919a99547..d46720ff8 100644
--- a/backend/src/federation/validateCommunities.test.ts
+++ b/backend/src/federation/validateCommunities.test.ts
@@ -6,6 +6,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Community as DbCommunity } from '@entity/Community'
+
 import { logger } from '@test/testSetup'
 import { testEnvironment, cleanDB } from '@test/helpers'
 
diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts
index c4a9f3b1d..642e59929 100644
--- a/backend/src/federation/validateCommunities.ts
+++ b/backend/src/federation/validateCommunities.ts
@@ -1,5 +1,6 @@
 import { Community as DbCommunity } from '@entity/Community'
 import { IsNull } from '@dbTools/typeorm'
+
 import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
 
diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts
index 290dba337..e605c49d4 100644
--- a/backend/src/graphql/arg/Paginated.ts
+++ b/backend/src/graphql/arg/Paginated.ts
@@ -1,5 +1,6 @@
 /* eslint-disable type-graphql/invalid-nullable-input-type */
 import { ArgsType, Field, Int } from 'type-graphql'
+
 import { Order } from '@enum/Order'
 
 @ArgsType()
diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts
index 39996efca..de7275f63 100644
--- a/backend/src/graphql/arg/SearchUsersArgs.ts
+++ b/backend/src/graphql/arg/SearchUsersArgs.ts
@@ -1,4 +1,5 @@
 import { ArgsType, Field, Int } from 'type-graphql'
+
 import SearchUsersFilters from '@arg/SearchUsersFilters'
 
 @ArgsType()
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 845593de6..09eac70a9 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -4,6 +4,7 @@
 
 import { AuthChecker } from 'type-graphql'
 import { User } from '@entity/User'
+
 import { decode, encode } from '@/auth/JWT'
 import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
 import { RIGHTS } from '@/auth/RIGHTS'
diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts
index 13ae31692..0da2fd430 100644
--- a/backend/src/graphql/model/ContributionLink.ts
+++ b/backend/src/graphql/model/ContributionLink.ts
@@ -1,6 +1,7 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
 import { ContributionLink as dbContributionLink } from '@entity/ContributionLink'
+
 import CONFIG from '@/config'
 
 @ObjectType()
diff --git a/backend/src/graphql/model/ContributionLinkList.ts b/backend/src/graphql/model/ContributionLinkList.ts
index d2c347b27..c35f6fae6 100644
--- a/backend/src/graphql/model/ContributionLinkList.ts
+++ b/backend/src/graphql/model/ContributionLinkList.ts
@@ -1,4 +1,5 @@
 import { ObjectType, Field, Int } from 'type-graphql'
+
 import { ContributionLink } from '@model/ContributionLink'
 
 @ObjectType()
diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts
index bbf1cceef..81dda0ca7 100644
--- a/backend/src/graphql/model/GdtEntry.ts
+++ b/backend/src/graphql/model/GdtEntry.ts
@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field, Float, Int } from 'type-graphql'
+
 import { GdtEntryType } from '@enum/GdtEntryType'
 
 @ObjectType()
diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 0a31cd8d6..3538260a5 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -1,6 +1,7 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
+
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 
 import { Decay } from './Decay'
diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index 1ed02b476..1e9c1a64d 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -1,6 +1,7 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+
 import CONFIG from '@/config'
 
 import { User } from './User'
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 0a9b651a9..aca10ed0f 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -4,6 +4,7 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Balance } from '@model/Balance'
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index f4352c095..b78d419f9 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -6,6 +6,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Community as DbCommunity } from '@entity/Community'
+
 import { getCommunities } from '@/seeds/graphql/queries'
 import { testEnvironment } from '@test/helpers'
 
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 37c42dd89..74ba0e57b 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,5 +1,6 @@
 import { Resolver, Query, Authorized } from 'type-graphql'
 import { Community as DbCommunity } from '@entity/Community'
+
 import { Community } from '@model/Community'
 import { RIGHTS } from '@/auth/RIGHTS'
 
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 6a69e257e..6bd62fd9f 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -8,6 +8,7 @@ import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+
 import { logger } from '@test/testSetup'
 import {
   login,
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 5febb95c5..815901f16 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 import { MoreThan, IsNull } from '@dbTools/typeorm'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+
 import { ContributionLinkList } from '@model/ContributionLinkList'
 import { ContributionLink } from '@model/ContributionLink'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 6b2c7c4d8..357455250 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -8,6 +8,7 @@
 
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
+
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
 import {
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 63cf2fd9c..b78f441d5 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -5,6 +5,7 @@ import { ContributionMessage as DbContributionMessage } from '@entity/Contributi
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
+
 import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
 import ContributionMessageArgs from '@arg/ContributionMessageArgs'
 import { ContributionMessageType } from '@enum/MessageType'
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index df8524a0c..d05060c7e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -13,6 +13,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { UserInputError } from 'apollo-server-express'
 import { Event as DbEvent } from '@entity/Event'
+
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 026793b5f..28b393be5 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -7,6 +7,7 @@ import { ContributionMessage } from '@entity/ContributionMessage'
 import { UserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
+
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { Decay } from '@model/Decay'
diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
index e9f9bc052..0b6ebfbe4 100644
--- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts
+++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
@@ -6,6 +6,7 @@
 
 import { User as DbUser } from '@entity/User'
 import { GraphQLError } from 'graphql'
+
 import { testEnvironment, cleanDB } from '@test/helpers'
 import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations'
 import { queryOptIn } from '@/seeds/graphql/queries'
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index e5ad56f2d..00b0aa1bf 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
+
 import { GdtEntryList } from '@model/GdtEntryList'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index f8aee5e2c..31bde0581 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Authorized, Arg, Mutation, Ctx } from 'type-graphql'
+
 import {
   getKlickTippUser,
   getKlicktippTagMap,
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index f16a2fd56..3ddc8bfbc 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -5,6 +5,7 @@ import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'
+
 import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 0ac73cbcf..d9010b57a 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -13,6 +13,7 @@ import { GraphQLError } from 'graphql'
 import { Transaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
 import { UserContact } from '@entity/UserContact'
+
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index e9a388cde..2131439d5 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -8,6 +8,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
+
 import { User } from '@model/User'
 import { ContributionLink } from '@model/ContributionLink'
 import { Decay } from '@model/Decay'
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index baa50e171..558f0c315 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -10,6 +10,7 @@ import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
+
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 7f3f1c5f1..f36ac3d68 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -8,6 +8,7 @@ import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+
 import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { User } from '@model/User'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index aebd0f0eb..ccf56a285 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -12,6 +12,7 @@ import { TransactionLink } from '@entity/TransactionLink'
 import { validate as validateUUID, version as versionUUID } from 'uuid'
 import { UserContact } from '@entity/UserContact'
 import { Event as DbEvent } from '@entity/Event'
+
 import { OptInType } from '@enum/OptInType'
 import { UserContactType } from '@enum/UserContactType'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 5f66e7725..0be376bd6 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -20,6 +20,7 @@ import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import { UserRepository } from '@repository/User'
 import { User } from '@model/User'
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index 6b1976021..0fb355676 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -5,6 +5,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Decimal } from 'decimal.js-light'
+
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index a35b37891..37bdb742c 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -6,6 +6,7 @@
 
 import { User } from '@entity/User'
 import { Contribution } from '@entity/Contribution'
+
 import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 6ebeae8b9..44b675de4 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -3,6 +3,7 @@
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
+
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
 import { backendLogger as logger } from '@/server/logger'
 import { OpenCreation } from '@model/OpenCreation'
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index a40279e9c..5c70fafe7 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -1,5 +1,6 @@
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { In } from '@dbTools/typeorm'
+
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
 
diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts
index 2d151b94a..ed90cc852 100644
--- a/backend/src/graphql/resolver/util/transactionLinkList.ts
+++ b/backend/src/graphql/resolver/util/transactionLinkList.ts
@@ -1,6 +1,7 @@
 import { MoreThan } from '@dbTools/typeorm'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { User as DbUser } from '@entity/User'
+
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
diff --git a/backend/src/graphql/union/QueryLinkResult.ts b/backend/src/graphql/union/QueryLinkResult.ts
index 9a35fbc71..775320bdd 100644
--- a/backend/src/graphql/union/QueryLinkResult.ts
+++ b/backend/src/graphql/union/QueryLinkResult.ts
@@ -1,4 +1,5 @@
 import { createUnionType } from 'type-graphql'
+
 import { TransactionLink } from '@model/TransactionLink'
 import { ContributionLink } from '@model/ContributionLink'
 
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 0469b4ccc..e133977ee 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { MiddlewareFn } from 'type-graphql'
+
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import { KlickTipp } from '@model/KlickTipp'
 import CONFIG from '@/config'
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index b4531b3bb..9537fb59e 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { User } from '@entity/User'
+
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 5925cdcfe..565669dad 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
+
 import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index ba46f4c09..d0ca131c7 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -8,6 +8,7 @@
 import { ApolloServerTestClient } from 'apollo-server-testing'
 import { Transaction } from '@entity/Transaction'
 import { Contribution } from '@entity/Contribution'
+
 import { CreationInterface } from '@/seeds/creation/CreationInterface'
 import { login, createContribution, confirmContribution } from '@/seeds/graphql/mutations'
 import { findUserByEmail } from '@/graphql/resolver/UserResolver'
diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts
index c6ed68839..fa4478074 100644
--- a/backend/src/seeds/factory/transactionLink.ts
+++ b/backend/src/seeds/factory/transactionLink.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
 import { TransactionLink } from '@entity/TransactionLink'
+
 import { login, createTransactionLink } from '@/seeds/graphql/mutations'
 import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface'
 import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver'
diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index c82c56648..13a274911 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { User } from '@entity/User'
 import { ApolloServerTestClient } from 'apollo-server-testing'
+
 import { createUser, setPassword } from '@/seeds/graphql/mutations'
 import { UserInterface } from '@/seeds/users/UserInterface'
 
diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index 9f945086c..0d972abb3 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -8,6 +8,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import { name, internet, datatype } from 'faker'
 import { entities } from '@entity/index'
+
 import createServer from '@/server/createServer'
 import { backendLogger as logger } from '@/server/logger'
 import CONFIG from '@/config'
diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts
index 1990100dd..4b631bd9c 100644
--- a/backend/src/server/context.ts
+++ b/backend/src/server/context.ts
@@ -2,6 +2,7 @@ import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
 import { ExpressContext } from 'apollo-server-express'
+
 import { Role } from '@/auth/Role'
 
 import LogError from './LogError'
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 23e1ad0d2..6ffd18c50 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -5,6 +5,7 @@ import { ApolloServer } from 'apollo-server-express'
 import express, { Express, json, urlencoded } from 'express'
 import { Connection } from '@dbTools/typeorm'
 import { Logger } from 'log4js'
+
 import connection from '@/typeorm/connection'
 import { checkDBVersion } from '@/typeorm/DBVersion'
 import CONFIG from '@/config'
diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts
index 35587e9c6..89f292ab7 100644
--- a/backend/src/server/logger.ts
+++ b/backend/src/server/logger.ts
@@ -3,6 +3,7 @@
 import { readFileSync } from 'fs'
 
 import { configure, getLogger } from 'log4js'
+
 import CONFIG from '@/config'
 
 const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8'))
diff --git a/backend/src/typeorm/DBVersion.ts b/backend/src/typeorm/DBVersion.ts
index cb53c49f1..c4c8d6c78 100644
--- a/backend/src/typeorm/DBVersion.ts
+++ b/backend/src/typeorm/DBVersion.ts
@@ -1,4 +1,5 @@
 import { Migration } from '@entity/Migration'
+
 import { backendLogger as logger } from '@/server/logger'
 
 const getDBVersion = async (): Promise<string | null> => {
diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 54b951a79..a3a20450b 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -2,6 +2,7 @@
 //      We cannot use our connection here, but must use the external typeorm installation
 import { Connection, createConnection, FileLogger } from '@dbTools/typeorm'
 import { entities } from '@entity/index'
+
 import CONFIG from '@/config'
 
 const connection = async (): Promise<Connection | null> => {
diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
index 58e9ca30b..61e87b3c8 100644
--- a/backend/src/typeorm/repository/Transaction.ts
+++ b/backend/src/typeorm/repository/Transaction.ts
@@ -1,5 +1,6 @@
 import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { Transaction } from '@entity/Transaction'
+
 import { Order } from '@enum/Order'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 4928b0cc8..71e43329b 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,5 +1,6 @@
 import { Brackets, EntityRepository, IsNull, Not, Repository } from '@dbTools/typeorm'
 import { User as DbUser } from '@entity/User'
+
 import SearchUsersFilters from '@/graphql/arg/SearchUsersFilters'
 
 @EntityRepository(DbUser)
diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts
index dfa477da9..0c9480118 100644
--- a/backend/src/util/communityUser.ts
+++ b/backend/src/util/communityUser.ts
@@ -3,6 +3,7 @@
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { UserContact } from '@entity/UserContact'
+
 import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType'
 // import { UserContact as EmailContact } from '@entity/UserContact'
 import { User } from '@model/User'
diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts
index d35eb83a4..5e2bdb5c6 100644
--- a/backend/src/util/decay.ts
+++ b/backend/src/util/decay.ts
@@ -1,4 +1,5 @@
 import { Decimal } from 'decimal.js-light'
+
 import CONFIG from '@/config'
 import { Decay } from '@model/Decay'
 import LogError from '@/server/LogError'
diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
index 6444d20f6..02bfa1044 100644
--- a/backend/src/util/klicktipp.ts
+++ b/backend/src/util/klicktipp.ts
@@ -1,4 +1,5 @@
 import { User } from '@entity/User'
+
 import connection from '@/typeorm/connection'
 import { getKlickTippUser } from '@/apis/KlicktippController'
 import LogError from '@/server/LogError'
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index 02128cb87..628b00d43 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -1,6 +1,7 @@
 import { Decimal } from 'decimal.js-light'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+
 import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Decay } from '@model/Decay'
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 442c06b21..f9f13afbc 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -2,6 +2,7 @@
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
+
 import { Transaction } from '@model/Transaction'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 import { User } from '@model/User'
diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts
index 6f3e3cbdb..404f2696a 100644
--- a/backend/src/webhook/elopage.ts
+++ b/backend/src/webhook/elopage.ts
@@ -33,6 +33,7 @@
 
 import { LoginElopageBuys } from '@entity/LoginElopageBuys'
 import { UserContact as dbUserContact } from '@entity/UserContact'
+
 import { UserResolver } from '@/graphql/resolver/UserResolver'
 
 export const elopageWebhook = async (req: any, res: any): Promise<void> => {
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index b118f7b9d..f68c15cb8 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -9,6 +9,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import { initialize } from '@dbTools/helpers'
 import { entities } from '@entity/index'
+
 import createServer from '@/server/createServer'
 
 import { i18n, logger } from './testSetup'

From 9407386de74172271848057e02639c55ed8ffa75 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 30 Mar 2023 17:57:15 +0200
Subject: [PATCH 070/101] fix alphabetical sort

---
 backend/.eslintrc.js                          |  4 ++
 backend/src/apis/HttpRequest.ts               |  2 +-
 backend/src/config/index.ts                   |  2 +-
 .../src/emails/sendEmailTranslated.test.ts    |  2 +-
 backend/src/emails/sendEmailTranslated.ts     |  4 +-
 backend/src/emails/sendEmailVariants.test.ts  |  2 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts |  4 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts  |  4 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts  |  4 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_DENY.ts    |  4 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts   |  4 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts   |  2 +-
 .../EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts   |  4 +-
 ...EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts |  2 +-
 .../event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts  |  4 +-
 backend/src/event/EVENT_ADMIN_USER_DELETE.ts  |  2 +-
 .../src/event/EVENT_ADMIN_USER_ROLE_SET.ts    |  2 +-
 .../src/event/EVENT_ADMIN_USER_UNDELETE.ts    |  2 +-
 .../src/event/EVENT_CONTRIBUTION_CREATE.ts    |  4 +-
 .../src/event/EVENT_CONTRIBUTION_DELETE.ts    |  4 +-
 .../event/EVENT_CONTRIBUTION_LINK_REDEEM.ts   |  6 +-
 .../EVENT_CONTRIBUTION_MESSAGE_CREATE.ts      |  2 +-
 .../src/event/EVENT_CONTRIBUTION_UPDATE.ts    |  4 +-
 .../EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts  |  2 +-
 .../event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts   |  2 +-
 backend/src/event/EVENT_EMAIL_CONFIRMATION.ts |  2 +-
 .../src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts  |  2 +-
 .../event/EVENT_TRANSACTION_LINK_CREATE.ts    |  6 +-
 .../event/EVENT_TRANSACTION_LINK_DELETE.ts    |  4 +-
 .../event/EVENT_TRANSACTION_LINK_REDEEM.ts    |  6 +-
 .../src/event/EVENT_TRANSACTION_RECEIVE.ts    |  6 +-
 backend/src/event/EVENT_TRANSACTION_SEND.ts   |  6 +-
 .../src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts  |  2 +-
 backend/src/event/EVENT_USER_INFO_UPDATE.ts   |  2 +-
 backend/src/event/EVENT_USER_LOGIN.ts         |  2 +-
 backend/src/event/EVENT_USER_LOGOUT.ts        |  2 +-
 backend/src/event/EVENT_USER_REGISTER.ts      |  2 +-
 backend/src/event/Event.ts                    |  8 +--
 .../federation/client/1_0/FederationClient.ts |  4 +-
 .../federation/client/1_1/FederationClient.ts |  4 +-
 .../federation/validateCommunities.test.ts    |  2 +-
 backend/src/federation/validateCommunities.ts |  4 +-
 .../arg/AdminCreateContributionArgs.ts        |  2 +-
 .../arg/AdminUpdateContributionArgs.ts        |  2 +-
 backend/src/graphql/arg/ContributionArgs.ts   |  2 +-
 .../src/graphql/arg/ContributionLinkArgs.ts   |  2 +-
 .../src/graphql/arg/TransactionLinkArgs.ts    |  2 +-
 .../src/graphql/arg/TransactionSendArgs.ts    |  2 +-
 backend/src/graphql/directive/isAuthorized.ts |  8 +--
 .../graphql/model/AdminUpdateContribution.ts  |  2 +-
 backend/src/graphql/model/Balance.ts          |  2 +-
 backend/src/graphql/model/Community.ts        |  2 +-
 .../src/graphql/model/CommunityStatistics.ts  |  2 +-
 backend/src/graphql/model/Contribution.ts     |  4 +-
 backend/src/graphql/model/ContributionLink.ts |  4 +-
 .../src/graphql/model/ContributionMessage.ts  |  2 +-
 backend/src/graphql/model/Decay.ts            |  2 +-
 backend/src/graphql/model/OpenCreation.ts     |  2 +-
 backend/src/graphql/model/Transaction.ts      |  2 +-
 backend/src/graphql/model/TransactionLink.ts  |  4 +-
 backend/src/graphql/model/TransactionList.ts  |  2 +-
 .../graphql/model/UnconfirmedContribution.ts  |  4 +-
 backend/src/graphql/model/User.ts             |  2 +-
 backend/src/graphql/model/UserAdmin.ts        |  4 +-
 backend/src/graphql/model/UserContact.ts      |  2 +-
 .../src/graphql/resolver/BalanceResolver.ts   | 16 ++---
 .../src/graphql/resolver/CommunityResolver.ts |  4 +-
 .../resolver/ContributionLinkResolver.test.ts | 12 ++--
 .../resolver/ContributionLinkResolver.ts      | 24 +++----
 .../ContributionMessageResolver.test.ts       | 12 ++--
 .../resolver/ContributionMessageResolver.ts   | 22 +++----
 .../resolver/ContributionResolver.test.ts     | 44 ++++++-------
 .../graphql/resolver/ContributionResolver.ts  | 56 ++++++++---------
 .../graphql/resolver/EmailOptinCodes.test.ts  |  4 +-
 backend/src/graphql/resolver/GdtResolver.ts   | 10 +--
 .../graphql/resolver/StatisticsResolver.ts    |  6 +-
 .../resolver/TransactionLinkResolver.test.ts  | 22 +++----
 .../resolver/TransactionLinkResolver.ts       | 48 +++++++-------
 .../resolver/TransactionResolver.test.ts      |  4 +-
 .../graphql/resolver/TransactionResolver.ts   | 42 ++++++-------
 .../src/graphql/resolver/UserResolver.test.ts | 54 ++++++++--------
 backend/src/graphql/resolver/UserResolver.ts  | 62 +++++++++----------
 .../src/graphql/resolver/semaphore.test.ts    | 10 +--
 .../graphql/resolver/util/creations.test.ts   |  8 +--
 .../src/graphql/resolver/util/creations.ts    |  2 +-
 .../resolver/util/findContributions.ts        |  2 +-
 .../resolver/util/transactionLinkList.ts      |  4 +-
 backend/src/graphql/scalar/Decimal.ts         |  2 +-
 backend/src/graphql/schema.ts                 |  2 +-
 backend/src/graphql/union/QueryLinkResult.ts  |  2 +-
 backend/src/index.ts                          |  2 +-
 backend/src/middleware/klicktippMiddleware.ts |  2 +-
 backend/src/seeds/factory/contributionLink.ts |  2 +-
 backend/src/seeds/factory/creation.ts         |  6 +-
 backend/src/seeds/factory/transactionLink.ts  |  4 +-
 backend/src/seeds/index.ts                    | 14 ++---
 backend/src/seeds/users/index.ts              |  4 +-
 backend/src/server/context.ts                 |  4 +-
 backend/src/server/createServer.ts            | 12 ++--
 backend/src/util/decay.ts                     |  2 +-
 backend/src/util/klicktipp.ts                 |  2 +-
 backend/src/util/validate.ts                  |  4 +-
 backend/src/util/virtualTransactions.ts       |  2 +-
 backend/test/helpers.ts                       |  2 +-
 backend/test/testSetup.ts                     |  2 +-
 105 files changed, 373 insertions(+), 369 deletions(-)

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 6b6db0486..4cb3d3cf1 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -88,6 +88,10 @@ module.exports = {
             position: 'after',
           },
         ],
+        alphabetize: {
+          order: 'asc' /* sort in ascending order. Options: ['ignore', 'asc', 'desc'] */,
+          caseInsensitive: true /* ignore case. Options: [true, false] */,
+        },
         distinctGroup: true,
       },
     ],
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index eff0c408a..d8de68bb8 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import axios from 'axios'
 
-import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const apiPost = async (url: string, payload: unknown): Promise<any> => {
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 13e339b13..e6c4e4c24 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -1,7 +1,7 @@
 // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
 
-import dotenv from 'dotenv'
 import { Decimal } from 'decimal.js-light'
+import dotenv from 'dotenv'
 
 dotenv.config()
 
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index 5a095f563..b930939cf 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
 
-import { logger, i18n } from '@test/testSetup'
 import CONFIG from '@/config'
+import { logger, i18n } from '@test/testSetup'
 
 import { sendEmailTranslated } from './sendEmailTranslated'
 
diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts
index 96fd27d83..6d89cc257 100644
--- a/backend/src/emails/sendEmailTranslated.ts
+++ b/backend/src/emails/sendEmailTranslated.ts
@@ -1,13 +1,13 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import path from 'path'
 
-import { createTransport } from 'nodemailer'
 import Email from 'email-templates'
 import i18n from 'i18n'
+import { createTransport } from 'nodemailer'
 
-import { backendLogger as logger } from '@/server/logger'
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export const sendEmailTranslated = async (params: {
   receiver: {
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 849b9d7f1..141319ac0 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -5,9 +5,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Decimal } from 'decimal.js-light'
 
+import CONFIG from '@/config'
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
-import CONFIG from '@/config'
 
 import { sendEmailTranslated } from './sendEmailTranslated'
 import {
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
index e53a56c11..5843fbee9 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
index 530c896ca..f4ad049ca 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
index 1d776a9e0..399604e35 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
index 98d42fcdc..332d3ab92 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
index 3cd55a40c..4b06cd3ad 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
index d6eb5f205..c4cd99f57 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
@@ -1,6 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
index deb7bb574..f8cd2d16f 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
index 68a59da27..a2385429d 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -1,7 +1,7 @@
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
index 06a5da0c0..f2fcb7478 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
index 6c022ad2c..bfd3e2bcc 100644
--- a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
index e6951d062..7902f5318 100644
--- a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
index 303c4d260..338a3a31d 100644
--- a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
index b01bad47a..96e24ec61 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
index fdfc12448..acf11bbb0 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
index 3ce38cf03..1202aa387 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
@@ -1,9 +1,9 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
index b977f90da..bfb7f742e 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -1,7 +1,7 @@
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
index be1d3d4ed..3e3d82b67 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
index 0133ab715..ae3a65ed2 100644
--- a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
index 6132484da..6262d42a5 100644
--- a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
index 44eb9323d..beb774632 100644
--- a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
index 20eb5f1fe..a7d60e60f 100644
--- a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
+++ b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
index dd97a0641..64bc2f6e5 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
index de4511b9e..7a6ee9576 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
@@ -1,6 +1,6 @@
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
index d699f3d41..576811d25 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
index d82bbd31c..22a71bc25 100644
--- a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_TRANSACTION_SEND.ts b/backend/src/event/EVENT_TRANSACTION_SEND.ts
index d2fd615a5..1327d739d 100644
--- a/backend/src/event/EVENT_TRANSACTION_SEND.ts
+++ b/backend/src/event/EVENT_TRANSACTION_SEND.ts
@@ -1,7 +1,7 @@
-import { Decimal } from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
index 602acb880..0213f122f 100644
--- a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
+++ b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_USER_INFO_UPDATE.ts b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
index 080c68e2c..28b3fe237 100644
--- a/backend/src/event/EVENT_USER_INFO_UPDATE.ts
+++ b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_USER_LOGIN.ts b/backend/src/event/EVENT_USER_LOGIN.ts
index ba09bc02c..64d43b264 100644
--- a/backend/src/event/EVENT_USER_LOGIN.ts
+++ b/backend/src/event/EVENT_USER_LOGIN.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_USER_LOGOUT.ts b/backend/src/event/EVENT_USER_LOGOUT.ts
index 2e6c54841..4b00c9839 100644
--- a/backend/src/event/EVENT_USER_LOGOUT.ts
+++ b/backend/src/event/EVENT_USER_LOGOUT.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/EVENT_USER_REGISTER.ts b/backend/src/event/EVENT_USER_REGISTER.ts
index 990ac396f..2d31299f1 100644
--- a/backend/src/event/EVENT_USER_REGISTER.ts
+++ b/backend/src/event/EVENT_USER_REGISTER.ts
@@ -1,5 +1,5 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
 
 import { Event, EventType } from './Event'
 
diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index 1ff8ba995..d3f515d51 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -1,10 +1,10 @@
+import { Contribution as DbContribution } from '@entity/Contribution'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
-import { Contribution as DbContribution } from '@entity/Contribution'
-import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { User as DbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 
 import { EventType } from './EventType'
diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index 7261bae45..c4063e4c5 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { gql } from 'graphql-request'
 import { Community as DbCommunity } from '@entity/Community'
+import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts
index 7dca9b465..b29960407 100644
--- a/backend/src/federation/client/1_1/FederationClient.ts
+++ b/backend/src/federation/client/1_1/FederationClient.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { gql } from 'graphql-request'
 import { Community as DbCommunity } from '@entity/Community'
+import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts
index d46720ff8..d90664b63 100644
--- a/backend/src/federation/validateCommunities.test.ts
+++ b/backend/src/federation/validateCommunities.test.ts
@@ -7,8 +7,8 @@
 
 import { Community as DbCommunity } from '@entity/Community'
 
-import { logger } from '@test/testSetup'
 import { testEnvironment, cleanDB } from '@test/helpers'
+import { logger } from '@test/testSetup'
 
 import { validateCommunities } from './validateCommunities'
 
diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts
index 642e59929..fb6bda673 100644
--- a/backend/src/federation/validateCommunities.ts
+++ b/backend/src/federation/validateCommunities.ts
@@ -1,8 +1,8 @@
-import { Community as DbCommunity } from '@entity/Community'
 import { IsNull } from '@dbTools/typeorm'
+import { Community as DbCommunity } from '@entity/Community'
 
-import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line camelcase
 import { requestGetPublicKey as v1_0_requestGetPublicKey } from './client/1_0/FederationClient'
diff --git a/backend/src/graphql/arg/AdminCreateContributionArgs.ts b/backend/src/graphql/arg/AdminCreateContributionArgs.ts
index 6259e672e..65aeb82e5 100644
--- a/backend/src/graphql/arg/AdminCreateContributionArgs.ts
+++ b/backend/src/graphql/arg/AdminCreateContributionArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field, InputType } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
diff --git a/backend/src/graphql/arg/AdminUpdateContributionArgs.ts b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
index 3b10acf1a..f3cf519b6 100644
--- a/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
+++ b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
 export default class AdminUpdateContributionArgs {
diff --git a/backend/src/graphql/arg/ContributionArgs.ts b/backend/src/graphql/arg/ContributionArgs.ts
index dc4285e4d..cc8aea41e 100644
--- a/backend/src/graphql/arg/ContributionArgs.ts
+++ b/backend/src/graphql/arg/ContributionArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field, InputType } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
diff --git a/backend/src/graphql/arg/ContributionLinkArgs.ts b/backend/src/graphql/arg/ContributionLinkArgs.ts
index fac1eacc1..d28a7808f 100644
--- a/backend/src/graphql/arg/ContributionLinkArgs.ts
+++ b/backend/src/graphql/arg/ContributionLinkArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
 export default class ContributionLinkArgs {
diff --git a/backend/src/graphql/arg/TransactionLinkArgs.ts b/backend/src/graphql/arg/TransactionLinkArgs.ts
index 6c1c4654a..19720e321 100644
--- a/backend/src/graphql/arg/TransactionLinkArgs.ts
+++ b/backend/src/graphql/arg/TransactionLinkArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field } from 'type-graphql'
 
 @ArgsType()
 export default class TransactionLinkArgs {
diff --git a/backend/src/graphql/arg/TransactionSendArgs.ts b/backend/src/graphql/arg/TransactionSendArgs.ts
index c0faff850..d91cecbcd 100644
--- a/backend/src/graphql/arg/TransactionSendArgs.ts
+++ b/backend/src/graphql/arg/TransactionSendArgs.ts
@@ -1,5 +1,5 @@
-import { ArgsType, Field } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ArgsType, Field } from 'type-graphql'
 
 @ArgsType()
 export default class TransactionSendArgs {
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 09eac70a9..a018fd230 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -2,13 +2,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { AuthChecker } from 'type-graphql'
 import { User } from '@entity/User'
+import { AuthChecker } from 'type-graphql'
 
-import { decode, encode } from '@/auth/JWT'
-import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
-import { RIGHTS } from '@/auth/RIGHTS'
 import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS'
+import { decode, encode } from '@/auth/JWT'
+import { RIGHTS } from '@/auth/RIGHTS'
+import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
 import LogError from '@/server/LogError'
 
 const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
diff --git a/backend/src/graphql/model/AdminUpdateContribution.ts b/backend/src/graphql/model/AdminUpdateContribution.ts
index d5cd4fc7f..b7c3df6bd 100644
--- a/backend/src/graphql/model/AdminUpdateContribution.ts
+++ b/backend/src/graphql/model/AdminUpdateContribution.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field } from 'type-graphql'
 
 @ObjectType()
 export class AdminUpdateContribution {
diff --git a/backend/src/graphql/model/Balance.ts b/backend/src/graphql/model/Balance.ts
index d68237db9..162ccc3c0 100644
--- a/backend/src/graphql/model/Balance.ts
+++ b/backend/src/graphql/model/Balance.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int, Float } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int, Float } from 'type-graphql'
 
 @ObjectType()
 export class Balance {
diff --git a/backend/src/graphql/model/Community.ts b/backend/src/graphql/model/Community.ts
index ec91ad36f..22b2b1fc6 100644
--- a/backend/src/graphql/model/Community.ts
+++ b/backend/src/graphql/model/Community.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Community as DbCommunity } from '@entity/Community'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class Community {
diff --git a/backend/src/graphql/model/CommunityStatistics.ts b/backend/src/graphql/model/CommunityStatistics.ts
index 1fb1ded46..775ad183b 100644
--- a/backend/src/graphql/model/CommunityStatistics.ts
+++ b/backend/src/graphql/model/CommunityStatistics.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class DynamicStatisticsFields {
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index a83adef4b..b19fae25b 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,7 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 import { Contribution as dbContribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class Contribution {
diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts
index 0da2fd430..e47ffc6ed 100644
--- a/backend/src/graphql/model/ContributionLink.ts
+++ b/backend/src/graphql/model/ContributionLink.ts
@@ -1,6 +1,6 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 import { ContributionLink as dbContributionLink } from '@entity/ContributionLink'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 import CONFIG from '@/config'
 
diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 6bd6a4715..6f70d5024 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -1,6 +1,6 @@
-import { Field, Int, ObjectType } from 'type-graphql'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { User } from '@entity/User'
+import { Field, Int, ObjectType } from 'type-graphql'
 
 @ObjectType()
 export class ContributionMessage {
diff --git a/backend/src/graphql/model/Decay.ts b/backend/src/graphql/model/Decay.ts
index 3e8412dfa..0b710c234 100644
--- a/backend/src/graphql/model/Decay.ts
+++ b/backend/src/graphql/model/Decay.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 interface DecayInterface {
   balance: Decimal
diff --git a/backend/src/graphql/model/OpenCreation.ts b/backend/src/graphql/model/OpenCreation.ts
index ed9ef731e..46ee8117f 100644
--- a/backend/src/graphql/model/OpenCreation.ts
+++ b/backend/src/graphql/model/OpenCreation.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class OpenCreation {
diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 3538260a5..1b857391b 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -1,6 +1,6 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 
diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index 1e9c1a64d..7356e97c6 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -1,6 +1,6 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 import CONFIG from '@/config'
 
diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts
index 36e51242d..77f9f6481 100644
--- a/backend/src/graphql/model/TransactionList.ts
+++ b/backend/src/graphql/model/TransactionList.ts
@@ -1,7 +1,7 @@
 import { ObjectType, Field } from 'type-graphql'
 
-import { Transaction } from './Transaction'
 import { Balance } from './Balance'
+import { Transaction } from './Transaction'
 
 @ObjectType()
 export class TransactionList {
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index 439f70a16..dece05781 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -1,7 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UnconfirmedContribution {
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 6797b0767..c705ba912 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { User as dbUser } from '@entity/User'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 import { KlickTipp } from './KlickTipp'
 import { UserContact } from './UserContact'
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 84512d812..3e7210874 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -1,6 +1,6 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserAdmin {
diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts
index bb31d0745..4a6ed47b6 100644
--- a/backend/src/graphql/model/UserContact.ts
+++ b/backend/src/graphql/model/UserContact.ts
@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { UserContact as dbUserContact } from '@entity/UserContact'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserContact {
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index aca10ed0f..ff1fee9f6 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -1,19 +1,19 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 
-import { TransactionLinkRepository } from '@repository/TransactionLink'
-import { Balance } from '@model/Balance'
-import { backendLogger as logger } from '@/server/logger'
-import { Context, getUser } from '@/server/context'
-import { calculateDecay } from '@/util/decay'
 import { RIGHTS } from '@/auth/RIGHTS'
+import { Context, getUser } from '@/server/context'
+import { backendLogger as logger } from '@/server/logger'
+import { calculateDecay } from '@/util/decay'
+import { Balance } from '@model/Balance'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
 
-import { getLastTransaction } from './util/getLastTransaction'
 import { GdtResolver } from './GdtResolver'
+import { getLastTransaction } from './util/getLastTransaction'
 
 @Resolver()
 export class BalanceResolver {
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 74ba0e57b..5ffbe77c8 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,8 +1,8 @@
-import { Resolver, Query, Authorized } from 'type-graphql'
 import { Community as DbCommunity } from '@entity/Community'
+import { Resolver, Query, Authorized } from 'type-graphql'
 
-import { Community } from '@model/Community'
 import { RIGHTS } from '@/auth/RIGHTS'
+import { Community } from '@model/Community'
 
 @Resolver()
 export class CommunityResolver {
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 6bd62fd9f..66c678be1 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -4,12 +4,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Decimal } from 'decimal.js-light'
-import { GraphQLError } from 'graphql'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { Decimal } from 'decimal.js-light'
+import { GraphQLError } from 'graphql'
 
-import { logger } from '@test/testSetup'
+import { EventType } from '@/event/Event'
+import { userFactory } from '@/seeds/factory/user'
 import {
   login,
   createContributionLink,
@@ -17,11 +18,10 @@ import {
   updateContributionLink,
 } from '@/seeds/graphql/mutations'
 import { listContributionLinks } from '@/seeds/graphql/queries'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { userFactory } from '@/seeds/factory/user'
-import { EventType } from '@/event/Event'
+import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
+import { logger } from '@test/testSetup'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 815901f16..aca291e5d 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -1,31 +1,31 @@
-import { Decimal } from 'decimal.js-light'
-import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 import { MoreThan, IsNull } from '@dbTools/typeorm'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 
-import { ContributionLinkList } from '@model/ContributionLinkList'
-import { ContributionLink } from '@model/ContributionLink'
-import ContributionLinkArgs from '@arg/ContributionLinkArgs'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { Order } from '@enum/Order'
-import Paginated from '@arg/Paginated'
-// TODO: this is a strange construct
-import LogError from '@/server/LogError'
-import { Context, getUser } from '@/server/context'
 import {
   EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
   EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
 } from '@/event/Event'
+// TODO: this is a strange construct
+import { Context, getUser } from '@/server/context'
+import LogError from '@/server/LogError'
+import ContributionLinkArgs from '@arg/ContributionLinkArgs'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { ContributionLink } from '@model/ContributionLink'
+import { ContributionLinkList } from '@model/ContributionLinkList'
 
-import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
-import { isStartEndDateValid } from './util/creations'
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,
   CONTRIBUTIONLINK_NAME_MIN_CHARS,
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
+import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
+import { isStartEndDateValid } from './util/creations'
 
 @Resolver()
 export class ContributionLinkResolver {
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 357455250..dd8c61cf2 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -6,11 +6,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
+import { GraphQLError } from 'graphql'
 
-import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
+import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
+import { EventType } from '@/event/Event'
+import { userFactory } from '@/seeds/factory/user'
 import {
   adminCreateContributionMessage,
   createContribution,
@@ -18,11 +19,10 @@ import {
   login,
 } from '@/seeds/graphql/mutations'
 import { listContributionMessages } from '@/seeds/graphql/queries'
-import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 
 jest.mock('@/emails/sendEmailVariants', () => {
   const originalModule = jest.requireActual('@/emails/sendEmailVariants')
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index b78f441d5..346f8b39c 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -1,25 +1,25 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
-import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Contribution as DbContribution } from '@entity/Contribution'
-import { UserContact as DbUserContact } from '@entity/UserContact'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { User as DbUser } from '@entity/User'
+import { UserContact as DbUserContact } from '@entity/UserContact'
+import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
-import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
-import ContributionMessageArgs from '@arg/ContributionMessageArgs'
-import { ContributionMessageType } from '@enum/MessageType'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { Order } from '@enum/Order'
-import Paginated from '@arg/Paginated'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { Context, getUser } from '@/server/context'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import LogError from '@/server/LogError'
 import {
   EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE,
   EVENT_CONTRIBUTION_MESSAGE_CREATE,
 } from '@/event/Event'
+import { Context, getUser } from '@/server/context'
+import LogError from '@/server/LogError'
+import ContributionMessageArgs from '@arg/ContributionMessageArgs'
+import Paginated from '@arg/Paginated'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionMessageType } from '@enum/MessageType'
+import { Order } from '@enum/Order'
+import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index d05060c7e..5291259b7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -6,18 +6,23 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { Decimal } from 'decimal.js-light'
-import { GraphQLError } from 'graphql'
 import { Contribution } from '@entity/Contribution'
+import { Event as DbEvent } from '@entity/Event'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { UserInputError } from 'apollo-server-express'
-import { Event as DbEvent } from '@entity/Event'
+import { Decimal } from 'decimal.js-light'
+import { GraphQLError } from 'graphql'
 
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { bobBaumeister } from '@/seeds/users/bob-baumeister'
-import { stephenHawking } from '@/seeds/users/stephen-hawking'
-import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
+import {
+  sendContributionConfirmedEmail,
+  sendContributionDeletedEmail,
+  sendContributionDeniedEmail,
+} from '@/emails/sendEmailVariants'
+import { EventType } from '@/event/Event'
+import { creations } from '@/seeds/creation/index'
+import { creationFactory } from '@/seeds/factory/creation'
+import { userFactory } from '@/seeds/factory/user'
 import {
   createContribution,
   updateContribution,
@@ -36,11 +41,16 @@ import {
   listContributions,
   adminListContributions,
 } from '@/seeds/graphql/queries'
-import {
-  sendContributionConfirmedEmail,
-  sendContributionDeletedEmail,
-  sendContributionDeniedEmail,
-} from '@/emails/sendEmailVariants'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { bobBaumeister } from '@/seeds/users/bob-baumeister'
+import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
+import { stephenHawking } from '@/seeds/users/stephen-hawking'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { Order } from '@enum/Order'
+import { ContributionListResult } from '@model/Contribution'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import {
   cleanDB,
   resetToken,
@@ -48,17 +58,7 @@ import {
   contributionDateFormatter,
   resetEntity,
 } from '@test/helpers'
-import { userFactory } from '@/seeds/factory/user'
-import { creationFactory } from '@/seeds/factory/creation'
-import { creations } from '@/seeds/creation/index'
-import { peterLustig } from '@/seeds/users/peter-lustig'
-import { EventType } from '@/event/Event'
 import { logger, i18n as localization } from '@test/testSetup'
-import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { ContributionListResult } from '@model/Contribution'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { Order } from '@enum/Order'
 
 jest.mock('@/emails/sendEmailVariants')
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 28b393be5..5fdbd1a12 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -1,30 +1,19 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-import { Decimal } from 'decimal.js-light'
-import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { IsNull, getConnection } from '@dbTools/typeorm'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage } from '@entity/ContributionMessage'
-import { UserContact } from '@entity/UserContact'
-import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
+import { Decimal } from 'decimal.js-light'
+import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
-import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
-import { Contribution, ContributionListResult } from '@model/Contribution'
-import { Decay } from '@model/Decay'
-import { OpenCreation } from '@model/OpenCreation'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { Order } from '@enum/Order'
-import { ContributionType } from '@enum/ContributionType'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { ContributionMessageType } from '@enum/MessageType'
-import ContributionArgs from '@arg/ContributionArgs'
-import Paginated from '@arg/Paginated'
-import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
-import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
-import { backendLogger as logger } from '@/server/logger'
+import {
+  sendContributionConfirmedEmail,
+  sendContributionDeletedEmail,
+  sendContributionDeniedEmail,
+} from '@/emails/sendEmailVariants'
 import {
   EVENT_CONTRIBUTION_CREATE,
   EVENT_CONTRIBUTION_DELETE,
@@ -35,15 +24,27 @@ import {
   EVENT_ADMIN_CONTRIBUTION_CONFIRM,
   EVENT_ADMIN_CONTRIBUTION_DENY,
 } from '@/event/Event'
-import { calculateDecay } from '@/util/decay'
-import {
-  sendContributionConfirmedEmail,
-  sendContributionDeletedEmail,
-  sendContributionDeniedEmail,
-} from '@/emails/sendEmailVariants'
-import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+import { calculateDecay } from '@/util/decay'
+import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
+import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
+import ContributionArgs from '@arg/ContributionArgs'
+import Paginated from '@arg/Paginated'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionType } from '@enum/ContributionType'
+import { ContributionMessageType } from '@enum/MessageType'
+import { Order } from '@enum/Order'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
+import { Contribution, ContributionListResult } from '@model/Contribution'
+import { Decay } from '@model/Decay'
+import { OpenCreation } from '@model/OpenCreation'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import {
   getUserCreation,
   validateContribution,
@@ -53,7 +54,6 @@ import {
 } from './util/creations'
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 
 @Resolver()
 export class ContributionResolver {
diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
index 0b6ebfbe4..9f234e73f 100644
--- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts
+++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
@@ -7,10 +7,10 @@
 import { User as DbUser } from '@entity/User'
 import { GraphQLError } from 'graphql'
 
-import { testEnvironment, cleanDB } from '@test/helpers'
+import CONFIG from '@/config'
 import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations'
 import { queryOptIn } from '@/seeds/graphql/queries'
-import CONFIG from '@/config'
+import { testEnvironment, cleanDB } from '@test/helpers'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index 00b0aa1bf..68a2c2275 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -3,14 +3,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
 
-import { GdtEntryList } from '@model/GdtEntryList'
-import { Order } from '@enum/Order'
-import Paginated from '@arg/Paginated'
-import { Context, getUser } from '@/server/context'
-import CONFIG from '@/config'
 import { apiGet, apiPost } from '@/apis/HttpRequest'
 import { RIGHTS } from '@/auth/RIGHTS'
+import CONFIG from '@/config'
+import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { GdtEntryList } from '@model/GdtEntryList'
 
 @Resolver()
 export class GdtResolver {
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index 3ddc8bfbc..056163811 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 
-import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
+import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 @Resolver((of) => CommunityStatistics)
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index d9010b57a..13bb2c431 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -7,21 +7,18 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { Event as DbEvent } from '@entity/Event'
+import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
-import { Transaction } from '@entity/Transaction'
-import { Event as DbEvent } from '@entity/Event'
-import { UserContact } from '@entity/UserContact'
 
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
-import { creationFactory } from '@/seeds/factory/creation'
+import { EventType } from '@/event/Event'
 import { creations } from '@/seeds/creation/index'
-import { userFactory } from '@/seeds/factory/user'
+import { creationFactory } from '@/seeds/factory/creation'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
-import { transactionLinks } from '@/seeds/transactionLink/index'
+import { userFactory } from '@/seeds/factory/user'
 import {
   login,
   createContributionLink,
@@ -33,10 +30,13 @@ import {
   confirmContribution,
 } from '@/seeds/graphql/mutations'
 import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { transactionLinks } from '@/seeds/transactionLink/index'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { peterLustig } from '@/seeds/users/peter-lustig'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
 import { logger } from '@test/testSetup'
-import { EventType } from '@/event/Event'
 
 import { transactionLinkCode } from './TransactionLinkResolver'
 
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 2131439d5..6365096cf 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -1,44 +1,44 @@
 import { randomBytes } from 'crypto'
 
-import { Decimal } from 'decimal.js-light'
 import { getConnection } from '@dbTools/typeorm'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
 
-import { User } from '@model/User'
-import { ContributionLink } from '@model/ContributionLink'
-import { Decay } from '@model/Decay'
-import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
-import { ContributionType } from '@enum/ContributionType'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { ContributionCycleType } from '@enum/ContributionCycleType'
-import TransactionLinkArgs from '@arg/TransactionLinkArgs'
-import Paginated from '@arg/Paginated'
-import TransactionLinkFilters from '@arg/TransactionLinkFilters'
-import { backendLogger as logger } from '@/server/logger'
-import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
-import { calculateBalance } from '@/util/validate'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { calculateDecay } from '@/util/decay'
-import QueryLinkResult from '@union/QueryLinkResult'
-import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
-import LogError from '@/server/LogError'
 import {
   EVENT_CONTRIBUTION_LINK_REDEEM,
   EVENT_TRANSACTION_LINK_CREATE,
   EVENT_TRANSACTION_LINK_DELETE,
   EVENT_TRANSACTION_LINK_REDEEM,
 } from '@/event/Event'
+import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
+import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+import { calculateDecay } from '@/util/decay'
+import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { calculateBalance } from '@/util/validate'
+import Paginated from '@arg/Paginated'
+import TransactionLinkArgs from '@arg/TransactionLinkArgs'
+import TransactionLinkFilters from '@arg/TransactionLinkFilters'
+import { ContributionCycleType } from '@enum/ContributionCycleType'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionType } from '@enum/ContributionType'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { ContributionLink } from '@model/ContributionLink'
+import { Decay } from '@model/Decay'
+import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
+import { User } from '@model/User'
+import QueryLinkResult from '@union/QueryLinkResult'
 
-import transactionLinkList from './util/transactionLinkList'
-import { getLastTransaction } from './util/getLastTransaction'
 import { executeTransaction } from './TransactionResolver'
 import { getUserCreation, validateContribution } from './util/creations'
+import { getLastTransaction } from './util/getLastTransaction'
+import transactionLinkList from './util/transactionLinkList'
 
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 558f0c315..7d855a1e6 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -5,11 +5,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { Decimal } from 'decimal.js-light'
+import { Event as DbEvent } from '@entity/Event'
 import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
-import { Event as DbEvent } from '@entity/Event'
 
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f36ac3d68..6e81a01c8 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -2,40 +2,40 @@
 /* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
-import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { User as dbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 
-import { TransactionRepository } from '@repository/Transaction'
-import { TransactionLinkRepository } from '@repository/TransactionLink'
-import { User } from '@model/User'
-import { Transaction } from '@model/Transaction'
-import { TransactionList } from '@model/TransactionList'
-import { Order } from '@enum/Order'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { calculateBalance } from '@/util/validate'
-import TransactionSendArgs from '@arg/TransactionSendArgs'
-import Paginated from '@arg/Paginated'
-import { backendLogger as logger } from '@/server/logger'
-import { Context, getUser } from '@/server/context'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { communityUser } from '@/util/communityUser'
-import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions'
 import {
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
-import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+import { communityUser } from '@/util/communityUser'
+import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { calculateBalance } from '@/util/validate'
+import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions'
+import Paginated from '@arg/Paginated'
+import TransactionSendArgs from '@arg/TransactionSendArgs'
+import { Order } from '@enum/Order'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { Transaction } from '@model/Transaction'
+import { TransactionList } from '@model/TransactionList'
+import { User } from '@model/User'
+import { TransactionRepository } from '@repository/Transaction'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
 
-import { getLastTransaction } from './util/getLastTransaction'
-import { findUserByEmail } from './UserResolver'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { BalanceResolver } from './BalanceResolver'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { findUserByEmail } from './UserResolver'
+import { getLastTransaction } from './util/getLastTransaction'
 
 export const executeTransaction = async (
   amount: Decimal,
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index ccf56a285..f9f0dcdb3 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -6,22 +6,25 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { GraphQLError } from 'graphql'
-import { User } from '@entity/User'
-import { TransactionLink } from '@entity/TransactionLink'
-import { validate as validateUUID, version as versionUUID } from 'uuid'
-import { UserContact } from '@entity/UserContact'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink } from '@entity/TransactionLink'
+import { User } from '@entity/User'
+import { UserContact } from '@entity/UserContact'
+import { GraphQLError } from 'graphql'
+import { validate as validateUUID, version as versionUUID } from 'uuid'
 
-import { OptInType } from '@enum/OptInType'
-import { UserContactType } from '@enum/UserContactType'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
-import { objectValuesToArray } from '@/util/utilities'
-import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
-import { printTimeDuration } from '@/util/time'
+import CONFIG from '@/config'
+import {
+  sendAccountActivationEmail,
+  sendAccountMultiRegistrationEmail,
+  sendResetPasswordEmail,
+} from '@/emails/sendEmailVariants'
+import { EventType } from '@/event/Event'
+import { SecretKeyCryptographyCreateKey } from '@/password/EncryptorUtils'
+import { encryptPassword } from '@/password/PasswordEncryptor'
+import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
+import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
 import { userFactory } from '@/seeds/factory/user'
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import {
   login,
   logout,
@@ -37,22 +40,19 @@ import {
   sendActivationEmail,
 } from '@/seeds/graphql/mutations'
 import { verifyLogin, queryOptIn, searchAdminUsers, searchUsers } from '@/seeds/graphql/queries'
-import CONFIG from '@/config'
-import {
-  sendAccountActivationEmail,
-  sendAccountMultiRegistrationEmail,
-  sendResetPasswordEmail,
-} from '@/emails/sendEmailVariants'
-import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
-import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
-import { ContributionLink } from '@model/ContributionLink'
-import { EventType } from '@/event/Event'
-import { peterLustig } from '@/seeds/users/peter-lustig'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
-import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
-import { encryptPassword } from '@/password/PasswordEncryptor'
-import { SecretKeyCryptographyCreateKey } from '@/password/EncryptorUtils'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { stephenHawking } from '@/seeds/users/stephen-hawking'
+import { printTimeDuration } from '@/util/time'
+import { objectValuesToArray } from '@/util/utilities'
+import { OptInType } from '@enum/OptInType'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+import { UserContactType } from '@enum/UserContactType'
+import { ContributionLink } from '@model/ContributionLink'
+import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 
 // import { klicktippSignIn } from '@/apis/KlicktippController'
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 0be376bd6..fb8f7568c 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -2,8 +2,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
+import { getConnection, getCustomRepository, IsNull, Not } from '@dbTools/typeorm'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { UserContact as DbUserContact } from '@entity/UserContact'
 import i18n from 'i18n'
-import { v4 as uuidv4 } from 'uuid'
 import {
   Resolver,
   Query,
@@ -15,40 +19,17 @@ import {
   Mutation,
   Int,
 } from 'type-graphql'
-import { getConnection, getCustomRepository, IsNull, Not } from '@dbTools/typeorm'
-import { User as DbUser } from '@entity/User'
-import { UserContact as DbUserContact } from '@entity/UserContact'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
-import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { v4 as uuidv4 } from 'uuid'
 
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
-import { UserRepository } from '@repository/User'
-import { User } from '@model/User'
-import { SearchAdminUsersResult } from '@model/AdminUser'
-import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
-import { OptInType } from '@enum/OptInType'
-import { Order } from '@enum/Order'
-import { UserContactType } from '@enum/UserContactType'
+import { klicktippSignIn } from '@/apis/KlicktippController'
+import { encode } from '@/auth/JWT'
+import { RIGHTS } from '@/auth/RIGHTS'
+import CONFIG from '@/config'
 import {
   sendAccountActivationEmail,
   sendAccountMultiRegistrationEmail,
   sendResetPasswordEmail,
 } from '@/emails/sendEmailVariants'
-import { getTimeDurationObject, printTimeDuration } from '@/util/time'
-import CreateUserArgs from '@arg/CreateUserArgs'
-import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
-import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
-import Paginated from '@arg/Paginated'
-import SearchUsersArgs from '@arg/SearchUsersArgs'
-import { backendLogger as logger } from '@/server/logger'
-import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
-import CONFIG from '@/config'
-import { communityDbUser } from '@/util/communityUser'
-import { encode } from '@/auth/JWT'
-import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware'
-import { klicktippSignIn } from '@/apis/KlicktippController'
-import { RIGHTS } from '@/auth/RIGHTS'
-import { hasElopageBuys } from '@/util/hasElopageBuys'
 import {
   Event,
   EventType,
@@ -65,17 +46,36 @@ import {
   EVENT_ADMIN_USER_DELETE,
   EVENT_ADMIN_USER_UNDELETE,
 } from '@/event/Event'
+import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware'
 import { isValidPassword } from '@/password/EncryptorUtils'
 import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
+import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+import { communityDbUser } from '@/util/communityUser'
+import { hasElopageBuys } from '@/util/hasElopageBuys'
+import { getTimeDurationObject, printTimeDuration } from '@/util/time'
+import CreateUserArgs from '@arg/CreateUserArgs'
+import Paginated from '@arg/Paginated'
+import SearchUsersArgs from '@arg/SearchUsersArgs'
+import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
+import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
+import { OptInType } from '@enum/OptInType'
+import { Order } from '@enum/Order'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+import { UserContactType } from '@enum/UserContactType'
+import { SearchAdminUsersResult } from '@model/AdminUser'
+import { User } from '@model/User'
+import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
+import { UserRepository } from '@repository/User'
 
 import { FULL_CREATION_AVAILABLE } from './const/const'
 import { getUserCreations } from './util/creations'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
-const sodium = require('sodium-native')
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const random = require('random-bigint')
+// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
+const sodium = require('sodium-native')
 
 const LANGUAGES = ['de', 'en', 'es', 'fr', 'nl']
 const DEFAULT_LANGUAGE = 'de'
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index 0fb355676..4aa76ab01 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -6,12 +6,8 @@
 
 import { Decimal } from 'decimal.js-light'
 
-import { userFactory } from '@/seeds/factory/user'
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { bobBaumeister } from '@/seeds/users/bob-baumeister'
-import { peterLustig } from '@/seeds/users/peter-lustig'
 import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation'
-import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
+import { userFactory } from '@/seeds/factory/user'
 import {
   confirmContribution,
   createContribution,
@@ -21,6 +17,10 @@ import {
   createContributionLink,
   sendCoins,
 } from '@/seeds/graphql/mutations'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { bobBaumeister } from '@/seeds/users/bob-baumeister'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 
 let mutate: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 37bdb742c..56e37a39b 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -4,14 +4,14 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { User } from '@entity/User'
 import { Contribution } from '@entity/Contribution'
+import { User } from '@entity/User'
 
-import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
-import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
-import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
 import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations'
+import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
 
 import { getUserCreation } from './creations'
 
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 44b675de4..3903eef19 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -5,9 +5,9 @@ import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
 
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
+import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 import { OpenCreation } from '@model/OpenCreation'
-import LogError from '@/server/LogError'
 
 interface CreationMap {
   id: number
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 5c70fafe7..a08631e2c 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -1,5 +1,5 @@
-import { Contribution as DbContribution } from '@entity/Contribution'
 import { In } from '@dbTools/typeorm'
+import { Contribution as DbContribution } from '@entity/Contribution'
 
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts
index ed90cc852..b7bf9eb5e 100644
--- a/backend/src/graphql/resolver/util/transactionLinkList.ts
+++ b/backend/src/graphql/resolver/util/transactionLinkList.ts
@@ -2,11 +2,11 @@ import { MoreThan } from '@dbTools/typeorm'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { User as DbUser } from '@entity/User'
 
-import { Order } from '@enum/Order'
+import { User } from '@/graphql/model/User'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
+import { Order } from '@enum/Order'
 import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
-import { User } from '@/graphql/model/User'
 
 export default async function transactionLinkList(
   { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
diff --git a/backend/src/graphql/scalar/Decimal.ts b/backend/src/graphql/scalar/Decimal.ts
index 586481a6d..e46446cee 100644
--- a/backend/src/graphql/scalar/Decimal.ts
+++ b/backend/src/graphql/scalar/Decimal.ts
@@ -1,5 +1,5 @@
-import { GraphQLScalarType, Kind } from 'graphql'
 import { Decimal } from 'decimal.js-light'
+import { GraphQLScalarType, Kind } from 'graphql'
 
 const DecimalType = new GraphQLScalarType({
   name: 'Decimal',
diff --git a/backend/src/graphql/schema.ts b/backend/src/graphql/schema.ts
index 1aae117d0..c6097f027 100644
--- a/backend/src/graphql/schema.ts
+++ b/backend/src/graphql/schema.ts
@@ -1,8 +1,8 @@
 import path from 'path'
 
+import { Decimal } from 'decimal.js-light'
 import { GraphQLSchema } from 'graphql'
 import { buildSchema } from 'type-graphql'
-import { Decimal } from 'decimal.js-light'
 
 import isAuthorized from './directive/isAuthorized'
 import DecimalScalar from './scalar/Decimal'
diff --git a/backend/src/graphql/union/QueryLinkResult.ts b/backend/src/graphql/union/QueryLinkResult.ts
index 775320bdd..390175d1d 100644
--- a/backend/src/graphql/union/QueryLinkResult.ts
+++ b/backend/src/graphql/union/QueryLinkResult.ts
@@ -1,7 +1,7 @@
 import { createUnionType } from 'type-graphql'
 
-import { TransactionLink } from '@model/TransactionLink'
 import { ContributionLink } from '@model/ContributionLink'
+import { TransactionLink } from '@model/TransactionLink'
 
 export default createUnionType({
   name: 'QueryLinkResult', // the name of the GraphQL union
diff --git a/backend/src/index.ts b/backend/src/index.ts
index d3ebc42cf..353b77616 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import createServer from './server/createServer'
 // config
 import CONFIG from './config'
 import { startValidateCommunities } from './federation/validateCommunities'
+import createServer from './server/createServer'
 
 async function main() {
   const { app } = await createServer()
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index e133977ee..ac0dff0d9 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -5,9 +5,9 @@
 import { MiddlewareFn } from 'type-graphql'
 
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
-import { KlickTipp } from '@model/KlickTipp'
 import CONFIG from '@/config'
 import { klickTippLogger as logger } from '@/server/logger'
+import { KlickTipp } from '@model/KlickTipp'
 
 // export const klicktippRegistrationMiddleware: MiddlewareFn = async (
 //   // Only for demo
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 565669dad..865e844b2 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -3,9 +3,9 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
 
+import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLink } from '@model/ContributionLink'
-import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 
 export const contributionLinkFactory = async (
   client: ApolloServerTestClient,
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index d0ca131c7..6a3aaa3e7 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -5,13 +5,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { ApolloServerTestClient } from 'apollo-server-testing'
-import { Transaction } from '@entity/Transaction'
 import { Contribution } from '@entity/Contribution'
+import { Transaction } from '@entity/Transaction'
+import { ApolloServerTestClient } from 'apollo-server-testing'
 
+import { findUserByEmail } from '@/graphql/resolver/UserResolver'
 import { CreationInterface } from '@/seeds/creation/CreationInterface'
 import { login, createContribution, confirmContribution } from '@/seeds/graphql/mutations'
-import { findUserByEmail } from '@/graphql/resolver/UserResolver'
 // import CONFIG from '@/config/index'
 
 export const nMonthsBefore = (date: Date, months = 1): string => {
diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts
index fa4478074..cab478c4b 100644
--- a/backend/src/seeds/factory/transactionLink.ts
+++ b/backend/src/seeds/factory/transactionLink.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/unbound-method */
-import { ApolloServerTestClient } from 'apollo-server-testing'
 import { TransactionLink } from '@entity/TransactionLink'
+import { ApolloServerTestClient } from 'apollo-server-testing'
 
+import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver'
 import { login, createTransactionLink } from '@/seeds/graphql/mutations'
 import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface'
-import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver'
 
 export const transactionLinkFactory = async (
   client: ApolloServerTestClient,
diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index 0d972abb3..d1960eea9 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -5,22 +5,22 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { entities } from '@entity/index'
 import { createTestClient } from 'apollo-server-testing'
 import { name, internet, datatype } from 'faker'
-import { entities } from '@entity/index'
 
+import CONFIG from '@/config'
 import createServer from '@/server/createServer'
 import { backendLogger as logger } from '@/server/logger'
-import CONFIG from '@/config'
 
-import { users } from './users/index'
-import { creations } from './creation/index'
-import { transactionLinks } from './transactionLink/index'
 import { contributionLinks } from './contributionLink/index'
-import { userFactory } from './factory/user'
+import { creations } from './creation/index'
+import { contributionLinkFactory } from './factory/contributionLink'
 import { creationFactory } from './factory/creation'
 import { transactionLinkFactory } from './factory/transactionLink'
-import { contributionLinkFactory } from './factory/contributionLink'
+import { userFactory } from './factory/user'
+import { transactionLinks } from './transactionLink/index'
+import { users } from './users/index'
 
 CONFIG.EMAIL = false
 
diff --git a/backend/src/seeds/users/index.ts b/backend/src/seeds/users/index.ts
index 7a6dbe519..beb6c6f25 100644
--- a/backend/src/seeds/users/index.ts
+++ b/backend/src/seeds/users/index.ts
@@ -1,9 +1,9 @@
-import { peterLustig } from './peter-lustig'
 import { bibiBloxberg } from './bibi-bloxberg'
 import { bobBaumeister } from './bob-baumeister'
+import { garrickOllivander } from './garrick-ollivander'
+import { peterLustig } from './peter-lustig'
 import { raeuberHotzenplotz } from './raeuber-hotzenplotz'
 import { stephenHawking } from './stephen-hawking'
-import { garrickOllivander } from './garrick-ollivander'
 
 export const users = [
   peterLustig,
diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts
index 4b631bd9c..f0e63daea 100644
--- a/backend/src/server/context.ts
+++ b/backend/src/server/context.ts
@@ -1,7 +1,7 @@
-import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
-import { Decimal } from 'decimal.js-light'
+import { User as dbUser } from '@entity/User'
 import { ExpressContext } from 'apollo-server-express'
+import { Decimal } from 'decimal.js-light'
 
 import { Role } from '@/auth/Role'
 
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 6ffd18c50..8a94ef3eb 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -1,22 +1,22 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/unbound-method */
+import { Connection } from '@dbTools/typeorm'
 import { ApolloServer } from 'apollo-server-express'
 import express, { Express, json, urlencoded } from 'express'
-import { Connection } from '@dbTools/typeorm'
 import { Logger } from 'log4js'
 
-import connection from '@/typeorm/connection'
-import { checkDBVersion } from '@/typeorm/DBVersion'
 import CONFIG from '@/config'
 import schema from '@/graphql/schema'
+import connection from '@/typeorm/connection'
+import { checkDBVersion } from '@/typeorm/DBVersion'
 import { elopageWebhook } from '@/webhook/elopage'
 
-import cors from './cors'
 import serverContext from './context'
-import plugins from './plugins'
-import { apolloLogger } from './logger'
+import cors from './cors'
 import { i18n } from './localization'
+import { apolloLogger } from './logger'
+import plugins from './plugins'
 
 // TODO implement
 // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity";
diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts
index 5e2bdb5c6..924e64895 100644
--- a/backend/src/util/decay.ts
+++ b/backend/src/util/decay.ts
@@ -1,8 +1,8 @@
 import { Decimal } from 'decimal.js-light'
 
 import CONFIG from '@/config'
-import { Decay } from '@model/Decay'
 import LogError from '@/server/LogError'
+import { Decay } from '@model/Decay'
 
 // TODO: externalize all those definitions and functions into an external decay library
 
diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
index 02bfa1044..4d90be134 100644
--- a/backend/src/util/klicktipp.ts
+++ b/backend/src/util/klicktipp.ts
@@ -1,8 +1,8 @@
 import { User } from '@entity/User'
 
-import connection from '@/typeorm/connection'
 import { getKlickTippUser } from '@/apis/KlicktippController'
 import LogError from '@/server/LogError'
+import connection from '@/typeorm/connection'
 
 export async function retrieveNotRegisteredEmails(): Promise<string[]> {
   const con = await connection()
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index 628b00d43..cd4841b9b 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -1,10 +1,10 @@
-import { Decimal } from 'decimal.js-light'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { Decimal } from 'decimal.js-light'
 
 import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
-import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Decay } from '@model/Decay'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
 
 import { calculateDecay } from './decay'
 
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index f9f13afbc..68a37746b 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -3,8 +3,8 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { Decimal } from 'decimal.js-light'
 
-import { Transaction } from '@model/Transaction'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { Transaction } from '@model/Transaction'
 import { User } from '@model/User'
 
 import { calculateDecay } from './decay'
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index f68c15cb8..f440adc02 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -6,9 +6,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { createTestClient } from 'apollo-server-testing'
 import { initialize } from '@dbTools/helpers'
 import { entities } from '@entity/index'
+import { createTestClient } from 'apollo-server-testing'
 
 import createServer from '@/server/createServer'
 
diff --git a/backend/test/testSetup.ts b/backend/test/testSetup.ts
index b13e3cf26..4e8a67e3f 100644
--- a/backend/test/testSetup.ts
+++ b/backend/test/testSetup.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import CONFIG from '@/config'
-import { backendLogger as logger } from '@/server/logger'
 import { i18n } from '@/server/localization'
+import { backendLogger as logger } from '@/server/logger'
 
 CONFIG.EMAIL = true
 CONFIG.EMAIL_TEST_MODUS = false

From 7d7eb34aeb364a2c3b0d0f773e8917ddb5bb8a03 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 30 Mar 2023 18:04:43 +0200
Subject: [PATCH 071/101] fix order

---
 backend/.eslintrc.js                          |  7 ++++-
 .../src/emails/sendEmailTranslated.test.ts    |  3 +-
 backend/src/emails/sendEmailVariants.test.ts  |  3 +-
 .../src/graphql/resolver/BalanceResolver.ts   |  5 ++--
 .../resolver/CommunityResolver.test.ts        |  3 +-
 .../src/graphql/resolver/CommunityResolver.ts |  3 +-
 .../resolver/ContributionLinkResolver.test.ts |  5 ++--
 .../resolver/ContributionLinkResolver.ts      | 13 +++++----
 .../ContributionMessageResolver.test.ts       |  5 ++--
 .../resolver/ContributionMessageResolver.ts   | 13 +++++----
 .../resolver/ContributionResolver.test.ts     | 25 ++++++++--------
 .../graphql/resolver/ContributionResolver.ts  | 29 ++++++++++---------
 .../graphql/resolver/EmailOptinCodes.test.ts  |  3 +-
 backend/src/graphql/resolver/GdtResolver.ts   |  7 +++--
 .../graphql/resolver/StatisticsResolver.ts    |  3 +-
 .../resolver/TransactionLinkResolver.test.ts  |  7 +++--
 .../resolver/TransactionLinkResolver.ts       | 25 ++++++++--------
 .../resolver/TransactionResolver.test.ts      |  5 ++--
 .../graphql/resolver/TransactionResolver.ts   | 19 ++++++------
 .../src/graphql/resolver/UserResolver.test.ts | 13 +++++----
 backend/src/graphql/resolver/UserResolver.ts  | 27 ++++++++---------
 .../src/graphql/resolver/semaphore.test.ts    |  3 +-
 .../graphql/resolver/util/creations.test.ts   |  3 +-
 .../src/graphql/resolver/util/creations.ts    |  3 +-
 .../resolver/util/transactionLinkList.ts      |  3 +-
 backend/src/middleware/klicktippMiddleware.ts |  3 +-
 backend/src/password/EncryptorUtils.ts        |  3 +-
 backend/src/seeds/factory/contributionLink.ts |  3 +-
 backend/src/util/communityUser.ts             |  3 +-
 backend/src/util/decay.ts                     |  3 +-
 backend/src/util/validate.ts                  |  3 +-
 31 files changed, 144 insertions(+), 109 deletions(-)

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 4cb3d3cf1..99b8baa24 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -83,7 +83,12 @@ module.exports = {
         'newlines-between': 'always',
         pathGroups: [
           {
-            pattern: '@*/**',
+            pattern: '@?*/**',
+            group: 'external',
+            position: 'after',
+          },
+          {
+            pattern: '@/**',
             group: 'external',
             position: 'after',
           },
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index b930939cf..85074344a 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -2,9 +2,10 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
 
-import CONFIG from '@/config'
 import { logger, i18n } from '@test/testSetup'
 
+import CONFIG from '@/config'
+
 import { sendEmailTranslated } from './sendEmailTranslated'
 
 CONFIG.EMAIL = false
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 141319ac0..44d996fa8 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -5,10 +5,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Decimal } from 'decimal.js-light'
 
-import CONFIG from '@/config'
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
 
+import CONFIG from '@/config'
+
 import { sendEmailTranslated } from './sendEmailTranslated'
 import {
   sendAddedContributionMessageEmail,
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index ff1fee9f6..deedb9dff 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -5,12 +5,13 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 
+import { Balance } from '@model/Balance'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
 import { calculateDecay } from '@/util/decay'
-import { Balance } from '@model/Balance'
-import { TransactionLinkRepository } from '@repository/TransactionLink'
 
 import { GdtResolver } from './GdtResolver'
 import { getLastTransaction } from './util/getLastTransaction'
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index b78d419f9..5b4b26cad 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -7,9 +7,10 @@
 
 import { Community as DbCommunity } from '@entity/Community'
 
-import { getCommunities } from '@/seeds/graphql/queries'
 import { testEnvironment } from '@test/helpers'
 
+import { getCommunities } from '@/seeds/graphql/queries'
+
 let query: any
 
 // to do: We need a setup for the tests that closes the connection
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 5ffbe77c8..86e55ad1f 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,9 +1,10 @@
 import { Community as DbCommunity } from '@entity/Community'
 import { Resolver, Query, Authorized } from 'type-graphql'
 
-import { RIGHTS } from '@/auth/RIGHTS'
 import { Community } from '@model/Community'
 
+import { RIGHTS } from '@/auth/RIGHTS'
+
 @Resolver()
 export class CommunityResolver {
   @Authorized([RIGHTS.COMMUNITIES])
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 66c678be1..2247318a3 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -9,6 +9,9 @@ import { Event as DbEvent } from '@entity/Event'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 
+import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -20,8 +23,6 @@ import {
 import { listContributionLinks } from '@/seeds/graphql/queries'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
-import { logger } from '@test/testSetup'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index aca291e5d..af76856c4 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -3,20 +3,21 @@ import { ContributionLink as DbContributionLink } from '@entity/ContributionLink
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 
+// TODO: this is a strange construct
+import ContributionLinkArgs from '@arg/ContributionLinkArgs'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { ContributionLink } from '@model/ContributionLink'
+import { ContributionLinkList } from '@model/ContributionLinkList'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import {
   EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
   EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
 } from '@/event/Event'
-// TODO: this is a strange construct
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
-import ContributionLinkArgs from '@arg/ContributionLinkArgs'
-import Paginated from '@arg/Paginated'
-import { Order } from '@enum/Order'
-import { ContributionLink } from '@model/ContributionLink'
-import { ContributionLinkList } from '@model/ContributionLinkList'
 
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index dd8c61cf2..189cb6e44 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -9,6 +9,9 @@
 import { Event as DbEvent } from '@entity/Event'
 import { GraphQLError } from 'graphql'
 
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
+
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
@@ -21,8 +24,6 @@ import {
 import { listContributionMessages } from '@/seeds/graphql/queries'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
 
 jest.mock('@/emails/sendEmailVariants', () => {
   const originalModule = jest.requireActual('@/emails/sendEmailVariants')
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 346f8b39c..adfb40f89 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -6,6 +6,13 @@ import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
+import ContributionMessageArgs from '@arg/ContributionMessageArgs'
+import Paginated from '@arg/Paginated'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionMessageType } from '@enum/MessageType'
+import { Order } from '@enum/Order'
+import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
 import {
@@ -14,12 +21,6 @@ import {
 } from '@/event/Event'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
-import ContributionMessageArgs from '@arg/ContributionMessageArgs'
-import Paginated from '@arg/Paginated'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { ContributionMessageType } from '@enum/MessageType'
-import { Order } from '@enum/Order'
-import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 5291259b7..14d3fe73e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -14,6 +14,19 @@ import { UserInputError } from 'apollo-server-express'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { Order } from '@enum/Order'
+import { ContributionListResult } from '@model/Contribution'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import {
+  cleanDB,
+  resetToken,
+  testEnvironment,
+  contributionDateFormatter,
+  resetEntity,
+} from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
+
 import {
   sendContributionConfirmedEmail,
   sendContributionDeletedEmail,
@@ -47,18 +60,6 @@ import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { Order } from '@enum/Order'
-import { ContributionListResult } from '@model/Contribution'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import {
-  cleanDB,
-  resetToken,
-  testEnvironment,
-  contributionDateFormatter,
-  resetEntity,
-} from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
 
 jest.mock('@/emails/sendEmailVariants')
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 5fdbd1a12..79e21b49e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -8,6 +8,21 @@ import { UserContact } from '@entity/UserContact'
 import { Decimal } from 'decimal.js-light'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
+import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
+import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
+import ContributionArgs from '@arg/ContributionArgs'
+import Paginated from '@arg/Paginated'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionType } from '@enum/ContributionType'
+import { ContributionMessageType } from '@enum/MessageType'
+import { Order } from '@enum/Order'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
+import { Contribution, ContributionListResult } from '@model/Contribution'
+import { Decay } from '@model/Decay'
+import { OpenCreation } from '@model/OpenCreation'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import {
   sendContributionConfirmedEmail,
@@ -29,20 +44,6 @@ import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 import { calculateDecay } from '@/util/decay'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
-import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
-import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
-import ContributionArgs from '@arg/ContributionArgs'
-import Paginated from '@arg/Paginated'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { ContributionType } from '@enum/ContributionType'
-import { ContributionMessageType } from '@enum/MessageType'
-import { Order } from '@enum/Order'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
-import { Contribution, ContributionListResult } from '@model/Contribution'
-import { Decay } from '@model/Decay'
-import { OpenCreation } from '@model/OpenCreation'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import {
diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
index 9f234e73f..cc8d4e534 100644
--- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts
+++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
@@ -7,10 +7,11 @@
 import { User as DbUser } from '@entity/User'
 import { GraphQLError } from 'graphql'
 
+import { testEnvironment, cleanDB } from '@test/helpers'
+
 import CONFIG from '@/config'
 import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations'
 import { queryOptIn } from '@/seeds/graphql/queries'
-import { testEnvironment, cleanDB } from '@test/helpers'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index 68a2c2275..53fc23295 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -3,14 +3,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
 
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { GdtEntryList } from '@model/GdtEntryList'
+
 import { apiGet, apiPost } from '@/apis/HttpRequest'
 import { RIGHTS } from '@/auth/RIGHTS'
 import CONFIG from '@/config'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
-import Paginated from '@arg/Paginated'
-import { Order } from '@enum/Order'
-import { GdtEntryList } from '@model/GdtEntryList'
 
 @Resolver()
 export class GdtResolver {
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index 056163811..21cf81e97 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -6,9 +6,10 @@ import { User as DbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 
+import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
-import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 @Resolver((of) => CommunityStatistics)
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 13bb2c431..8fd5c35de 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -14,6 +14,10 @@ import { UserContact } from '@entity/UserContact'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
 import { EventType } from '@/event/Event'
 import { creations } from '@/seeds/creation/index'
 import { creationFactory } from '@/seeds/factory/creation'
@@ -34,9 +38,6 @@ import { transactionLinks } from '@/seeds/transactionLink/index'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
-import { logger } from '@test/testSetup'
 
 import { transactionLinkCode } from './TransactionLinkResolver'
 
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 6365096cf..a5f8c0ee6 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -9,6 +9,19 @@ import { User as DbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
 
+import Paginated from '@arg/Paginated'
+import TransactionLinkArgs from '@arg/TransactionLinkArgs'
+import TransactionLinkFilters from '@arg/TransactionLinkFilters'
+import { ContributionCycleType } from '@enum/ContributionCycleType'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { ContributionType } from '@enum/ContributionType'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { ContributionLink } from '@model/ContributionLink'
+import { Decay } from '@model/Decay'
+import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
+import { User } from '@model/User'
+import QueryLinkResult from '@union/QueryLinkResult'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import {
   EVENT_CONTRIBUTION_LINK_REDEEM,
@@ -22,18 +35,6 @@ import { backendLogger as logger } from '@/server/logger'
 import { calculateDecay } from '@/util/decay'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { calculateBalance } from '@/util/validate'
-import Paginated from '@arg/Paginated'
-import TransactionLinkArgs from '@arg/TransactionLinkArgs'
-import TransactionLinkFilters from '@arg/TransactionLinkFilters'
-import { ContributionCycleType } from '@enum/ContributionCycleType'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { ContributionType } from '@enum/ContributionType'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { ContributionLink } from '@model/ContributionLink'
-import { Decay } from '@model/Decay'
-import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
-import { User } from '@model/User'
-import QueryLinkResult from '@union/QueryLinkResult'
 
 import { executeTransaction } from './TransactionResolver'
 import { getUserCreation, validateContribution } from './util/creations'
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 7d855a1e6..a2e2e7e75 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -11,6 +11,9 @@ import { User } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 
+import { cleanDB, testEnvironment } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -23,8 +26,6 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
-import { cleanDB, testEnvironment } from '@test/helpers'
-import { logger } from '@test/testSetup'
 
 import { findUserByEmail } from './UserResolver'
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 6e81a01c8..430cdb363 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -9,6 +9,16 @@ import { User as dbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 
+import Paginated from '@arg/Paginated'
+import TransactionSendArgs from '@arg/TransactionSendArgs'
+import { Order } from '@enum/Order'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { Transaction } from '@model/Transaction'
+import { TransactionList } from '@model/TransactionList'
+import { User } from '@model/User'
+import { TransactionRepository } from '@repository/Transaction'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
+
 import { RIGHTS } from '@/auth/RIGHTS'
 import {
   sendTransactionLinkRedeemedEmail,
@@ -22,15 +32,6 @@ import { communityUser } from '@/util/communityUser'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { calculateBalance } from '@/util/validate'
 import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions'
-import Paginated from '@arg/Paginated'
-import TransactionSendArgs from '@arg/TransactionSendArgs'
-import { Order } from '@enum/Order'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { Transaction } from '@model/Transaction'
-import { TransactionList } from '@model/TransactionList'
-import { User } from '@model/User'
-import { TransactionRepository } from '@repository/Transaction'
-import { TransactionLinkRepository } from '@repository/TransactionLink'
 
 import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index f9f0dcdb3..69a5f824f 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -13,6 +13,13 @@ import { UserContact } from '@entity/UserContact'
 import { GraphQLError } from 'graphql'
 import { validate as validateUUID, version as versionUUID } from 'uuid'
 
+import { OptInType } from '@enum/OptInType'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+import { UserContactType } from '@enum/UserContactType'
+import { ContributionLink } from '@model/ContributionLink'
+import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
+
 import CONFIG from '@/config'
 import {
   sendAccountActivationEmail,
@@ -47,12 +54,6 @@ import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { printTimeDuration } from '@/util/time'
 import { objectValuesToArray } from '@/util/utilities'
-import { OptInType } from '@enum/OptInType'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
-import { UserContactType } from '@enum/UserContactType'
-import { ContributionLink } from '@model/ContributionLink'
-import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
 
 // import { klicktippSignIn } from '@/apis/KlicktippController'
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index fb8f7568c..a01719775 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -21,6 +21,20 @@ import {
 } from 'type-graphql'
 import { v4 as uuidv4 } from 'uuid'
 
+import CreateUserArgs from '@arg/CreateUserArgs'
+import Paginated from '@arg/Paginated'
+import SearchUsersArgs from '@arg/SearchUsersArgs'
+import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
+import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
+import { OptInType } from '@enum/OptInType'
+import { Order } from '@enum/Order'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+import { UserContactType } from '@enum/UserContactType'
+import { SearchAdminUsersResult } from '@model/AdminUser'
+import { User } from '@model/User'
+import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
+import { UserRepository } from '@repository/User'
+
 import { klicktippSignIn } from '@/apis/KlicktippController'
 import { encode } from '@/auth/JWT'
 import { RIGHTS } from '@/auth/RIGHTS'
@@ -55,19 +69,6 @@ import { backendLogger as logger } from '@/server/logger'
 import { communityDbUser } from '@/util/communityUser'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { getTimeDurationObject, printTimeDuration } from '@/util/time'
-import CreateUserArgs from '@arg/CreateUserArgs'
-import Paginated from '@arg/Paginated'
-import SearchUsersArgs from '@arg/SearchUsersArgs'
-import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
-import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
-import { OptInType } from '@enum/OptInType'
-import { Order } from '@enum/Order'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
-import { UserContactType } from '@enum/UserContactType'
-import { SearchAdminUsersResult } from '@model/AdminUser'
-import { User } from '@model/User'
-import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
-import { UserRepository } from '@repository/User'
 
 import { FULL_CREATION_AVAILABLE } from './const/const'
 import { getUserCreations } from './util/creations'
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index 4aa76ab01..6963c980e 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -6,6 +6,8 @@
 
 import { Decimal } from 'decimal.js-light'
 
+import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
+
 import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -20,7 +22,6 @@ import {
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 
 let mutate: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 56e37a39b..1e3460b30 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -7,11 +7,12 @@
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
 
+import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
+
 import { userFactory } from '@/seeds/factory/user'
 import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers'
 
 import { getUserCreation } from './creations'
 
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 3903eef19..dbf0650a6 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -4,10 +4,11 @@ import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
 
+import { OpenCreation } from '@model/OpenCreation'
+
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
-import { OpenCreation } from '@model/OpenCreation'
 
 interface CreationMap {
   id: number
diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts
index b7bf9eb5e..544d35114 100644
--- a/backend/src/graphql/resolver/util/transactionLinkList.ts
+++ b/backend/src/graphql/resolver/util/transactionLinkList.ts
@@ -2,12 +2,13 @@ import { MoreThan } from '@dbTools/typeorm'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { User as DbUser } from '@entity/User'
 
-import { User } from '@/graphql/model/User'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
 import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
 
+import { User } from '@/graphql/model/User'
+
 export default async function transactionLinkList(
   { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
   filters: TransactionLinkFilters | null,
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index ac0dff0d9..481094752 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -4,10 +4,11 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { MiddlewareFn } from 'type-graphql'
 
+import { KlickTipp } from '@model/KlickTipp'
+
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import CONFIG from '@/config'
 import { klickTippLogger as logger } from '@/server/logger'
-import { KlickTipp } from '@model/KlickTipp'
 
 // export const klicktippRegistrationMiddleware: MiddlewareFn = async (
 //   // Only for demo
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index 9537fb59e..eb25edda6 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -3,10 +3,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { User } from '@entity/User'
 
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const sodium = require('sodium-native')
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 865e844b2..51e970a5c 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -3,9 +3,10 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
 
+import { ContributionLink } from '@model/ContributionLink'
+
 import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 import { login, createContributionLink } from '@/seeds/graphql/mutations'
-import { ContributionLink } from '@model/ContributionLink'
 
 export const contributionLinkFactory = async (
   client: ApolloServerTestClient,
diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts
index 0c9480118..f96c33470 100644
--- a/backend/src/util/communityUser.ts
+++ b/backend/src/util/communityUser.ts
@@ -4,9 +4,10 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { UserContact } from '@entity/UserContact'
 
+import { User } from '@model/User'
+
 import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType'
 // import { UserContact as EmailContact } from '@entity/UserContact'
-import { User } from '@model/User'
 
 const communityDbUser: dbUser = {
   id: -1,
diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts
index 924e64895..77157e203 100644
--- a/backend/src/util/decay.ts
+++ b/backend/src/util/decay.ts
@@ -1,8 +1,9 @@
 import { Decimal } from 'decimal.js-light'
 
+import { Decay } from '@model/Decay'
+
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
-import { Decay } from '@model/Decay'
 
 // TODO: externalize all those definitions and functions into an external decay library
 
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index cd4841b9b..22a6ee5db 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -2,10 +2,11 @@ import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { Decimal } from 'decimal.js-light'
 
-import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 import { Decay } from '@model/Decay'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
+import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
+
 import { calculateDecay } from './decay'
 
 function isStringBoolean(value: string): boolean {

From 6dff07a7baf761e33bdd6e4828ba4b4d30f8099f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 18:25:47 +0200
Subject: [PATCH 072/101] Revert "do not allow user to edit admin
 contributions"

This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.
---
 .../src/graphql/resolver/BalanceResolver.ts   |  1 +
 .../resolver/CommunityResolver.test.ts        |  2 +-
 .../resolver/ContributionLinkResolver.test.ts |  2 +-
 .../resolver/ContributionLinkResolver.ts      |  6 +-
 .../resolver/ContributionResolver.test.ts     | 68 ++++---------------
 .../graphql/resolver/ContributionResolver.ts  |  9 +--
 .../resolver/TransactionLinkResolver.test.ts  |  6 +-
 .../resolver/TransactionLinkResolver.ts       |  8 +--
 .../resolver/TransactionResolver.test.ts      |  4 +-
 .../graphql/resolver/TransactionResolver.ts   |  8 +--
 .../src/graphql/resolver/UserResolver.test.ts |  4 +-
 backend/src/graphql/resolver/UserResolver.ts  | 15 ++--
 .../src/graphql/resolver/semaphore.test.ts    |  2 +-
 .../src/graphql/resolver/util/creations.ts    |  2 +-
 backend/src/middleware/klicktippMiddleware.ts |  2 +-
 backend/src/password/EncryptorUtils.ts        |  2 +-
 backend/src/seeds/factory/contributionLink.ts |  2 +-
 backend/src/util/communityUser.ts             |  2 +-
 backend/src/util/decay.ts                     |  2 +-
 backend/src/util/validate.ts                  |  2 +-
 20 files changed, 52 insertions(+), 97 deletions(-)

diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 31e2384d4..7600f12b9 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -9,6 +9,7 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { GdtResolver } from './GdtResolver'
 import { getLastTransaction } from './util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
+
 import { Balance } from '@model/Balance'
 
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index 5513a73b8..f4352c095 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -6,8 +6,8 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Community as DbCommunity } from '@entity/Community'
-import { testEnvironment } from '@test/helpers'
 import { getCommunities } from '@/seeds/graphql/queries'
+import { testEnvironment } from '@test/helpers'
 
 let query: any
 
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 7dfb44e55..6a69e257e 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -9,7 +9,6 @@ import { GraphQLError } from 'graphql'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
 import { logger } from '@test/testSetup'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import {
   login,
   createContributionLink,
@@ -17,6 +16,7 @@ import {
   updateContributionLink,
 } from '@/seeds/graphql/mutations'
 import { listContributionLinks } from '@/seeds/graphql/queries'
+import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 4b19c36e1..55a23187f 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -3,20 +3,20 @@ import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type
 import { MoreThan, IsNull } from '@dbTools/typeorm'
 
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
-import { isStartEndDateValid } from './util/creations'
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,
   CONTRIBUTIONLINK_NAME_MIN_CHARS,
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
+import { isStartEndDateValid } from './util/creations'
+import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
 import { ContributionLinkList } from '@model/ContributionLinkList'
 import { ContributionLink } from '@model/ContributionLink'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
+import { RIGHTS } from '@/auth/RIGHTS'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'
-import { RIGHTS } from '@/auth/RIGHTS'
 
 // TODO: this is a strange construct
 import LogError from '@/server/LogError'
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 5570f953f..201d04db1 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -13,18 +13,6 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { UserInputError } from 'apollo-server-express'
 import { Event as DbEvent } from '@entity/Event'
-import {
-  cleanDB,
-  resetToken,
-  testEnvironment,
-  contributionDateFormatter,
-  resetEntity,
-} from '@test/helpers'
-import { logger, i18n as localization } from '@test/testSetup'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { ContributionListResult } from '@model/Contribution'
-import { ContributionStatus } from '@enum/ContributionStatus'
-import { Order } from '@enum/Order'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
@@ -52,12 +40,24 @@ import {
   sendContributionDeletedEmail,
   sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
+import {
+  cleanDB,
+  resetToken,
+  testEnvironment,
+  contributionDateFormatter,
+  resetEntity,
+} from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { EventType } from '@/event/Event'
+import { logger, i18n as localization } from '@test/testSetup'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+import { ContributionListResult } from '@model/Contribution'
+import { ContributionStatus } from '@enum/ContributionStatus'
+import { Order } from '@enum/Order'
 
 jest.mock('@/emails/sendEmailVariants')
 
@@ -2040,50 +2040,6 @@ describe('ContributionResolver', () => {
                   }),
                 )
               })
-
-              describe('user tries to update admin contribution', () => {
-                beforeAll(async () => {
-                  await mutate({
-                    mutation: login,
-                    variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-                  })
-                })
-
-                afterAll(async () => {
-                  await mutate({
-                    mutation: login,
-                    variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
-                  })
-                })
-
-                it('logs and throws "Cannot update contribution of moderator" error', async () => {
-                  jest.clearAllMocks()
-                  const adminContribution = await Contribution.findOne({
-                    where: {
-                      moderatorId: admin.id,
-                      userId: bibi.id,
-                    },
-                  })
-                  await expect(
-                    mutate({
-                      mutation: updateContribution,
-                      variables: {
-                        contributionId: (adminContribution && adminContribution.id) || -1,
-                        amount: 100.0,
-                        memo: 'Test Test Test',
-                        creationDate: new Date().toString(),
-                      },
-                    }),
-                  ).resolves.toMatchObject({
-                    errors: [new GraphQLError('Cannot update contribution of moderator')],
-                  })
-                  expect(logger.error).toBeCalledWith(
-                    'Cannot update contribution of moderator',
-                    expect.any(Object),
-                    bibi.id,
-                  )
-                })
-              })
             })
 
             describe('second creation surpasses the available amount ', () => {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index f756b3a0d..a9446db7f 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -9,6 +9,9 @@ import { UserContact } from '@entity/UserContact'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { getLastTransaction } from './util/getLastTransaction'
+import { findContributions } from './util/findContributions'
 import {
   getUserCreation,
   validateContribution,
@@ -16,9 +19,6 @@ import {
   isValidDateString,
   getOpenCreations,
 } from './util/creations'
-import { findContributions } from './util/findContributions'
-import { getLastTransaction } from './util/getLastTransaction'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { Contribution, ContributionListResult } from '@model/Contribution'
 import { Decay } from '@model/Decay'
@@ -201,9 +201,6 @@ export class ContributionResolver {
         user.id,
       )
     }
-    if (contributionToUpdate.moderatorId) {
-      throw new LogError('Cannot update contribution of moderator', contributionToUpdate, user.id)
-    }
     if (
       contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
       contributionToUpdate.contributionStatus !== ContributionStatus.PENDING
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 4f72276d4..fd2a44b4b 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -14,11 +14,9 @@ import { Transaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
 import { UserContact } from '@entity/UserContact'
 import { transactionLinkCode } from './TransactionLinkResolver'
-import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { logger } from '@test/testSetup'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
+import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { userFactory } from '@/seeds/factory/user'
@@ -35,7 +33,9 @@ import {
   confirmContribution,
 } from '@/seeds/graphql/mutations'
 import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+import { logger } from '@test/testSetup'
 import { EventType } from '@/event/Event'
 
 // mock semaphore to allow use fake timers
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 3ff6fd36a..6aa829ac1 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -10,10 +10,10 @@ import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql'
-import transactionLinkList from './util/transactionLinkList'
-import { getLastTransaction } from './util/getLastTransaction'
-import { executeTransaction } from './TransactionResolver'
 import { getUserCreation, validateContribution } from './util/creations'
+import { executeTransaction } from './TransactionResolver'
+import { getLastTransaction } from './util/getLastTransaction'
+import transactionLinkList from './util/transactionLinkList'
 import { User } from '@model/User'
 import { ContributionLink } from '@model/ContributionLink'
 import { Decay } from '@model/Decay'
@@ -25,12 +25,12 @@ import { ContributionCycleType } from '@enum/ContributionCycleType'
 import TransactionLinkArgs from '@arg/TransactionLinkArgs'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
-import QueryLinkResult from '@union/QueryLinkResult'
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import { calculateBalance } from '@/util/validate'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
+import QueryLinkResult from '@union/QueryLinkResult'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
 import {
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 6d039784e..f26234363 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -11,8 +11,6 @@ import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
 import { findUserByEmail } from './UserResolver'
-import { cleanDB, testEnvironment } from '@test/helpers'
-import { logger } from '@test/testSetup'
 import { EventType } from '@/event/Event'
 import { userFactory } from '@/seeds/factory/user'
 import {
@@ -25,6 +23,8 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
+import { cleanDB, testEnvironment } from '@test/helpers'
+import { logger } from '@test/testSetup'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a699e7291..f38a4a07b 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -9,10 +9,10 @@ import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { getLastTransaction } from './util/getLastTransaction'
-import { findUserByEmail } from './UserResolver'
-import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { BalanceResolver } from './BalanceResolver'
+import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { findUserByEmail } from './UserResolver'
+import { getLastTransaction } from './util/getLastTransaction'
 import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
@@ -21,9 +21,9 @@ import { Transaction } from '@model/Transaction'
 import { TransactionList } from '@model/TransactionList'
 import { Order } from '@enum/Order'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { calculateBalance } from '@/util/validate'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
 import Paginated from '@arg/Paginated'
-import { calculateBalance } from '@/util/validate'
 
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser } from '@/server/context'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 1b6239fea..aebd0f0eb 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -15,10 +15,9 @@ import { Event as DbEvent } from '@entity/Event'
 import { OptInType } from '@enum/OptInType'
 import { UserContactType } from '@enum/UserContactType'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
+import { objectValuesToArray } from '@/util/utilities'
 import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
-import { ContributionLink } from '@model/ContributionLink'
-import { objectValuesToArray } from '@/util/utilities'
 import { printTimeDuration } from '@/util/time'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
@@ -45,6 +44,7 @@ import {
 } from '@/emails/sendEmailVariants'
 import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
+import { ContributionLink } from '@model/ContributionLink'
 import { EventType } from '@/event/Event'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 0c1cefd12..54d4f583f 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -21,8 +21,8 @@ import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { FULL_CREATION_AVAILABLE } from './const/const'
 import { getUserCreations } from './util/creations'
+import { FULL_CREATION_AVAILABLE } from './const/const'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import { UserRepository } from '@repository/User'
 
@@ -33,18 +33,19 @@ import { OptInType } from '@enum/OptInType'
 import { Order } from '@enum/Order'
 import { UserContactType } from '@enum/UserContactType'
 
-import CreateUserArgs from '@arg/CreateUserArgs'
-import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
-import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
-import Paginated from '@arg/Paginated'
-import SearchUsersArgs from '@arg/SearchUsersArgs'
-import { getTimeDurationObject, printTimeDuration } from '@/util/time'
 import {
   sendAccountActivationEmail,
   sendAccountMultiRegistrationEmail,
   sendResetPasswordEmail,
 } from '@/emails/sendEmailVariants'
 
+import { getTimeDurationObject, printTimeDuration } from '@/util/time'
+import CreateUserArgs from '@arg/CreateUserArgs'
+import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
+import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
+import Paginated from '@arg/Paginated'
+import SearchUsersArgs from '@arg/SearchUsersArgs'
+
 import { backendLogger as logger } from '@/server/logger'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import CONFIG from '@/config'
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index cc4d589dc..6b1976021 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -5,12 +5,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Decimal } from 'decimal.js-light'
-import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation'
+import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers'
 import {
   confirmContribution,
   createContribution,
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index dba0c8c81..6ebeae8b9 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -3,9 +3,9 @@
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import { Decimal } from 'decimal.js-light'
-import { OpenCreation } from '@model/OpenCreation'
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const'
 import { backendLogger as logger } from '@/server/logger'
+import { OpenCreation } from '@model/OpenCreation'
 import LogError from '@/server/LogError'
 
 interface CreationMap {
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 568120fe8..0469b4ccc 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -3,8 +3,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { MiddlewareFn } from 'type-graphql'
-import { KlickTipp } from '@model/KlickTipp'
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
+import { KlickTipp } from '@model/KlickTipp'
 import CONFIG from '@/config'
 import { klickTippLogger as logger } from '@/server/logger'
 
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index ab8a333d2..b4531b3bb 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -2,10 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { User } from '@entity/User'
-import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
+import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs
 const sodium = require('sodium-native')
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 6e1d9bd50..5925cdcfe 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
-import { ContributionLink } from '@model/ContributionLink'
 import { login, createContributionLink } from '@/seeds/graphql/mutations'
+import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface'
 
 export const contributionLinkFactory = async (
diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts
index d086727bf..dfa477da9 100644
--- a/backend/src/util/communityUser.ts
+++ b/backend/src/util/communityUser.ts
@@ -3,9 +3,9 @@
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { UserContact } from '@entity/UserContact'
-import { User } from '@model/User'
 import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType'
 // import { UserContact as EmailContact } from '@entity/UserContact'
+import { User } from '@model/User'
 
 const communityDbUser: dbUser = {
   id: -1,
diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts
index 3c76b0995..d35eb83a4 100644
--- a/backend/src/util/decay.ts
+++ b/backend/src/util/decay.ts
@@ -1,6 +1,6 @@
 import { Decimal } from 'decimal.js-light'
-import { Decay } from '@model/Decay'
 import CONFIG from '@/config'
+import { Decay } from '@model/Decay'
 import LogError from '@/server/LogError'
 
 // TODO: externalize all those definitions and functions into an external decay library
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index aaadbdd31..ec28dfa13 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -2,9 +2,9 @@ import { Decimal } from 'decimal.js-light'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { calculateDecay } from './decay'
+import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { Decay } from '@model/Decay'
-import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction'
 
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()

From 695d037a2dfaffe815b1555075a7fe45fa9d4c82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 18:33:36 +0200
Subject: [PATCH 073/101] do not allow edit contribution for admin
 contributions in backend

---
 .../resolver/ContributionResolver.test.ts     | 44 +++++++++++++++++++
 .../graphql/resolver/ContributionResolver.ts  |  3 ++
 2 files changed, 47 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 6d3f29280..490f5a4a7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -2042,6 +2042,50 @@ describe('ContributionResolver', () => {
                   }),
                 )
               })
+
+              describe('user tries to update admin contribution', () => {
+                beforeAll(async () => {
+                  await mutate({
+                    mutation: login,
+                    variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+                  })
+                })
+
+                afterAll(async () => {
+                  await mutate({
+                    mutation: login,
+                    variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+                  })
+                })
+
+                it('logs and throws "Cannot update contribution of moderator" error', async () => {
+                  jest.clearAllMocks()
+                  const adminContribution = await Contribution.findOne({
+                    where: {
+                      moderatorId: admin.id,
+                      userId: bibi.id,
+                    },
+                  })
+                  await expect(
+                    mutate({
+                      mutation: updateContribution,
+                      variables: {
+                        contributionId: (adminContribution && adminContribution.id) || -1,
+                        amount: 100.0,
+                        memo: 'Test Test Test',
+                        creationDate: new Date().toString(),
+                      },
+                    }),
+                  ).resolves.toMatchObject({
+                    errors: [new GraphQLError('Cannot update contribution of moderator')],
+                  })
+                  expect(logger.error).toBeCalledWith(
+                    'Cannot update contribution of moderator',
+                    expect.any(Object),
+                    bibi.id,
+                  )
+                })
+              })
             })
 
             describe('second creation surpasses the available amount ', () => {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 1d3274b79..5969eaef2 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -201,6 +201,9 @@ export class ContributionResolver {
         user.id,
       )
     }
+    if (contributionToUpdate.moderatorId) {
+      throw new LogError('Cannot update contribution of moderator', contributionToUpdate, user.id)
+    }
     if (
       contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
       contributionToUpdate.contributionStatus !== ContributionStatus.PENDING

From c0141c18013f301549641d78d52230184ff0c5c5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 30 Mar 2023 19:18:51 +0200
Subject: [PATCH 074/101] no doubled imports

---
 backend/src/graphql/resolver/UserResolver.test.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index e0f21df8d..43b62b173 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -11,13 +11,7 @@ import { TransactionLink } from '@entity/TransactionLink'
 import { User } from '@entity/User'
 import { UserContact } from '@entity/UserContact'
 import { GraphQLError } from 'graphql'
-import {
-  v4 as uuidv4,
-  validate as validateUUID,
-  version as versionUUID,
-  validate as validateUUID,
-  version as versionUUID,
-} from 'uuid'
+import { v4 as uuidv4, validate as validateUUID, version as versionUUID } from 'uuid'
 
 import { OptInType } from '@enum/OptInType'
 import { PasswordEncryptionType } from '@enum/PasswordEncryptionType'

From f238a3ddb11ca486960d912baf4afc7ec1bc394c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:30:15 +0200
Subject: [PATCH 075/101] adapt change user formular unit tests to changes

---
 .../components/ChangeUserRoleFormular.spec.js | 199 ++++++++++++------
 1 file changed, 137 insertions(+), 62 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 7f2154ecc..4048a9fa3 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils'
 import ChangeUserRoleFormular from './ChangeUserRoleFormular'
 import { setUserRole } from '../graphql/setUserRole'
 import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
+import { BIconFileEarmarkSpreadsheet } from 'bootstrap-vue'
 
 const localVue = global.localVue
 
@@ -28,6 +29,7 @@ const mocks = {
 
 let propsData
 let wrapper
+let spy
 
 describe('ChangeUserRoleFormular', () => {
   const Wrapper = () => {
@@ -70,12 +72,16 @@ describe('ChangeUserRoleFormular', () => {
         expect(wrapper.text()).toContain('userRole.notChangeYourSelf')
       })
 
-      it('has role select disabled', () => {
-        expect(wrapper.find('select[disabled="disabled"]').exists()).toBe(true)
+      it('has no role select', () => {
+        expect(wrapper.find('select.role-select').exists()).toBe(false)
+      })
+
+      it('has no button', () => {
+        expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
       })
     })
 
-    describe('change others role', () => {
+    describe("change other user's role", () => {
       let rolesToSelect
 
       describe('general', () => {
@@ -106,19 +112,12 @@ describe('ChangeUserRoleFormular', () => {
           expect(wrapper.find('select.role-select[disabled="disabled"]').exists()).toBe(false)
         })
 
-        describe('on API error', () => {
-          beforeEach(() => {
-            apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
-            rolesToSelect.at(1).setSelected()
-          })
-
-          it('toasts an error message', () => {
-            expect(toastErrorSpy).toBeCalledWith('Oh no!')
-          })
+        it('has "change_user_role" button', () => {
+          expect(wrapper.find('button.btn.btn-danger').text()).toBe('change_user_role')
         })
       })
 
-      describe('user is usual user', () => {
+      describe('user has role "usual user"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -141,6 +140,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(0).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -152,39 +155,73 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(1).setSelected()
             })
 
-            it('calls the API', () => {
-              expect(apolloMutateMock).toBeCalledWith(
-                expect.objectContaining({
-                  mutation: setUserRole,
-                  variables: {
-                    userId: 1,
-                    isAdmin: true,
-                  },
-                }),
-              )
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
             })
 
-            it('emits "updateIsAdmin"', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
-                expect.arrayContaining([
-                  expect.arrayContaining([
-                    {
-                      userId: 1,
-                      isAdmin: expect.any(Date),
-                    },
-                  ]),
-                ]),
-              )
-            })
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
 
-            it('toasts success message', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: true,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: expect.any(Date),
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
             })
           })
         })
       })
 
-      describe('user is admin', () => {
+      describe('user has role "admin"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -207,6 +244,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(1).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -218,33 +259,67 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(0).setSelected()
             })
 
-            it('calls the API', () => {
-              expect(apolloMutateMock).toBeCalledWith(
-                expect.objectContaining({
-                  mutation: setUserRole,
-                  variables: {
-                    userId: 1,
-                    isAdmin: false,
-                  },
-                }),
-              )
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
             })
 
-            it('emits "updateIsAdmin"', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
-                expect.arrayContaining([
-                  expect.arrayContaining([
-                    {
-                      userId: 1,
-                      isAdmin: null,
-                    },
-                  ]),
-                ]),
-              )
-            })
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
 
-            it('toasts success message', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: false,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: null,
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
             })
           })
         })

From e70552b3fb636cbd165d6c71e8672faa1fe11e52 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:31:18 +0200
Subject: [PATCH 076/101] add user recovery tests to user search page

---
 admin/src/pages/UserSearch.spec.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 77e8a3559..0d145cb89 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -25,7 +25,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           email: 'benjamin@bluemchen.de',
           creation: [1000, 1000, 1000],
           emailChecked: true,
-          deletedAt: null,
+          deletedAt: new Date(),
         },
         {
           userId: 3,
@@ -243,6 +243,17 @@ describe('UserSearch', () => {
       })
     })
 
+    describe('recover user', () => {
+      const userId = 2
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'SearchUserTable' }).vm.$emit('updateDeletedAt', userId, null)
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith('user_recovered')
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({

From cc91cd32dc65b9c1bdbe14a4bf3a82be29699b09 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:35:14 +0200
Subject: [PATCH 077/101] fix linting

---
 admin/src/components/ChangeUserRoleFormular.spec.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 4048a9fa3..381d2ce43 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -2,7 +2,6 @@ import { mount } from '@vue/test-utils'
 import ChangeUserRoleFormular from './ChangeUserRoleFormular'
 import { setUserRole } from '../graphql/setUserRole'
 import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
-import { BIconFileEarmarkSpreadsheet } from 'bootstrap-vue'
 
 const localVue = global.localVue
 
@@ -157,7 +156,9 @@ describe('ChangeUserRoleFormular', () => {
 
             it('has "change_user_role" button enabled', () => {
               expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
             })
 
             describe('clicking the "change_user_role" button', () => {
@@ -261,7 +262,9 @@ describe('ChangeUserRoleFormular', () => {
 
             it('has "change_user_role" button enabled', () => {
               expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
             })
 
             describe('clicking the "change_user_role" button', () => {

From c25a9f936a66a247ea7ccdc0960bda14eea30de8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 31 Mar 2023 09:40:28 +0200
Subject: [PATCH 078/101] Center the canvas and remove bottom gap

---
 frontend/src/components/QrCode/FigureQrCode.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.vue b/frontend/src/components/QrCode/FigureQrCode.vue
index 71570f79d..350cc3f61 100644
--- a/frontend/src/components/QrCode/FigureQrCode.vue
+++ b/frontend/src/components/QrCode/FigureQrCode.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="figure-qr-code">
     <div class="qrbox">
-      <q-r-canvas :options="options" class="canvas mb-4" id="qrcanvas" />
+      <div>
+        <q-r-canvas :options="options" class="canvas mb-3" id="qrcanvas" />
+      </div>
       <a id="download" download="GradidoLinkQRCode.png" href="" @click="downloadImg(this)">
         {{ $t('download') }}
       </a>

From 2f67f0634c0282e9314913bd53c9482007cac2f9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 10:27:49 +0200
Subject: [PATCH 079/101] update admin/src/components/DeletedUserFormular.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 admin/src/components/DeletedUserFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 93ec12d8d..19d1a1dfe 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,7 +6,7 @@
     <div v-else class="mt-5">
       <div class="mt-3 mb-5">
         <b-button
-          v-if="item.deletedAt === null"
+          v-if="!item.deletedAt"
           variant="danger"
           v-b-modal.delete-user-modal
           @click="showDeleteModal()"

From 01afe6a068a76bea6bea42e451ed3c37e99beae3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 10:32:45 +0200
Subject: [PATCH 080/101] update admin/src/components/DeletedUserFormular.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 admin/src/components/DeletedUserFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 19d1a1dfe..11c8041c3 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -14,7 +14,7 @@
           {{ $t('delete_user') }}
         </b-button>
         <b-button
-          v-if="item.deletedAt !== null"
+          v-else
           variant="success"
           v-b-modal.delete-user-modal
           @click="showUndeleteModal()"

From 8a505bb1baec5908dbaeb3b7dac0633976c0b8d2 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 11:16:58 +0200
Subject: [PATCH 081/101] fix linting

---
 admin/src/components/DeletedUserFormular.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 11c8041c3..2160f82e1 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -13,12 +13,7 @@
         >
           {{ $t('delete_user') }}
         </b-button>
-        <b-button
-          v-else
-          variant="success"
-          v-b-modal.delete-user-modal
-          @click="showUndeleteModal()"
-        >
+        <b-button v-else variant="success" v-b-modal.delete-user-modal @click="showUndeleteModal()">
           {{ $t('undelete_user') }}
         </b-button>
       </div>

From 05fc48198e28fdad9d15b290aa71690c695ebd4d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 31 Mar 2023 12:08:55 +0200
Subject: [PATCH 082/101] merge conflicts

---
 backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts         | 2 --
 backend/src/graphql/resolver/ContributionLinkResolver.test.ts | 2 +-
 backend/src/graphql/resolver/TransactionLinkResolver.test.ts  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
index 390662ec1..36cabba63 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
@@ -1,10 +1,8 @@
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-
 import { User as DbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 
-
 import { Event } from './Event'
 import { EventType } from './EventType'
 
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 2247318a3..318b5a230 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -12,7 +12,7 @@ import { GraphQLError } from 'graphql'
 import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { logger } from '@test/testSetup'
 
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { userFactory } from '@/seeds/factory/user'
 import {
   login,
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 70238e515..0d47b8006 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -18,7 +18,7 @@ import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
 import { logger } from '@test/testSetup'
 
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { creations } from '@/seeds/creation/index'
 import { creationFactory } from '@/seeds/factory/creation'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'

From 1fa6d3e46943acf9f3697c4b3cb2a61cfd319a31 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 31 Mar 2023 12:10:50 +0200
Subject: [PATCH 083/101] lint fixes

---
 backend/src/graphql/resolver/ContributionResolver.test.ts    | 4 ++--
 backend/src/graphql/resolver/TransactionLinkResolver.test.ts | 1 +
 backend/src/graphql/resolver/TransactionResolver.test.ts     | 1 +
 backend/src/graphql/resolver/TransactionResolver.ts          | 3 +--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 5bca29972..8a391618e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -25,12 +25,14 @@ import {
   contributionDateFormatter,
   resetEntity,
 } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 
 import {
   sendContributionConfirmedEmail,
   sendContributionDeletedEmail,
   sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
+import { EventType } from '@/event/Events'
 import { creations } from '@/seeds/creation/index'
 import { creationFactory } from '@/seeds/factory/creation'
 import { userFactory } from '@/seeds/factory/user'
@@ -56,8 +58,6 @@ import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { EventType } from '@/event/Events'
-import { logger, i18n as localization } from '@test/testSetup'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
 
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 0d47b8006..1c79e2815 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -38,6 +38,7 @@ import { transactionLinks } from '@/seeds/transactionLink/index'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
+
 import { transactionLinkCode } from './TransactionLinkResolver'
 
 // mock semaphore to allow use fake timers
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 63606e4ee..65fb13996 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -10,6 +10,7 @@ import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
+
 import { cleanDB, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a78d51e7a..eb9b19b3f 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -25,12 +25,11 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Events'
-
-import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 import { communityUser } from '@/util/communityUser'
+import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { calculateBalance } from '@/util/validate'
 import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions'
 

From 35855f80ed8723fefc3ee23ce2516b6974d1ab18 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 31 Mar 2023 13:14:21 +0200
Subject: [PATCH 084/101] remove fileextension import rule from n, its covered
 in import

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

diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index a8ce7b690..4aa367a85 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -124,7 +124,7 @@ module.exports = {
     'n/shebang': 'error',
     'n/callback-return': 'error',
     'n/exports-style': 'error',
-    'n/file-extension-in-import': ['error', 'never'],
+    'n/file-extension-in-import': 'off',
     'n/global-require': 'error',
     'n/no-mixed-requires': 'error',
     'n/no-process-env': 'error',

From bd29624c794fe6fe0b0ea0057fc6efe32aab273f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 31 Mar 2023 16:01:43 +0200
Subject: [PATCH 085/101] Refactor downloadImg to refs

---
 frontend/src/components/QrCode/FigureQrCode.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.vue b/frontend/src/components/QrCode/FigureQrCode.vue
index 350cc3f61..40b1098dc 100644
--- a/frontend/src/components/QrCode/FigureQrCode.vue
+++ b/frontend/src/components/QrCode/FigureQrCode.vue
@@ -2,9 +2,15 @@
   <div class="figure-qr-code">
     <div class="qrbox">
       <div>
-        <q-r-canvas :options="options" class="canvas mb-3" id="qrcanvas" />
+        <q-r-canvas :options="options" class="canvas mb-3" id="qrcanvas" ref="canvas" />
       </div>
-      <a id="download" download="GradidoLinkQRCode.png" href="" @click="downloadImg(this)">
+      <a
+        id="download"
+        ref="download"
+        download="GradidoLinkQRCode.png"
+        href=""
+        @click="downloadImg(this)"
+      >
         {{ $t('download') }}
       </a>
     </div>
@@ -44,9 +50,9 @@ export default {
   },
   methods: {
     downloadImg() {
-      const canvas = document.getElementById('qrcanvas')
+      const canvas = this.$refs.canvas.$el
       const image = canvas.toDataURL('image/png')
-      document.getElementById('download').href = image
+      this.$refs.download.href = image
     },
   },
 }

From 06523f38fa77efaf24f26fdf575c31046893c0be Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 31 Mar 2023 16:02:05 +0200
Subject: [PATCH 086/101] Unit tests for FigureQrCode

---
 .../components/QrCode/FigureQrCode.spec.js    | 58 +++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.spec.js b/frontend/src/components/QrCode/FigureQrCode.spec.js
index 30a8277e1..f883f09a0 100644
--- a/frontend/src/components/QrCode/FigureQrCode.spec.js
+++ b/frontend/src/components/QrCode/FigureQrCode.spec.js
@@ -22,12 +22,62 @@ describe('FigureQrCode', () => {
       wrapper = Wrapper()
     })
 
-    it('renders the Div Element ".figure-qr-code"', () => {
-      expect(wrapper.find('div.figure-qr-code').exists()).toBeTruthy()
+    afterEach(() => {
+      jest.clearAllMocks()
     })
 
-    it('renders the Div Element "q-r-canvas"', () => {
-      expect(wrapper.find('q-r-canvas'))
+    it('has options filled', () => {
+      expect(wrapper.vm.options).toEqual({
+        cellSize: 8,
+        correctLevel: 'H',
+        data: '',
+      })
+    })
+
+    it('renders the Div Element ".figure-qr-code"', () => {
+      expect(wrapper.find('div.figure-qr-code').exists()).toBe(true)
+    })
+
+    it('renders the Div Element "qrbox"', () => {
+      expect(wrapper.find('div.qrbox').exists()).toBe(true)
+    })
+
+    it('renders the Canvas Element "#qrcanvas"', () => {
+      const canvas = wrapper.find('#qrcanvas')
+
+      // console.log(canvas.html())
+      expect(canvas.exists()).toBe(true)
+
+      // Hier können Sie weitere Tests für das Canvas-Element durchführen
+      // z.B. überprüfen Sie die Breite und Höhe des Canvas-Elements oder den Canvas-Kontext
+
+      const canvasEl = canvas.element
+      const canvasWidth = canvasEl.width
+      const canvasHeight = canvasEl.height
+
+      expect(canvasWidth).toBeGreaterThan(0)
+      expect(canvasHeight).toBeGreaterThan(0)
+
+      const canvasContext = canvasEl.getContext('2d')
+      expect(canvasContext).not.toBeNull()
+    })
+
+    it('renders the A Element "#download"', () => {
+      const downloadLink = wrapper.find('#download')
+      expect(downloadLink.exists()).toBe(true)
+    })
+
+    describe('Download QR-Code link', () => {
+      beforeEach(() => {
+        const downloadLink = wrapper.find('#download')
+        downloadLink.trigger('click')
+        // await wrapper.vm.$nextTick()
+      })
+
+      it('click the A Element "#download" set an href', () => {
+        // expect(toDataURLStub).toHaveBeenCalledWith('image/png')
+        expect(wrapper.find('#download').attributes('href')).toEqual('')
+      })
     })
   })
 })

From 386b451dd61290eb7dfc0621e1f5c05b971effd1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 31 Mar 2023 16:09:50 +0200
Subject: [PATCH 087/101] Call toDataUrl on canvasEl and expect data on href

---
 frontend/src/components/QrCode/FigureQrCode.spec.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/QrCode/FigureQrCode.spec.js b/frontend/src/components/QrCode/FigureQrCode.spec.js
index f883f09a0..0c0b7bf3a 100644
--- a/frontend/src/components/QrCode/FigureQrCode.spec.js
+++ b/frontend/src/components/QrCode/FigureQrCode.spec.js
@@ -45,12 +45,7 @@ describe('FigureQrCode', () => {
     it('renders the Canvas Element "#qrcanvas"', () => {
       const canvas = wrapper.find('#qrcanvas')
 
-      // console.log(canvas.html())
       expect(canvas.exists()).toBe(true)
-
-      // Hier können Sie weitere Tests für das Canvas-Element durchführen
-      // z.B. überprüfen Sie die Breite und Höhe des Canvas-Elements oder den Canvas-Kontext
-
       const canvasEl = canvas.element
       const canvasWidth = canvasEl.width
       const canvasHeight = canvasEl.height
@@ -58,7 +53,7 @@ describe('FigureQrCode', () => {
       expect(canvasWidth).toBeGreaterThan(0)
       expect(canvasHeight).toBeGreaterThan(0)
 
-      const canvasContext = canvasEl.getContext('2d')
+      const canvasContext = canvasEl.toDataURL('image/png')
       expect(canvasContext).not.toBeNull()
     })
 
@@ -71,12 +66,10 @@ describe('FigureQrCode', () => {
       beforeEach(() => {
         const downloadLink = wrapper.find('#download')
         downloadLink.trigger('click')
-        // await wrapper.vm.$nextTick()
       })
 
       it('click the A Element "#download" set an href', () => {
-        // expect(toDataURLStub).toHaveBeenCalledWith('image/png')
-        expect(wrapper.find('#download').attributes('href')).toEqual('')
+        expect(wrapper.find('#download').attributes('href')).toEqual('data:image/png;base64,00')
       })
     })
   })

From 03f1cc320684711d23e17a09578ba4ddaefddacd Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 3 Apr 2023 12:52:49 +0200
Subject: [PATCH 088/101] implement Hannes suggestion regarding export style

---
 database/src/prepare.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/database/src/prepare.ts b/database/src/prepare.ts
index de47f7336..3c64b1c5e 100644
--- a/database/src/prepare.ts
+++ b/database/src/prepare.ts
@@ -2,7 +2,7 @@ import { createConnection } from 'mysql2/promise'
 
 import CONFIG from './config'
 
-const createDatabase = async (): Promise<void> => {
+export const createDatabase = async (): Promise<void> => {
   const con = await createConnection({
     host: CONFIG.DB_HOST,
     port: CONFIG.DB_PORT,
@@ -36,5 +36,3 @@ const createDatabase = async (): Promise<void> => {
 
   await con.end()
 }
-
-export { createDatabase }

From 60ccdc5beb194ae771ae7606562b60de74aced6d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 12:54:11 +0200
Subject: [PATCH 089/101] feat(backend): previuos balance in transaction

---
 backend/src/graphql/model/Transaction.ts            | 11 ++++++++++-
 backend/src/graphql/resolver/TransactionResolver.ts |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 1b857391b..dc20a5c83 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -9,7 +9,12 @@ import { User } from './User'
 
 @ObjectType()
 export class Transaction {
-  constructor(transaction: dbTransaction, user: User, linkedUser: User | null = null) {
+  constructor(
+    transaction: dbTransaction,
+    user: User,
+    linkedUser: User | null = null,
+    previuosBalance: Decimal = new Decimal(0),
+  ) {
     this.id = transaction.id
     this.user = user
     this.previous = transaction.previous
@@ -47,6 +52,7 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
+    this.previousBalance = previuosBalance
   }
 
   @Field(() => Int)
@@ -70,6 +76,9 @@ export class Transaction {
   @Field(() => Date)
   balanceDate: Date
 
+  @Field(() => Decimal)
+  previousBalance: Decimal
+
   @Field(() => Decay)
   decay: Decay
 
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 430cdb363..8c51c6681 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -283,12 +283,13 @@ export class TransactionResolver {
     }
 
     // transactions
-    userTransactions.forEach((userTransaction) => {
+    userTransactions.forEach((userTransaction, idx) => {
       const linkedUser =
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      transactions.push(new Transaction(userTransaction, self, linkedUser))
+      const previousBalance = idx ? userTransactions[idx - 1].balance : new Decimal(0)
+      transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 

From d5782735896c61abc774292a4a9bdea2b192711e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:17:42 +0200
Subject: [PATCH 090/101] correct calculation of previuos balance

---
 backend/src/graphql/model/Transaction.ts            | 2 +-
 backend/src/graphql/resolver/TransactionResolver.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index dc20a5c83..50ca7d098 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -52,7 +52,7 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
-    this.previousBalance = previuosBalance
+    this.previousBalance = previuosBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
   }
 
   @Field(() => Int)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 8c51c6681..72e919dad 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -288,7 +288,8 @@ export class TransactionResolver {
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      const previousBalance = idx ? userTransactions[idx - 1].balance : new Decimal(0)
+      const previousBalance =
+        idx < userTransactions.length - 1 ? userTransactions[idx + 1].balance : new Decimal(0)
       transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)

From adbd8b1e5d01a71c7a98aa6a1808bd817c021e90 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:50:22 +0200
Subject: [PATCH 091/101] add previous balance to virtual transaction link
 transaction

---
 backend/src/graphql/resolver/TransactionResolver.ts | 1 +
 backend/src/util/virtualTransactions.ts             | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 72e919dad..d855a0701 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -276,6 +276,7 @@ export class TransactionResolver {
             firstDate || now,
             lastDate || now,
             self,
+            (userTransactions.length && userTransactions[0].balance) || new Decimal(0),
           ),
         )
         logger.debug(`transactions=${transactions}`)
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 68a37746b..9f4def31e 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -38,6 +38,7 @@ const virtualLinkTransaction = (
   createdAt: Date,
   validUntil: Date,
   user: User,
+  previousBalance: Decimal,
 ): Transaction => {
   const linkDbTransaction: dbTransaction = {
     id: -2,
@@ -54,7 +55,12 @@ const virtualLinkTransaction = (
     contribution: null,
     ...defaultModelFunctions,
   }
-  return new Transaction(linkDbTransaction, user)
+  return new Transaction(
+    linkDbTransaction,
+    user,
+    null,
+    previousBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
+  )
 }
 
 const virtualDecayTransaction = (

From 0a62c87dd992686302067d02ba2ad23d63b787c2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:54:48 +0200
Subject: [PATCH 092/101] locales for new and old balance

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b8635f44a..a5357e6d9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -89,6 +89,8 @@
     "decay_introduced": "Die Vergänglichkeit wurde eingeführt am:",
     "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion",
     "last_transaction": "Letzte Transaktion",
+    "new_balance": "Neuer Kontostand",
+    "old_balance": "Vorheriger Kontostand",
     "past_time": "Vergangene Zeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "total": "Gesamt",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 15449a208..42f22f709 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -89,6 +89,8 @@
     "decay_introduced": "Decay was introduced on:",
     "decay_since_last_transaction": "Decay since the last transaction",
     "last_transaction": "Last transaction:",
+    "new_balance": "New balance",
+    "old_balance": "Previous balance",
     "past_time": "Time passed",
     "Starting_block_decay": "Starting Block Decay",
     "total": "Total",

From 545e55659955c2de3371a7d352fe5a0fa8d5320e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 14:55:22 +0200
Subject: [PATCH 093/101] previuos balance from server, displayed in decay
 details

---
 .../DecayInformation-Decay.vue                |  4 +--
 .../DecayInformation-Long.vue                 | 22 +++++++++++----
 .../DecayInformations/DecayInformation.vue    | 18 ++++++++++++-
 .../src/components/GddTransactionList.vue     | 27 +++----------------
 .../Transactions/TransactionCreation.vue      | 15 +++++++++--
 .../Transactions/TransactionDecay.vue         |  9 ++++---
 .../Transactions/TransactionReceive.vue       | 15 +++++++++--
 .../Transactions/TransactionSend.vue          | 15 +++++++++--
 frontend/src/graphql/queries.js               |  1 +
 9 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 7abdb0f2b..ce679fb30 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -12,7 +12,7 @@
           </b-col>
           <b-col offset="1" offset-md="0" offset-lg="0">
             <div>
-              {{ previousBookedBalance | GDD }}
+              {{ previousBalance | GDD }}
               {{ decay === '0' ? $t('math.minus') : '' }}
               {{ decay | GDD }} {{ $t('math.equal') }}
               <b>{{ balance | GDD }}</b>
@@ -35,7 +35,7 @@ export default {
       type: String,
       required: true,
     },
-    previousBookedBalance: {
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index 0fd6b7f5c..d7e943225 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -24,8 +24,18 @@
         </b-row>
         <duration-row :decayStart="decay.start" :decayEnd="decay.end" />
 
-        <!-- Decay-->
+        <!-- Previous Balance -->
         <b-row class="mt-2">
+          <b-col cols="12" lg="6" md="3">
+            <div>{{ $t('decay.old_balance') }}</div>
+          </b-col>
+          <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
+            {{ previousBalance | GDD }}
+          </b-col>
+        </b-row>
+
+        <!-- Decay-->
+        <b-row class="mt-0">
           <b-col cols="12" lg="3" md="3">
             <div>{{ $t('decay.decay') }}</div>
           </b-col>
@@ -38,7 +48,7 @@
     <!-- Type-->
     <b-row>
       <b-col>
-        <b-row>
+        <b-row class="mb-2">
           <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <b-col cols="12" lg="3" md="3">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
           <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
@@ -46,12 +56,12 @@
           </b-col>
         </b-row>
         <!-- Total-->
-        <b-row>
+        <b-row class="border-top pt-2">
           <b-col cols="12" lg="3" md="3">
-            <div>{{ $t('decay.total') }}</div>
+            <div>{{ $t('decay.new_balance') }}</div>
           </b-col>
           <b-col offset="1" offset-md="0" offset-lg="0" class="text-right mr-5">
-            <b>{{ (Number(amount) + Number(decay.decay)) | GDD }}</b>
+            <b>{{ balance | GDD }}</b>
           </b-col>
         </b-row>
       </b-col>
@@ -67,6 +77,8 @@ export default {
     DurationRow,
   },
   props: {
+    balance: { type: String, default: '0' },
+    previousBalance: { type: String, default: '0' },
     amount: { type: String, default: '0' },
     typeId: { type: String, default: '' },
     memo: { type: String, default: '' },
diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue
index 3329fd021..0be12d0de 100644
--- a/frontend/src/components/DecayInformations/DecayInformation.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation.vue
@@ -7,7 +7,15 @@
       :decay="decay"
       :typeId="typeId"
     />
-    <decay-information-long v-else :amount="amount" :decay="decay" :typeId="typeId" :memo="memo" />
+    <decay-information-long
+      v-else
+      :amount="amount"
+      :decay="decay"
+      :typeId="typeId"
+      :memo="memo"
+      :balance="balance"
+      :previousBalance="previousBalance"
+    />
   </div>
 </template>
 <script>
@@ -39,6 +47,14 @@ export default {
       type: String,
       required: true,
     },
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
     isStartBlock() {
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index deed0dedb..5347fae83 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -19,10 +19,7 @@
           class="pointer bg-white appBoxShadow gradido-border-radius px-4 pt-2 test-list-group-item"
         >
           <template #DECAY>
-            <transaction-decay
-              v-bind="transactions[index]"
-              :previousBookedBalance="previousBookedBalance(index)"
-            />
+            <transaction-decay v-bind="transactions[index]" />
           </template>
         </transaction-list-item>
       </div>
@@ -34,27 +31,15 @@
             class="pointer mb-3 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
           >
             <template #SEND>
-              <transaction-send
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-send v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #RECEIVE>
-              <transaction-receive
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-receive v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #CREATION>
-              <transaction-creation
-                v-bind="transactions[index]"
-                :previousBookedBalance="previousBookedBalance(index)"
-                v-on="$listeners"
-              />
+              <transaction-creation v-bind="transactions[index]" v-on="$listeners" />
             </template>
 
             <template #LINK_SUMMARY>
@@ -127,10 +112,6 @@ export default {
       })
       window.scrollTo(0, 0)
     },
-    previousBookedBalance(idx) {
-      if (this.transactions[idx + 1]) return this.transactions[idx + 1].balance
-      return '0'
-    },
   },
   computed: {
     isPaginationVisible() {
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 36068a27e..e398d601f 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -18,7 +18,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -61,7 +68,11 @@ export default {
       type: Number,
       required: false,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index bdbde0cac..9b6a957e4 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -14,7 +14,7 @@
       <decay-information-decay
         :balance="balance"
         :decay="decay.decay"
-        :previousBookedBalance="previousBookedBalance"
+        :previousBalance="previousBalance"
       />
     </b-collapse>
   </div>
@@ -44,9 +44,10 @@ export default {
       type: Object,
       required: true,
     },
-    previousBookedBalance: {
-      type: String,
-      required: true,
+  },
+  computed: {
+    previousBalance() {
+      return String(Number(this.balance) - Number(this.decay.decay))
     },
   },
   data() {
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 9d6f0207a..1a620baa3 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -43,7 +43,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -85,7 +92,11 @@ export default {
     typeId: {
       type: String,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index f150dd320..6be191714 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -42,7 +42,14 @@
       </b-col>
     </b-row>
     <b-collapse class="pb-4 pt-lg-3" v-model="visible">
-      <decay-information :typeId="typeId" :decay="decay" :amount="amount" :memo="memo" />
+      <decay-information
+        :typeId="typeId"
+        :decay="decay"
+        :amount="amount"
+        :memo="memo"
+        :balance="balance"
+        :previousBalance="previousBalance"
+      />
     </b-collapse>
   </div>
 </template>
@@ -85,7 +92,11 @@ export default {
       type: String,
       required: true,
     },
-    previousBookedBalance: {
+    balance: {
+      type: String,
+      required: true,
+    },
+    previousBalance: {
       type: String,
       required: true,
     },
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 1a37d082b..d1d92c51f 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -33,6 +33,7 @@ export const transactionsQuery = gql`
         typeId
         amount
         balance
+        previousBalance
         balanceDate
         memo
         linkedUser {

From 166debcc7d6e8d5bbdfc25deed8b56e553567b67 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 15:10:01 +0200
Subject: [PATCH 094/101] add previous balance to unit tests

---
 frontend/src/components/GddTransactionList.spec.js       | 9 +++++++--
 .../components/Transactions/TransactionCreation.spec.js  | 3 ++-
 .../components/Transactions/TransactionReceive.spec.js   | 3 ++-
 .../src/components/Transactions/TransactionSend.spec.js  | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/GddTransactionList.spec.js b/frontend/src/components/GddTransactionList.spec.js
index 7473c11e0..b1cdf9eb9 100644
--- a/frontend/src/components/GddTransactionList.spec.js
+++ b/frontend/src/components/GddTransactionList.spec.js
@@ -93,8 +93,9 @@ describe('GddTransactionList', () => {
             {
               id: -1,
               typeId: 'DECAY',
-              amount: '-0.16778637075575395772595',
-              balance: '31.59320453982945549519405',
+              amount: '-0.16',
+              balance: '31.59',
+              previousBalance: '31.75',
               balanceDate: '2022-03-03T08:54:54',
               memo: '',
               linkedUser: null,
@@ -110,6 +111,7 @@ describe('GddTransactionList', () => {
               typeId: 'SEND',
               amount: '1',
               balance: '31.76099091058520945292',
+              previousBalance: '30.76',
               balanceDate: '2022-02-28T13:55:47',
               memo:
                 'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
@@ -129,6 +131,7 @@ describe('GddTransactionList', () => {
               typeId: 'RECEIVE',
               amount: '10',
               balance: '10',
+              previousBalance: '31.75',
               balanceDate: '2022-02-23T10:55:30',
               memo:
                 'Monatlanges Gift sog ein, In den Topf zuerst hinein… (William Shakespeare, Die Hexen aus Macbeth)',
@@ -148,6 +151,7 @@ describe('GddTransactionList', () => {
               typeId: 'CREATION',
               amount: '1000',
               balance: '32.96482231613347376132',
+              previousBalance: '31.75',
               balanceDate: '2022-02-25T07:29:26',
               memo: 'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
               linkedUser: {
@@ -414,6 +418,7 @@ describe('GddTransactionList', () => {
         return {
           amount: '3.14',
           balanceDate: '2021-04-29T17:26:40+00:00',
+          previousBalance: '31.75',
           decay: {
             decay: '-477.01',
             start: '2021-05-13T17:46:31.000Z',
diff --git a/frontend/src/components/Transactions/TransactionCreation.spec.js b/frontend/src/components/Transactions/TransactionCreation.spec.js
index be0713ecf..cec48cce9 100644
--- a/frontend/src/components/Transactions/TransactionCreation.spec.js
+++ b/frontend/src/components/Transactions/TransactionCreation.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',
diff --git a/frontend/src/components/Transactions/TransactionReceive.spec.js b/frontend/src/components/Transactions/TransactionReceive.spec.js
index 46cb57e06..76c7977d4 100644
--- a/frontend/src/components/Transactions/TransactionReceive.spec.js
+++ b/frontend/src/components/Transactions/TransactionReceive.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',
diff --git a/frontend/src/components/Transactions/TransactionSend.spec.js b/frontend/src/components/Transactions/TransactionSend.spec.js
index 410fcc733..662d9fd76 100644
--- a/frontend/src/components/Transactions/TransactionSend.spec.js
+++ b/frontend/src/components/Transactions/TransactionSend.spec.js
@@ -13,7 +13,8 @@ const mocks = {
 
 const propsData = {
   amount: '12.45',
-  balance: '31.76099091058521',
+  balance: '31.76',
+  previousBalance: '19.31',
   balanceDate: '2022-02-28T13:55:47.000Z',
   decay: {
     decay: '-0.2038314055482643084',

From 466b755a3da64900c4da800b1d88875af8b644cf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 15:55:15 +0200
Subject: [PATCH 095/101] middleware to ensure best possible decay displayed

---
 .../graphql/resolver/TransactionResolver.ts   |  4 +++-
 backend/src/middleware/fixDecayCalculation.ts | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/middleware/fixDecayCalculation.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d855a0701..a968a9ebb 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -7,7 +7,7 @@ import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
+import { Resolver, Query, Args, Authorized, Ctx, Mutation, UseMiddleware } from 'type-graphql'
 
 import Paginated from '@arg/Paginated'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
@@ -25,6 +25,7 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
+import { fixDecayCalculation } from '@/middleware/fixDecayCalculation'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -184,6 +185,7 @@ export const executeTransaction = async (
 export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
   @Query(() => TransactionList)
+  @UseMiddleware(fixDecayCalculation)
   async transactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
diff --git a/backend/src/middleware/fixDecayCalculation.ts b/backend/src/middleware/fixDecayCalculation.ts
new file mode 100644
index 000000000..7d25b7484
--- /dev/null
+++ b/backend/src/middleware/fixDecayCalculation.ts
@@ -0,0 +1,24 @@
+import { Decimal } from 'decimal.js-light'
+import { MiddlewareFn } from 'type-graphql'
+
+import { TransactionTypeId } from '@enum/TransactionTypeId'
+import { Transaction } from '@model/Transaction'
+import { TransactionList } from '@model/TransactionList'
+
+export const fixDecayCalculation: MiddlewareFn = async (
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+  { root, args, context, info },
+  next,
+) => {
+  const result: TransactionList = (await next()) as TransactionList
+  const { transactions } = result
+  transactions.forEach((transaction: Transaction) => {
+    if (transaction.typeId !== TransactionTypeId.DECAY) {
+      const { balance, previousBalance, amount } = transaction
+      transaction.decay.decay = new Decimal(
+        Number(balance) - Number(amount) - Number(previousBalance),
+      ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
+    }
+  })
+  return result
+}

From 95303c30e05c684e80bc0130790b08ae99287eb0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 18:38:09 +0200
Subject: [PATCH 096/101] add previous transaction relation

---
 .../0036-unique_previous_in_transactions/Transaction.ts       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/database/entity/0036-unique_previous_in_transactions/Transaction.ts b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
index ef8d0abdc..993ffd262 100644
--- a/database/entity/0036-unique_previous_in_transactions/Transaction.ts
+++ b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
@@ -96,4 +96,8 @@ export class Transaction extends BaseEntity {
   @OneToOne(() => Contribution, (contribution) => contribution.transaction)
   @JoinColumn({ name: 'id', referencedColumnName: 'transactionId' })
   contribution?: Contribution | null
+
+  @OneToOne(() => Transaction)
+  @JoinColumn({ name: 'previous' })
+  previousTransaction?: Transaction | null
 }

From 1fdd2e10142ff868e25ae973c94234a84c57058a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 3 Apr 2023 18:42:17 +0200
Subject: [PATCH 097/101] get previuos transaction from database

---
 backend/src/graphql/model/Transaction.ts           | 12 +++++-------
 .../src/graphql/resolver/TransactionResolver.ts    |  6 ++----
 backend/src/typeorm/repository/Transaction.ts      | 14 +++-----------
 backend/src/util/virtualTransactions.ts            |  7 +------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index 50ca7d098..3334dea84 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -9,12 +9,7 @@ import { User } from './User'
 
 @ObjectType()
 export class Transaction {
-  constructor(
-    transaction: dbTransaction,
-    user: User,
-    linkedUser: User | null = null,
-    previuosBalance: Decimal = new Decimal(0),
-  ) {
+  constructor(transaction: dbTransaction, user: User, linkedUser: User | null = null) {
     this.id = transaction.id
     this.user = user
     this.previous = transaction.previous
@@ -52,7 +47,10 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
-    this.previousBalance = previuosBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN)
+    this.previousBalance =
+      (transaction.previousTransaction &&
+        transaction.previousTransaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN)) ||
+      new Decimal(0)
   }
 
   @Field(() => Int)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a968a9ebb..5db293373 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -286,14 +286,12 @@ export class TransactionResolver {
     }
 
     // transactions
-    userTransactions.forEach((userTransaction, idx) => {
+    userTransactions.forEach((userTransaction) => {
       const linkedUser =
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
           : involvedUsers.find((u) => u.id === userTransaction.linkedUserId)
-      const previousBalance =
-        idx < userTransactions.length - 1 ? userTransactions[idx + 1].balance : new Decimal(0)
-      transactions.push(new Transaction(userTransaction, self, linkedUser, previousBalance))
+      transactions.push(new Transaction(userTransaction, self, linkedUser))
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 
diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
index 61e87b3c8..0fb9f7ffe 100644
--- a/backend/src/typeorm/repository/Transaction.ts
+++ b/backend/src/typeorm/repository/Transaction.ts
@@ -2,7 +2,6 @@ import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { Transaction } from '@entity/Transaction'
 
 import { Order } from '@enum/Order'
-import { TransactionTypeId } from '@enum/TransactionTypeId'
 
 @EntityRepository(Transaction)
 export class TransactionRepository extends Repository<Transaction> {
@@ -11,22 +10,15 @@ export class TransactionRepository extends Repository<Transaction> {
     limit: number,
     offset: number,
     order: Order,
-    onlyCreation?: boolean,
   ): Promise<[Transaction[], number]> {
     const query = this.createQueryBuilder('userTransaction')
       .leftJoinAndSelect(
-        'userTransaction.contribution',
-        'contribution',
-        'userTransaction.id = contribution.transactionId',
+        'userTransaction.previousTransaction',
+        'transaction',
+        'userTransaction.previous = transaction.id',
       )
       .where('userTransaction.userId = :userId', { userId })
 
-    if (onlyCreation) {
-      query.andWhere('userTransaction.typeId = :typeId', {
-        typeId: TransactionTypeId.CREATION,
-      })
-    }
-
     return query
       .orderBy('userTransaction.balanceDate', order)
       .limit(limit)
diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts
index 9f4def31e..5d1fbbfd3 100644
--- a/backend/src/util/virtualTransactions.ts
+++ b/backend/src/util/virtualTransactions.ts
@@ -55,12 +55,7 @@ const virtualLinkTransaction = (
     contribution: null,
     ...defaultModelFunctions,
   }
-  return new Transaction(
-    linkDbTransaction,
-    user,
-    null,
-    previousBalance.toDecimalPlaces(2, Decimal.ROUND_DOWN),
-  )
+  return new Transaction(linkDbTransaction, user)
 }
 
 const virtualDecayTransaction = (

From 6696f9be26531d20ea445570d53f43aa4032ba0a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 3 Apr 2023 21:35:57 +0200
Subject: [PATCH 098/101] lint fixes

---
 backend/src/federation/client/GraphQLGetClient.ts           | 1 -
 backend/src/graphql/directive/isAuthorized.ts               | 2 +-
 .../src/graphql/resolver/ContributionLinkResolver.test.ts   | 2 +-
 .../graphql/resolver/ContributionMessageResolver.test.ts    | 2 +-
 backend/src/graphql/resolver/ContributionResolver.test.ts   | 2 +-
 backend/src/graphql/resolver/StatisticsResolver.ts          | 6 +++---
 backend/src/graphql/resolver/UserResolver.test.ts           | 2 +-
 backend/src/graphql/resolver/util/creations.test.ts         | 2 +-
 backend/src/graphql/scalar/Decimal.ts                       | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/backend/src/federation/client/GraphQLGetClient.ts b/backend/src/federation/client/GraphQLGetClient.ts
index 008433c27..2f5281532 100644
--- a/backend/src/federation/client/GraphQLGetClient.ts
+++ b/backend/src/federation/client/GraphQLGetClient.ts
@@ -8,7 +8,6 @@ type ClientInstance = {
 }
 
 export class GraphQLGetClient extends GraphQLClient {
-  // eslint-disable-next-line no-use-before-define
   private static instanceArray: ClientInstance[] = []
 
   /**
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 0781d3dde..d659b3f1c 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { User } from '@entity/User'
 import { AuthChecker } from 'type-graphql'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 3073298fe..d37e60111 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 77e2ce1f4..1d6f3f9e0 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Event as DbEvent } from '@entity/Event'
 import { GraphQLError } from 'graphql'
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index af394fe0f..88a62b656 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Contribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
 import { Transaction as DbTransaction } from '@entity/Transaction'
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index f64d26806..ba8a32d37 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
-import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { getConnection } from '@dbTools/typeorm'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 
 import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index d497076f9..e0527a2a1 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Event as DbEvent } from '@entity/Event'
 import { TransactionLink } from '@entity/TransactionLink'
 import { User } from '@entity/User'
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index e2114528b..0b05099c8 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
 
diff --git a/backend/src/graphql/scalar/Decimal.ts b/backend/src/graphql/scalar/Decimal.ts
index e87dc2db9..a2633f0db 100644
--- a/backend/src/graphql/scalar/Decimal.ts
+++ b/backend/src/graphql/scalar/Decimal.ts
@@ -1,4 +1,4 @@
-/* eslint-disable! @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Decimal } from 'decimal.js-light'
 import { GraphQLScalarType, Kind } from 'graphql'
 

From ee9092878213337c067f250d71303a47a2ecd8b3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 4 Apr 2023 17:06:29 +0200
Subject: [PATCH 099/101] remove middleware

---
 .../graphql/resolver/TransactionResolver.ts   | 13 +++++++---
 backend/src/middleware/fixDecayCalculation.ts | 24 -------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 backend/src/middleware/fixDecayCalculation.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 4fcda3a15..4d546ddc0 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -7,7 +7,7 @@ import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
-import { Resolver, Query, Args, Authorized, Ctx, Mutation, UseMiddleware } from 'type-graphql'
+import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 
 import Paginated from '@arg/Paginated'
 import TransactionSendArgs from '@arg/TransactionSendArgs'
@@ -25,7 +25,6 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
-import { fixDecayCalculation } from '@/middleware/fixDecayCalculation'
 import { Context, getUser } from '@/server/context'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -184,7 +183,6 @@ export const executeTransaction = async (
 export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
   @Query(() => TransactionList)
-  @UseMiddleware(fixDecayCalculation)
   async transactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
@@ -294,6 +292,15 @@ export class TransactionResolver {
     })
     logger.debug(`TransactionTypeId.CREATION: transactions=${transactions}`)
 
+    transactions.forEach((transaction: Transaction) => {
+      if (transaction.typeId !== TransactionTypeId.DECAY) {
+        const { balance, previousBalance, amount } = transaction
+        transaction.decay.decay = new Decimal(
+          Number(balance) - Number(amount) - Number(previousBalance),
+        ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
+      }
+    })
+
     // Construct Result
     return new TransactionList(await balanceResolver.balance(context), transactions)
   }
diff --git a/backend/src/middleware/fixDecayCalculation.ts b/backend/src/middleware/fixDecayCalculation.ts
deleted file mode 100644
index 7d25b7484..000000000
--- a/backend/src/middleware/fixDecayCalculation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Decimal } from 'decimal.js-light'
-import { MiddlewareFn } from 'type-graphql'
-
-import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { Transaction } from '@model/Transaction'
-import { TransactionList } from '@model/TransactionList'
-
-export const fixDecayCalculation: MiddlewareFn = async (
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  { root, args, context, info },
-  next,
-) => {
-  const result: TransactionList = (await next()) as TransactionList
-  const { transactions } = result
-  transactions.forEach((transaction: Transaction) => {
-    if (transaction.typeId !== TransactionTypeId.DECAY) {
-      const { balance, previousBalance, amount } = transaction
-      transaction.decay.decay = new Decimal(
-        Number(balance) - Number(amount) - Number(previousBalance),
-      ).toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
-    }
-  })
-  return result
-}

From bb887be74c273b3324bc0f6824d109700e7719da Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 5 Apr 2023 13:22:21 +0200
Subject: [PATCH 100/101] refactor(backend): get transaction list

---
 .../graphql/resolver/TransactionResolver.ts   |  7 +++----
 .../resolver/util/getTransactionList.ts       | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/graphql/resolver/util/getTransactionList.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 4d546ddc0..0d867ba55 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -16,7 +16,6 @@ import { TransactionTypeId } from '@enum/TransactionTypeId'
 import { Transaction } from '@model/Transaction'
 import { TransactionList } from '@model/TransactionList'
 import { User } from '@model/User'
-import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
 import { RIGHTS } from '@/auth/RIGHTS'
@@ -37,6 +36,7 @@ import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { findUserByIdentifier } from './util/findUserByIdentifier'
 import { getLastTransaction } from './util/getLastTransaction'
+import { getTransactionList } from './util/getTransactionList'
 
 export const executeTransaction = async (
   amount: Decimal,
@@ -209,8 +209,7 @@ export class TransactionResolver {
     // find transactions
     // first page can contain 26 due to virtual decay transaction
     const offset = (currentPage - 1) * pageSize
-    const transactionRepository = getCustomRepository(TransactionRepository)
-    const [userTransactions, userTransactionsCount] = await transactionRepository.findByUserPaged(
+    const [userTransactions, userTransactionsCount] = await getTransactionList(
       user.id,
       pageSize,
       offset,
@@ -283,7 +282,7 @@ export class TransactionResolver {
     }
 
     // transactions
-    userTransactions.forEach((userTransaction) => {
+    userTransactions.forEach((userTransaction: dbTransaction) => {
       const linkedUser =
         userTransaction.typeId === TransactionTypeId.CREATION
           ? communityUser
diff --git a/backend/src/graphql/resolver/util/getTransactionList.ts b/backend/src/graphql/resolver/util/getTransactionList.ts
new file mode 100644
index 000000000..654f4e002
--- /dev/null
+++ b/backend/src/graphql/resolver/util/getTransactionList.ts
@@ -0,0 +1,20 @@
+import { Transaction as DbTransaction } from '@entity/Transaction'
+
+import { Order } from '@enum/Order'
+
+export const getTransactionList = async (
+  userId: number,
+  limit: number,
+  offset: number,
+  order: Order,
+): Promise<[DbTransaction[], number]> => {
+  return DbTransaction.findAndCount({
+    where: {
+      userId,
+    },
+    order: { balanceDate: order, id: order },
+    relations: ['previousTransaction'],
+    skip: offset,
+    take: limit,
+  })
+}

From 6065cfee3343ee8fa9c522154575b8303b93b208 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 5 Apr 2023 13:25:12 +0200
Subject: [PATCH 101/101] remove unused file

---
 backend/src/typeorm/repository/Transaction.ts | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 backend/src/typeorm/repository/Transaction.ts

diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
deleted file mode 100644
index 0fb9f7ffe..000000000
--- a/backend/src/typeorm/repository/Transaction.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { EntityRepository, Repository } from '@dbTools/typeorm'
-import { Transaction } from '@entity/Transaction'
-
-import { Order } from '@enum/Order'
-
-@EntityRepository(Transaction)
-export class TransactionRepository extends Repository<Transaction> {
-  findByUserPaged(
-    userId: number,
-    limit: number,
-    offset: number,
-    order: Order,
-  ): Promise<[Transaction[], number]> {
-    const query = this.createQueryBuilder('userTransaction')
-      .leftJoinAndSelect(
-        'userTransaction.previousTransaction',
-        'transaction',
-        'userTransaction.previous = transaction.id',
-      )
-      .where('userTransaction.userId = :userId', { userId })
-
-    return query
-      .orderBy('userTransaction.balanceDate', order)
-      .limit(limit)
-      .offset(offset)
-      .getManyAndCount()
-  }
-}