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 fix-info-svg

Browse Source
This commit is contained in:
Hannes Heine 2023-03-09 13:25:32 +01:00 committed by GitHub
commit e6aecefc26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2745,15 +2745,6 @@ describe('ContributionResolver', () => {
messagesCount: 0, messagesCount: 0,
state: 'CONFIRMED', state: 'CONFIRMED',
}), }),
expect.objectContaining({
amount: expect.decimalEqual(100),
firstName: 'Bob',
id: expect.any(Number),
lastName: 'der Baumeister',
memo: 'Confirmed Contribution',
messagesCount: 0,
state: 'CONFIRMED',
}),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(400), amount: expect.decimalEqual(400),
firstName: 'Peter', firstName: 'Peter',
@ -2763,6 +2754,15 @@ describe('ContributionResolver', () => {
messagesCount: 0, messagesCount: 0,
state: 'PENDING', state: 'PENDING',
}), }),
expect.objectContaining({
amount: expect.decimalEqual(100),
firstName: 'Bob',
id: expect.any(Number),
lastName: 'der Baumeister',
memo: 'Confirmed Contribution',
messagesCount: 0,
state: 'CONFIRMED',
}),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(100), amount: expect.decimalEqual(100),
firstName: 'Peter', firstName: 'Peter',
@ -2781,15 +2781,6 @@ describe('ContributionResolver', () => {
messagesCount: 0, messagesCount: 0,
state: 'PENDING', state: 'PENDING',
}), }),
expect.objectContaining({
amount: expect.decimalEqual(10),
firstName: 'Bibi',
id: expect.any(Number),
lastName: 'Bloxberg',
memo: 'Test PENDING contribution update',
messagesCount: 0,
state: 'PENDING',
}),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(200), amount: expect.decimalEqual(200),
firstName: 'Peter', firstName: 'Peter',
@ -2799,15 +2790,6 @@ describe('ContributionResolver', () => {
messagesCount: 0, messagesCount: 0,
state: 'DELETED', state: 'DELETED',
}), }),
expect.objectContaining({
amount: expect.decimalEqual(166),
firstName: 'Räuber',
id: expect.any(Number),
lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
state: 'DELETED',
}),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(166), amount: expect.decimalEqual(166),
firstName: 'Räuber', firstName: 'Räuber',
@ -2817,6 +2799,15 @@ describe('ContributionResolver', () => {
messagesCount: 0, messagesCount: 0,
state: 'DENIED', state: 'DENIED',
}), }),
expect.objectContaining({
amount: expect.decimalEqual(166),
firstName: 'Räuber',
id: expect.any(Number),
lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
state: 'DELETED',
}),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(166), amount: expect.decimalEqual(166),
firstName: 'Räuber', firstName: 'Räuber',
@ -2831,18 +2822,9 @@ describe('ContributionResolver', () => {
firstName: 'Bibi', firstName: 'Bibi',
id: expect.any(Number), id: expect.any(Number),
lastName: 'Bloxberg', lastName: 'Bloxberg',
memo: 'Test IN_PROGRESS contribution', memo: 'Test contribution to delete',
messagesCount: 0, messagesCount: 0,
state: 'IN_PROGRESS', state: 'DELETED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
firstName: 'Bibi',
id: expect.any(Number),
lastName: 'Bloxberg',
memo: 'Test contribution to confirm',
messagesCount: 0,
state: 'CONFIRMED',
}), }),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(100), amount: expect.decimalEqual(100),
@ -2858,9 +2840,27 @@ describe('ContributionResolver', () => {
firstName: 'Bibi', firstName: 'Bibi',
id: expect.any(Number), id: expect.any(Number),
lastName: 'Bloxberg', lastName: 'Bloxberg',
memo: 'Test contribution to delete', memo: 'Test contribution to confirm',
messagesCount: 0, messagesCount: 0,
state: 'DELETED', state: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
firstName: 'Bibi',
id: expect.any(Number),
lastName: 'Bloxberg',
memo: 'Test IN_PROGRESS contribution',
messagesCount: 1,
state: 'IN_PROGRESS',
}),
expect.objectContaining({
amount: expect.decimalEqual(10),
firstName: 'Bibi',
id: expect.any(Number),
lastName: 'Bloxberg',
memo: 'Test PENDING contribution update',
messagesCount: 1,
state: 'PENDING',
}), }),
expect.objectContaining({ expect.objectContaining({
amount: expect.decimalEqual(1000), amount: expect.decimalEqual(1000),

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

@ -391,7 +391,7 @@ export class ContributionResolver {
currentPage, currentPage,
pageSize, pageSize,
true, true,
['user'], ['user', 'messages'],
undefined, undefined,
statusFilter, statusFilter,
) )