From ab5e3a7729d494b1e587efc5d6c0fd8367aadfd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 16 May 2022 11:45:27 +0200 Subject: [PATCH] Revert "Replace some withDeleted by filterByDeleted" This reverts commit 5fd1a86af1f5efa514b01784750830380fd53c0f. --- backend/src/graphql/arg/TransactionLinkFilters.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/arg/TransactionLinkFilters.ts b/backend/src/graphql/arg/TransactionLinkFilters.ts index 4d02a18cc..e2f752d3f 100644 --- a/backend/src/graphql/arg/TransactionLinkFilters.ts +++ b/backend/src/graphql/arg/TransactionLinkFilters.ts @@ -3,7 +3,7 @@ import { ArgsType, Field } from 'type-graphql' @ArgsType() export default class TransactionLinkFilters { @Field(() => Boolean, { nullable: true, defaultValue: true }) - filterByDeleted?: boolean + withDeleted?: boolean @Field(() => Boolean, { nullable: true, defaultValue: true }) withExpired?: boolean diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 20eab662f..78cbf3fc8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -149,7 +149,7 @@ export class AdminResolver { } // soft-delete user await user.softRemove() - const newUser = await dbUser.findOne({ id: userId }, { filterByDeleted: true }) + const newUser = await dbUser.findOne({ id: userId }, { withDeleted: true }) return newUser ? newUser.deletedAt : null } @@ -444,7 +444,7 @@ export class AdminResolver { if (!filters.withExpired) where.validUntil = MoreThan(new Date()) const [transactionLinks, count] = await dbTransactionLink.findAndCount({ where, - withDeleted: filters.filterByDeleted, + withDeleted: filters.withDeleted, order: { createdAt: order, },