From fadaaf85b084c8608ebc6128148fe66083775a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 9 Jun 2022 01:48:27 +0200 Subject: [PATCH] new method createContributionLink --- backend/src/graphql/resolver/AdminResolver.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9e7a3a031..7b6ceb906 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -41,7 +41,7 @@ import { checkOptInCode, activationLink, printTimeDuration } from './UserResolve import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' import { ContributionLinks as dbContributionLinks } from '@entity/ContributionLinks' import CreateContributionLinkArgs from '@arg/CreateContributionLinkArgs' -import { ContributionCycleType } from '@enum/ContributionCycleType' +import { ContributionLink } from '../model/ContributionLink' import CONFIG from '@/config' import { backendLogger as logger } from '@/server/logger' import _ from 'lodash' @@ -472,7 +472,7 @@ export class AdminResolver { } @Authorized([RIGHTS.CONTRIBUTION_LINK_CREATE]) - @Mutation(() => dbContributionLinks) + @Mutation(() => ContributionLink) async createContributionLink( @Args() { @@ -486,7 +486,10 @@ export class AdminResolver { maxAmount, }: CreateContributionLinkArgs, @Ctx() context: Context, - ): Promise { + ): Promise { + logger.trace( + `createContributionLink(startDate=${startDate}, endDate=${endDate}, name=${name}, amount=${amount}, memo=${memo}, cycle=${cycle}, repetition=${repetition}, maxAmount=${maxAmount})`, + ) if (!isStartEndDateValid(startDate, endDate)) { logger.error(`The startDate=${startDate} must be before or equals the endDate=${endDate}!`) throw new Error(`The startDate=${startDate} must be before or equals the endDate=${endDate}!`) @@ -539,7 +542,7 @@ export class AdminResolver { contributionLink.validTo = endDateObj await dbContributionLinks.save(contributionLink) - return dbContributionLinks.findOneOrFail(contributionLink.code) + return new ContributionLink(await dbContributionLinks.findOneOrFail(contributionLink.code)) } }