From 4b4bb15912e4e1a66514dfd4643999f72f512d2a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 16 May 2025 07:45:42 +0200 Subject: [PATCH] fix some syntax error --- backend/src/graphql/model/Contribution.ts | 4 +++- backend/src/graphql/model/UnconfirmedContribution.ts | 5 ++++- backend/src/graphql/resolver/ContributionResolver.ts | 12 +++--------- .../src/graphql/resolver/util/loadContributions.ts | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index 458d64e7d..49a3c0be4 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -59,7 +59,9 @@ export class Contribution extends UnconfirmedContribution { export class ContributionListResult { constructor(count: number, list: DbContribution[]) { this.contributionCount = count - this.contributionList = list.map((dbContribution: DbContribution) => new Contribution(dbContribution)) + this.contributionList = list.map( + (dbContribution: DbContribution) => new Contribution(dbContribution), + ) } @Field(() => Int) diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index 435fbcdf2..48f40ea85 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -1,4 +1,7 @@ -import { Contribution as DbContribution, ContributionMessage as DbContributionMessage } from 'database' +import { + Contribution as DbContribution, + ContributionMessage as DbContributionMessage, +} from 'database' import { Decimal } from 'decimal.js-light' import { Field, Int, ObjectType } from 'type-graphql' diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 2f4e45b12..49077bdbd 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -179,7 +179,7 @@ export class ContributionResolver { contribution.messages = contribution.messages?.filter( (message) => message.type !== ContributionMessageType.MODERATOR, ) - return new Contribution(contribution) + return contribution }), ) } @@ -201,10 +201,7 @@ export class ContributionResolver { ): Promise { const [dbContributions, count] = await loadAllContributions(pagination) - return new ContributionListResult( - count, - dbContributions.map((contribution) => new Contribution(contribution)), - ) + return new ContributionListResult(count, dbContributions) } @Authorized([RIGHTS.UPDATE_CONTRIBUTION]) @@ -388,10 +385,7 @@ export class ContributionResolver { countOnly, ) - return new ContributionListResult( - count, - dbContributions.map((contribution) => new Contribution(contribution)), - ) + return new ContributionListResult(count, dbContributions) } @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION]) diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts index 0bf18aece..17ba3d17f 100644 --- a/backend/src/graphql/resolver/util/loadContributions.ts +++ b/backend/src/graphql/resolver/util/loadContributions.ts @@ -1,6 +1,6 @@ import { Paginated } from '@arg/Paginated' -import { FindManyOptions } from '@dbTools/typeorm' -import { Contribution as DbContribution } from '@entity/Contribution' +import { Contribution as DbContribution } from 'database' +import { FindManyOptions } from 'typeorm' function buildBaseOptions(paginated: Paginated): FindManyOptions { const { currentPage, pageSize } = paginated