diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index ed4cdffa0..27f6d1c2a 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -2745,15 +2745,6 @@ describe('ContributionResolver', () => { messagesCount: 0, 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({ amount: expect.decimalEqual(400), firstName: 'Peter', @@ -2763,6 +2754,15 @@ describe('ContributionResolver', () => { messagesCount: 0, 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({ amount: expect.decimalEqual(100), firstName: 'Peter', @@ -2781,15 +2781,6 @@ describe('ContributionResolver', () => { messagesCount: 0, 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({ amount: expect.decimalEqual(200), firstName: 'Peter', @@ -2799,15 +2790,6 @@ describe('ContributionResolver', () => { messagesCount: 0, 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({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2817,6 +2799,15 @@ describe('ContributionResolver', () => { messagesCount: 0, 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({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2831,18 +2822,9 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test IN_PROGRESS contribution', + memo: 'Test contribution to delete', messagesCount: 0, - state: 'IN_PROGRESS', - }), - expect.objectContaining({ - amount: expect.decimalEqual(100), - firstName: 'Bibi', - id: expect.any(Number), - lastName: 'Bloxberg', - memo: 'Test contribution to confirm', - messagesCount: 0, - state: 'CONFIRMED', + state: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2858,9 +2840,27 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test contribution to delete', + memo: 'Test contribution to confirm', 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({ amount: expect.decimalEqual(1000), diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index ab177d759..2469f60ba 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -391,7 +391,7 @@ export class ContributionResolver { currentPage, pageSize, true, - ['user'], + ['user', 'messages'], undefined, statusFilter, )