From ead31344f5593018067cf5111e4ee032e0efaea9 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 25 Aug 2022 15:16:44 +0200 Subject: [PATCH] Remove leftJoin on user and remove messages from UnconfirmedContribution model added messageCount instead to the model. --- backend/src/graphql/model/UnconfirmedContribution.ts | 9 +++------ backend/src/graphql/resolver/AdminResolver.ts | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index 3b88bec1c..5847b08d0 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -2,7 +2,6 @@ import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' import { Contribution } from '@entity/Contribution' import { User } from '@entity/User' -import { ContributionMessage } from '@model/ContributionMessage' @ObjectType() export class UnconfirmedContribution { @@ -18,9 +17,7 @@ export class UnconfirmedContribution { this.moderator = contribution.moderatorId this.creation = creations this.state = contribution.contributionStatus - this.messages = contribution.messages - ? contribution.messages.map((message) => new ContributionMessage(message, message.user)) - : [] + this.messageCount = contribution.messages ? contribution.messages.length : 0 } @Field(() => String) @@ -56,6 +53,6 @@ export class UnconfirmedContribution { @Field(() => String) state: string - @Field(() => [ContributionMessage]) - messages: ContributionMessage[] + @Field(() => Number) + messageCount: number } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a0eed646f..f4656aec8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -366,7 +366,6 @@ export class AdminResolver { .select('c') .from(Contribution, 'c') .leftJoinAndSelect('c.messages', 'm') - .leftJoinAndSelect('m.user', 'u') .where({ confirmedAt: IsNull() }) .getMany()