IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not query on email opt in type, since we have different ones and legacy types. Furthermore order the result of the query.

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-02-14 13:45:48 +01:00
parent 1e6e056dcd
commit f3b3fa2eba
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -24,7 +24,8 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation'
import { hasElopageBuys } from '../../util/hasElopageBuys' import { hasElopageBuys } from '../../util/hasElopageBuys'
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_IN_REGISTER = 1
// const EMAIL_OPT_UNKNOWN = 3 // elopage?
@Resolver() @Resolver()
export class AdminResolver { export class AdminResolver {
@ -46,10 +47,17 @@ export class AdminResolver {
adminUser.emailChecked = user.emailChecked adminUser.emailChecked = user.emailChecked
adminUser.hasElopage = await hasElopageBuys(user.email) adminUser.hasElopage = await hasElopageBuys(user.email)
if (!user.emailChecked) { if (!user.emailChecked) {
const emailOptIn = await LoginEmailOptIn.findOne({ const emailOptIn = await LoginEmailOptIn.findOne(
userId: user.id, {
emailOptInTypeId: EMAIL_OPT_IN_REGISTER, userId: user.id,
}) },
{
order: {
updatedAt: 'DESC',
createdAt: 'DESC',
},
},
)
if (emailOptIn) { if (emailOptIn) {
if (emailOptIn.updatedAt) { if (emailOptIn.updatedAt) {
adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString() adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()