From dfb85d036bd6c3f8fa90ece6092bea5a1c69b9d2 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Mon, 6 Nov 2023 10:10:08 +0100
Subject: [PATCH] fix

---
 .../resolver/ContributionResolver.test.ts     | 25 ++-----------------
 .../UnconfirmedContributionUser.role.ts       |  2 +-
 .../Contribution.ts                           |  4 +--
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index e6cb485a3..c2f3fc3ae 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -497,28 +497,6 @@ describe('ContributionResolver', () => {
           })
         })
 
-        it('throws an error', async () => {
-          jest.clearAllMocks()
-          const { errors: errorObjects } = await mutate({
-            mutation: adminUpdateContribution,
-            variables: {
-              id: pendingContribution.data.createContribution.id,
-              amount: 10.0,
-              memo: 'Test env contribution',
-              creationDate: new Date().toString(),
-            },
-          })
-          expect(errorObjects).toEqual([
-            new GraphQLError('An admin is not allowed to update an user contribution'),
-          ])
-        })
-
-        it('logs the error "An admin is not allowed to update an user contribution"', () => {
-          expect(logger.error).toBeCalledWith(
-            'An admin is not allowed to update an user contribution',
-          )
-        })
-
         describe('contribution has wrong status', () => {
           beforeAll(async () => {
             const contribution = await Contribution.findOneOrFail({
@@ -2824,7 +2802,8 @@ describe('ContributionResolver', () => {
         } = await query({
           query: adminListContributions,
         })
-        // console.log('17 contributions: %s', JSON.stringify(contributionListObject, null, 2))
+        // console.log('18 contributions: %s', JSON.stringify(contributionListObject, null, 2))
+        // console.log(contributionListObject)
         expect(contributionListObject.contributionList).toHaveLength(18)
         expect(contributionListObject).toMatchObject({
           contributionCount: 18,
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
index 27aedeca8..fad8ac56f 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
@@ -19,7 +19,7 @@ export class UnconfirmedContributionUserRole extends UnconfirmedContributionRole
     this.self.contributionStatus = ContributionStatus.PENDING
     this.self.updatedAt = new Date()
     // null because updated by user them self
-    this.self.updatedBy = undefined
+    this.self.updatedBy = null
   }
 
   public checkAuthorization(user: User): UnconfirmedContributionRole {
diff --git a/database/entity/0074-add_updated_by_contribution/Contribution.ts b/database/entity/0074-add_updated_by_contribution/Contribution.ts
index f2b6987f1..8ed8c82d5 100644
--- a/database/entity/0074-add_updated_by_contribution/Contribution.ts
+++ b/database/entity/0074-add_updated_by_contribution/Contribution.ts
@@ -85,8 +85,8 @@ export class Contribution extends BaseEntity {
   @Column({ nullable: true, name: 'updated_at' })
   updatedAt: Date
 
-  @Column({ nullable: true, unsigned: true, name: 'updated_by' })
-  updatedBy?: number
+  @Column({ nullable: true, unsigned: true, name: 'updated_by', type: 'int' })
+  updatedBy: number | null
 
   @DeleteDateColumn({ name: 'deleted_at' })
   deletedAt: Date | null