diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index 7d75d5c7a..1669c258b 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -29,7 +29,7 @@ export enum RIGHTS { SEARCH_USERS = 'SEARCH_USERS', ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION', ADMIN_CREATE_CONTRIBUTIONS = 'ADMIN_CREATE_CONTRIBUTIONS', - ADMIN_UPDATE_UNCONFIRMED_CONTRIBUTION = 'ADMIN_UPDATE_UNCONFIRMED_CONTRIBUTION', + ADMIN_UPDATE_CONTRIBUTION = 'ADMIN_UPDATE_CONTRIBUTION', SEARCH_PENDING_CREATION = 'SEARCH_PENDING_CREATION', DELETE_PENDING_CREATION = 'DELETE_PENDING_CREATION', CONFIRM_PENDING_CREATION = 'CONFIRM_PENDING_CREATION', diff --git a/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts similarity index 84% rename from backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts rename to backend/src/graphql/arg/AdminUpdateContributionArgs.ts index 228207707..392365b38 100644 --- a/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts +++ b/backend/src/graphql/arg/AdminUpdateContributionArgs.ts @@ -2,7 +2,7 @@ import { ArgsType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ArgsType() -export default class AdminUpdatePendingContributionArgs { +export default class AdminUpdateContributionArgs { @Field(() => Int) id: number diff --git a/backend/src/graphql/model/AdminCreateContribution.ts b/backend/src/graphql/model/AdminCreateContributions.ts similarity index 89% rename from backend/src/graphql/model/AdminCreateContribution.ts rename to backend/src/graphql/model/AdminCreateContributions.ts index 7327eb224..aa402733a 100644 --- a/backend/src/graphql/model/AdminCreateContribution.ts +++ b/backend/src/graphql/model/AdminCreateContributions.ts @@ -1,7 +1,7 @@ import { ObjectType, Field } from 'type-graphql' @ObjectType() -export class AdminCreateContribution { +export class AdminCreateContributions { constructor() { this.success = false this.successfulContribution = [] diff --git a/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts b/backend/src/graphql/model/AdminUpdateContribution.ts similarity index 84% rename from backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts rename to backend/src/graphql/model/AdminUpdateContribution.ts index 5f905cd6c..e824975a4 100644 --- a/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts +++ b/backend/src/graphql/model/AdminUpdateContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class AdminUpdateUnconfirmedContribution { +export class AdminUpdateContribution { @Field(() => Date) date: Date diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index e8cf19171..290b6f039 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -13,14 +13,14 @@ import { } from '@dbTools/typeorm' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' import { UnconfirmedContribution } from '@model/UnconfirmedContribution' -import { AdminCreateContribution } from '@model/AdminCreateContribution' -import { AdminUpdateUnconfirmedContribution } from '@model/AdminUpdateUnconfirmedContribution' +import { AdminCreateContributions } from '@model/AdminCreateContributions' +import { AdminUpdateContribution } from '@model/AdminUpdateContribution' import { ContributionLink } from '@model/ContributionLink' import { ContributionLinkList } from '@model/ContributionLinkList' import { RIGHTS } from '@/auth/RIGHTS' import { UserRepository } from '@repository/User' import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' -import AdminUpdateUnconfirmedContributionArgs from '@arg/AdminUpdateUnconfirmedContributionArgs' +import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs' import SearchUsersArgs from '@arg/SearchUsersArgs' import ContributionLinkArgs from '@arg/ContributionLinkArgs' import { Transaction as DbTransaction } from '@entity/Transaction' @@ -207,12 +207,12 @@ export class AdminResolver { } @Authorized([RIGHTS.ADMIN_CREATE_CONTRIBUTIONS]) - @Mutation(() => AdminCreateContribution) + @Mutation(() => AdminCreateContributions) async adminCreateContributions( @Arg('pendingCreations', () => [AdminCreateContributionArgs]) contributions: AdminCreateContributionArgs[], @Ctx() context: Context, - ): Promise { + ): Promise { let success = false const successfulContribution: string[] = [] const failedContribution: string[] = [] @@ -233,12 +233,12 @@ export class AdminResolver { } } - @Authorized([RIGHTS.ADMIN_UPDATE_UNCONFIRMED_CONTRIBUTION]) - @Mutation(() => AdminUpdateUnconfirmedContribution) + @Authorized([RIGHTS.ADMIN_UPDATE_CONTRIBUTION]) + @Mutation(() => AdminUpdateContribution) async updatePendingCreation( - @Args() { id, email, amount, memo, creationDate }: AdminUpdateUnconfirmedContributionArgs, + @Args() { id, email, amount, memo, creationDate }: AdminUpdateContributionArgs, @Ctx() context: Context, - ): Promise { + ): Promise { const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { throw new Error(`Could not find user with email: ${email}`) @@ -273,7 +273,7 @@ export class AdminResolver { contributionToUpdate.moderatorId = moderator.id await Contribution.save(contributionToUpdate) - const result = new AdminUpdateUnconfirmedContribution() + const result = new AdminUpdateContribution() result.amount = amount result.memo = contributionToUpdate.memo result.date = contributionToUpdate.contributionDate