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

Rename TransactionLinkFilters fields from by* back to with*

Browse Source
This commit is contained in:
Wolfgang Huß 2022-05-24 10:15:18 +02:00
parent 72e67194c4
commit cba20e8490
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,11 @@ import { Field, InputType } from 'type-graphql'
@InputType() @InputType()
export default class TransactionLinkFilters { export default class TransactionLinkFilters {
@Field(() => Boolean, { nullable: true, defaultValue: true }) @Field(() => Boolean, { nullable: true, defaultValue: true })
byDeleted: boolean withDeleted: boolean
@Field(() => Boolean, { nullable: true, defaultValue: true }) @Field(() => Boolean, { nullable: true, defaultValue: true })
byExpired: boolean withExpired: boolean
@Field(() => Boolean, { nullable: true, defaultValue: true }) @Field(() => Boolean, { nullable: true, defaultValue: true })
byRedeemed: boolean withRedeemed: boolean
} }

24
backend/src/graphql/resolver/AdminResolver.test.ts
View File

@ -1333,9 +1333,9 @@ describe('AdminResolver', () => {
const variables = { const variables = {
userId: 1, // dummy, may be replaced userId: 1, // dummy, may be replaced
filters: { filters: {
byDeleted: null, withDeleted: null,
byExpired: null, withExpired: null,
byRedeemed: null, withRedeemed: null,
}, },
currentPage: 1, currentPage: 1,
pageSize: 5, pageSize: 5,
@ -1465,9 +1465,9 @@ describe('AdminResolver', () => {
variables: { variables: {
...variables, ...variables,
filters: { filters: {
byDeleted: true, // Wolle: rename to `withDeleted`? withDeleted: true, // Wolle: rename to `withDeleted`?
byExpired: null, withExpired: null,
byRedeemed: null, withRedeemed: null,
}, },
}, },
}), }),
@ -1502,9 +1502,9 @@ describe('AdminResolver', () => {
variables: { variables: {
...variables, ...variables,
filters: { filters: {
byDeleted: null, withDeleted: null,
byExpired: true, withExpired: true,
byRedeemed: null, withRedeemed: null,
}, },
}, },
}), }),
@ -1539,9 +1539,9 @@ describe('AdminResolver', () => {
variables: { variables: {
...variables, ...variables,
filters: { filters: {
byDeleted: null, withDeleted: null,
byExpired: null, withExpired: null,
byRedeemed: true, withRedeemed: true,
}, },
}, },
}), }),

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

@ -438,13 +438,11 @@ export class AdminResolver {
} = { } = {
userId, userId,
} }
if (!filters.byRedeemed) where.redeemedBy = null if (!filters.withRedeemed) where.redeemedBy = null
if (!filters.byExpired) where.validUntil = MoreThan(new Date()) if (!filters.withExpired) where.validUntil = MoreThan(new Date())
const [transactionLinks, count] = await dbTransactionLink.findAndCount({ const [transactionLinks, count] = await dbTransactionLink.findAndCount({
where, where,
// Wolle: works not as expected withDeleted: filters.withDeleted,
withDeleted: filters.byDeleted,
// withDeleted: filters.byDeleted !== undefined ? !filters.byDeleted : undefined,
order: { order: {
createdAt: order, createdAt: order,
}, },