IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dlt_connector_try_dci

Browse Source
This commit is contained in:
einhornimmond 2024-01-12 12:44:56 +01:00 committed by GitHub
commit ee26e610a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/config/index.ts
View File

@ -12,7 +12,7 @@ Decimal.set({
})
const constants = {
DB_VERSION: '0079-fill_linked_user_id_of_contributions',
DB_VERSION: '0080-fill_linked_user_gradidoId_of_contributions',
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info

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

@ -2609,7 +2609,7 @@ describe('ContributionResolver', () => {
expect(transaction[0].linkedTransactionId).toEqual(null)
expect(transaction[0].transactionLinkId).toEqual(null)
expect(transaction[0].previous).toEqual(null)
expect(transaction[0].linkedUserId).toEqual(null)
expect(transaction[0].linkedUserId).toEqual(admin.id)
expect(transaction[0].typeId).toEqual(1)
})

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

@ -451,7 +451,11 @@ export class ContributionResolver {
transaction.userId = contribution.userId
transaction.userGradidoID = user.gradidoID
transaction.userName = fullName(user.firstName, user.lastName)
transaction.linkedUserId = contribution.moderatorId
transaction.userCommunityUuid = user.communityUuid
transaction.linkedUserId = moderatorUser.id
transaction.linkedUserGradidoID = moderatorUser.gradidoID
transaction.linkedUserName = fullName(moderatorUser.firstName, moderatorUser.lastName)
transaction.linkedUserCommunityUuid = moderatorUser.communityUuid
transaction.previous = lastTransaction ? lastTransaction.id : null
transaction.amount = contribution.amount
transaction.creationDate = contribution.contributionDate

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

@ -109,9 +109,11 @@ export const executeTransaction = async (
transactionSend.userId = sender.id
transactionSend.userGradidoID = sender.gradidoID
transactionSend.userName = fullName(sender.firstName, sender.lastName)
transactionSend.userCommunityUuid = sender.communityUuid
transactionSend.linkedUserId = recipient.id
transactionSend.linkedUserGradidoID = recipient.gradidoID
transactionSend.linkedUserName = fullName(recipient.firstName, recipient.lastName)
transactionSend.linkedUserCommunityUuid = recipient.communityUuid
transactionSend.amount = amount.mul(-1)
transactionSend.balance = sendBalance.balance
transactionSend.balanceDate = receivedCallDate
@ -129,9 +131,11 @@ export const executeTransaction = async (
transactionReceive.userId = recipient.id
transactionReceive.userGradidoID = recipient.gradidoID
transactionReceive.userName = fullName(recipient.firstName, recipient.lastName)
transactionReceive.userCommunityUuid = recipient.communityUuid
transactionReceive.linkedUserId = sender.id
transactionReceive.linkedUserGradidoID = sender.gradidoID
transactionReceive.linkedUserName = fullName(sender.firstName, sender.lastName)
transactionReceive.linkedUserCommunityUuid = sender.communityUuid
transactionReceive.amount = amount
const receiveBalance = await calculateBalance(recipient.id, amount, receivedCallDate)
transactionReceive.balance = receiveBalance ? receiveBalance.balance : amount

34
database/migrations/0080-fill_linked_user_gradidoId_of_contributions.ts Normal file
View File

@ -0,0 +1,34 @@
export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
await queryFn(
`UPDATE \`transactions\` AS t
JOIN \`contributions\` AS c ON t.id = c.transaction_id
JOIN \`users\` AS u ON u.id = c.confirmed_by
SET
t.linked_user_gradido_id = u.gradido_id,
t.linked_user_name = CONCAT(u.first_name, ' ', u.last_name),
t.linked_user_community_uuid = u.community_uuid
WHERE t.type_id = ?`,
[1],
)
// fill user community uuid fields in transactions
await queryFn(
`UPDATE \`transactions\` AS t
JOIN \`users\` AS u ON u.id = t.user_id
JOIN \`users\` AS lu ON lu.id = t.linked_user_id
SET
t.user_community_uuid = u.community_uuid,
t.linked_user_community_uuid = lu.community_uuid`,
)
}
export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
await queryFn(
`UPDATE \`transactions\` SET \`linked_user_gradido_id\` = NULL, \`linked_user_name\` = NULL where \`type_id\` = ?;`,
[1],
)
await queryFn(
`UPDATE \`transactions\` SET \`user_community_uuid\` = NULL, \`linked_user_community_uuid\` = NULL;`,
)
}

2
dht-node/src/config/index.ts
View File

@ -4,7 +4,7 @@ import dotenv from 'dotenv'
dotenv.config()
const constants = {
DB_VERSION: '0079-fill_linked_user_id_of_contributions',
DB_VERSION: '0080-fill_linked_user_gradidoId_of_contributions',
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info
LOG_LEVEL: process.env.LOG_LEVEL || 'info',

2
federation/src/config/index.ts
View File

@ -10,7 +10,7 @@ Decimal.set({
})
const constants = {
DB_VERSION: '0079-fill_linked_user_id_of_contributions',
DB_VERSION: '0080-fill_linked_user_gradidoId_of_contributions',
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
LOG4JS_CONFIG: 'log4js-config.json',
// default log level on production should be info