IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename updatePendingCreation

Browse Source
This commit is contained in:
Moriz Wahl 2022-06-15 20:01:53 +02:00
parent 2b87cbcd18
commit 1de8c94ba3
6 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/EditCreationFormular.spec.js
View File

@ -6,7 +6,7 @@ const localVue = global.localVue
const apolloMutateMock = jest.fn().mockResolvedValue({
data: {
updatePendingCreation: {
adminUpdateContribution: {
creation: [0, 0, 0],
amount: 500,
date: new Date(),

12
admin/src/components/EditCreationFormular.vue
View File

@ -73,7 +73,7 @@
</div>
</template>
<script>
import { updatePendingCreation } from '../graphql/updatePendingCreation'
import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
import { creationMonths } from '../mixins/creationMonths'
export default {
@ -113,7 +113,7 @@ export default {
submitCreation() {
this.$apollo
.mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: this.item.id,
email: this.item.email,
@ -123,11 +123,11 @@ export default {
},
})
.then((result) => {
this.$emit('update-user-data', this.item, result.data.updatePendingCreation.creation)
this.$emit('update-user-data', this.item, result.data.adminUpdateContribution.creation)
this.$emit('update-creation-data', {
amount: Number(result.data.updatePendingCreation.amount),
date: result.data.updatePendingCreation.date,
memo: result.data.updatePendingCreation.memo,
amount: Number(result.data.adminUpdateContribution.amount),
date: result.data.adminUpdateContribution.date,
memo: result.data.adminUpdateContribution.memo,
row: this.row,
})
this.toastSuccess(

4
admin/src/graphql/updatePendingCreation.js → admin/src/graphql/adminUpdateContribution.js
View File

@ -1,8 +1,8 @@
import gql from 'graphql-tag'
export const updatePendingCreation = gql`
export const adminUpdateContribution = gql`
mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
updatePendingCreation(
adminUpdateContribution(
id: $id
email: $email
amount: $amount

30
backend/src/graphql/resolver/AdminResolver.test.ts
View File

@ -17,7 +17,7 @@ import {
unDeleteUser,
adminCreateContribution,
adminCreateContributions,
updatePendingCreation,
adminUpdateContribution,
adminDeleteContribution,
confirmContribution,
createContributionLink,
@ -527,11 +527,11 @@ describe('AdminResolver', () => {
})
})
describe('updatePendingCreation', () => {
describe('adminUpdateContribution', () => {
it('returns an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: 1,
email: 'bibi@bloxberg.de',
@ -637,11 +637,11 @@ describe('AdminResolver', () => {
})
})
describe('updatePendingCreation', () => {
describe('adminUpdateContribution', () => {
it('returns an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: 1,
email: 'bibi@bloxberg.de',
@ -939,7 +939,7 @@ describe('AdminResolver', () => {
})
})
describe('updatePendingCreation', () => {
describe('adminUpdateContribution', () => {
// at this I expect to have this data in DB:
// bibi@bloxberg.de: [1000, 1000, 300]
// peter@lustig.de: [1000, 600, 500]
@ -950,7 +950,7 @@ describe('AdminResolver', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: 1,
email: 'bob@baumeister.de',
@ -971,7 +971,7 @@ describe('AdminResolver', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: 1,
email: 'stephen@hawking.uk',
@ -992,7 +992,7 @@ describe('AdminResolver', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: -1,
email: 'bibi@bloxberg.de',
@ -1013,7 +1013,7 @@ describe('AdminResolver', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: creation ? creation.id : -1,
email: 'bibi@bloxberg.de',
@ -1038,7 +1038,7 @@ describe('AdminResolver', () => {
it('throws an error', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: creation ? creation.id : -1,
email: 'peter@lustig.de',
@ -1063,7 +1063,7 @@ describe('AdminResolver', () => {
it('returns update creation object', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: creation ? creation.id : -1,
email: 'peter@lustig.de',
@ -1075,7 +1075,7 @@ describe('AdminResolver', () => {
).resolves.toEqual(
expect.objectContaining({
data: {
updatePendingCreation: {
adminUpdateContribution: {
date: expect.any(String),
memo: 'Danke Peter!',
amount: '300',
@ -1091,7 +1091,7 @@ describe('AdminResolver', () => {
it('returns update creation object', async () => {
await expect(
mutate({
mutation: updatePendingCreation,
mutation: adminUpdateContribution,
variables: {
id: creation ? creation.id : -1,
email: 'peter@lustig.de',
@ -1103,7 +1103,7 @@ describe('AdminResolver', () => {
).resolves.toEqual(
expect.objectContaining({
data: {
updatePendingCreation: {
adminUpdateContribution: {
date: expect.any(String),
memo: 'Das war leider zu Viel!',
amount: '200',

16
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -191,7 +191,7 @@ export class AdminResolver {
const creations = await getUserCreation(user.id)
logger.trace('creations', creations)
const creationDateObj = new Date(creationDate)
if (isCreationValid(creations, amount, creationDateObj)) {
if (isContributionValid(creations, amount, creationDateObj)) {
const contribution = Contribution.create()
contribution.userId = user.id
contribution.amount = amount
@ -235,7 +235,7 @@ export class AdminResolver {
@Authorized([RIGHTS.ADMIN_UPDATE_CONTRIBUTION])
@Mutation(() => AdminUpdateContribution)
async updatePendingCreation(
async adminUpdateContribution(
@Args() { id, email, amount, memo, creationDate }: AdminUpdateContributionArgs,
@Ctx() context: Context,
): Promise<AdminUpdateContribution> {
@ -249,7 +249,9 @@ export class AdminResolver {
const moderator = getUser(context)
const contributionToUpdate = await Contribution.findOne({ id })
const contributionToUpdate = await Contribution.findOne({
where: { id, confirmedAt: IsNull() },
})
if (!contributionToUpdate) {
throw new Error('No contribution found to given id.')
@ -266,7 +268,7 @@ export class AdminResolver {
}
// all possible cases not to be true are thrown in this function
isCreationValid(creations, amount, creationDateObj)
isContributionValid(creations, amount, creationDateObj)
contributionToUpdate.amount = amount
contributionToUpdate.memo = memo
contributionToUpdate.contributionDate = new Date(creationDate)
@ -343,7 +345,7 @@ export class AdminResolver {
if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a contribution.')
const creations = await getUserCreation(contribution.userId, false)
if (!isCreationValid(creations, contribution.amount, contribution.contributionDate)) {
if (!isContributionValid(creations, contribution.amount, contribution.contributionDate)) {
throw new Error('Creation is not valid!!')
}
@ -661,8 +663,8 @@ function updateCreations(creations: Decimal[], contribution: Contribution): Deci
return creations
}
function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Date) {
logger.trace('isCreationValid', creations, amount, creationDate)
function isContributionValid(creations: Decimal[], amount: Decimal, creationDate: Date) {
logger.trace('isContributionValid', creations, amount, creationDate)
const index = getCreationIndex(creationDate.getMonth())
if (index < 0) {

4
backend/src/seeds/graphql/mutations.ts
View File

@ -120,9 +120,9 @@ export const adminCreateContributions = gql`
}
`
export const updatePendingCreation = gql`
export const adminUpdateContribution = gql`
mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
updatePendingCreation(
adminUpdateContribution(
id: $id
email: $email
amount: $amount