diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 357908bdc..696ed9ea7 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -44,6 +44,7 @@ import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' import { calculateDecay } from '@/util/decay' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { fullName } from '@/util/utilities' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' import { @@ -55,7 +56,6 @@ import { } from './util/creations' import { findContributions } from './util/findContributions' import { getLastTransaction } from './util/getLastTransaction' -import { fullName } from '@/util/utilities' @Resolver() export class ContributionResolver { diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 914b2c081..a97078f66 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -34,13 +34,13 @@ import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' import { calculateDecay } from '@/util/decay' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { fullName } from '@/util/utilities' import { calculateBalance } from '@/util/validate' import { executeTransaction } from './TransactionResolver' import { getUserCreation, validateContribution } from './util/creations' import { getLastTransaction } from './util/getLastTransaction' import { transactionLinkList } from './util/transactionLinkList' -import { fullName } from '@/util/utilities' // TODO: do not export, test it inside the resolver export const transactionLinkCode = (date: Date): string => { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 65aa29435..7e2a10404 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -29,6 +29,7 @@ import { LogError } from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' import { communityUser } from '@/util/communityUser' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' +import { fullName } from '@/util/utilities' import { calculateBalance } from '@/util/validate' import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions' @@ -37,7 +38,6 @@ import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' import { findUserByIdentifier } from './util/findUserByIdentifier' import { getLastTransaction } from './util/getLastTransaction' import { getTransactionList } from './util/getTransactionList' -import { fullName } from '@/util/utilities' export const executeTransaction = async ( amount: Decimal, diff --git a/backend/src/util/utilities.ts b/backend/src/util/utilities.ts index 9a318f576..4dc71ff7f 100644 --- a/backend/src/util/utilities.ts +++ b/backend/src/util/utilities.ts @@ -16,12 +16,12 @@ export const decimalSeparatorByLanguage = (a: Decimal, language: string): string } export const fullName = (firstName: string, lastName: string): string => { - return [firstName, lastName].filter(Boolean).join(' ') + return [firstName, lastName].filter(Boolean).join(' ') } export const userName = (f?: string, l?: string): string | null => { let name: string | null - if(f && l) { + if (f && l) { name = f + ' ' + l } else if (f && !l) { name = f @@ -30,6 +30,6 @@ export const userName = (f?: string, l?: string): string | null => { } else { name = null } - + return name -} \ No newline at end of file +} diff --git a/database/entity/0065-x-community-sendcoins-transactions_table/Transaction.ts b/database/entity/0065-x-community-sendcoins-transactions_table/Transaction.ts index 050661824..0da9a2265 100644 --- a/database/entity/0065-x-community-sendcoins-transactions_table/Transaction.ts +++ b/database/entity/0065-x-community-sendcoins-transactions_table/Transaction.ts @@ -144,4 +144,8 @@ export class Transaction extends BaseEntity { @OneToOne(() => Contribution, (contribution) => contribution.transaction) @JoinColumn({ name: 'id', referencedColumnName: 'transactionId' }) contribution?: Contribution | null + + @OneToOne(() => Transaction) + @JoinColumn({ name: 'previous' }) + previousTransaction?: Transaction | null }