From eabd14bdf3625741a9912c17acb52cc4ee589d5d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 15 Jun 2022 09:04:34 +0200 Subject: [PATCH] further renaming --- admin/src/components/CreationFormular.spec.js | 8 ++++---- admin/src/components/CreationFormular.vue | 12 ++++++------ admin/src/graphql/adminCreateContributions.js | 4 ++-- .../src/graphql/model/AdminCreateContribution.ts | 8 ++++---- .../src/graphql/resolver/AdminResolver.test.ts | 12 ++++++++---- backend/src/graphql/resolver/AdminResolver.ts | 16 ++++++++-------- backend/src/seeds/graphql/mutations.ts | 4 ++-- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index 6c89ec727..6e4c1dc6e 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -336,8 +336,8 @@ describe('CreationFormular', () => { data: { adminCreateContributions: { success: true, - successfulCreation: ['bob@baumeister.de', 'bibi@bloxberg.de'], - failedCreation: [], + successfulContribution: ['bob@baumeister.de', 'bibi@bloxberg.de'], + failedContribution: [], }, }, }) @@ -392,8 +392,8 @@ describe('CreationFormular', () => { data: { adminCreateContributions: { success: true, - successfulCreation: [], - failedCreation: ['bob@baumeister.de', 'bibi@bloxberg.de'], + successfulContribution: [], + failedContribution: ['bob@baumeister.de', 'bibi@bloxberg.de'], }, }, }) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 8531eaa16..2201838de 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -165,18 +165,18 @@ export default { fetchPolicy: 'no-cache', }) .then((result) => { - const failedCreations = [] + const failedContributions = [] this.$store.commit( 'openCreationsPlus', - result.data.adminCreateContributions.successfulCreation.length, + result.data.adminCreateContributions.successfulContribution.length, ) - if (result.data.adminCreateContributions.failedCreation.length > 0) { - result.data.adminCreateContributions.failedCreation.forEach((email) => { - failedCreations.push(email) + if (result.data.adminCreateContributions.failedContribution.length > 0) { + result.data.adminCreateContributions.failedContribution.forEach((email) => { + failedContributions.push(email) }) } this.$emit('remove-all-bookmark') - this.$emit('toast-failed-creations', failedCreations) + this.$emit('toast-failed-creations', failedContributions) }) .catch((error) => { this.toastError(error.message) diff --git a/admin/src/graphql/adminCreateContributions.js b/admin/src/graphql/adminCreateContributions.js index 9aacf1e94..20831975c 100644 --- a/admin/src/graphql/adminCreateContributions.js +++ b/admin/src/graphql/adminCreateContributions.js @@ -4,8 +4,8 @@ export const adminCreateContributions = gql` mutation ($pendingCreations: [AdminCreateContributionArgs!]!) { adminCreateContributions(pendingCreations: $pendingCreations) { success - successfulCreation - failedCreation + successfulContribution + failedContribution } } ` diff --git a/backend/src/graphql/model/AdminCreateContribution.ts b/backend/src/graphql/model/AdminCreateContribution.ts index c2df3d73e..7327eb224 100644 --- a/backend/src/graphql/model/AdminCreateContribution.ts +++ b/backend/src/graphql/model/AdminCreateContribution.ts @@ -4,16 +4,16 @@ import { ObjectType, Field } from 'type-graphql' export class AdminCreateContribution { constructor() { this.success = false - this.successfulCreation = [] - this.failedCreation = [] + this.successfulContribution = [] + this.failedContribution = [] } @Field(() => Boolean) success: boolean @Field(() => [String]) - successfulCreation: string[] + successfulContribution: string[] @Field(() => [String]) - failedCreation: string[] + failedContribution: string[] } diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index b70e9fe6d..b9a723572 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -750,7 +750,9 @@ describe('AdminResolver', () => { mutate({ mutation: adminCreateContribution, variables }), ).resolves.toEqual( expect.objectContaining({ - errors: [new GraphQLError('This user was deleted. Cannot make a creation.')], + errors: [ + new GraphQLError('This user was deleted. Cannot create a contribution.'), + ], }), ) }) @@ -767,7 +769,9 @@ describe('AdminResolver', () => { mutate({ mutation: adminCreateContribution, variables }), ).resolves.toEqual( expect.objectContaining({ - errors: [new GraphQLError('Creation could not be saved, Email is not activated')], + errors: [ + new GraphQLError('Contribution could not be saved, Email is not activated'), + ], }), ) }) @@ -917,8 +921,8 @@ describe('AdminResolver', () => { data: { adminCreateContributions: { success: true, - successfulCreation: ['bibi@bloxberg.de', 'peter@lustig.de'], - failedCreation: [ + successfulContribution: ['bibi@bloxberg.de', 'peter@lustig.de'], + failedContribution: [ 'stephen@hawking.uk', 'garrick@ollivander.com', 'bob@baumeister.de', diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 1aa93bb03..9a871637c 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -176,10 +176,10 @@ export class AdminResolver { throw new Error(`Could not find user with email: ${email}`) } if (user.deletedAt) { - throw new Error('This user was deleted. Cannot make a creation.') + throw new Error('This user was deleted. Cannot create a contribution.') } if (!user.emailChecked) { - throw new Error('Creation could not be saved, Email is not activated') + throw new Error('Contribution could not be saved, Email is not activated') } const moderator = getUser(context) logger.trace('moderator: ', moderator.id) @@ -209,22 +209,22 @@ export class AdminResolver { @Ctx() context: Context, ): Promise { let success = false - const successfulCreation: string[] = [] - const failedCreation: string[] = [] + const successfulContribution: string[] = [] + const failedContribution: string[] = [] for (const contribution of contributions) { await this.adminCreateContribution(contribution, context) .then(() => { - successfulCreation.push(contribution.email) + successfulContribution.push(contribution.email) success = true }) .catch(() => { - failedCreation.push(contribution.email) + failedContribution.push(contribution.email) }) } return { success, - successfulCreation, - failedCreation, + successfulContribution, + failedContribution, } } diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index c854e413f..9ce310d82 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -114,8 +114,8 @@ export const adminCreateContributions = gql` mutation ($pendingCreations: [AdminCreateContributionArgs!]!) { adminCreateContributions(pendingCreations: $pendingCreations) { success - successfulCreation - failedCreation + successfulContribution + failedContribution } } `