diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 291ee6ed8..e3c61c300 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -49,10 +49,10 @@ import CONFIG from '@/config' import { getUserCreation, getUserCreations, - isContributionValid, + validateContribution, isStartEndDateValid, updateCreations, -} from './util/isContributionValid' +} from './util/creations' import { CONTRIBUTIONLINK_MEMO_MAX_CHARS, CONTRIBUTIONLINK_MEMO_MIN_CHARS, @@ -252,7 +252,7 @@ export class AdminResolver { const creations = await getUserCreation(user.id) logger.trace('creations', creations) const creationDateObj = new Date(creationDate) - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) const contribution = Contribution.create() contribution.userId = user.id contribution.amount = amount @@ -328,7 +328,7 @@ export class AdminResolver { } // all possible cases not to be true are thrown in this function - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) contributionToUpdate.amount = amount contributionToUpdate.memo = memo 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.') const creations = await getUserCreation(contribution.userId, false) - isContributionValid(creations, contribution.amount, contribution.contributionDate) + validateContribution(creations, contribution.amount, contribution.contributionDate) const receivedCallDate = new Date() diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index f14aa4f36..394a693db 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -10,7 +10,7 @@ import { Order } from '../enum/Order' import { Contribution } from '../model/Contribution' import { UnconfirmedContribution } from '../model/UnconfirmedContribution' import { User } from '../model/User' -import { isContributionValid, getUserCreation, updateCreations } from './util/isContributionValid' +import { validateContribution, getUserCreation, updateCreations } from './util/creations' @Resolver() export class ContributionResolver { @@ -24,7 +24,7 @@ export class ContributionResolver { const creations = await getUserCreation(user.id) logger.trace('creations', creations) const creationDateObj = new Date(creationDate) - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) const contribution = dbContribution.create() contribution.userId = user.id @@ -103,7 +103,7 @@ export class ContributionResolver { } // all possible cases not to be true are thrown in this function - isContributionValid(creations, amount, creationDateObj) + validateContribution(creations, amount, creationDateObj) contributionToUpdate.amount = amount contributionToUpdate.memo = memo contributionToUpdate.contributionDate = new Date(creationDate) diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 8d1555f58..8696065ed 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -28,7 +28,7 @@ import { executeTransaction } from './TransactionResolver' import { Order } from '@enum/Order' import { Contribution as DbContribution } from '@entity/Contribution' 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 Decimal from 'decimal.js-light' import { TransactionTypeId } from '@enum/TransactionTypeId' @@ -223,7 +223,7 @@ export class TransactionLinkResolver { const creations = await getUserCreation(user.id, false) logger.info('open creations', creations) - isContributionValid(creations, contributionLink.amount, now) + validateContribution(creations, contributionLink.amount, now) const contribution = new DbContribution() contribution.userId = user.id contribution.createdAt = now diff --git a/backend/src/graphql/resolver/util/isContributionValid.ts b/backend/src/graphql/resolver/util/creations.ts similarity index 99% rename from backend/src/graphql/resolver/util/isContributionValid.ts rename to backend/src/graphql/resolver/util/creations.ts index 552370f4c..ad15ebec6 100644 --- a/backend/src/graphql/resolver/util/isContributionValid.ts +++ b/backend/src/graphql/resolver/util/creations.ts @@ -10,7 +10,7 @@ interface CreationMap { creations: Decimal[] } -export const isContributionValid = ( +export const validateContribution = ( creations: Decimal[], amount: Decimal, creationDate: Date, diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index e1f47e5a7..1192d6db3 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -46,7 +46,7 @@ export default {