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

corrected test name, some code style fixes

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-03-07 13:33:08 +01:00
parent fd912fb6c8
commit 920f16aad5
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/resolver/ContributionResolver.test.ts
View File

@ -2541,7 +2541,7 @@ describe('ContributionResolver', () => {
) )
}) })
it('stores the CONTRIBUTION_CONFIRM event in the database', async () => { it('stores the ADMIN_CONTRIBUTION_CONFIRM event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual( await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({ expect.objectContaining({
type: EventType.ADMIN_CONTRIBUTION_CONFIRM, type: EventType.ADMIN_CONTRIBUTION_CONFIRM,

13
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -89,7 +89,6 @@ export class ContributionResolver {
logger.trace('contribution to save', contribution) logger.trace('contribution to save', contribution)
await DbContribution.save(contribution) await DbContribution.save(contribution)
await EVENT_CONTRIBUTION_CREATE(user, contribution, amount) await EVENT_CONTRIBUTION_CREATE(user, contribution, amount)
return new UnconfirmedContribution(contribution, user, creations) return new UnconfirmedContribution(contribution, user, creations)
@ -117,7 +116,6 @@ export class ContributionResolver {
contribution.deletedBy = user.id contribution.deletedBy = user.id
contribution.deletedAt = new Date() contribution.deletedAt = new Date()
await contribution.save() await contribution.save()
await EVENT_CONTRIBUTION_DELETE(user, contribution, contribution.amount) await EVENT_CONTRIBUTION_DELETE(user, contribution, contribution.amount)
const res = await contribution.softRemove() const res = await contribution.softRemove()
@ -254,7 +252,6 @@ export class ContributionResolver {
contributionToUpdate.contributionStatus = ContributionStatus.PENDING contributionToUpdate.contributionStatus = ContributionStatus.PENDING
contributionToUpdate.updatedAt = new Date() contributionToUpdate.updatedAt = new Date()
DbContribution.save(contributionToUpdate) DbContribution.save(contributionToUpdate)
await EVENT_CONTRIBUTION_UPDATE(user, contributionToUpdate, amount) await EVENT_CONTRIBUTION_UPDATE(user, contributionToUpdate, amount)
return new UnconfirmedContribution(contributionToUpdate, user, creations) return new UnconfirmedContribution(contributionToUpdate, user, creations)
@ -307,11 +304,8 @@ export class ContributionResolver {
contribution.moderatorId = moderator.id contribution.moderatorId = moderator.id
contribution.contributionType = ContributionType.ADMIN contribution.contributionType = ContributionType.ADMIN
contribution.contributionStatus = ContributionStatus.PENDING contribution.contributionStatus = ContributionStatus.PENDING
logger.trace('contribution to save', contribution) logger.trace('contribution to save', contribution)
await DbContribution.save(contribution) await DbContribution.save(contribution)
await EVENT_ADMIN_CONTRIBUTION_CREATE(emailContact.user, moderator, contribution, amount) await EVENT_ADMIN_CONTRIBUTION_CREATE(emailContact.user, moderator, contribution, amount)
return getUserCreation(emailContact.userId, clientTimezoneOffset) return getUserCreation(emailContact.userId, clientTimezoneOffset)
@ -377,9 +371,7 @@ export class ContributionResolver {
result.amount = amount result.amount = amount
result.memo = contributionToUpdate.memo result.memo = contributionToUpdate.memo
result.date = contributionToUpdate.contributionDate result.date = contributionToUpdate.contributionDate
result.creation = await getUserCreation(emailContact.user.id, clientTimezoneOffset) result.creation = await getUserCreation(emailContact.user.id, clientTimezoneOffset)
await EVENT_ADMIN_CONTRIBUTION_UPDATE( await EVENT_ADMIN_CONTRIBUTION_UPDATE(
emailContact.user, emailContact.user,
moderator, moderator,
@ -440,14 +432,12 @@ export class ContributionResolver {
contribution.deletedBy = moderator.id contribution.deletedBy = moderator.id
await contribution.save() await contribution.save()
const res = await contribution.softRemove() const res = await contribution.softRemove()
await EVENT_ADMIN_CONTRIBUTION_DELETE( await EVENT_ADMIN_CONTRIBUTION_DELETE(
{ id: contribution.userId } as DbUser, { id: contribution.userId } as DbUser,
moderator, moderator,
contribution, contribution,
contribution.amount, contribution.amount,
) )
sendContributionDeletedEmail({ sendContributionDeletedEmail({
firstName: user.firstName, firstName: user.firstName,
lastName: user.lastName, lastName: user.lastName,
@ -558,7 +548,6 @@ export class ContributionResolver {
} finally { } finally {
await queryRunner.release() await queryRunner.release()
} }
await EVENT_ADMIN_CONTRIBUTION_CONFIRM(user, moderatorUser, contribution, contribution.amount) await EVENT_ADMIN_CONTRIBUTION_CONFIRM(user, moderatorUser, contribution, contribution.amount)
} finally { } finally {
releaseLock() releaseLock()
@ -648,14 +637,12 @@ export class ContributionResolver {
contributionToUpdate.deniedBy = moderator.id contributionToUpdate.deniedBy = moderator.id
contributionToUpdate.deniedAt = new Date() contributionToUpdate.deniedAt = new Date()
const res = await contributionToUpdate.save() const res = await contributionToUpdate.save()
await EVENT_ADMIN_CONTRIBUTION_DENY( await EVENT_ADMIN_CONTRIBUTION_DENY(
user, user,
moderator, moderator,
contributionToUpdate, contributionToUpdate,
contributionToUpdate.amount, contributionToUpdate.amount,
) )
sendContributionDeniedEmail({ sendContributionDeniedEmail({
firstName: user.firstName, firstName: user.firstName,
lastName: user.lastName, lastName: user.lastName,