diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts index 3cd85e84b..691d73154 100644 --- a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts @@ -17,7 +17,4 @@ export default class UpdatePendingCreationArgs { @Field(() => String) creationDate: string - - @Field(() => Int) - moderator: number } diff --git a/backend/src/graphql/model/UpdatePendingCreation.ts b/backend/src/graphql/model/UpdatePendingCreation.ts index 85d3af2cc..e19e1e064 100644 --- a/backend/src/graphql/model/UpdatePendingCreation.ts +++ b/backend/src/graphql/model/UpdatePendingCreation.ts @@ -12,9 +12,6 @@ export class UpdatePendingCreation { @Field(() => Decimal) amount: Decimal - @Field(() => Number) - moderator: number - @Field(() => [Decimal]) creation: Decimal[] } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 779d81c99..fe3861cfa 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -230,7 +230,8 @@ export class AdminResolver { @Authorized([RIGHTS.UPDATE_PENDING_CREATION]) @Mutation(() => UpdatePendingCreation) async updatePendingCreation( - @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs, + @Args() { id, email, amount, memo, creationDate }: UpdatePendingCreationArgs, + @Ctx() context: Context, ): Promise { const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { @@ -240,6 +241,8 @@ export class AdminResolver { throw new Error(`User was deleted (${email})`) } + const moderator = getUser(context) + const pendingCreationToUpdate = await AdminPendingCreation.findOneOrFail({ id }) if (pendingCreationToUpdate.userId !== user.id) { @@ -258,14 +261,13 @@ export class AdminResolver { pendingCreationToUpdate.amount = amount pendingCreationToUpdate.memo = memo pendingCreationToUpdate.date = new Date(creationDate) - pendingCreationToUpdate.moderator = moderator + pendingCreationToUpdate.moderator = moderator.id await AdminPendingCreation.save(pendingCreationToUpdate) const result = new UpdatePendingCreation() result.amount = amount result.memo = pendingCreationToUpdate.memo result.date = pendingCreationToUpdate.date - result.moderator = pendingCreationToUpdate.moderator result.creation = await getUserCreation(user.id) diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index 33b863768..e68ba13d0 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -116,3 +116,20 @@ export const createPendingCreations = gql` } } ` + +export const updatePendingCreation = gql` + mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { + updatePendingCreation( + id: $id + email: $email + amount: $amount + memo: $memo + creationDate: $creationDate + ) { + amount + date + memo + creation + } + } +`