From c3acd21a678857be696141b4d32f07af0c43bd3a Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 17 Dec 2025 13:44:33 +0100
Subject: [PATCH 01/13] request the name of contribution changer (deniedBy,
 deletedBy, confirmedBy, updatedBy) and show them in admin frontend

---
 admin/src/components/RowDetails.vue           |  2 +-
 .../components/Tables/OpenCreationsTable.vue  | 25 ++++++++++++++--
 .../graphql/adminListContributions.graphql    |  7 ++++-
 admin/src/locales/de.json                     | 10 +++++--
 admin/src/locales/en.json                     | 10 +++++--
 admin/src/pages/CreationConfirm.vue           | 16 ++++++----
 backend/package.json                          |  1 +
 backend/src/graphql/model/Contribution.ts     | 20 ++++++++++++-
 .../graphql/resolver/ContributionResolver.ts  | 29 ++++++++++++++++++-
 bun.lock                                      |  3 ++
 database/src/queries/user.ts                  | 18 +++++++++++-
 11 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 9715ef158..97858c22b 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -6,7 +6,7 @@
         :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
         aria-label="Help"
       ></b-icon>
-      {{ $t('hide_details') }} {{ row.item.user.firstName }} {{ row.item.user.lastName }}
+      {{ $t('hide_details') }}
     </b-button>
   </b-card>
 </template>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index d94f85bae..f6bd49343 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -30,9 +30,9 @@
       </template>
       <template #cell(memo)="row">
         {{ row.value }}
-        <small v-if="row.item.updatedBy > 0">
+        <small v-if="isAddCommentToMemo(row.item)">
           <hr />
-          {{ $t('moderator.memo-modified') }}
+          {{ getMemoComment(row.item) }}
         </small>
       </template>
       <template #cell(editCreation)="row">
@@ -229,6 +229,27 @@ export default {
         this.creationUserData = row.item
       }
     },
+    isAddCommentToMemo(item) {
+      return item.updatedBy > 0 || item.confirmedBy > 0 || item.deletedBy > 0 || item.deniedBy > 0
+    },
+    getMemoComment(item) {
+      let comment = ''
+      if (item.confirmedBy > 0) {
+        comment = this.$t('contribution.confirmedBy', { name: item.confirmedByUserName })
+      } else if (item.deletedBy > 0) {
+        comment = this.$t('contribution.deletedBy', { name: item.deletedByUserName })
+      } else if (item.deniedBy > 0) {
+        comment = this.$t('contribution.deniedBy', { name: item.deniedByUserName })
+      }
+
+      if (item.updatedBy > 0) {
+        if (comment.length) {
+          comment += ' '
+        }
+        comment += this.$t('moderator.memo-modified', { name: item.updatedByUserName })
+      }
+      return comment
+    },
     addClipboardListener() {
       document.addEventListener('copy', this.handleCopy)
     },
diff --git a/admin/src/graphql/adminListContributions.graphql b/admin/src/graphql/adminListContributions.graphql
index 57c26c10a..a73788c23 100644
--- a/admin/src/graphql/adminListContributions.graphql
+++ b/admin/src/graphql/adminListContributions.graphql
@@ -23,15 +23,20 @@ query adminListContributions(
       contributionDate
       confirmedAt
       confirmedBy
+      confirmedByUserName
       updatedAt
-      updatedBy
+      updatedBy 
+      updatedByUserName
       contributionStatus
       messagesCount
       deniedAt
       deniedBy
+      deniedByUserName
       deletedAt
       deletedBy
+      deletedByUserName
       moderatorId
+      moderatorUserName
       userId
       resubmissionAt
     }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 58e3efcfc..4e47cf2fa 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -16,6 +16,11 @@
   "back": "zurück",
   "change_user_role": "Nutzerrolle ändern",
   "close": "Schließen",
+  "contribution": {
+    "confirmedBy": "Bestätigt von {name}.",
+    "deletedBy": "Gelöscht von {name}.",
+    "deniedBy": "Abgelehnt von {name}."
+  },
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -171,10 +176,11 @@
     "notice-tooltip": "Die Notiz ist nur für Moderatoren sichtbar",
     "memo": "Text ändern",
     "memo-tooltip": "Den Beitragstext bearbeiten",
-    "memo-modified": "Text vom Moderator bearbeitet.",
+    "memo-modified": "Text von {name} bearbeitet.",
     "message": "Nachricht",
     "message-tooltip": "Nachricht an Benutzer schreiben",
-    "request": "Diese Nachricht ist nur für die Moderatoren sichtbar!"
+    "request": "Diese Nachricht ist nur für die Moderatoren sichtbar!",
+    "who": "Wer?"
   },
   "name": "Name",
   "navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 4cd9f9860..e9ab404ff 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -16,6 +16,11 @@
   "back": "back",
   "change_user_role": "Change user role",
   "close": "Close",
+  "contribution": {
+    "confirmedBy": "Confirmed by {name}.",
+    "deletedBy": "Deleted by {name}.",
+    "deniedBy": "Denied by {name}."
+  },
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -171,10 +176,11 @@
     "notice-tooltip": "The note is only visible to moderators",
     "memo": "Edit text",
     "memo-tooltip": "Edit the text of the contribution",
-    "memo-modified": "Text edited by moderator",
+    "memo-modified": "Text edited by {name}",
     "message": "Message",
     "message-tooltip": "Write message to user",
