Merge branch 'master' into setup_improve

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>

admin/src/components/Tables/OpenCreationsTable.vue

@@ -34,11 +34,20 @@
           </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="row.item.updatedBy > 0">
+        <small v-if="isAddCommentToMemo(row.item)" class="no-select">
           <hr />
-          {{ $t('moderator.memo-modified') }}
+          {{ getMemoComment(row.item) }}
         </small>
       </template>
       <template #cell(editCreation)="row">
@@ -140,6 +149,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 +205,7 @@ export default {
     this.removeClipboardListener()
   },
   methods: {
+    ...useDateFormatter(),
     myself(item) {
       return item.userId === this.$store.state.moderator.id
     },
@@ -235,6 +246,36 @@ export default {
         this.creationUserData = row.item
       }
     },
+    isAddCommentToMemo(item) {
+      return item.closedBy > 0 || item.moderatorId > 0 || item.updatedBy > 0
+    },
+    getMemoComment(item) {
+      let comment = ''
+      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) {
+        if (comment.length) {
+          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() {
       document.addEventListener('copy', this.handleCopy)
     },

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,
   }
 }

admin/src/graphql/adminListContributions.graphql

@@ -19,19 +19,18 @@ query adminListContributions(
       }
       amount
       memo
-      createdAt
+      closedAt
+      closedBy
+      closedByUserName
       contributionDate
-      confirmedAt
-      confirmedBy
+      createdAt      
       updatedAt
-      updatedBy
+      updatedBy 
+      updatedByUserName
       contributionStatus
       messagesCount
-      deniedAt
-      deniedBy
-      deletedAt
-      deletedBy
       moderatorId
+      moderatorUserName
       userId
       resubmissionAt
     }

admin/src/locales/de.json

@@ -16,6 +16,12 @@
   "back": "zurück",
   "change_user_role": "Nutzerrolle ändern",
   "close": "Schließen",
+  "contribution": {
+    "confirmedBy": "Bestätigt von {name}.",
+    "createdBy": "Erstellt von {name}.",
+    "deletedBy": "Gelöscht von {name}.",
+    "deniedBy": "Abgelehnt von {name}."
+  },
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -49,6 +55,7 @@
   },
   "contributions": {
     "all": "Alle",
+    "closed": "Geschlossen",
     "confirms": "Bestätigt",
     "deleted": "Gelöscht",
     "denied": "Abgelehnt",
@@ -166,7 +173,7 @@
   "moderator": {
     "history": "Die Daten wurden geändert. Dies sind die alten Daten.",
     "memo": "Text ändern",
-    "memo-modified": "Text vom Moderator bearbeitet.",
+    "memo-modified": "Text von {name} bearbeitet.",
     "memo-tooltip": "Den Beitragstext bearbeiten",
     "message": "Nachricht",
     "message-tooltip": "Nachricht an Benutzer schreiben",

admin/src/locales/en.json

@@ -16,6 +16,12 @@
   "back": "back",
   "change_user_role": "Change user role",
   "close": "Close",
+  "contribution": {
+    "confirmedBy": "Confirmed by {name}.",
+    "createdBy": "Created by {name}.",
+    "deletedBy": "Deleted by {name}.",
+    "deniedBy": "Rejected by {name}."
+  },
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -49,6 +55,7 @@
   },
   "contributions": {
     "all": "All",
+    "closed": "Closed",
     "confirms": "Confirmed",
     "deleted": "Deleted",
     "denied": "Rejected",
@@ -166,7 +173,7 @@
   "moderator": {
     "history": "The data has been changed. This is the old data.",
     "memo": "Edit text",
-    "memo-modified": "Text edited by moderator",
+    "memo-modified": "Text edited by {name}",
     "memo-tooltip": "Edit the text of the contribution",
     "message": "Message",
     "message-tooltip": "Write message to user",

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,9 +135,10 @@ const query = ref('')
 const noHashtag = ref(null)
 const hideResubmissionModel = ref(true)
 
-const formatDateOrDash = (value) => (value ? new Date(value).toLocaleDateString() : '—')
+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' },
@@ -153,13 +155,12 @@ 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,
   },
-  confirmedBy: { key: 'confirmedBy', label: t('moderator.moderator'), class: 'no-select' },
 }
 
 const fields = computed(
@@ -169,70 +170,52 @@ 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,
-        { key: 'moderatorId', label: t('moderator.moderator'), class: 'no-select' },
         { key: 'editCreation', label: t('details') },
         { key: 'confirm', label: t('save') },
       ],
       // confirmed contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        baseFields.confirmedAt,
-        baseFields.confirmedBy,
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // denied contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        {
-          key: 'deniedAt',
-          label: t('contributions.denied'),
-          formatter: formatDateOrDash,
-        },
-        { key: 'deniedBy', label: t('moderator.moderator') },
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // deleted contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        {
-          key: 'deletedAt',
-          label: t('contributions.deleted'),
-          formatter: formatDateOrDash,
-        },
-        { key: 'deletedBy', label: t('moderator.moderator') },
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
       // all contributions
       [
         { key: 'contributionStatus', label: t('status') },
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
         baseFields.createdAt,
-        baseFields.confirmedAt,
-        baseFields.confirmedBy,
+        baseFields.closedAt,
         { key: 'chatCreation', label: t('details') },
       ],
     ][tabIndex.value],

backend/src/graphql/model/Contribution.ts

@@ -1,6 +1,6 @@
+import { ContributionStatus } from '@enum/ContributionStatus'
 import { Contribution as DbContribution } from 'database'
 import { Field, Int, ObjectType } from 'type-graphql'
-
 import { UnconfirmedContribution } from './UnconfirmedContribution'
 
 @ObjectType()
@@ -8,6 +8,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
@@ -19,11 +20,36 @@ 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
 
+  @Field(() => Int, { nullable: true })
+  moderatorId: number | null
+
+  @Field(() => String, { nullable: true })
+  moderatorUserName?: string | null
+
   @Field(() => Date, { nullable: true })
   confirmedAt: Date | null
 
@@ -48,6 +74,9 @@ export class Contribution extends UnconfirmedContribution {
   @Field(() => Int, { nullable: true })
   updatedBy: number | null
 
+  @Field(() => String, { nullable: true })
+  updatedByUserName?: string | null
+
   @Field(() => Date)
   contributionDate: Date
 

backend/src/graphql/resolver/ContributionResolver.ts

@@ -23,6 +23,7 @@ import {
   Contribution as DbContribution,
   Transaction as DbTransaction,
   User as DbUser,
+  findUserNamesByIds,
   getLastTransaction,
   UserContact,
 } from 'database'
@@ -348,6 +349,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 +372,25 @@ export class ContributionResolver {
       },
       countOnly,
     )
+    const result = new ContributionListResult(count, dbContributions)
 
-    return 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.updatedBy)
+      addIfExist(contribution.moderatorId)
+      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.updatedByUserName = getNameById(contribution.updatedBy)
+      contribution.moderatorUserName = getNameById(contribution.moderatorId)
+      contribution.closedByUserName = getNameById(contribution.closedBy)
+    }
+    return result
   }
 
   @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION])

backend/src/graphql/resolver/util/findContributions.ts

@@ -66,6 +66,10 @@ 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) })
         }

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([

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,15 @@ 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) => {
+      return [user.id, `${user.firstName} ${user.lastName}`]
+    }),
+  )
+}