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

improve error messages

Browse Source
This commit is contained in:
Moriz Wahl 2022-04-28 11:53:24 +02:00
parent 6251ad54d2
commit 48826feaa6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ describe('AdminResolver', () => {
mutate({ mutation: unDeleteUser, variables: { userId: user.id } }), mutate({ mutation: unDeleteUser, variables: { userId: user.id } }),
).resolves.toEqual( ).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('User already deleted')], errors: [new GraphQLError('User is not deleted')],
}), }),
) )
}) })
@ -265,7 +265,7 @@ describe('AdminResolver', () => {
const variables = { const variables = {
email: 'bibi@bloxberg.de', email: 'bibi@bloxberg.de',
amount: new Decimal(2000), amount: new Decimal(2000),
memo: 'Vielen Dank für den Zaubertrank!', memo: 'Aktives Grundeinkommen',
creationDate: 'not-valid', creationDate: 'not-valid',
} }
@ -552,7 +552,7 @@ describe('AdminResolver', () => {
mutate({ mutation: createPendingCreation, variables }), mutate({ mutation: createPendingCreation, variables }),
).resolves.toEqual( ).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('No Creation found!')], errors: [new GraphQLError('No information for available creations for the given date')],
}), }),
) )
}) })
@ -570,7 +570,7 @@ describe('AdminResolver', () => {
mutate({ mutation: createPendingCreation, variables }), mutate({ mutation: createPendingCreation, variables }),
).resolves.toEqual( ).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('No Creation found!')], errors: [new GraphQLError('No information for available creations for the given date')],
}), }),
) )
}) })
@ -588,7 +588,7 @@ describe('AdminResolver', () => {
mutate({ mutation: createPendingCreation, variables }), mutate({ mutation: createPendingCreation, variables }),
).resolves.toEqual( ).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('No Creation found!')], errors: [new GraphQLError('No information for available creations for the given date')],
}), }),
) )
}) })
@ -603,7 +603,7 @@ describe('AdminResolver', () => {
expect.objectContaining({ expect.objectContaining({
errors: [ errors: [
new GraphQLError( new GraphQLError(
'The amount (2000 GDD) to be created exceeds the available amount (1000 GDD) for this month.', 'The amount (2000 GDD) to be created exceeds the amount (1000 GDD) still available for this month.',
), ),
], ],
}), }),
@ -635,7 +635,7 @@ describe('AdminResolver', () => {
expect.objectContaining({ expect.objectContaining({
errors: [ errors: [
new GraphQLError( new GraphQLError(
'The amount (1000 GDD) to be created exceeds the available amount (800 GDD) for this month.', 'The amount (1000 GDD) to be created exceeds the amount (800 GDD) still available for this month.',
), ),
], ],
}), }),
@ -803,7 +803,7 @@ describe('AdminResolver', () => {
expect.objectContaining({ expect.objectContaining({
errors: [ errors: [
new GraphQLError( new GraphQLError(
'The amount (1900 GDD) to be created exceeds the available amount (500 GDD) for this month.', 'The amount (1900 GDD) to be created exceeds the amount (500 GDD) still available for this month.',
), ),
], ],
}), }),
@ -917,7 +917,7 @@ describe('AdminResolver', () => {
lastName: 'Bloxberg', lastName: 'Bloxberg',
email: 'bibi@bloxberg.de', email: 'bibi@bloxberg.de',
date: expect.any(String), date: expect.any(String),
memo: 'Vielen Dank für den Zaubertrank!', memo: 'Aktives Grundeinkommen',
amount: '200', amount: '200',
moderator: admin.id, moderator: admin.id,
creation: ['1000', '1000', '300'], creation: ['1000', '1000', '300'],
@ -941,7 +941,7 @@ describe('AdminResolver', () => {
}), }),
).resolves.toEqual( ).resolves.toEqual(
expect.objectContaining({ expect.objectContaining({
errors: [new GraphQLError('Creation not found to given id.')], errors: [new GraphQLError('Creation not found for given id.')],
}), }),
) )
}) })

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

@ -161,7 +161,7 @@ export class AdminResolver {
throw new Error(`Could not find user with userId: ${userId}`) throw new Error(`Could not find user with userId: ${userId}`)
} }
if (!user.deletedAt) { if (!user.deletedAt) {
throw new Error('User already deleted') throw new Error('User is not deleted')
} }
await user.recover() await user.recover()
return null return null
@ -309,7 +309,7 @@ export class AdminResolver {
async deletePendingCreation(@Arg('id', () => Int) id: number): Promise<boolean> { async deletePendingCreation(@Arg('id', () => Int) id: number): Promise<boolean> {
const pendingCreation = await AdminPendingCreation.findOne(id) const pendingCreation = await AdminPendingCreation.findOne(id)
if (!pendingCreation) { if (!pendingCreation) {
throw new Error('Creation not found to given id.') throw new Error('Creation not found for given id.')
} }
const res = await AdminPendingCreation.delete(pendingCreation) const res = await AdminPendingCreation.delete(pendingCreation)
return !!res return !!res
@ -526,12 +526,12 @@ function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Da
const index = getCreationIndex(creationDate.getMonth()) const index = getCreationIndex(creationDate.getMonth())
if (index < 0) { if (index < 0) {
throw new Error(`No Creation found!`) throw new Error('No information for available creations for the given date')
} }
if (amount.greaterThan(creations[index].toString())) { if (amount.greaterThan(creations[index].toString())) {
throw new Error( throw new Error(
`The amount (${amount} GDD) to be created exceeds the available amount (${creations[index]} GDD) for this month.`, `The amount (${amount} GDD) to be created exceeds the amount (${creations[index]} GDD) still available for this month.`,
) )
} }