-    "request": "This message is only visible to the moderators!"
+    "request": "This message is only visible to the moderators!",
+    "who": "Who?"
   },
   "name": "Name",
   "navbar": {
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 74588f9f4..01f38a7c6 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -159,7 +159,11 @@ const baseFields = {
     class: 'no-select',
     formatter: formatDateOrDash,
   },
-  confirmedBy: { key: 'confirmedBy', label: t('moderator.moderator'), class: 'no-select' },
+  confirmedByUserName: {
+    key: 'confirmedByUserName',
+    label: t('moderator.who'),
+    class: 'no-select',
+  },
 }
 
 const fields = computed(
@@ -174,7 +178,7 @@ const fields = computed(
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
-        { key: 'moderatorId', label: t('moderator.moderator'), class: 'no-select' },
+        { key: 'moderatorUserName', label: t('moderator.who'), class: 'no-select' },
         { key: 'editCreation', label: t('details') },
         { key: 'confirm', label: t('save') },
       ],
@@ -187,7 +191,7 @@ const fields = computed(
         baseFields.contributionDate,
         baseFields.createdAt,
         baseFields.confirmedAt,
-        baseFields.confirmedBy,
+        baseFields.confirmedByUserName,
         { key: 'chatCreation', label: t('details') },
       ],
       // denied contributions
@@ -203,7 +207,7 @@ const fields = computed(
           label: t('contributions.denied'),
           formatter: formatDateOrDash,
         },
-        { key: 'deniedBy', label: t('moderator.moderator') },
+        { key: 'deniedByUserName', label: t('moderator.who') },
         { key: 'chatCreation', label: t('details') },
       ],
       // deleted contributions
@@ -219,7 +223,7 @@ const fields = computed(
           label: t('contributions.deleted'),
           formatter: formatDateOrDash,
         },
-        { key: 'deletedBy', label: t('moderator.moderator') },
+        { key: 'deletedByUserName', label: t('moderator.who') },
         { key: 'chatCreation', label: t('details') },
       ],
       // all contributions
@@ -232,7 +236,7 @@ const fields = computed(
         baseFields.contributionDate,
         baseFields.createdAt,
         baseFields.confirmedAt,
-        baseFields.confirmedBy,
+        baseFields.confirmedByUserName,
         { key: 'chatCreation', label: t('details') },
       ],
     ][tabIndex.value],
diff --git a/backend/package.json b/backend/package.json
index 9420a155a..c950d0de9 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,6 +60,7 @@
     "core": "*",
     "cors": "^2.8.5",
     "database": "*",
+    "dataloader": "^2.2.3",
     "decimal.js-light": "^2.5.1",
     "dotenv": "^10.0.0",
     "esbuild": "^0.25.2",
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 49a3c0be4..be4da99cf 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,6 +1,5 @@
 import { Contribution as DbContribution } from 'database'
 import { Field, Int, ObjectType } from 'type-graphql'
-
 import { UnconfirmedContribution } from './UnconfirmedContribution'
 
 @ObjectType()
@@ -8,6 +7,7 @@ export class Contribution extends UnconfirmedContribution {
   constructor(dbContribution: DbContribution) {
     super(dbContribution)
     this.createdAt = dbContribution.createdAt
+    this.moderatorId = dbContribution.moderatorId
     this.confirmedAt = dbContribution.confirmedAt
     this.confirmedBy = dbContribution.confirmedBy
     this.contributionDate = dbContribution.contributionDate
@@ -24,30 +24,48 @@ export class Contribution extends UnconfirmedContribution {
   @Field(() => Date)
   createdAt: Date
 
+  @Field(() => Int, { nullable: true })
+  moderatorId: number | null
+
+  @Field(() => String, { nullable: true })
+  moderatorUserName?: string | null
+
   @Field(() => Date, { nullable: true })
   confirmedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   confirmedBy: number | null
 
+  @Field(() => String, { nullable: true })
+  confirmedByUserName?: string | null
+
   @Field(() => Date, { nullable: true })
   deniedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   deniedBy: number | null
 
+  @Field(() => String, { nullable: true })
+  deniedByUserName?: string | null
+
   @Field(() => Date, { nullable: true })
   deletedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   deletedBy: number | null
 
+  @Field(() => String, { nullable: true })
+  deletedByUserName?: string | null
+
   @Field(() => Date, { nullable: true })
   updatedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   updatedBy: number | null
 
+  @Field(() => String, { nullable: true })
+  updatedByUserName?: string | null
+
   @Field(() => Date)
   contributionDate: Date
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index b18af5c39..0882a04bd 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -23,9 +23,11 @@ import {
   Contribution as DbContribution,
   Transaction as DbTransaction,
   User as DbUser,
+  findUserNamesByIds,
   getLastTransaction,
   UserContact,
 } from 'database'
+import DataLoader from 'dataloader'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLResolveInfo } from 'graphql'
 import { getLogger } from 'log4js'
@@ -348,6 +350,7 @@ export class ContributionResolver {
   ): Promise<ContributionListResult> {
     // Check if only count was requested (without contributionList)
     const fields = Object.keys(extractGraphQLFields(info))
+    // console.log(`fields: ${fields}`)
     const countOnly: boolean = fields.includes('contributionCount') && fields.length === 1
     // check if related user was requested
     const userRequested =
@@ -370,8 +373,32 @@ export class ContributionResolver {
       },
       countOnly,
     )
+    const result = new ContributionListResult(count, dbContributions)
 
-    return new ContributionListResult(count, dbContributions)
+    const dataLoader = new DataLoader(async (userIds: readonly number[]) => {
+      const uniqueUserIds = new Set<number>()
+      userIds.forEach((userId) => uniqueUserIds.add(userId))
+      const users = await findUserNamesByIds(Array.from(uniqueUserIds))
+      return userIds.map((userId) => users.get(userId))
+    })
+    for (const contribution of result.contributionList) {
+      if (contribution.confirmedBy) {
+        contribution.confirmedByUserName = await dataLoader.load(contribution.confirmedBy)
+      }
+      if (contribution.updatedBy) {
+        contribution.updatedByUserName = await dataLoader.load(contribution.updatedBy)
+      }
+      if (contribution.moderatorId) {
+        contribution.moderatorUserName = await dataLoader.load(contribution.moderatorId)
+      }
+      if (contribution.deletedBy) {
+        contribution.deletedByUserName = await dataLoader.load(contribution.deletedBy)
+      }
+      if (contribution.deniedBy) {
+        contribution.deniedByUserName = await dataLoader.load(contribution.deniedBy)
+      }
+    }
+    return result
   }
 
   @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION])
