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

Change utils file isContributionValid to contributions and changed method isContributionValid to validateContribution.

Browse Source
This commit is contained in:
elweyn 2022-07-05 11:35:50 +02:00
parent 25b9a5a622
commit 103928518c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,9 @@ import {
getCreationIndex, getCreationIndex,
getUserCreation, getUserCreation,
getUserCreations, getUserCreations,
isContributionValid, validateContribution,
isStartEndDateValid, isStartEndDateValid,
} from './util/isContributionValid' } from './util/creations'
import { import {
CONTRIBUTIONLINK_MEMO_MAX_CHARS, CONTRIBUTIONLINK_MEMO_MAX_CHARS,
CONTRIBUTIONLINK_MEMO_MIN_CHARS, CONTRIBUTIONLINK_MEMO_MIN_CHARS,
@ -252,7 +252,7 @@ export class AdminResolver {
const creations = await getUserCreation(user.id) const creations = await getUserCreation(user.id)
logger.trace('creations', creations) logger.trace('creations', creations)
const creationDateObj = new Date(creationDate) const creationDateObj = new Date(creationDate)
isContributionValid(creations, amount, creationDateObj) validateContribution(creations, amount, creationDateObj)
const contribution = Contribution.create() const contribution = Contribution.create()
contribution.userId = user.id contribution.userId = user.id
contribution.amount = amount contribution.amount = amount
@ -328,7 +328,7 @@ export class AdminResolver {
} }
// all possible cases not to be true are thrown in this function // all possible cases not to be true are thrown in this function
isContributionValid(creations, amount, creationDateObj) validateContribution(creations, amount, creationDateObj)
contributionToUpdate.amount = amount contributionToUpdate.amount = amount
contributionToUpdate.memo = memo contributionToUpdate.memo = memo
contributionToUpdate.contributionDate = new Date(creationDate) contributionToUpdate.contributionDate = new Date(creationDate)
@ -405,7 +405,7 @@ export class AdminResolver {
if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a contribution.') if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a contribution.')
const creations = await getUserCreation(contribution.userId, false) const creations = await getUserCreation(contribution.userId, false)
isContributionValid(creations, contribution.amount, contribution.contributionDate) validateContribution(creations, contribution.amount, contribution.contributionDate)
const receivedCallDate = new Date() const receivedCallDate = new Date()

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

@ -5,7 +5,7 @@ import { Contribution } from '@entity/Contribution'
import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql' import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
import ContributionArgs from '../arg/ContributionArgs' import ContributionArgs from '../arg/ContributionArgs'
import { UnconfirmedContribution } from '../model/UnconfirmedContribution' import { UnconfirmedContribution } from '../model/UnconfirmedContribution'
import { isContributionValid, getUserCreation } from './util/isContributionValid' import { validateContribution, getUserCreation } from './util/creations'
@Resolver() @Resolver()
export class ContributionResolver { export class ContributionResolver {
@ -19,7 +19,7 @@ export class ContributionResolver {
const creations = await getUserCreation(user.id) const creations = await getUserCreation(user.id)
logger.trace('creations', creations) logger.trace('creations', creations)
const creationDateObj = new Date(creationDate) const creationDateObj = new Date(creationDate)
isContributionValid(creations, amount, creationDateObj) validateContribution(creations, amount, creationDateObj)
const contribution = Contribution.create() const contribution = Contribution.create()
contribution.userId = user.id contribution.userId = user.id

4
backend/src/graphql/resolver/TransactionLinkResolver.ts
View File

@ -28,7 +28,7 @@ import { executeTransaction } from './TransactionResolver'
import { Order } from '@enum/Order' import { Order } from '@enum/Order'
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, isContributionValid } from './util/isContributionValid' import { getUserCreation, validateContribution } from './util/creations'
import { Decay } from '@model/Decay' import { Decay } from '@model/Decay'
import Decimal from 'decimal.js-light' import Decimal from 'decimal.js-light'
import { TransactionTypeId } from '@enum/TransactionTypeId' import { TransactionTypeId } from '@enum/TransactionTypeId'
@ -223,7 +223,7 @@ export class TransactionLinkResolver {
const creations = await getUserCreation(user.id, false) const creations = await getUserCreation(user.id, false)
logger.info('open creations', creations) logger.info('open creations', creations)
isContributionValid(creations, contributionLink.amount, now) validateContribution(creations, contributionLink.amount, now)
const contribution = new DbContribution() const contribution = new DbContribution()
contribution.userId = user.id contribution.userId = user.id
contribution.createdAt = now contribution.createdAt = now

2
backend/src/graphql/resolver/util/isContributionValid.ts → backend/src/graphql/resolver/util/creations.ts
View File

@ -9,7 +9,7 @@ interface CreationMap {
creations: Decimal[] creations: Decimal[]
} }
export const isContributionValid = ( export const validateContribution = (
creations: Decimal[], creations: Decimal[],
amount: Decimal, amount: Decimal,
creationDate: Date, creationDate: Date,