From bda04f87d26886e67bd91c937a4510bbe09def64 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Aug 2022 10:57:03 +0200 Subject: [PATCH] Add messages and state to the contribution model. --- backend/src/graphql/model/Contribution.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index aa878990c..741debbbb 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -1,7 +1,8 @@ import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { Contribution as dbContribution } from '@entity/Contribution' -import { User } from './User' +import { User } from '@entity/User' +import { ContributionMessage } from './ContributionMessage' @ObjectType() export class Contribution { @@ -16,6 +17,10 @@ export class Contribution { this.confirmedAt = contribution.confirmedAt this.confirmedBy = contribution.confirmedBy this.contributionDate = contribution.contributionDate + this.state = contribution.contributionStatus + this.messages = contribution.messages + ? contribution.messages.map((message) => new ContributionMessage(message, user)) + : [] } @Field(() => Number) @@ -47,6 +52,12 @@ export class Contribution { @Field(() => Date) contributionDate: Date + + @Field(() => [ContributionMessage]) + messages: ContributionMessage[] + + @Field(() => String) + state: string } @ObjectType()