diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 1c88fcd8e..46b9db8fb 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -12,7 +12,7 @@ Decimal.set({ }) const constants = { - DB_VERSION: '0079-introduce_gms_registration', + DB_VERSION: '0080-introduce_gms_registration', 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 diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index bd985d2d2..c07a691a3 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -451,6 +451,7 @@ export class ContributionResolver { transaction.userId = contribution.userId transaction.userGradidoID = user.gradidoID transaction.userName = fullName(user.firstName, user.lastName) + transaction.linkedUserId = contribution.moderatorId transaction.previous = lastTransaction ? lastTransaction.id : null transaction.amount = contribution.amount transaction.creationDate = contribution.contributionDate diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index a763edc08..15a84e04f 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -254,6 +254,9 @@ export class TransactionResolver { // userTransactions.forEach((transaction: dbTransaction) => { // use normal for loop because of timing problems with await in forEach-loop for (const transaction of userTransactions) { + if (transaction.typeId === TransactionTypeId.CREATION) { + continue + } if (transaction.linkedUserId && !involvedUserIds.includes(transaction.linkedUserId)) { involvedUserIds.push(transaction.linkedUserId) } diff --git a/database/entity/0079-introduce_gms_registration/Community.ts b/database/entity/0080-introduce_gms_registration/Community.ts similarity index 100% rename from database/entity/0079-introduce_gms_registration/Community.ts rename to database/entity/0080-introduce_gms_registration/Community.ts diff --git a/database/entity/0079-introduce_gms_registration/User.ts b/database/entity/0080-introduce_gms_registration/User.ts similarity index 100% rename from database/entity/0079-introduce_gms_registration/User.ts rename to database/entity/0080-introduce_gms_registration/User.ts diff --git a/database/entity/0079-introduce_gms_registration/UserContact.ts b/database/entity/0080-introduce_gms_registration/UserContact.ts similarity index 100% rename from database/entity/0079-introduce_gms_registration/UserContact.ts rename to database/entity/0080-introduce_gms_registration/UserContact.ts diff --git a/database/entity/Community.ts b/database/entity/Community.ts index d20d2d8d7..b73edb5d9 100644 --- a/database/entity/Community.ts +++ b/database/entity/Community.ts @@ -1 +1 @@ -export { Community } from './0079-introduce_gms_registration/Community' +export { Community } from './0080-introduce_gms_registration/Community' diff --git a/database/entity/User.ts b/database/entity/User.ts index 732d11e8e..d9a711e66 100644 --- a/database/entity/User.ts +++ b/database/entity/User.ts @@ -1 +1 @@ -export { User } from './0079-introduce_gms_registration/User' +export { User } from './0080-introduce_gms_registration/User' diff --git a/database/entity/UserContact.ts b/database/entity/UserContact.ts index 795ce0a43..47cf5b3fd 100644 --- a/database/entity/UserContact.ts +++ b/database/entity/UserContact.ts @@ -1 +1 @@ -export { UserContact } from './0079-introduce_gms_registration/UserContact' +export { UserContact } from './0080-introduce_gms_registration/UserContact' diff --git a/database/migrations/0079-fill_linked_user_id_of_contributions.ts b/database/migrations/0079-fill_linked_user_id_of_contributions.ts new file mode 100644 index 000000000..5fe62af30 --- /dev/null +++ b/database/migrations/0079-fill_linked_user_id_of_contributions.ts @@ -0,0 +1,13 @@ +export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn( + `UPDATE \`transactions\` AS t + JOIN \`contributions\` AS c ON t.id = c.transaction_id + SET t.linked_user_id = c.confirmed_by + WHERE t.type_id = ?`, + [1], + ) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn(`UPDATE \`transactions\` SET \`linked_user_id\` = NULL where \`type_id\` = ?;`, [1]) +} diff --git a/database/migrations/0079-introduce_gms_registration.ts b/database/migrations/0080-introduce_gms_registration.ts similarity index 100% rename from database/migrations/0079-introduce_gms_registration.ts rename to database/migrations/0080-introduce_gms_registration.ts diff --git a/dht-node/src/config/index.ts b/dht-node/src/config/index.ts index 1cfc7869c..032ec9f23 100644 --- a/dht-node/src/config/index.ts +++ b/dht-node/src/config/index.ts @@ -4,7 +4,7 @@ import dotenv from 'dotenv' dotenv.config() const constants = { - DB_VERSION: '0079-introduce_gms_registration', + DB_VERSION: '0080-introduce_gms_registration', LOG4JS_CONFIG: 'log4js-config.json', // default log level on production should be info LOG_LEVEL: process.env.LOG_LEVEL || 'info', diff --git a/federation/src/config/index.ts b/federation/src/config/index.ts index 16b246aef..23a7737af 100644 --- a/federation/src/config/index.ts +++ b/federation/src/config/index.ts @@ -10,7 +10,7 @@ Decimal.set({ }) const constants = { - DB_VERSION: '0079-introduce_gms_registration', + DB_VERSION: '0080-introduce_gms_registration', 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