From b64c080447120919951ef1afe2b50f9f4619727b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 23 Mar 2023 13:27:47 +0100
Subject: [PATCH] changes requested

---
 admin/src/components/EditCreationFormular.vue |  1 -
 .../resolver/ContributionResolver.test.ts     | 33 -------------------
 .../graphql/resolver/ContributionResolver.ts  |  3 +-
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 994a734f6..6dbe22ebb 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -108,7 +108,6 @@ export default {
   },
   methods: {
     submitCreation() {
-      // console.log('submitCreation', this.selected)
       this.$apollo
         .mutate({
           mutation: adminUpdateContribution,
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 19d19080a..5a6e6d7c6 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -2152,39 +2152,6 @@ describe('ContributionResolver', () => {
             })
           })
 
-          describe.skip('user email does not match creation user', () => {
-            it('throws an error', async () => {
-              jest.clearAllMocks()
-              await expect(
-                mutate({
-                  mutation: adminUpdateContribution,
-                  variables: {
-                    id: creation ? creation.id : -1,
-                    amount: new Decimal(300),
-                    memo: 'Danke Bibi!',
-                    creationDate: creation
-                      ? contributionDateFormatter(creation.contributionDate)
-                      : contributionDateFormatter(new Date()),
-                  },
-                }),
-              ).resolves.toEqual(
-                expect.objectContaining({
-                  errors: [
-                    new GraphQLError(
-                      'User of the pending contribution and send user does not correspond',
-                    ),
-                  ],
-                }),
-              )
-            })
-
-            it('logs the error thrown', () => {
-              expect(logger.error).toBeCalledWith(
-                'User of the pending contribution and send user does not correspond',
-              )
-            })
-          })
-
           describe('creation update is not valid', () => {
             // as this test has not clearly defined that date, it is a false positive
             it('throws an error', async () => {
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2a9d96790..ab1c25d2e 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -321,7 +321,6 @@ export class ContributionResolver {
 
     const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
-      relations: ['user'],
     })
 
     if (!contributionToUpdate) {
@@ -358,7 +357,7 @@ export class ContributionResolver {
     result.date = contributionToUpdate.contributionDate
 
     await EVENT_ADMIN_CONTRIBUTION_UPDATE(
-      contributionToUpdate.user,
+      { id: contributionToUpdate.userId } as DbUser,
       moderator,
       contributionToUpdate,
       amount,