rename from pending creation to unconfirmed contribution

This commit is contained in:
Moriz Wahl 2022-06-14 19:47:18 +02:00
parent 92b076e8b1
commit 5845f708f6
6 changed files with 21 additions and 21 deletions

View File

@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light'
@InputType()
@ArgsType()
export default class CreatePendingCreationArgs {
export default class AdminCreateContributionArgs {
@Field(() => String)
email: string

View File

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

View File

@ -1,7 +1,7 @@
import { ObjectType, Field } from 'type-graphql'
@ObjectType()
export class CreatePendingCreations {
export class AdminCreateContribution {
constructor() {
this.success = false
this.successfulCreation = []

View File

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

View File

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

View File

@ -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<Decimal[]> {
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<CreatePendingCreations> {
): Promise<AdminCreateContribution> {
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<UpdatePendingCreation> {
): Promise<AdminUpdateUnconfirmedContribution> {
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<PendingContribution[]> {
@Query(() => [UnconfirmedContribution])
async getPendingCreations(): Promise<UnconfirmedContribution[]> {
const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } })
if (contributions.length === 0) {
return []