diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index b00d84de6..50eed4502 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/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 - .createQueryBuilder() - .withDeleted() - .where('id IN (:...userIds)', { userIds: involvedUserIds }) - .getMany() + const involvedDbUsers = await dbUser.find({ + where: { id: In(involvedUserIds) }, + withDeleted: true, + relations: ['emailContact'], + }) const involvedUsers = involvedDbUsers.map((u) => new User(u)) logger.debug(`involvedUsers=${involvedUsers}`) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index f772aa931..1c910a23e 100644 --- a/frontend/src/graphql/queries.js +++ b/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 } }