IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use user entity instead of user model.

Browse Source
This commit is contained in:
elweyn 2022-08-24 10:56:19 +02:00
parent 41fb0d2a9f
commit 0271a42741
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/model/ContributionMessage.ts
View File

@ -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 {

2
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -740,6 +740,6 @@ export class AdminResolver {
} finally {
await queryRunner.release()
}
return new ContributionMessage(contributionMessage, new User(user))
return new ContributionMessage(contributionMessage, user)
}
}

3
backend/src/graphql/resolver/ContributionMessageResolver.ts
View File

@ -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)
}
}

7
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -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)),
)
}