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 set-EMAIL_TLS-true

Browse Source
This commit is contained in:
mahula 2023-03-01 10:45:50 +01:00 committed by GitHub
commit 6ec9d9120e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/graphql/resolver/ContributionResolver.test.ts
View File

@ -2888,11 +2888,11 @@ describe('ContributionResolver', () => {
state: 'PENDING', state: 'PENDING',
}), }),
expect.objectContaining({ expect.objectContaining({
amount: '200', amount: '100',
firstName: 'Bibi', firstName: 'Peter',
id: expect.any(Number), id: expect.any(Number),
lastName: 'Bloxberg', lastName: 'Lustig',
memo: 'Aktives Grundeinkommen', memo: 'Test env contribution',
messagesCount: 0, messagesCount: 0,
state: 'PENDING', state: 'PENDING',
}), }),

1
backend/src/graphql/resolver/util/findContributions.ts
View File

@ -17,6 +17,7 @@ export const findContributions = async (
withDeleted: withDeleted, withDeleted: withDeleted,
order: { order: {
createdAt: order, createdAt: order,
id: order,
}, },
relations: ['user'], relations: ['user'],
skip: (currentPage - 1) * pageSize, skip: (currentPage - 1) * pageSize,