From b3be4f664a8a59530bdcf89dd6184f852aba3cbf Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 10 Feb 2022 08:05:25 +0100 Subject: [PATCH] add date of last email confirmation send to admin user --- backend/src/graphql/model/UserAdmin.ts | 3 +++ backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index 27dfe96f1..11cf384b3 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -22,6 +22,9 @@ export class UserAdmin { @Field(() => Boolean) hasElopage: boolean + + @Field(() => String, { nullable: true }) + emailConfirmationSend?: string } @ObjectType() diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 80345fb49..e89f20ba6 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -22,6 +22,9 @@ import { BalanceRepository } from '../../typeorm/repository/Balance' import { calculateDecay } from '../../util/decay' import { AdminPendingCreation } from '@entity/AdminPendingCreation' import { hasElopageBuys } from '../../util/hasElopageBuys' +import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' + +const EMAIL_OPT_IN_REGISTER = 1 @Resolver() export class AdminResolver { @@ -42,6 +45,13 @@ export class AdminResolver { adminUser.creation = await getUserCreations(user.id) adminUser.emailChecked = user.emailChecked adminUser.hasElopage = await hasElopageBuys(user.email) + if (!user.emailChecked) { + const emailOptIn = await LoginEmailOptIn.findOne({ + userId: user.id, + emailOptInTypeId: EMAIL_OPT_IN_REGISTER, + }) + if (emailOptIn) adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString() + } return adminUser }), )