From 9a7bc97777ecedfe27f2ee09b901f30e715626a3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 26 Oct 2021 17:37:28 +0200 Subject: [PATCH 1/3] change getCustomRepository to createUser function --- backend/src/graphql/resolver/UserResolver.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 33949197c..4e6f6d882 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,7 +55,8 @@ export class UserResolver { user.hasElopage = result.data.hasElopage // read additional settings from settings table const userRepository = getCustomRepository(UserRepository) - let userEntity: void | DbUser + let userEntity: void | DbUser + console.log("user.pubkey", user.pubkey) userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { userEntity = new DbUser() userEntity.firstName = user.firstName @@ -136,7 +137,7 @@ export class UserResolver { throw new Error(result.data) } - const user = new User(result.data.user) + const user = new User(result.data.user) const dbuser = new DbUser() dbuser.pubkey = Buffer.from(fromHex(user.pubkey)) dbuser.email = user.email @@ -144,7 +145,8 @@ export class UserResolver { dbuser.lastName = user.lastName dbuser.username = user.username - dbuser.save().catch(() => { + const userRepository = getCustomRepository(UserRepository) + userRepository.save(dbuser).catch(() => { throw new Error('error saving user') }) From 4de667067da7326f4a922f9b9ce933dbf7cdc040 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 26 Oct 2021 17:50:59 +0200 Subject: [PATCH 2/3] fix lint --- backend/src/graphql/resolver/UserResolver.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 4e6f6d882..68a61cbeb 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,8 +55,7 @@ export class UserResolver { user.hasElopage = result.data.hasElopage // read additional settings from settings table const userRepository = getCustomRepository(UserRepository) - let userEntity: void | DbUser - console.log("user.pubkey", user.pubkey) + let userEntity: void | DbUser userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { userEntity = new DbUser() userEntity.firstName = user.firstName @@ -137,7 +136,7 @@ export class UserResolver { throw new Error(result.data) } - const user = new User(result.data.user) + const user = new User(result.data.user) const dbuser = new DbUser() dbuser.pubkey = Buffer.from(fromHex(user.pubkey)) dbuser.email = user.email From f2d2ed970172e39c5bf919bfc8fc3a669638404a Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 09:24:06 +0100 Subject: [PATCH 3/3] Changed all entity.save methods to respository.save(entity) --- backend/src/graphql/resolver/UserResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 68a61cbeb..09e8d1079 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -64,7 +64,7 @@ export class UserResolver { userEntity.email = user.email userEntity.pubkey = Buffer.from(fromHex(user.pubkey)) - userEntity.save().catch(() => { + userRepository.save(userEntity).catch(() => { throw new Error('error by save userEntity') }) }) @@ -247,7 +247,7 @@ export class UserResolver { userEntityChanged = true } if (userEntityChanged) { - userEntity.save().catch((error) => { + userRepository.save(userEntity).catch((error) => { throw new Error(error) }) }