diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/AdminCreateContributionArgs.ts similarity index 85% rename from backend/src/graphql/arg/CreatePendingCreationArgs.ts rename to backend/src/graphql/arg/AdminCreateContributionArgs.ts index 11c345465..b09edea32 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/AdminCreateContributionArgs.ts @@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light' @InputType() @ArgsType() -export default class CreatePendingCreationArgs { +export default class AdminCreateContributionArgs { @Field(() => String) email: string diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts similarity index 84% rename from backend/src/graphql/arg/UpdatePendingCreationArgs.ts rename to backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts index 691d73154..228207707 100644 --- a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts @@ -2,7 +2,7 @@ import { ArgsType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ArgsType() -export default class UpdatePendingCreationArgs { +export default class AdminUpdatePendingContributionArgs { @Field(() => Int) id: number diff --git a/backend/src/graphql/model/CreatePendingCreations.ts b/backend/src/graphql/model/AdminCreateContribution.ts similarity index 89% rename from backend/src/graphql/model/CreatePendingCreations.ts rename to backend/src/graphql/model/AdminCreateContribution.ts index 8d5bcef2c..c2df3d73e 100644 --- a/backend/src/graphql/model/CreatePendingCreations.ts +++ b/backend/src/graphql/model/AdminCreateContribution.ts @@ -1,7 +1,7 @@ import { ObjectType, Field } from 'type-graphql' @ObjectType() -export class CreatePendingCreations { +export class AdminCreateContribution { constructor() { this.success = false this.successfulCreation = [] diff --git a/backend/src/graphql/model/UpdatePendingCreation.ts b/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts similarity index 84% rename from backend/src/graphql/model/UpdatePendingCreation.ts rename to backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts index e19e1e064..5f905cd6c 100644 --- a/backend/src/graphql/model/UpdatePendingCreation.ts +++ b/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class UpdatePendingCreation { +export class AdminUpdateUnconfirmedContribution { @Field(() => Date) date: Date diff --git a/backend/src/graphql/model/PendingContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts similarity index 93% rename from backend/src/graphql/model/PendingContribution.ts rename to backend/src/graphql/model/UnconfirmedContribution.ts index e8991deb7..69001c19b 100644 --- a/backend/src/graphql/model/PendingContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class PendingContribution { +export class UnconfirmedContribution { @Field(() => String) firstName: string diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index cf179263d..b0e2fcbec 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -11,13 +11,13 @@ import { FindOperator, } from '@dbTools/typeorm' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' -import { PendingContribution } from '@model/PendingContribution' -import { CreatePendingCreations } from '@model/CreatePendingCreations' -import { UpdatePendingCreation } from '@model/UpdatePendingCreation' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { AdminCreateContribution } from '@model/AdminCreateContribution' +import { AdminUpdateUnconfirmedContribution } from '@model/AdminUpdateUnconfirmedContribution' import { RIGHTS } from '@/auth/RIGHTS' import { UserRepository } from '@repository/User' -import CreatePendingCreationArgs from '@arg/CreatePendingCreationArgs' -import UpdatePendingCreationArgs from '@arg/UpdatePendingCreationArgs' +import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' +import AdminUpdateUnconfirmedContributionArgs from '@arg/AdminUpdateUnconfirmedContributionArgs' import SearchUsersArgs from '@arg/SearchUsersArgs' import { Transaction as DbTransaction } from '@entity/Transaction' import { Transaction } from '@model/Transaction' @@ -167,7 +167,7 @@ export class AdminResolver { @Authorized([RIGHTS.CREATE_PENDING_CREATION]) @Mutation(() => [Number]) async createPendingCreation( - @Args() { email, amount, memo, creationDate }: CreatePendingCreationArgs, + @Args() { email, amount, memo, creationDate }: AdminCreateContributionArgs, @Ctx() context: Context, ): Promise { logger.trace('createPendingCreation...') @@ -202,12 +202,12 @@ export class AdminResolver { } @Authorized([RIGHTS.CREATE_PENDING_CREATION]) - @Mutation(() => CreatePendingCreations) + @Mutation(() => AdminCreateContribution) async createPendingCreations( - @Arg('pendingCreations', () => [CreatePendingCreationArgs]) - contributions: CreatePendingCreationArgs[], + @Arg('pendingCreations', () => [AdminCreateContributionArgs]) + contributions: AdminCreateContributionArgs[], @Ctx() context: Context, - ): Promise { + ): Promise { let success = false const successfulCreation: string[] = [] const failedCreation: string[] = [] @@ -229,11 +229,11 @@ export class AdminResolver { } @Authorized([RIGHTS.UPDATE_PENDING_CREATION]) - @Mutation(() => UpdatePendingCreation) + @Mutation(() => AdminUpdateUnconfirmedContribution) async updatePendingCreation( - @Args() { id, email, amount, memo, creationDate }: UpdatePendingCreationArgs, + @Args() { id, email, amount, memo, creationDate }: AdminUpdateUnconfirmedContributionArgs, @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}`) @@ -268,7 +268,7 @@ export class AdminResolver { contributionToUpdate.moderatorId = moderator.id await Contribution.save(contributionToUpdate) - const result = new UpdatePendingCreation() + const result = new AdminUpdateUnconfirmedContribution() result.amount = amount result.memo = contributionToUpdate.memo result.date = contributionToUpdate.contributionDate @@ -279,8 +279,8 @@ export class AdminResolver { } @Authorized([RIGHTS.SEARCH_PENDING_CREATION]) - @Query(() => [PendingContribution]) - async getPendingCreations(): Promise { + @Query(() => [UnconfirmedContribution]) + async getPendingCreations(): Promise { const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } }) if (contributions.length === 0) { return []