IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the query to get the messages and the user of a message.

Browse Source
This commit is contained in:
elweyn 2022-08-25 09:52:33 +02:00 committed by ogerly
parent 8e61b89113
commit 275ce304f9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -361,7 +361,15 @@ export class AdminResolver {
@Authorized([RIGHTS.LIST_UNCONFIRMED_CONTRIBUTIONS])
@Query(() => [UnconfirmedContribution])
async listUnconfirmedContributions(): Promise<UnconfirmedContribution[]> {
const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } })
const contributions = await getConnection()
.createQueryBuilder()
.select('c')
.from(Contribution, 'c')
.leftJoinAndSelect('c.messages', 'm')
.leftJoinAndSelect('m.user', 'u')
.where({ confirmedAt: IsNull() })
.getMany()
if (contributions.length === 0) {
return []
}
@ -374,18 +382,11 @@ export class AdminResolver {
const user = users.find((u) => u.id === contribution.userId)
const creation = userCreations.find((c) => c.id === contribution.userId)
return {
id: contribution.id,
userId: contribution.userId,
date: contribution.contributionDate,
memo: contribution.memo,
amount: contribution.amount,
moderator: contribution.moderatorId,
firstName: user ? user.firstName : '',
lastName: user ? user.lastName : '',
email: user ? user.email : '',
creation: creation ? creation.creations : FULL_CREATION_AVAILABLE,
}
return new UnconfirmedContribution(
contribution,
user,
creation ? creation.creations : FULL_CREATION_AVAILABLE,
)
})
}