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

Revert "Replace some withDeleted by filterByDeleted"

Browse Source 
This reverts commit 5fd1a86af1f5efa514b01784750830380fd53c0f.
This commit is contained in:
Wolfgang Huß 2022-05-16 11:45:27 +02:00
parent 5fd1a86af1
commit ab5e3a7729
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/arg/TransactionLinkFilters.ts
View File

@ -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

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

@ -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,
},