From d8def24e0c2f87a6973e3298a184a9b8e7c82867 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 18 Nov 2021 10:28:54 +0100 Subject: [PATCH 1/3] Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined. --- backend/src/graphql/resolver/UserResolver.ts | 2 +- backend/src/typeorm/repository/UserSettingRepository.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 5c4625938..b10876d46 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -537,7 +537,7 @@ export class UserResolver { await queryRunner.startTransaction('READ UNCOMMITTED') try { - if (coinanimation) { + if (coinanimation !== undefined) { queryRunner.manager .getCustomRepository(UserSettingRepository) .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index 80c44802b..7ec7ed3dd 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -18,7 +18,7 @@ export class UserSettingRepository extends Repository { let entity = await this.findOne({ userId: userId, key: key }) if (!entity) { - entity = new UserSetting() + entity = this.create() entity.userId = userId entity.key = key } From 49db3d37fc8cd9bea1743b9290bbbff8db9d3c6c Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 22 Nov 2021 23:33:04 +0100 Subject: [PATCH 2/3] Update backend/src/typeorm/repository/UserSettingRepository.ts --- backend/src/typeorm/repository/UserSettingRepository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index 7ec7ed3dd..80c44802b 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -18,7 +18,7 @@ export class UserSettingRepository extends Repository { let entity = await this.findOne({ userId: userId, key: key }) if (!entity) { - entity = this.create() + entity = new UserSetting() entity.userId = userId entity.key = key } From ed01bca12b437e31163829fb80de8b3ff293886e Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 22 Nov 2021 23:35:02 +0100 Subject: [PATCH 3/3] Update backend/src/graphql/resolver/UserResolver.ts --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index b10876d46..e5728d1d8 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -537,7 +537,7 @@ export class UserResolver { await queryRunner.startTransaction('READ UNCOMMITTED') try { - if (coinanimation !== undefined) { + if (coinanimation !== null && coinanimation !== undefined) { queryRunner.manager .getCustomRepository(UserSettingRepository) .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString())