From da3574edb81aa93a362aa61a69ff5cbd459fe5ba Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 18 Jul 2022 12:35:42 +0200
Subject: [PATCH] Fix merge conflict and reviewed name changes.

---
 .../graphql/resolver/ContributionResolver.ts    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

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