diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index bd985d2d2..c07a691a3 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -451,6 +451,7 @@ export class ContributionResolver { transaction.userId = contribution.userId transaction.userGradidoID = user.gradidoID transaction.userName = fullName(user.firstName, user.lastName) + transaction.linkedUserId = contribution.moderatorId transaction.previous = lastTransaction ? lastTransaction.id : null transaction.amount = contribution.amount transaction.creationDate = contribution.contributionDate diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 8d35708a6..f3a0bed9e 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -254,6 +254,9 @@ export class TransactionResolver { // userTransactions.forEach((transaction: dbTransaction) => { // use normal for loop because of timing problems with await in forEach-loop for (const transaction of userTransactions) { + if (transaction.typeId === TransactionTypeId.CREATION) { + continue; + } if (transaction.linkedUserId && !involvedUserIds.includes(transaction.linkedUserId)) { involvedUserIds.push(transaction.linkedUserId) } diff --git a/database/migrations/0079-fill_linked_user_id_of_contributions.ts b/database/migrations/0079-fill_linked_user_id_of_contributions.ts new file mode 100644 index 000000000..957733830 --- /dev/null +++ b/database/migrations/0079-fill_linked_user_id_of_contributions.ts @@ -0,0 +1,13 @@ +export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn(` + UPDATE \`transactions\` AS t + JOIN \`contributions\` AS c ON t.id = c.transaction_id + SET t.linked_user_id = c.confirmed_by + WHERE t.typeId = ? + `, [1]) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn(`UPDATE \`transactions\` SET \`linked_user_id\` = NULL where \`type_id\` = ?;`, [1]) +} + \ No newline at end of file