diff --git a/bun.lock b/bun.lock
index 9a4a4c2bb..f6dc312a7 100644
--- a/bun.lock
+++ b/bun.lock
@@ -122,6 +122,7 @@
         "core": "*",
         "cors": "^2.8.5",
         "database": "*",
+        "dataloader": "^2.2.3",
         "decimal.js-light": "^2.5.1",
         "dotenv": "^10.0.0",
         "esbuild": "^0.25.2",
@@ -1808,6 +1809,8 @@
 
     "database": ["database@workspace:database"],
 
+    "dataloader": ["dataloader@2.2.3", "", {}, "sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA=="],
+
     "date-fns": ["date-fns@2.30.0", "", { "dependencies": { "@babel/runtime": "^7.21.0" } }, "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw=="],
 
     "date-format": ["date-format@4.0.14", "", {}, "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="],
diff --git a/database/src/queries/user.ts b/database/src/queries/user.ts
index 9e7d84c27..5aa46a07b 100644
--- a/database/src/queries/user.ts
+++ b/database/src/queries/user.ts
@@ -1,6 +1,6 @@
 import { getLogger } from 'log4js'
 import { aliasSchema, emailSchema, uuidv4Schema } from 'shared'
-import { Raw } from 'typeorm'
+import { In, Raw } from 'typeorm'
 import { User as DbUser, UserContact as DbUserContact } from '../entity'
 import { findWithCommunityIdentifier, LOG4JS_QUERIES_CATEGORY_NAME } from './index'
 
@@ -81,3 +81,19 @@ export async function findForeignUserByUuids(
     where: { foreign: true, communityUuid, gradidoID },
   })
 }
+
+export async function findUserNamesByIds(userIds: number[]): Promise<Map<number, string>> {
+  const users = await DbUser.find({
+    select: { id: true, firstName: true, lastName: true, alias: true },
+    where: { id: In(userIds) },
+  })
+  return new Map(
+    users.map((user) => {
+      let name = `${user.firstName} ${user.lastName}`
+      if (user.alias && user.alias.length > 2) {
+        name = user.alias
+      }
+      return [user.id, name]
+    }),
+  )
+}

From 31a6b28c8521fb1ee158f7a62195b83dc7866e0c Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 17 Dec 2025 13:58:28 +0100
Subject: [PATCH 02/13] retrieve user names without using slow dataloader

---
 backend/package.json                          |  1 -
 .../graphql/resolver/ContributionResolver.ts  | 47 ++++++++++---------
 bun.lock                                      |  3 --
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index c950d0de9..9420a155a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -60,7 +60,6 @@
     "core": "*",
     "cors": "^2.8.5",
     "database": "*",
-    "dataloader": "^2.2.3",
     "decimal.js-light": "^2.5.1",
     "dotenv": "^10.0.0",
     "esbuild": "^0.25.2",
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 0882a04bd..9523e3a9b 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -27,7 +27,6 @@ import {
   getLastTransaction,
   UserContact,
 } from 'database'
-import DataLoader from 'dataloader'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLResolveInfo } from 'graphql'
 import { getLogger } from 'log4js'
@@ -375,28 +374,32 @@ export class ContributionResolver {
     )
     const result = new ContributionListResult(count, dbContributions)
 
-    const dataLoader = new DataLoader(async (userIds: readonly number[]) => {
-      const uniqueUserIds = new Set<number>()
-      userIds.forEach((userId) => uniqueUserIds.add(userId))
-      const users = await findUserNamesByIds(Array.from(uniqueUserIds))
-      return userIds.map((userId) => users.get(userId))
-    })
+    const uniqueUserIds = new Set<number>()
+    const addIfExist = (userId?: number | null) => {
+      if (userId) {
+        uniqueUserIds.add(userId)
+      }
+    }
+    const getNameById = (userId?: number | null) => {
+      if (userId) {
+        return users.get(userId)
+      }
+      return null
+    }
     for (const contribution of result.contributionList) {
-      if (contribution.confirmedBy) {
-        contribution.confirmedByUserName = await dataLoader.load(contribution.confirmedBy)
-      }
-      if (contribution.updatedBy) {
-        contribution.updatedByUserName = await dataLoader.load(contribution.updatedBy)
-      }
-      if (contribution.moderatorId) {
-        contribution.moderatorUserName = await dataLoader.load(contribution.moderatorId)
-      }
-      if (contribution.deletedBy) {
-        contribution.deletedByUserName = await dataLoader.load(contribution.deletedBy)
-      }
-      if (contribution.deniedBy) {
-        contribution.deniedByUserName = await dataLoader.load(contribution.deniedBy)
-      }
+      addIfExist(contribution.confirmedBy)
+      addIfExist(contribution.updatedBy)
+      addIfExist(contribution.moderatorId)
+      addIfExist(contribution.deletedBy)
+      addIfExist(contribution.deniedBy)
+    }
+    const users = await findUserNamesByIds(Array.from(uniqueUserIds))
+    for (const contribution of result.contributionList) {
+      contribution.confirmedByUserName = getNameById(contribution.confirmedBy)
+      contribution.updatedByUserName = getNameById(contribution.updatedBy)
+      contribution.moderatorUserName = getNameById(contribution.moderatorId)
+      contribution.deletedByUserName = getNameById(contribution.deletedBy)
+      contribution.deniedByUserName = getNameById(contribution.deniedBy)
     }
     return result
   }
