From 2c88bc03838fa6810edc7fcd41f6e6e133b71d71 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 10 Feb 2022 07:32:39 +0100 Subject: [PATCH] remove query for checkEmail as it is included in the user model now --- backend/src/graphql/resolver/AdminResolver.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 54fe9335e..80345fb49 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -22,7 +22,6 @@ import { BalanceRepository } from '../../typeorm/repository/Balance' import { calculateDecay } from '../../util/decay' import { AdminPendingCreation } from '@entity/AdminPendingCreation' import { hasElopageBuys } from '../../util/hasElopageBuys' -import { User as dbUser } from '@entity/User' @Resolver() export class AdminResolver { @@ -41,7 +40,7 @@ export class AdminResolver { adminUser.lastName = user.lastName adminUser.email = user.email adminUser.creation = await getUserCreations(user.id) - adminUser.emailChecked = await hasActivatedEmail(user.email) + adminUser.emailChecked = user.emailChecked adminUser.hasElopage = await hasElopageBuys(user.email) return adminUser }), @@ -61,8 +60,7 @@ export class AdminResolver { ): Promise { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - const isActivated = await hasActivatedEmail(user.email) - if (!isActivated) { + if (user.emailChecked) { throw new Error('Creation could not be saved, Email is not activated') } const creations = await getUserCreations(user.id) @@ -374,8 +372,3 @@ function isCreationValid(creations: number[], amount: number, creationDate: Date } return true } - -async function hasActivatedEmail(email: string): Promise { - const user = await dbUser.findOne({ email }) - return user ? user.emailChecked : false -}