Remove leftJoin on user and remove messages from UnconfirmedContribution model added messageCount instead to the model.

This commit is contained in:
elweyn 2022-08-25 15:16:44 +02:00
parent 84ee364051
commit ead31344f5
2 changed files with 3 additions and 7 deletions

View File

@ -2,7 +2,6 @@ import { ObjectType, Field, Int } from 'type-graphql'
import Decimal from 'decimal.js-light' import Decimal from 'decimal.js-light'
import { Contribution } from '@entity/Contribution' import { Contribution } from '@entity/Contribution'
import { User } from '@entity/User' import { User } from '@entity/User'
import { ContributionMessage } from '@model/ContributionMessage'
@ObjectType() @ObjectType()
export class UnconfirmedContribution { export class UnconfirmedContribution {
@ -18,9 +17,7 @@ export class UnconfirmedContribution {
this.moderator = contribution.moderatorId this.moderator = contribution.moderatorId
this.creation = creations this.creation = creations
this.state = contribution.contributionStatus this.state = contribution.contributionStatus
this.messages = contribution.messages this.messageCount = contribution.messages ? contribution.messages.length : 0
? contribution.messages.map((message) => new ContributionMessage(message, message.user))
: []
} }
@Field(() => String) @Field(() => String)
@ -56,6 +53,6 @@ export class UnconfirmedContribution {
@Field(() => String) @Field(() => String)
state: string state: string
@Field(() => [ContributionMessage]) @Field(() => Number)
messages: ContributionMessage[] messageCount: number
} }

View File

@ -366,7 +366,6 @@ export class AdminResolver {
.select('c') .select('c')
.from(Contribution, 'c') .from(Contribution, 'c')
.leftJoinAndSelect('c.messages', 'm') .leftJoinAndSelect('c.messages', 'm')
.leftJoinAndSelect('m.user', 'u')
.where({ confirmedAt: IsNull() }) .where({ confirmedAt: IsNull() })
.getMany() .getMany()