diff --git a/bun.lock b/bun.lock
index f6dc312a7..9a4a4c2bb 100644
--- a/bun.lock
+++ b/bun.lock
@@ -122,7 +122,6 @@
         "core": "*",
         "cors": "^2.8.5",
         "database": "*",
-        "dataloader": "^2.2.3",
         "decimal.js-light": "^2.5.1",
         "dotenv": "^10.0.0",
         "esbuild": "^0.25.2",
@@ -1809,8 +1808,6 @@
 
     "database": ["database@workspace:database"],
 
-    "dataloader": ["dataloader@2.2.3", "", {}, "sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA=="],
-
     "date-fns": ["date-fns@2.30.0", "", { "dependencies": { "@babel/runtime": "^7.21.0" } }, "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw=="],
 
     "date-format": ["date-format@4.0.14", "", {}, "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="],

From 3521246cf1208f55923178194a36c65d6a3a2e6c Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 17 Dec 2025 14:03:02 +0100
Subject: [PATCH 03/13] shorten code, position after variable decleration

---
 .../graphql/resolver/ContributionResolver.ts    | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 9523e3a9b..643f983e9 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -375,17 +375,9 @@ export class ContributionResolver {
     const result = new ContributionListResult(count, dbContributions)
 
     const uniqueUserIds = new Set<number>()
-    const addIfExist = (userId?: number | null) => {
-      if (userId) {
-        uniqueUserIds.add(userId)
-      }
-    }
-    const getNameById = (userId?: number | null) => {
-      if (userId) {
-        return users.get(userId)
-      }
-      return null
-    }
+    const addIfExist = (userId?: number | null) =>
+      userId ? uniqueUserIds.add(userId) : null
+    
     for (const contribution of result.contributionList) {
       addIfExist(contribution.confirmedBy)
       addIfExist(contribution.updatedBy)
@@ -394,6 +386,9 @@ export class ContributionResolver {
       addIfExist(contribution.deniedBy)
     }
     const users = await findUserNamesByIds(Array.from(uniqueUserIds))
+    const getNameById = (userId?: number | null) =>
+      userId ? users.get(userId) ?? null : null
+
     for (const contribution of result.contributionList) {
       contribution.confirmedByUserName = getNameById(contribution.confirmedBy)
       contribution.updatedByUserName = getNameById(contribution.updatedBy)

From 9e8c44a48b78a21115a7050cb40873d5ea9d78ce Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 17 Dec 2025 14:07:22 +0100
Subject: [PATCH 04/13] fix lint

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 643f983e9..170c262e0 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -375,9 +375,8 @@ export class ContributionResolver {
     const result = new ContributionListResult(count, dbContributions)
 
     const uniqueUserIds = new Set<number>()
-    const addIfExist = (userId?: number | null) =>
-      userId ? uniqueUserIds.add(userId) : null
-    
+    const addIfExist = (userId?: number | null) => (userId ? uniqueUserIds.add(userId) : null)
+
     for (const contribution of result.contributionList) {
       addIfExist(contribution.confirmedBy)
       addIfExist(contribution.updatedBy)
@@ -386,8 +385,7 @@ export class ContributionResolver {
       addIfExist(contribution.deniedBy)
     }
     const users = await findUserNamesByIds(Array.from(uniqueUserIds))
-    const getNameById = (userId?: number | null) =>
-      userId ? users.get(userId) ?? null : null
+    const getNameById = (userId?: number | null) => (userId ? (users.get(userId) ?? null) : null)
 
     for (const contribution of result.contributionList) {
       contribution.confirmedByUserName = getNameById(contribution.confirmedBy)

From 62e6bfe4143df012eb09e7103e4155b191367b98 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 09:30:33 +0100
Subject: [PATCH 05/13] remove who/moderator column, add comment if
 contribution was created by moderator

---
 .../components/Tables/OpenCreationsTable.vue    | 17 +++++++++++++++--
 admin/src/locales/de.json                       |  4 ++--
 admin/src/locales/en.json                       |  6 +++---
 admin/src/pages/CreationConfirm.vue             |  5 -----
 database/src/queries/user.ts                    |  6 +-----
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index ae69470e4..9d1b43db9 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -236,7 +236,13 @@ export default {
       }
     },
     isAddCommentToMemo(item) {
-      return item.updatedBy > 0 || item.confirmedBy > 0 || item.deletedBy > 0 || item.deniedBy > 0
+      return (
+        item.updatedBy > 0 ||
+        item.confirmedBy > 0 ||
+        item.deletedBy > 0 ||
+        item.deniedBy > 0 ||
+        item.moderatorId > 0
+      )
     },
     getMemoComment(item) {
       let comment = ''
@@ -250,10 +256,17 @@ export default {
 
       if (item.updatedBy > 0) {
         if (comment.length) {
-          comment += ' '
+          comment += ' | '
         }
         comment += this.$t('moderator.memo-modified', { name: item.updatedByUserName })
       }
+
+      if (item.moderatorId > 0) {
+        if (comment.length) {
+          comment += ' | '
+        }
+        comment += this.$t('contribution.createdBy', { name: item.moderatorUserName })
+      }
       return comment
     },
     addClipboardListener() {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 8e098b2ab..2443e3e3d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -18,6 +18,7 @@
   "close": "Schließen",
   "contribution": {
     "confirmedBy": "Bestätigt von {name}.",
+    "createdBy": "Erstellt von {name}.",
     "deletedBy": "Gelöscht von {name}.",
     "deniedBy": "Abgelehnt von {name}."
   },
@@ -179,8 +180,7 @@
     "notice": "Notiz",
     "notice-tooltip": "Die Notiz ist nur für Moderatoren sichtbar",
     "request": "Diese Nachricht ist nur für die Moderatoren sichtbar!",
-    "show-submission-form": "warten auf Erinnerung?",
-    "who": "Wer?"
+    "show-submission-form": "warten auf Erinnerung?"
   },
   "name": "Name",
   "navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e3f5b03f0..45b0f2a80 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -18,8 +18,9 @@
   "close": "Close",
   "contribution": {
     "confirmedBy": "Confirmed by {name}.",
+    "createdBy": "Created by {name}.",
     "deletedBy": "Deleted by {name}.",
-    "deniedBy": "Denied by {name}."
+    "deniedBy": "Rejected by {name}."
   },
   "contributionLink": {
     "amount": "Amount",
@@ -179,8 +180,7 @@
     "notice": "Note",
     "notice-tooltip": "The note is only visible to moderators",
     "request": "This message is only visible to the moderators!",
-    "show-submission-form": "wait for reminder?",
-    "who": "Who?"
+    "show-submission-form": "wait for reminder?"
   },
   "name": "Name",
   "navbar": {
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 01f38a7c6..af002bac8 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -178,7 +178,6 @@ const fields = computed(
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
-        { key: 'moderatorUserName', label: t('moderator.who'), class: 'no-select' },
         { key: 'editCreation', label: t('details') },
         { key: 'confirm', label: t('save') },
       ],
@@ -191,7 +190,6 @@ const fields = computed(
         baseFields.contributionDate,
         baseFields.createdAt,
         baseFields.confirmedAt,
-        baseFields.confirmedByUserName,
         { key: 'chatCreation', label: t('details') },
       ],
       // denied contributions
@@ -207,7 +205,6 @@ const fields = computed(
           label: t('contributions.denied'),
           formatter: formatDateOrDash,
         },
-        { key: 'deniedByUserName', label: t('moderator.who') },
         { key: 'chatCreation', label: t('details') },
       ],
       // deleted contributions
@@ -223,7 +220,6 @@ const fields = computed(
           label: t('contributions.deleted'),
           formatter: formatDateOrDash,
         },
-        { key: 'deletedByUserName', label: t('moderator.who') },
         { key: 'chatCreation', label: t('details') },
       ],
       // all contributions
@@ -236,7 +232,6 @@ const fields = computed(
         baseFields.contributionDate,
         baseFields.createdAt,
         baseFields.confirmedAt,
-        baseFields.confirmedByUserName,
         { key: 'chatCreation', label: t('details') },
       ],
     ][tabIndex.value],
diff --git a/database/src/queries/user.ts b/database/src/queries/user.ts
index 5aa46a07b..2a1c474d7 100644
--- a/database/src/queries/user.ts
+++ b/database/src/queries/user.ts
@@ -89,11 +89,7 @@ export async function findUserNamesByIds(userIds: number[]): Promise<Map<number,
   })
   return new Map(
     users.map((user) => {
-      let name = `${user.firstName} ${user.lastName}`
-      if (user.alias && user.alias.length > 2) {
-        name = user.alias
-      }
-      return [user.id, name]
+      return [user.id, `${user.firstName} ${user.lastName}`]
     }),
   )
 }

From 4d1eaba6cfb789daedffcb9e90694f5d895c25f0 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 10:00:46 +0100
Subject: [PATCH 06/13] replace createdAt column in open creations with smart
 colum closed

---
 .../src/components/Tables/OpenCreationsTable.vue  | 15 +++++++++++++++
 admin/src/composables/useDateFormatter.js         |  6 +++++-
 admin/src/locales/de.json                         |  1 +
 admin/src/locales/en.json                         |  1 +
 admin/src/pages/CreationConfirm.vue               | 14 +++++++-------
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 9d1b43db9..5649697c4 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -99,6 +99,9 @@
           </BButton>
         </div>
       </template>
+      <template #cell(closed)="row">
+        {{ formatDateOrDash(getClosedDate(row.item)) }}
+      </template>
       <template #row-details="row">
         <row-details
           :row="row"
@@ -140,6 +143,7 @@
 import RowDetails from '../RowDetails'
 import EditCreationFormular from '../EditCreationFormular'
 import ContributionMessagesList from '../ContributionMessages/ContributionMessagesList'
+import { useDateFormatter } from '@/composables/useDateFormatter'
 
 const iconMap = {
   IN_PROGRESS: 'question-square',
@@ -195,6 +199,7 @@ export default {
     this.removeClipboardListener()
   },
   methods: {
+    ...useDateFormatter(),
     myself(item) {
       return item.userId === this.$store.state.moderator.id
     },
@@ -209,6 +214,16 @@ export default {
       if (item.contributionStatus === 'IN_PROGRESS') return 'table-primary'
       if (item.contributionStatus === 'PENDING') return 'table-primary'
     },
+    getClosedDate(item) {
+      if (item.contributionStatus === 'CONFIRMED') {
+        return item.confirmedAt
+      } else if (item.contributionStatus === 'DENIED') {
+        return item.deniedAt
+      } else if (item.contributionStatus === 'DELETED') {
+        return item.deletedAt
+      }
+      return null
+    },
     updateStatus(id) {
       this.$emit('update-status', id)
     },
diff --git a/admin/src/composables/useDateFormatter.js b/admin/src/composables/useDateFormatter.js
index 8f3c85bfe..6e062b3e9 100644
--- a/admin/src/composables/useDateFormatter.js
+++ b/admin/src/composables/useDateFormatter.js
@@ -1,10 +1,14 @@
 export const useDateFormatter = () => {
   const formatDateFromDateTime = (datetimeString) => {
-    if (!datetimeString || !datetimeString?.includes('T')) return datetimeString
+    if (!datetimeString || !datetimeString?.includes('T')) {
+      return datetimeString
+    }
     return datetimeString.split('T')[0]
   }
+  const formatDateOrDash = (value) => (value ? new Date(value).toLocaleDateString() : '—')
 
   return {
     formatDateFromDateTime,
+    formatDateOrDash,
   }
 }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 2443e3e3d..d36d53576 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -55,6 +55,7 @@
   },
   "contributions": {
     "all": "Alle",
+    "closed": "Geschlossen",
     "confirms": "Bestätigt",
     "deleted": "Gelöscht",
     "denied": "Abgelehnt",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 45b0f2a80..b0db604cc 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -55,6 +55,7 @@
   },
   "contributions": {
     "all": "All",
+    "closed": "Closed",
     "confirms": "Confirmed",
     "deleted": "Deleted",
     "denied": "Rejected",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index af002bac8..6ffd967f1 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -108,6 +108,7 @@ import { confirmContribution } from '../graphql/confirmContribution'
 import { denyContribution } from '../graphql/denyContribution'
 import { getContribution } from '../graphql/getContribution'
 import { useAppToast } from '@/composables/useToast'
+import { useDateFormatter } from '@/composables/useDateFormatter'
 import CONFIG from '@/config'
 
 const FILTER_TAB_MAP = [
@@ -134,7 +135,7 @@ const query = ref('')
 const noHashtag = ref(null)
 const hideResubmissionModel = ref(true)
 
-const formatDateOrDash = (value) => (value ? new Date(value).toLocaleDateString() : '—')
+const { formatDateOrDash } = useDateFormatter()
 
 const baseFields = {
   firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' },
@@ -159,11 +160,6 @@ const baseFields = {
     class: 'no-select',
     formatter: formatDateOrDash,
   },
-  confirmedByUserName: {
-    key: 'confirmedByUserName',
-    label: t('moderator.who'),
-    class: 'no-select',
-  },
 }
 
 const fields = computed(
@@ -231,7 +227,11 @@ const fields = computed(
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        baseFields.confirmedAt,
+        {
+          key: 'closed',
+          label: t('contributions.closed'),
+          class: 'no-select',
+        },
         { key: 'chatCreation', label: t('details') },
       ],
     ][tabIndex.value],

From 8b8e6cfa0d1864a7c95345daca8d695fa8075c8a Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 11:56:01 +0100
Subject: [PATCH 07/13] move date pick logic by contribution state into backend

---
 .../components/Tables/OpenCreationsTable.vue  | 35 +++++--------------
 .../graphql/adminListContributions.graphql    | 14 +++-----
 admin/src/pages/CreationConfirm.vue           | 26 ++++----------
 backend/src/graphql/model/Contribution.ts     | 30 +++++++++++-----
 .../graphql/resolver/ContributionResolver.ts  |  9 ++---
 5 files changed, 44 insertions(+), 70 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 5649697c4..94ddc7208 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -99,9 +99,6 @@
           </BButton>
         </div>
       </template>
-      <template #cell(closed)="row">
-        {{ formatDateOrDash(getClosedDate(row.item)) }}
-      </template>
       <template #row-details="row">
         <row-details
           :row="row"
@@ -214,16 +211,6 @@ export default {
       if (item.contributionStatus === 'IN_PROGRESS') return 'table-primary'
       if (item.contributionStatus === 'PENDING') return 'table-primary'
     },
-    getClosedDate(item) {
-      if (item.contributionStatus === 'CONFIRMED') {
-        return item.confirmedAt
-      } else if (item.contributionStatus === 'DENIED') {
-        return item.deniedAt
-      } else if (item.contributionStatus === 'DELETED') {
-        return item.deletedAt
-      }
-      return null
-    },
     updateStatus(id) {
       this.$emit('update-status', id)
     },
@@ -251,22 +238,18 @@ export default {
       }
     },
     isAddCommentToMemo(item) {
-      return (
-        item.updatedBy > 0 ||
-        item.confirmedBy > 0 ||
-        item.deletedBy > 0 ||
-        item.deniedBy > 0 ||
-        item.moderatorId > 0
-      )
+      return item.closedBy > 0 || item.moderatorId > 0 || item.updatedBy > 0
     },
     getMemoComment(item) {
       let comment = ''
-      if (item.confirmedBy > 0) {
-        comment = this.$t('contribution.confirmedBy', { name: item.confirmedByUserName })
-      } else if (item.deletedBy > 0) {
-        comment = this.$t('contribution.deletedBy', { name: item.deletedByUserName })
-      } else if (item.deniedBy > 0) {
-        comment = this.$t('contribution.deniedBy', { name: item.deniedByUserName })
+      if (item.closedBy > 0) {
+        if (item.contributionStatus === 'CONFIRMED') {
+          comment = this.$t('contribution.confirmedBy', { name: item.closedByUserName })
+        } else if (item.contributionStatus === 'DENIED') {
+          comment = this.$t('contribution.deniedBy', { name: item.closedByUserName })
+        } else if (item.contributionStatus === 'DELETED') {
+          comment = this.$t('contribution.deletedBy', { name: item.closedByUserName })
+        }
       }
 
       if (item.updatedBy > 0) {
diff --git a/admin/src/graphql/adminListContributions.graphql b/admin/src/graphql/adminListContributions.graphql
index a73788c23..e2b6417d1 100644
--- a/admin/src/graphql/adminListContributions.graphql
+++ b/admin/src/graphql/adminListContributions.graphql
@@ -19,22 +19,16 @@ query adminListContributions(
       }
       amount
       memo
-      createdAt
+      closedAt
+      closedBy
+      closedByUserName
       contributionDate
-      confirmedAt
-      confirmedBy
-      confirmedByUserName
+      createdAt      
       updatedAt
       updatedBy 
       updatedByUserName
       contributionStatus
       messagesCount
-      deniedAt
-      deniedBy
-      deniedByUserName
-      deletedAt
-      deletedBy
-      deletedByUserName
       moderatorId
       moderatorUserName
       userId
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6ffd967f1..7990b50f3 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -154,9 +154,9 @@ const baseFields = {
     class: 'no-select',
     formatter: formatDateOrDash,
   },
-  confirmedAt: {
-    key: 'confirmedAt',
-    label: t('contributions.confirms'),
+  closedAt: {
+    key: 'closedAt',
+    label: t('contributions.closed'),
     class: 'no-select',
     formatter: formatDateOrDash,
   },
@@ -185,7 +185,7 @@ const fields = computed(
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        baseFields.confirmedAt,
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // denied contributions
@@ -196,11 +196,7 @@ const fields = computed(
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        {
-          key: 'deniedAt',
-          label: t('contributions.denied'),
-          formatter: formatDateOrDash,
-        },
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // deleted contributions
@@ -211,11 +207,7 @@ const fields = computed(
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        {
-          key: 'deletedAt',
-          label: t('contributions.deleted'),
-          formatter: formatDateOrDash,
-        },
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // all contributions
@@ -227,11 +219,7 @@ const fields = computed(
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        {
-          key: 'closed',
-          label: t('contributions.closed'),
-          class: 'no-select',
-        },
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
     ][tabIndex.value],
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index be4da99cf..564b29e9c 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,3 +1,4 @@
+import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution as DbContribution } from 'database'
 import { Field, Int, ObjectType } from 'type-graphql'
 import { UnconfirmedContribution } from './UnconfirmedContribution'
@@ -19,8 +20,28 @@ export class Contribution extends UnconfirmedContribution {
     this.updatedAt = dbContribution.updatedAt
     this.updatedBy = dbContribution.updatedBy
     this.resubmissionAt = dbContribution.resubmissionAt
+    if( ContributionStatus.CONFIRMED === dbContribution.contributionStatus) {
+      this.closedAt = dbContribution.confirmedAt
+      this.closedBy = dbContribution.confirmedBy
+    } else if (ContributionStatus.DELETED === dbContribution.contributionStatus) {
+      this.closedAt = dbContribution.deletedAt
+      this.closedBy = dbContribution.deletedBy
+    } else if (ContributionStatus.DENIED === dbContribution.contributionStatus ) {
+      this.closedAt = dbContribution.deniedAt
+      this.closedBy = dbContribution.deniedBy
+    }
   }
 
+
+  @Field(() => Date, { nullable: true })
+  closedAt?: Date | null
+
+  @Field(() => Int, { nullable: true })
+  closedBy?: number | null
+
+  @Field(() => String, { nullable: true })
+  closedByUserName?: string | null
+
   @Field(() => Date)
   createdAt: Date
 
@@ -36,27 +57,18 @@ export class Contribution extends UnconfirmedContribution {
   @Field(() => Int, { nullable: true })
   confirmedBy: number | null
 
-  @Field(() => String, { nullable: true })
-  confirmedByUserName?: string | null
-
   @Field(() => Date, { nullable: true })
   deniedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   deniedBy: number | null
 
-  @Field(() => String, { nullable: true })
-  deniedByUserName?: string | null
-
   @Field(() => Date, { nullable: true })
   deletedAt: Date | null
 
   @Field(() => Int, { nullable: true })
   deletedBy: number | null
 
-  @Field(() => String, { nullable: true })
-  deletedByUserName?: string | null
-
   @Field(() => Date, { nullable: true })
   updatedAt: Date | null
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 170c262e0..94a2772ec 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -372,27 +372,24 @@ export class ContributionResolver {
       },
       countOnly,
     )
+    console.log(dbContributions)
     const result = new ContributionListResult(count, dbContributions)
 
     const uniqueUserIds = new Set<number>()
     const addIfExist = (userId?: number | null) => (userId ? uniqueUserIds.add(userId) : null)
 
     for (const contribution of result.contributionList) {
-      addIfExist(contribution.confirmedBy)
       addIfExist(contribution.updatedBy)
       addIfExist(contribution.moderatorId)
-      addIfExist(contribution.deletedBy)
-      addIfExist(contribution.deniedBy)
+      addIfExist(contribution.closedBy)
     }
     const users = await findUserNamesByIds(Array.from(uniqueUserIds))
     const getNameById = (userId?: number | null) => (userId ? (users.get(userId) ?? null) : null)
 
     for (const contribution of result.contributionList) {
-      contribution.confirmedByUserName = getNameById(contribution.confirmedBy)
       contribution.updatedByUserName = getNameById(contribution.updatedBy)
       contribution.moderatorUserName = getNameById(contribution.moderatorId)
-      contribution.deletedByUserName = getNameById(contribution.deletedBy)
-      contribution.deniedByUserName = getNameById(contribution.deniedBy)
+      contribution.closedByUserName = getNameById(contribution.closedBy)
     }
     return result
   }

From bec95b9ec6f0a45e0d259b2d924d626704dbe60f Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 12:24:32 +0100
Subject: [PATCH 08/13] combine first and last name fields and show alias
 underneath if exist

---
 .../src/components/Tables/OpenCreationsTable.vue |  9 +++++++++
 admin/src/pages/CreationConfirm.vue              | 16 ++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 94ddc7208..a774f74ea 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -34,6 +34,15 @@
           </BButton>
         </div>
       </template>
+      <template #cell(name)="row">
+        <span v-if="row.item.user">
+          {{ row.item.user.firstName }} {{ row.item.user.lastName }}
+          <small v-if="row.item.user.alias">
+            <hr />
+            {{ row.item.user.alias }}
+          </small>
+        </span>
+      </template>
       <template #cell(memo)="row">
         {{ row.value }}
         <small v-if="isAddCommentToMemo(row.item)">
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 7990b50f3..ea8414296 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -138,6 +138,7 @@ const hideResubmissionModel = ref(true)
 const { formatDateOrDash } = useDateFormatter()
 
 const baseFields = {
+  name: { key: 'name', label: t('name'), class: 'no-select' },
   firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' },
   lastName: { key: 'user.lastName', label: t('lastname'), class: 'no-select' },
   amount: { key: 'amount', label: t('creation'), formatter: (value) => value + ' GDD' },
@@ -169,8 +170,7 @@ const fields = computed(
       [
         { key: 'bookmark', label: t('delete') },
         { key: 'deny', label: t('deny') },
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -179,8 +179,7 @@ const fields = computed(
       ],
       // confirmed contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -190,8 +189,7 @@ const fields = computed(
       ],
       // denied contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -201,8 +199,7 @@ const fields = computed(
       ],
       // deleted contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -213,8 +210,7 @@ const fields = computed(
       // all contributions
       [
         { key: 'contributionStatus', label: t('status') },
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,

From cf5a8be57fe580035970e039b3271dea5b483cf6 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 14:05:13 +0100
Subject: [PATCH 09/13] make memo comment not selectable

---
 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 a774f74ea..46a1651a1 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -45,7 +45,7 @@
       </template>
       <template #cell(memo)="row">
         {{ row.value }}
-        <small v-if="isAddCommentToMemo(row.item)">
+        <small v-if="isAddCommentToMemo(row.item)" class="no-select">
           <hr />
           {{ getMemoComment(row.item) }}
         </small>

From 2d121a098ce80ab7c299f883c3dabdc0a60097c2 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 14:05:59 +0100
Subject: [PATCH 10/13] remove debug log

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

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 94a2772ec..9b588158e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -372,7 +372,6 @@ export class ContributionResolver {
       },
       countOnly,
     )
-    console.log(dbContributions)
     const result = new ContributionListResult(count, dbContributions)
 
     const uniqueUserIds = new Set<number>()

From 4368530f6e006ea7536ceeb368c2f2d592b39ea1 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 14:14:20 +0100
Subject: [PATCH 11/13] add search for alias and first_name last_name
 combination

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

diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 5fad940f5..557dfae2a 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -66,6 +66,8 @@ export const findContributions = async (
         if (relations?.user) {
           qb.orWhere('user.first_name LIKE :firstName', { firstName: queryString })
             .orWhere('user.last_name LIKE :lastName', { lastName: queryString })
+            .orWhere('user.alias LIKE :alias', { alias: queryString })
+            .orWhere("LOWER(CONCAT(user.first_name, ' ', user.last_name)) LIKE LOWER(:fullName)", { fullName: queryString.toLowerCase() })
             .orWhere('emailContact.email LIKE :emailContact', { emailContact: queryString })
             .orWhere({ memo: Like(queryString) })
         }

From 9349943925e0c37e9e91e77a759f319d1f688f3f Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 14:18:42 +0100
Subject: [PATCH 12/13] fix lint

---
 backend/src/graphql/model/Contribution.ts              | 5 ++---
 backend/src/graphql/resolver/util/findContributions.ts | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 564b29e9c..4d69ecf26 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -20,19 +20,18 @@ export class Contribution extends UnconfirmedContribution {
     this.updatedAt = dbContribution.updatedAt
     this.updatedBy = dbContribution.updatedBy
     this.resubmissionAt = dbContribution.resubmissionAt
-    if( ContributionStatus.CONFIRMED === dbContribution.contributionStatus) {
+    if (ContributionStatus.CONFIRMED === dbContribution.contributionStatus) {
       this.closedAt = dbContribution.confirmedAt
       this.closedBy = dbContribution.confirmedBy
     } else if (ContributionStatus.DELETED === dbContribution.contributionStatus) {
       this.closedAt = dbContribution.deletedAt
       this.closedBy = dbContribution.deletedBy
-    } else if (ContributionStatus.DENIED === dbContribution.contributionStatus ) {
+    } else if (ContributionStatus.DENIED === dbContribution.contributionStatus) {
       this.closedAt = dbContribution.deniedAt
       this.closedBy = dbContribution.deniedBy
     }
   }
 
-
   @Field(() => Date, { nullable: true })
   closedAt?: Date | null
 
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 557dfae2a..187bb7b53 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -67,7 +67,9 @@ export const findContributions = async (
           qb.orWhere('user.first_name LIKE :firstName', { firstName: queryString })
             .orWhere('user.last_name LIKE :lastName', { lastName: queryString })
             .orWhere('user.alias LIKE :alias', { alias: queryString })
-            .orWhere("LOWER(CONCAT(user.first_name, ' ', user.last_name)) LIKE LOWER(:fullName)", { fullName: queryString.toLowerCase() })
+            .orWhere("LOWER(CONCAT(user.first_name, ' ', user.last_name)) LIKE LOWER(:fullName)", {
+              fullName: queryString.toLowerCase(),
+            })
             .orWhere('emailContact.email LIKE :emailContact', { emailContact: queryString })
             .orWhere({ memo: Like(queryString) })
         }

From 8aebe5d35ad94479dc4cbf71ea73bb1cd95a980e Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 30 Dec 2025 12:45:47 +0100
Subject: [PATCH 13/13] fix promise all in test

---
 database/src/queries/openaiThreads.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/src/queries/openaiThreads.test.ts b/database/src/queries/openaiThreads.test.ts
index f6eb94c6e..31003840d 100644
--- a/database/src/queries/openaiThreads.test.ts
+++ b/database/src/queries/openaiThreads.test.ts
@@ -23,7 +23,7 @@ afterAll(async () => {
 
 describe('openaiThreads query test', () => {
   it('should insert a new openai thread', async () => {
-    await Promise.resolve([dbInsertOpenaiThread('7', 1), dbInsertOpenaiThread('72', 6)])
+    await Promise.all([dbInsertOpenaiThread('7', 1), dbInsertOpenaiThread('72', 6)])
     const result = await db.select().from(openaiThreadsTable)
     expect(result).toHaveLength(2)
     expect(result).toMatchObject([