From ec143bd18fcda30cd628e127c8d0a6613c57ef1a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 24 Feb 2022 11:08:30 +0100 Subject: [PATCH] fix: No Creations for Deleted Users --- backend/src/graphql/resolver/AdminResolver.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3d7661e35..89b4d88b3 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -263,7 +263,7 @@ export class AdminResolver { const userIds = pendingCreations.map((p) => p.userId) const userCreations = await getUserCreations(userIds) - const users = await User.find({ id: In(userIds) }) + const users = await User.find({ where: { id: In(userIds) }, withDeleted: true }) return pendingCreations.map((pendingCreation) => { const user = users.find((u) => u.id === pendingCreation.userId) @@ -297,6 +297,9 @@ export class AdminResolver { if (moderatorUser.id === pendingCreation.userId) throw new Error('Moderator can not confirm own pending creation') + const user = await User.findOneOrFail({ id: pendingCreation.userId }, { withDeleted: true }) + if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a creation.') + const creations = await getUserCreation(pendingCreation.userId, false) if (!isCreationValid(creations, Number(pendingCreation.amount) / 10000, pendingCreation.date)) { throw new Error('Creation is not valid!!')