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

linting

Browse Source
This commit is contained in:
Claus-Peter Hübner 2023-04-17 12:45:20 +02:00
parent ef6a39f5f5
commit c62532c89a
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger' import { backendLogger as logger } from '@/server/logger'
import { calculateDecay } from '@/util/decay' import { calculateDecay } from '@/util/decay'
import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
import { fullName } from '@/util/utilities'
import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
import { import {
@ -55,7 +56,6 @@ import {
} from './util/creations' } from './util/creations'
import { findContributions } from './util/findContributions' import { findContributions } from './util/findContributions'
import { getLastTransaction } from './util/getLastTransaction' import { getLastTransaction } from './util/getLastTransaction'
import { fullName } from '@/util/utilities'
@Resolver() @Resolver()
export class ContributionResolver { export class ContributionResolver {

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

@ -34,13 +34,13 @@ import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger' import { backendLogger as logger } from '@/server/logger'
import { calculateDecay } from '@/util/decay' import { calculateDecay } from '@/util/decay'
import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
import { fullName } from '@/util/utilities'
import { calculateBalance } from '@/util/validate' import { calculateBalance } from '@/util/validate'
import { executeTransaction } from './TransactionResolver' import { executeTransaction } from './TransactionResolver'
import { getUserCreation, validateContribution } from './util/creations' import { getUserCreation, validateContribution } from './util/creations'
import { getLastTransaction } from './util/getLastTransaction' import { getLastTransaction } from './util/getLastTransaction'
import { transactionLinkList } from './util/transactionLinkList' import { transactionLinkList } from './util/transactionLinkList'
import { fullName } from '@/util/utilities'
// TODO: do not export, test it inside the resolver // TODO: do not export, test it inside the resolver
export const transactionLinkCode = (date: Date): string => { export const transactionLinkCode = (date: Date): string => {

2
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -29,6 +29,7 @@ import { LogError } from '@/server/LogError'
import { backendLogger as logger } from '@/server/logger' import { backendLogger as logger } from '@/server/logger'
import { communityUser } from '@/util/communityUser' import { communityUser } from '@/util/communityUser'
import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
import { fullName } from '@/util/utilities'
import { calculateBalance } from '@/util/validate' import { calculateBalance } from '@/util/validate'
import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions' 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 { findUserByIdentifier } from './util/findUserByIdentifier'
import { getLastTransaction } from './util/getLastTransaction' import { getLastTransaction } from './util/getLastTransaction'
import { getTransactionList } from './util/getTransactionList' import { getTransactionList } from './util/getTransactionList'
import { fullName } from '@/util/utilities'
export const executeTransaction = async ( export const executeTransaction = async (
amount: Decimal, amount: Decimal,

4
backend/src/util/utilities.ts
View File

@ -16,12 +16,12 @@ export const decimalSeparatorByLanguage = (a: Decimal, language: string): string
} }
export const fullName = (firstName: string, lastName: 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 => { export const userName = (f?: string, l?: string): string | null => {
let name: string | null let name: string | null
if(f && l) { if (f && l) {
name = f + ' ' + l name = f + ' ' + l
} else if (f && !l) { } else if (f && !l) {
name = f name = f

4
database/entity/0065-x-community-sendcoins-transactions_table/Transaction.ts
View File

@ -144,4 +144,8 @@ export class Transaction extends BaseEntity {
@OneToOne(() => Contribution, (contribution) => contribution.transaction) @OneToOne(() => Contribution, (contribution) => contribution.transaction)
@JoinColumn({ name: 'id', referencedColumnName: 'transactionId' }) @JoinColumn({ name: 'id', referencedColumnName: 'transactionId' })
contribution?: Contribution | null contribution?: Contribution | null
@OneToOne(() => Transaction)
@JoinColumn({ name: 'previous' })
previousTransaction?: Transaction | null
} }