From 33638598a04c7d205d78de91c57ec928cf68727c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 25 Mar 2022 13:43:53 +0100 Subject: [PATCH] notActivated & isDeleted are both nullable Admin User Search is a nightmare codewise --- backend/src/graphql/arg/SearchUsersArgs.ts | 4 ++-- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 52da77852..2a94d8998 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -12,8 +12,8 @@ export default class SearchUsersArgs { pageSize?: number @Field(() => Boolean, { nullable: true }) - notActivated?: boolean + notActivated?: boolean | null @Field(() => Boolean, { nullable: true }) - isDeleted?: boolean + isDeleted?: boolean | null } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index e0a35b864..1905bde34 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -58,7 +58,7 @@ export class AdminResolver { const filterCriteria: ObjectLiteral[] = [] if (notActivated !== null) { - filterCriteria.push({ emailChecked: notActivated }) + filterCriteria.push({ emailChecked: !notActivated }) } if (isDeleted !== null) {