mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Remove leftJoin on user, changed ContributionMessage array to count of ContributionMessage.
This commit is contained in:
parent
7a8f776380
commit
423989777b
@ -2,7 +2,6 @@ import { ObjectType, Field, Int } from 'type-graphql'
|
||||
import Decimal from 'decimal.js-light'
|
||||
import { Contribution as dbContribution } from '@entity/Contribution'
|
||||
import { User } from '@entity/User'
|
||||
import { ContributionMessage } from './ContributionMessage'
|
||||
|
||||
@ObjectType()
|
||||
export class Contribution {
|
||||
@ -18,9 +17,7 @@ export class Contribution {
|
||||
this.confirmedBy = contribution.confirmedBy
|
||||
this.contributionDate = contribution.contributionDate
|
||||
this.state = contribution.contributionStatus
|
||||
this.messages = contribution.messages
|
||||
? contribution.messages.map((message) => new ContributionMessage(message, message.user))
|
||||
: []
|
||||
this.messagesCount = contribution.messages ? contribution.messages.length : 0
|
||||
}
|
||||
|
||||
@Field(() => Number)
|
||||
@ -53,8 +50,8 @@ export class Contribution {
|
||||
@Field(() => Date)
|
||||
contributionDate: Date
|
||||
|
||||
@Field(() => [ContributionMessage])
|
||||
messages: ContributionMessage[]
|
||||
@Field(() => Number)
|
||||
messagesCount: number
|
||||
|
||||
@Field(() => String)
|
||||
state: string
|
||||
|
||||
@ -97,7 +97,6 @@ export class ContributionResolver {
|
||||
.select('c')
|
||||
.from(dbContribution, 'c')
|
||||
.leftJoinAndSelect('c.messages', 'm')
|
||||
.leftJoinAndSelect('m.user', 'u')
|
||||
.where(where)
|
||||
.orderBy('c.createdAt', order)
|
||||
.limit(pageSize)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user