diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts index caf5eddc4..98b6b2721 100644 --- a/backend/src/graphql/model/ContributionMessage.ts +++ b/backend/src/graphql/model/ContributionMessage.ts @@ -1,6 +1,6 @@ import { Field, ObjectType } from 'type-graphql' import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' -import { User } from './User' +import { User } from '@entity/User' @ObjectType() export class ContributionMessage { diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9a5609b75..63da1baed 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -740,6 +740,6 @@ export class AdminResolver { } finally { await queryRunner.release() } - return new ContributionMessage(contributionMessage, new User(user)) + return new ContributionMessage(contributionMessage, user) } } diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 7c4779e63..c73301598 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -9,7 +9,6 @@ import { ContributionMessageType } from '@enum/MessageType' import { ContributionStatus } from '@enum/ContributionStatus' import { getConnection } from '@dbTools/typeorm' import { ContributionMessage } from '@model/ContributionMessage' -import { User } from '@model/User' @Resolver() export class ContributionMessageResolver { @@ -52,6 +51,6 @@ export class ContributionMessageResolver { } finally { await queryRunner.release() } - return new ContributionMessage(contributionMessage, new User(user)) + return new ContributionMessage(contributionMessage, user) } } diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 8056ffde3..a59ba0a86 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -96,13 +96,14 @@ export class ContributionResolver { order: { createdAt: order, }, + relations: ['messages'], withDeleted: true, skip: (currentPage - 1) * pageSize, take: pageSize, }) return new ContributionListResult( count, - contributions.map((contribution) => new Contribution(contribution, new User(user))), + contributions.map((contribution) => new Contribution(contribution, user)), ) } @@ -123,9 +124,7 @@ export class ContributionResolver { .getManyAndCount() return new ContributionListResult( count, - dbContributions.map( - (contribution) => new Contribution(contribution, new User(contribution.user)), - ), + dbContributions.map((contribution) => new Contribution(contribution, contribution.user)), ) }