diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index b5db21b16..6f36a9f64 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -15,7 +15,7 @@ export class Contribution { this.confirmedAt = contribution.confirmedAt this.confirmedBy = contribution.confirmedBy this.contributionDate = contribution.contributionDate - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messagesCount = contribution.messages ? contribution.messages.length : 0 this.deniedAt = contribution.deniedAt this.deniedBy = contribution.deniedBy @@ -68,7 +68,7 @@ export class Contribution { messagesCount: number @Field(() => String) - state: string + status: string @Field(() => Int, { nullable: true }) moderatorId: number | null diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts index 06f77f532..7c08520c8 100644 --- a/backend/src/graphql/model/GdtEntryList.ts +++ b/backend/src/graphql/model/GdtEntryList.ts @@ -10,7 +10,7 @@ import { GdtEntry } from './GdtEntry' @ObjectType() export class GdtEntryList { constructor(json: any) { - this.state = json.state + this.status = json.state this.count = json.count this.gdtEntries = json.gdtEntries ? json.gdtEntries.map((json: any) => new GdtEntry(json)) : [] this.gdtSum = json.gdtSum @@ -18,7 +18,7 @@ export class GdtEntryList { } @Field(() => String) - state: string + status: string @Field(() => Int) count: number diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index dece05781..5e38db6a0 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -16,7 +16,7 @@ export class UnconfirmedContribution { this.email = user ? user.emailContact.email : '' this.moderator = contribution.moderatorId this.creation = creations - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messageCount = contribution.messages ? contribution.messages.length : 0 } @@ -51,7 +51,7 @@ export class UnconfirmedContribution { creation: Decimal[] @Field(() => String) - state: string + status: string @Field(() => Int) messageCount: number diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index d4c84b4f3..f3646de54 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -1092,29 +1092,29 @@ describe('ContributionResolver', () => { contributionCount: 4, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: contributionToDelete.data.createContribution.id, - state: 'DELETED', + status: 'DELETED', memo: 'Test contribution to delete', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1223,47 +1223,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1288,47 +1288,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1353,47 +1353,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1419,33 +1419,33 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -1468,20 +1468,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), @@ -1506,20 +1506,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1545,27 +1545,27 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), ]), }) @@ -1608,36 +1608,36 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -2691,7 +2691,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(50), @@ -2700,7 +2700,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(450), @@ -2709,7 +2709,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(400), @@ -2718,7 +2718,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2727,7 +2727,7 @@ describe('ContributionResolver', () => { lastName: 'der Baumeister', memo: 'Confirmed Contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2736,7 +2736,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2745,7 +2745,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Aktives Grundeinkommen', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2754,7 +2754,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Das war leider zu Viel!', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2763,7 +2763,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2772,7 +2772,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2781,7 +2781,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2790,7 +2790,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to delete', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2799,7 +2799,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to deny', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2808,7 +2808,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to confirm', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2817,7 +2817,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test IN_PROGRESS contribution', messagesCount: 1, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ amount: expect.decimalEqual(10), @@ -2826,7 +2826,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test PENDING contribution update', messagesCount: 1, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(1000), @@ -2835,7 +2835,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), ]), }) @@ -2864,7 +2864,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: '100', @@ -2873,19 +2873,19 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index a964cdb3a..f376a5ff6 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -195,7 +195,7 @@ export const listContributions = gql` confirmedAt confirmedBy deletedAt - state + status messagesCount deniedAt deniedBy @@ -218,7 +218,7 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF confirmedAt confirmedBy contributionDate - state + status messagesCount deniedAt deniedBy @@ -254,7 +254,7 @@ export const adminListContributions = gql` confirmedAt confirmedBy contributionDate - state + status messagesCount deniedAt deniedBy