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

rework PR-comments

Browse Source
This commit is contained in:
Claus-Peter Hübner 2023-04-06 15:59:59 +02:00
parent 7d5ba899ce
commit 71f0f6c7f9
7 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ import {
} from './util/creations'
import { findContributions } from './util/findContributions'
import { getLastTransaction } from './util/getLastTransaction'
import { fullName } from '@/util/utilities'
@Resolver()
export class ContributionResolver {
@ -502,7 +503,7 @@ export class ContributionResolver {
transaction.memo = contribution.memo
transaction.userId = contribution.userId
transaction.userGradidoID = user.gradidoID
transaction.userName = user.firstName + ' ' + user.lastName
transaction.userName = fullName(user.firstName, user.lastName)
transaction.previous = lastTransaction ? lastTransaction.id : null
transaction.amount = contribution.amount
transaction.creationDate = contribution.contributionDate

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

@ -40,6 +40,7 @@ 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 => {
@ -267,7 +268,7 @@ export class TransactionLinkResolver {
transaction.memo = contribution.memo
transaction.userId = contribution.userId
transaction.userGradidoID = user.gradidoID
transaction.userName = user.firstName + ' ' + user.lastName
transaction.userName = fullName(user.firstName, user.lastName)
transaction.previous = lastTransaction ? lastTransaction.id : null
transaction.amount = contribution.amount
transaction.creationDate = contribution.contributionDate

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

@ -37,6 +37,7 @@ 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,
@ -88,10 +89,10 @@ export const executeTransaction = async (
transactionSend.memo = memo
transactionSend.userId = sender.id
transactionSend.userGradidoID = sender.gradidoID
transactionSend.userName = sender.firstName + ' ' + sender.lastName
transactionSend.userName = fullName(sender.firstName, sender.lastName)
transactionSend.linkedUserId = recipient.id
transactionSend.linkedUserGradidoID = recipient.gradidoID
transactionSend.linkedUserName = recipient.firstName + ' ' + recipient.lastName
transactionSend.linkedUserName = fullName(recipient.firstName, recipient.lastName)
transactionSend.amount = amount.mul(-1)
transactionSend.balance = sendBalance.balance
transactionSend.balanceDate = receivedCallDate
@ -108,10 +109,10 @@ export const executeTransaction = async (
transactionReceive.memo = memo
transactionReceive.userId = recipient.id
transactionReceive.userGradidoID = recipient.gradidoID
transactionReceive.userName = recipient.firstName + ' ' + recipient.lastName
transactionReceive.userName = fullName(recipient.firstName, recipient.lastName)
transactionReceive.linkedUserId = sender.id
transactionReceive.linkedUserGradidoID = sender.gradidoID
transactionReceive.linkedUserName = sender.firstName + ' ' + sender.lastName
transactionReceive.linkedUserName = fullName(sender.firstName, sender.lastName)
transactionReceive.amount = amount
const receiveBalance = await calculateBalance(recipient.id, amount, receivedCallDate)
transactionReceive.balance = receiveBalance ? receiveBalance.balance : amount

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

@ -14,3 +14,22 @@ export const decimalSeparatorByLanguage = (a: Decimal, language: string): string
i18n.setLocale(rememberLocaleToRestore)
return result
}
export const fullName = (firstName: string, lastName: string): string => {
return [firstName, lastName].filter(Boolean).join(' ')
}
export const userName = (f?: string, l?: string): string | null => {
let name: string | null
if(f && l) {
name = f + ' ' + l
} else if (f && !l) {
name = f
} else if (!f && l) {
name = l
} else {
name = null
}
return name
}

20
backend/src/util/virtualTransactions.ts
View File

@ -55,11 +55,11 @@ const virtualLinkTransaction = (
contribution: null,
...defaultModelFunctions,
userGradidoID: '',
userCommunityUuid: '',
userName: '',
linkedUserGradidoID: '',
linkedUserCommunityUuid: '',
linkedUserName: '',
userCommunityUuid: null,
userName: null,
linkedUserGradidoID: null,
linkedUserCommunityUuid: null,
linkedUserName: null,
}
return new Transaction(linkDbTransaction, user)
}
@ -91,11 +91,11 @@ const virtualDecayTransaction = (
contribution: null,
...defaultModelFunctions,
userGradidoID: '',
userCommunityUuid: '',
userName: '',
linkedUserGradidoID: '',
linkedUserCommunityUuid: '',
linkedUserName: '',
userCommunityUuid: null,
userName: null,
linkedUserGradidoID: null,
linkedUserCommunityUuid: null,
linkedUserName: null,
}
return new Transaction(decayDbTransaction, user)
}

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

@ -86,18 +86,18 @@ export class Transaction extends BaseEntity {
@Column({
name: 'user_community_uuid',
length: 36,
nullable: false,
nullable: true,
collation: 'utf8mb4_unicode_ci',
})
userCommunityUuid: string
userCommunityUuid: string | null
@Column({
name: 'user_name',
length: 512,
nullable: false,
nullable: true,
collation: 'utf8mb4_unicode_ci',
})
userName: string
userName: string | null
@Column({
name: 'linked_user_id',
@ -111,26 +111,26 @@ export class Transaction extends BaseEntity {
@Column({
name: 'linked_user_gradido_id',
length: 36,
nullable: false,
nullable: true,
collation: 'utf8mb4_unicode_ci',
})
linkedUserGradidoID: string
linkedUserGradidoID: string | null
@Column({
name: 'linked_user_community_uuid',
length: 36,
nullable: false,
nullable: true,
collation: 'utf8mb4_unicode_ci',
})
linkedUserCommunityUuid: string
linkedUserCommunityUuid: string | null
@Column({
name: 'linked_user_name',
length: 512,
nullable: false,
nullable: true,
collation: 'utf8mb4_unicode_ci',
})
linkedUserName: string
linkedUserName: string | null
@Column({
name: 'linked_transaction_id',

3
database/migrations/0065-x-community-sendcoins-transactions_table.ts
View File

@ -68,10 +68,11 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
await queryFn(
'ALTER TABLE `transactions` MODIFY COLUMN `user_gradido_id` char(36) NOT NULL AFTER `user_id`;',
)
/*
await queryFn(
'ALTER TABLE `transactions` MODIFY COLUMN `user_name` varchar(512) COLLATE utf8mb4_unicode_ci NOT NULL AFTER `user_community_uuid`;',
)
*/
await queryFn(
`UPDATE transactions t, users u SET t.linked_user_gradido_id = u.gradido_id, t.linked_user_name = concat(u.first_name, ' ', u.last_name) WHERE t.linked_user_id = u.id and t.linked_user_id is null and t.linked_user_gradido_id is null;`,
)