Merge pull request #2268 from gradido/fix-linked-user-email

fix: Linked User Email in Transaction List

backend/src/graphql/resolver/TransactionResolver.ts

@@ -6,7 +6,7 @@ import CONFIG from '@/config'
 
 import { Context, getUser } from '@/server/context'
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
-import { getCustomRepository, getConnection } from '@dbTools/typeorm'
+import { getCustomRepository, getConnection, In } from '@dbTools/typeorm'
 
 import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail'
 
@@ -224,11 +224,11 @@ export class TransactionResolver {
     logger.debug(`involvedUserIds=${involvedUserIds}`)
 
     // We need to show the name for deleted users for old transactions
-    const involvedDbUsers = await dbUser
+    const involvedDbUsers = await dbUser.find({
-      .createQueryBuilder()
+      where: { id: In(involvedUserIds) },
-      .withDeleted()
+      withDeleted: true,
-      .where('id IN (:...userIds)', { userIds: involvedUserIds })
+      relations: ['emailContact'],
-      .getMany()
+    })
     const involvedUsers = involvedDbUsers.map((u) => new User(u))
     logger.debug(`involvedUsers=${involvedUsers}`)
 

frontend/src/graphql/queries.js

@@ -37,6 +37,7 @@ export const transactionsQuery = gql`
         linkedUser {
           firstName
           lastName
+          email
         }
         decay {
           decay
@@ -44,9 +45,6 @@ export const transactionsQuery = gql`
           end
           duration
         }
-        linkedUser {
-          email
-        }
         transactionLinkId
       }
     }