mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
add contribution type enum and set contribution type on creation
This commit is contained in:
parent
cc2cc93b60
commit
daa8d48ca6
12
backend/src/graphql/enum/ContributionType.ts
Normal file
12
backend/src/graphql/enum/ContributionType.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { registerEnumType } from 'type-graphql'
|
||||||
|
|
||||||
|
export enum ContributionType {
|
||||||
|
ADMIN = 'ADMIN',
|
||||||
|
USER = 'USER',
|
||||||
|
LINK = 'LINK',
|
||||||
|
}
|
||||||
|
|
||||||
|
registerEnumType(ContributionType, {
|
||||||
|
name: 'ContributionType',
|
||||||
|
description: 'Name of the Type of the Contribution',
|
||||||
|
})
|
||||||
@ -36,6 +36,7 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
|
|||||||
import { User as dbUser } from '@entity/User'
|
import { User as dbUser } from '@entity/User'
|
||||||
import { User } from '@model/User'
|
import { User } from '@model/User'
|
||||||
import { TransactionTypeId } from '@enum/TransactionTypeId'
|
import { TransactionTypeId } from '@enum/TransactionTypeId'
|
||||||
|
import { ContributionType } from '@enum/ContributionType'
|
||||||
import Decimal from 'decimal.js-light'
|
import Decimal from 'decimal.js-light'
|
||||||
import { Decay } from '@model/Decay'
|
import { Decay } from '@model/Decay'
|
||||||
import Paginated from '@arg/Paginated'
|
import Paginated from '@arg/Paginated'
|
||||||
@ -260,6 +261,7 @@ export class AdminResolver {
|
|||||||
contribution.contributionDate = creationDateObj
|
contribution.contributionDate = creationDateObj
|
||||||
contribution.memo = memo
|
contribution.memo = memo
|
||||||
contribution.moderatorId = moderator.id
|
contribution.moderatorId = moderator.id
|
||||||
|
contribution.contributionType = ContributionType.ADMIN
|
||||||
|
|
||||||
logger.trace('contribution to save', contribution)
|
logger.trace('contribution to save', contribution)
|
||||||
await Contribution.save(contribution)
|
await Contribution.save(contribution)
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import { FindOperator, IsNull, getConnection } from '@dbTools/typeorm'
|
|||||||
import ContributionArgs from '@arg/ContributionArgs'
|
import ContributionArgs from '@arg/ContributionArgs'
|
||||||
import Paginated from '@arg/Paginated'
|
import Paginated from '@arg/Paginated'
|
||||||
import { Order } from '@enum/Order'
|
import { Order } from '@enum/Order'
|
||||||
|
import { ContributionType } from '@enum/ContributionType'
|
||||||
import { Contribution, ContributionListResult } from '@model/Contribution'
|
import { Contribution, ContributionListResult } from '@model/Contribution'
|
||||||
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
|
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
|
||||||
import { User } from '@model/User'
|
import { User } from '@model/User'
|
||||||
@ -43,6 +44,7 @@ export class ContributionResolver {
|
|||||||
contribution.createdAt = new Date()
|
contribution.createdAt = new Date()
|
||||||
contribution.contributionDate = creationDateObj
|
contribution.contributionDate = creationDateObj
|
||||||
contribution.memo = memo
|
contribution.memo = memo
|
||||||
|
contribution.contributionType = ContributionType.USER
|
||||||
|
|
||||||
logger.trace('contribution to save', contribution)
|
logger.trace('contribution to save', contribution)
|
||||||
await dbContribution.save(contribution)
|
await dbContribution.save(contribution)
|
||||||
|
|||||||
@ -26,6 +26,7 @@ import { User } from '@model/User'
|
|||||||
import { calculateDecay } from '@/util/decay'
|
import { calculateDecay } from '@/util/decay'
|
||||||
import { executeTransaction } from './TransactionResolver'
|
import { executeTransaction } from './TransactionResolver'
|
||||||
import { Order } from '@enum/Order'
|
import { Order } from '@enum/Order'
|
||||||
|
import { ContributionType } from '@enum/ContributionType'
|
||||||
import { Contribution as DbContribution } from '@entity/Contribution'
|
import { Contribution as DbContribution } from '@entity/Contribution'
|
||||||
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
|
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
|
||||||
import { getUserCreation, validateContribution } from './util/creations'
|
import { getUserCreation, validateContribution } from './util/creations'
|
||||||
@ -231,6 +232,8 @@ export class TransactionLinkResolver {
|
|||||||
contribution.memo = contributionLink.memo
|
contribution.memo = contributionLink.memo
|
||||||
contribution.amount = contributionLink.amount
|
contribution.amount = contributionLink.amount
|
||||||
contribution.contributionLinkId = contributionLink.id
|
contribution.contributionLinkId = contributionLink.id
|
||||||
|
contribution.contributionType = ContributionType.LINK
|
||||||
|
|
||||||
await queryRunner.manager.insert(DbContribution, contribution)
|
await queryRunner.manager.insert(DbContribution, contribution)
|
||||||
|
|
||||||
const lastTransaction = await queryRunner.manager
|
const lastTransaction = await queryRunner.manager
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user