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

Merge branch 'master' into do-not-log-IntrospectionQuery

Browse Source
This commit is contained in:
Moriz Wahl 2022-07-15 13:47:11 +02:00 committed by GitHub
commit 07093c466d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/graphql/model/Contribution.ts
View File

@ -12,6 +12,8 @@ export class Contribution {
this.memo = contribution.memo this.memo = contribution.memo
this.createdAt = contribution.createdAt this.createdAt = contribution.createdAt
this.deletedAt = contribution.deletedAt this.deletedAt = contribution.deletedAt
this.confirmedAt = contribution.confirmedAt
this.confirmedBy = contribution.confirmedBy
} }
@Field(() => Number) @Field(() => Number)
@ -31,6 +33,12 @@ export class Contribution {
@Field(() => Date, { nullable: true }) @Field(() => Date, { nullable: true })
deletedAt: Date | null deletedAt: Date | null
@Field(() => Date, { nullable: true })
confirmedAt: Date | null
@Field(() => Number, { nullable: true })
confirmedBy: number | null
} }
@ObjectType() @ObjectType()

1
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -58,6 +58,7 @@ export class ContributionResolver {
order: { order: {
createdAt: order, createdAt: order,
}, },
withDeleted: true,
skip: (currentPage - 1) * pageSize, skip: (currentPage - 1) * pageSize,
take: pageSize, take: pageSize,
}) })