mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Change search to get the contribution.user instead of queriing it after wards.
This commit is contained in:
parent
42f667674e
commit
d65bd827ca
@ -714,7 +714,10 @@ export class AdminResolver {
|
|||||||
await queryRunner.startTransaction('READ UNCOMMITTED')
|
await queryRunner.startTransaction('READ UNCOMMITTED')
|
||||||
const contributionMessage = DbContributionMessage.create()
|
const contributionMessage = DbContributionMessage.create()
|
||||||
try {
|
try {
|
||||||
const contribution = await Contribution.findOne({ id: contributionId })
|
const contribution = await Contribution.findOne({
|
||||||
|
where: { id: contributionId },
|
||||||
|
relations: ['user'],
|
||||||
|
})
|
||||||
if (!contribution) {
|
if (!contribution) {
|
||||||
throw new Error('Contribution not found')
|
throw new Error('Contribution not found')
|
||||||
}
|
}
|
||||||
@ -738,20 +741,18 @@ export class AdminResolver {
|
|||||||
await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
|
await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
|
||||||
}
|
}
|
||||||
await queryRunner.commitTransaction()
|
await queryRunner.commitTransaction()
|
||||||
const contributionUser = await dbUser.findOne({ id: contribution.userId })
|
|
||||||
if (contributionUser) {
|
await sendAddedContributionMessageEmail({
|
||||||
await sendAddedContributionMessageEmail({
|
senderFirstName: user.firstName,
|
||||||
senderFirstName: user.firstName,
|
senderLastName: user.lastName,
|
||||||
senderLastName: user.lastName,
|
recipientFirstName: contribution.user.firstName,
|
||||||
recipientFirstName: contributionUser.firstName,
|
recipientLastName: contribution.user.lastName,
|
||||||
recipientLastName: contributionUser.lastName,
|
recipientEmail: contribution.user.email,
|
||||||
recipientEmail: contributionUser.email,
|
senderEmail: user.email,
|
||||||
senderEmail: user.email,
|
contributionMemo: contribution.memo,
|
||||||
contributionMemo: contribution.memo,
|
message,
|
||||||
message,
|
overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
|
||||||
overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
|
})
|
||||||
})
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
await queryRunner.rollbackTransaction()
|
await queryRunner.rollbackTransaction()
|
||||||
logger.error(`ContributionMessage was not successful: ${e}`)
|
logger.error(`ContributionMessage was not successful: ${e}`)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user