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

Fix merge conflict and reviewed name changes.

Browse Source
This commit is contained in:
elweyn 2022-07-18 12:35:42 +02:00
parent 7a337f027d
commit da3574edb8
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,6 @@
import { RIGHTS } from '@/auth/RIGHTS' import { RIGHTS } from '@/auth/RIGHTS'
import { Context, getUser } from '@/server/context' import { Context, getUser } from '@/server/context'
import { backendLogger as logger } from '@/server/logger' import { backendLogger as logger } from '@/server/logger'
<<<<<<< HEAD
import { Contribution } from '@entity/Contribution'
import { Arg, Args, Authorized, Ctx, Int, Mutation, Resolver } from 'type-graphql'
import ContributionArgs from '../arg/ContributionArgs'
import { UnconfirmedContribution } from '../model/UnconfirmedContribution'
import { validateContribution, getUserCreation } from './util/creations'
=======
import { Contribution as dbContribution } from '@entity/Contribution' import { Contribution as dbContribution } from '@entity/Contribution'
import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
import { FindOperator, IsNull } from '@dbTools/typeorm' import { FindOperator, IsNull } from '@dbTools/typeorm'
@ -18,7 +11,6 @@ import { Contribution, ContributionListResult } from '@model/Contribution'
import { UnconfirmedContribution } from '@model/UnconfirmedContribution' import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
import { User } from '@model/User' import { User } from '@model/User'
import { validateContribution, getUserCreation, updateCreations } from './util/creations' import { validateContribution, getUserCreation, updateCreations } from './util/creations'
>>>>>>> master
@Resolver() @Resolver()
export class ContributionResolver { export class ContributionResolver {
@ -46,15 +38,14 @@ export class ContributionResolver {
return new UnconfirmedContribution(contribution, user, creations) return new UnconfirmedContribution(contribution, user, creations)
} }
<<<<<<< HEAD
@Authorized([RIGHTS.DELETE_CONTRIBUTION]) @Authorized([RIGHTS.DELETE_CONTRIBUTION])
@Mutation(() => Boolean) @Mutation(() => Boolean)
async adminDeleteContribution( async deleteContribution(
@Arg('id', () => Int) id: number, @Arg('id', () => Int) id: number,
@Ctx() context: Context, @Ctx() context: Context,
): Promise<boolean> { ): Promise<boolean> {
const user = getUser(context) const user = getUser(context)
const contribution = await Contribution.findOne(id) const contribution = await dbContribution.findOne(id)
if (!contribution) { if (!contribution) {
throw new Error('Contribution not found for given id.') throw new Error('Contribution not found for given id.')
} }
@ -63,7 +54,8 @@ export class ContributionResolver {
} }
const res = await contribution.softRemove() const res = await contribution.softRemove()
return !!res return !!res
======= }
@Authorized([RIGHTS.LIST_CONTRIBUTIONS]) @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
@Query(() => [Contribution]) @Query(() => [Contribution])
async listContributions( async listContributions(
@ -147,6 +139,5 @@ export class ContributionResolver {
dbContribution.save(contributionToUpdate) dbContribution.save(contributionToUpdate)
return new UnconfirmedContribution(contributionToUpdate, user, creations) return new UnconfirmedContribution(contributionToUpdate, user, creations)
>>>>>>> master
} }
} }