From 38d53e61c0b2fda99763bc852b82e7ca2ffe4a09 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 1 Mar 2022 09:32:16 +0100 Subject: [PATCH 1/8] TransactionTypeId to TypeId changed, *10000 removed, graphql refactor --- .../CreationTransactionListFormular.vue | 1 + admin/src/graphql/transactionList.js | 31 +++++------ .../enum/{TransactionTypeId.ts => TypeId.ts} | 6 +-- backend/src/graphql/model/Transaction.ts | 6 +-- backend/src/graphql/resolver/AdminResolver.ts | 10 ++-- .../graphql/resolver/TransactionResolver.ts | 8 +-- backend/src/typeorm/repository/Transaction.ts | 6 +-- backend/src/util/virtualDecayTransaction.ts | 4 +- database/entity/0001-init_db/Transaction.ts | 4 +- .../entity/0001-init_db/UserTransaction.ts | 4 +- .../Transaction.ts | 4 +- .../Transaction.ts | 4 +- .../Transaction.ts | 4 +- database/migrations/0001-init_db.ts | 6 +-- .../0014-drop_unused_tables_with_data.ts | 2 +- .../0022-delete_decay_start_block.ts | 2 +- .../0024-combine_transaction_tables.ts | 6 +-- .../0026-combine_transaction_tables2.ts | 26 +++++----- .../0027-clean_transaction_table.ts | 6 +-- database/migrations/0028-decimal_types.ts | 4 +- .../0029-clean_transaction_table.ts | 8 +-- .../graphics/CommunityDBSkeema.drawio | 52 +++++++++---------- .../db/cake_gradido_single_dev_node-1.sql | 4 +- docu/other/db/cake_gradido_single_node.sql | 4 +- docu/other/db/community_db.txt | 4 +- docu/other/db/mirror_db.txt | 4 +- docu/other/db/transactions.sql | 2 +- frontend/src/components/DecayInformation.vue | 2 +- 28 files changed, 111 insertions(+), 113 deletions(-) rename backend/src/graphql/enum/{TransactionTypeId.ts => TypeId.ts} (66%) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 627647534..e00c32cb2 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -59,6 +59,7 @@ export default { }, }) .then((result) => { + console.log('getTransactions', result.data) this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation') }) .catch((error) => { diff --git a/admin/src/graphql/transactionList.js b/admin/src/graphql/transactionList.js index 8ae5cde42..b9dd2e3b1 100644 --- a/admin/src/graphql/transactionList.js +++ b/admin/src/graphql/transactionList.js @@ -15,28 +15,25 @@ export const transactionList = gql` onlyCreations: $onlyCreations userId: $userId ) { - gdtSum + balanceGDT count balance - decay - decayDate + decayStartBlock transactions { - type - balance - decayStart - decayEnd - decayDuration + id + typeId + amount + balanceDate memo - transactionId - name - email - date + linkedUser { + firstName + lastName + } decay { - balance - decayStart - decayEnd - decayDuration - decayStartBlock + decay + start + end + duration } } } diff --git a/backend/src/graphql/enum/TransactionTypeId.ts b/backend/src/graphql/enum/TypeId.ts similarity index 66% rename from backend/src/graphql/enum/TransactionTypeId.ts rename to backend/src/graphql/enum/TypeId.ts index 497ad5055..29916331c 100644 --- a/backend/src/graphql/enum/TransactionTypeId.ts +++ b/backend/src/graphql/enum/TypeId.ts @@ -1,6 +1,6 @@ import { registerEnumType } from 'type-graphql' -export enum TransactionTypeId { +export enum TypeId { CREATION = 1, SEND = 2, RECEIVE = 3, @@ -8,7 +8,7 @@ export enum TransactionTypeId { DECAY = 4, } -registerEnumType(TransactionTypeId, { - name: 'TransactionTypeId', // this one is mandatory +registerEnumType(TypeId, { + name: 'TypeId', // this one is mandatory description: 'Type of the transaction', // this one is optional }) diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 8d32ec80e..3e8089eda 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -4,7 +4,7 @@ import { ObjectType, Field } from 'type-graphql' import { Decay } from './Decay' import { Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' -import { TransactionTypeId } from '../enum/TransactionTypeId' +import { TypeId } from '../enum/TypeId' import { User } from './User' @ObjectType() @@ -43,8 +43,8 @@ export class Transaction { @Field(() => Number, { nullable: true }) previous: number | null - @Field(() => TransactionTypeId) - typeId: TransactionTypeId + @Field(() => TypeId) + typeId: TypeId @Field(() => Decimal) amount: Decimal diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2dfaafbcc..1152a18c6 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -26,7 +26,7 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation' import { hasElopageBuys } from '../../util/hasElopageBuys' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' -import { TransactionTypeId } from '../enum/TransactionTypeId' +import { TypeId } from '../enum/TypeId' import Decimal from 'decimal.js-light' // const EMAIL_OPT_IN_REGISTER = 1 @@ -170,7 +170,7 @@ export class AdminResolver { if (isCreationValid(creations, amount, creationDateObj)) { const adminPendingCreation = AdminPendingCreation.create() adminPendingCreation.userId = user.id - adminPendingCreation.amount = BigInt(amount * 10000) + adminPendingCreation.amount = BigInt(amount) adminPendingCreation.created = new Date() adminPendingCreation.date = creationDateObj adminPendingCreation.memo = memo @@ -235,7 +235,7 @@ export class AdminResolver { if (!isCreationValid(creations, amount, creationDateObj)) { throw new Error('Creation is not valid') } - pendingCreationToUpdate.amount = BigInt(amount * 10000) + pendingCreationToUpdate.amount = BigInt(amount) pendingCreationToUpdate.memo = memo pendingCreationToUpdate.date = new Date(creationDate) pendingCreationToUpdate.moderator = moderator @@ -321,7 +321,7 @@ export class AdminResolver { newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount))) const transaction = new Transaction() - transaction.typeId = TransactionTypeId.CREATION + transaction.typeId = TypeId.CREATION transaction.memo = pendingCreation.memo transaction.userId = pendingCreation.userId // TODO pending creations decimal @@ -367,7 +367,7 @@ async function getUserCreations(ids: number[], includePending = true): Promise= ${dateFilter} ${unionString}) AS result GROUP BY month, userId diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 4909c1a0d..63166cb08 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -24,7 +24,7 @@ import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' import { apiPost } from '../../apis/HttpRequest' -import { TransactionTypeId } from '../enum/TransactionTypeId' +import { TypeId } from '../enum/TypeId' import { calculateBalance, isHexPublicKey } from '../../util/validate' import { RIGHTS } from '../../auth/RIGHTS' import { User } from '../model/User' @@ -111,7 +111,7 @@ export class TransactionResolver { for (let i = 0; i < userTransactions.length; i++) { const userTransaction = userTransactions[i] let linkedUser = null - if (userTransaction.typeId === TransactionTypeId.CREATION) { + if (userTransaction.typeId === TypeId.CREATION) { linkedUser = communityUser } else { linkedUser = involvedUsers.find((u) => u.id === userTransaction.linkedUserId) @@ -180,7 +180,7 @@ export class TransactionResolver { try { // transaction const transactionSend = new dbTransaction() - transactionSend.typeId = TransactionTypeId.SEND + transactionSend.typeId = TypeId.SEND transactionSend.memo = memo transactionSend.userId = senderUser.id transactionSend.linkedUserId = recipientUser.id @@ -193,7 +193,7 @@ export class TransactionResolver { await queryRunner.manager.insert(dbTransaction, transactionSend) const transactionReceive = new dbTransaction() - transactionReceive.typeId = TransactionTypeId.RECEIVE + transactionReceive.typeId = TypeId.RECEIVE transactionReceive.memo = memo transactionReceive.userId = recipientUser.id transactionReceive.linkedUserId = senderUser.id diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 2abcb4090..4353aa981 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' import { Order } from '../../graphql/enum/Order' -import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' +import { TypeId } from '../../graphql/enum/TypeId' @EntityRepository(Transaction) export class TransactionRepository extends Repository { @@ -15,8 +15,8 @@ export class TransactionRepository extends Repository { if (onlyCreation) { return this.createQueryBuilder('userTransaction') .where('userTransaction.userId = :userId', { userId }) - .andWhere('userTransaction.transactionTypeId = :transactionTypeId', { - transactionTypeId: TransactionTypeId.CREATION, + .andWhere('userTransaction.typeId = :typeId', { + typeId: TypeId.CREATION, }) .orderBy('userTransaction.balanceDate', order) .limit(limit) diff --git a/backend/src/util/virtualDecayTransaction.ts b/backend/src/util/virtualDecayTransaction.ts index df3482716..31e9e9258 100644 --- a/backend/src/util/virtualDecayTransaction.ts +++ b/backend/src/util/virtualDecayTransaction.ts @@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light' import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { calculateDecay } from './decay' -import { TransactionTypeId } from '../graphql/enum/TransactionTypeId' +import { TypeId } from '../graphql/enum/TypeId' import { Transaction } from '../graphql/model/Transaction' import { User } from '../graphql/model/User' @@ -19,7 +19,7 @@ const virtualDecayTransaction = ( id: -1, userId: -1, previous: -1, - typeId: TransactionTypeId.DECAY, + typeId: TypeId.DECAY, amount: decay.decay ? decay.decay : new Decimal(0), // new Decimal(0), // this kinda is wrong, but helps with the frontend query balance: decay.balance, balanceDate: time, diff --git a/database/entity/0001-init_db/Transaction.ts b/database/entity/0001-init_db/Transaction.ts index a33fbd0be..a1fd75b4d 100644 --- a/database/entity/0001-init_db/Transaction.ts +++ b/database/entity/0001-init_db/Transaction.ts @@ -10,8 +10,8 @@ export class Transaction extends BaseEntity { @Column({ name: 'state_group_id', unsigned: true, default: null }) stateGroupId: number - @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) - transactionTypeId: number + @Column({ name: 'type_id', unsigned: true, nullable: false }) + typeId: number @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null }) txHash: Buffer diff --git a/database/entity/0001-init_db/UserTransaction.ts b/database/entity/0001-init_db/UserTransaction.ts index 7e24b66b0..a15200332 100644 --- a/database/entity/0001-init_db/UserTransaction.ts +++ b/database/entity/0001-init_db/UserTransaction.ts @@ -11,8 +11,8 @@ export class UserTransaction extends BaseEntity { @Column({ name: 'transaction_id' }) transactionId: number - @Column({ name: 'transaction_type_id' }) - transactionTypeId: number + @Column({ name: 'type_id' }) + typeId: number @Column({ name: 'balance', type: 'bigint' }) balance: number diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts index 5410d010b..5cfaabfd5 100644 --- a/database/entity/0016-transaction_signatures/Transaction.ts +++ b/database/entity/0016-transaction_signatures/Transaction.ts @@ -8,8 +8,8 @@ export class Transaction extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) - transactionTypeId: number + @Column({ name: 'type_id', unsigned: true, nullable: false }) + typeId: number @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null }) txHash: Buffer diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts index 5834c007a..e914bf313 100644 --- a/database/entity/0024-combine_transaction_tables/Transaction.ts +++ b/database/entity/0024-combine_transaction_tables/Transaction.ts @@ -6,8 +6,8 @@ export class Transaction extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) - transactionTypeId: number + @Column({ name: 'type_id', unsigned: true, nullable: false }) + typeId: number @Column({ name: 'user_id', unsigned: true, nullable: false }) userId: number diff --git a/database/entity/0026-combine_transaction_tables2/Transaction.ts b/database/entity/0026-combine_transaction_tables2/Transaction.ts index 77f23e4e4..542f7b2c7 100644 --- a/database/entity/0026-combine_transaction_tables2/Transaction.ts +++ b/database/entity/0026-combine_transaction_tables2/Transaction.ts @@ -11,8 +11,8 @@ export class Transaction extends BaseEntity { @Column({ name: 'transaction_id', unsigned: true, nullable: false }) transactionId: number - @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) - transactionTypeId: number + @Column({ name: 'type_id', unsigned: true, nullable: false }) + typeId: number @Column({ type: 'bigint', nullable: false }) amount: BigInt diff --git a/database/migrations/0001-init_db.ts b/database/migrations/0001-init_db.ts index e26c2c1a7..2c7dea0b4 100644 --- a/database/migrations/0001-init_db.ts +++ b/database/migrations/0001-init_db.ts @@ -140,7 +140,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis CREATE TABLE IF NOT EXISTS \`state_errors\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`state_user_id\` int(10) unsigned NOT NULL, - \`transaction_type_id\` int(10) unsigned NOT NULL, + \`type_id\` int(10) unsigned NOT NULL, \`created\` datetime NOT NULL, \`message_json\` text COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (\`id\`) @@ -196,7 +196,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT, \`state_user_id\` int UNSIGNED NOT NULL, \`transaction_id\` int UNSIGNED NOT NULL, - \`transaction_type_id\` int UNSIGNED NOT NULL, + \`type_id\` int UNSIGNED NOT NULL, \`balance\` bigint(20) DEFAULT 0, \`balance_date\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (\`id\`) @@ -304,7 +304,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis CREATE TABLE IF NOT EXISTS \`transactions\` ( \`id\` bigint(20) unsigned NOT NULL AUTO_INCREMENT, \`state_group_id\` int(10) unsigned DEFAULT NULL, - \`transaction_type_id\` int(10) unsigned NOT NULL, + \`type_id\` int(10) unsigned NOT NULL, \`tx_hash\` binary(48) DEFAULT NULL, \`memo\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, \`received\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/database/migrations/0014-drop_unused_tables_with_data.ts b/database/migrations/0014-drop_unused_tables_with_data.ts index af1e27cb4..0d2c9903d 100644 --- a/database/migrations/0014-drop_unused_tables_with_data.ts +++ b/database/migrations/0014-drop_unused_tables_with_data.ts @@ -292,7 +292,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom CREATE TABLE \`state_errors\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`state_user_id\` int(10) unsigned NOT NULL, - \`transaction_type_id\` int(10) unsigned NOT NULL, + \`type_id\` int(10) unsigned NOT NULL, \`created\` datetime NOT NULL, \`message_json\` text COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (\`id\`) diff --git a/database/migrations/0022-delete_decay_start_block.ts b/database/migrations/0022-delete_decay_start_block.ts index a31f9c441..7f31ab792 100644 --- a/database/migrations/0022-delete_decay_start_block.ts +++ b/database/migrations/0022-delete_decay_start_block.ts @@ -9,7 +9,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Remove transactions with type 9 (start decay block). This should affect exactly 1 row - await queryFn(`DELETE FROM transactions WHERE transaction_type_id = 9;`) + await queryFn(`DELETE FROM transactions WHERE type_id = 9;`) } export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts index 5b8ec8be8..e80ca9922 100644 --- a/database/migrations/0024-combine_transaction_tables.ts +++ b/database/migrations/0024-combine_transaction_tables.ts @@ -9,7 +9,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Create new `user_id` column (former `state_user_id`), with a temporary default of null await queryFn( - 'ALTER TABLE `transactions` ADD COLUMN `user_id` int(10) unsigned DEFAULT NULL AFTER `transaction_type_id`;', + 'ALTER TABLE `transactions` ADD COLUMN `user_id` int(10) unsigned DEFAULT NULL AFTER `type_id`;', ) // Create new `amount` column, with a temporary default of null await queryFn( @@ -105,7 +105,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom send_receiver_public_key AS receiver_public_key, send_receiver_user_id AS receiver_user_id, amount, send_sender_final_balance AS sender_final_balance FROM transactions - WHERE transaction_type_id = 2 ); + WHERE type_id = 2 ); `) await queryFn(` @@ -115,7 +115,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom ( SELECT id AS transaction_id, user_id AS state_user_id, amount, creation_ident_hash AS ident_hash, creation_date AS target_date FROM transactions - WHERE transaction_type_id = 1 ); + WHERE type_id = 1 ); `) await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_sender_final_balance`;') diff --git a/database/migrations/0026-combine_transaction_tables2.ts b/database/migrations/0026-combine_transaction_tables2.ts index 3abf77354..5c31ad4e1 100644 --- a/database/migrations/0026-combine_transaction_tables2.ts +++ b/database/migrations/0026-combine_transaction_tables2.ts @@ -31,7 +31,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis await queryFn('ALTER TABLE `state_user_transactions` RENAME COLUMN state_user_id TO user_id;') // Create new `amount` column, with a temporary default of null await queryFn( - 'ALTER TABLE `state_user_transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `transaction_type_id`;', + 'ALTER TABLE `state_user_transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `type_id`;', ) // Create new `send_sender_final_balance` await queryFn( @@ -89,7 +89,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.pubkey, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash - WHERE state_user_transactions.transaction_type_id = 1; + WHERE state_user_transactions.type_id = 1; `) // Insert Data from `transactions` for sendCoin sender @@ -104,7 +104,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.linked_user_id = transactions.send_receiver_user_id, state_user_transactions.linked_state_user_transaction_id = ( SELECT id FROM state_user_transactions AS sut - WHERE sut.transaction_type_id = 2 + WHERE sut.type_id = 2 AND sut.transaction_id = state_user_transactions.transaction_id AND sut.user_id = transactions.send_receiver_user_id ), @@ -112,7 +112,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.pubkey, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash - WHERE state_user_transactions.transaction_type_id = 2 + WHERE state_user_transactions.type_id = 2 AND state_user_transactions.user_id = transactions.user_id; `) @@ -128,7 +128,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.linked_user_id = transactions.user_id, state_user_transactions.linked_state_user_transaction_id = ( SELECT id FROM state_user_transactions AS sut - WHERE sut.transaction_type_id = 2 + WHERE sut.type_id = 2 AND sut.transaction_id = state_user_transactions.transaction_id AND sut.user_id = transactions.user_id ), @@ -136,8 +136,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.send_receiver_public_key, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash, - state_user_transactions.transaction_type_id = 3 - WHERE state_user_transactions.transaction_type_id = 2 + state_user_transactions.type_id = 3 + WHERE state_user_transactions.type_id = 2 AND state_user_transactions.user_id = transactions.send_receiver_user_id; `) @@ -161,7 +161,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn('RENAME TABLE `transactions` TO `state_user_transactions`;') await queryFn(`CREATE TABLE \`transactions\` ( \`id\` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - \`transaction_type_id\` int(10) unsigned NOT NULL, + \`type_id\` int(10) unsigned NOT NULL, \`user_id\` int(10) unsigned NOT NULL, \`amount\` bigint(20) NOT NULL, \`tx_hash\` binary(48) DEFAULT NULL, @@ -179,13 +179,13 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom `) await queryFn(` INSERT INTO transactions ( - id, transaction_type_id, user_id, amount, + id, type_id, user_id, amount, tx_hash, memo, received, signature, pubkey, creation_ident_hash, creation_date, send_receiver_public_key, send_receiver_user_id, send_sender_final_balance ) - SELECT transaction_id AS id, transaction_type_id, + SELECT transaction_id AS id, type_id, user_id, amount, tx_hash, memo, received, signature, pubkey, creation_ident_hash, creation_date, send_receiver_public_key, @@ -194,12 +194,12 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom FROM state_user_transactions LEFT JOIN ( SELECT id, pubkey AS send_receiver_public_key FROM state_user_transactions AS sut - WHERE sut.transaction_type_id = 3 + WHERE sut.type_id = 3 ) AS sutj ON sutj.id = state_user_transactions.id - WHERE transaction_type_id IN (1,2) + WHERE type_id IN (1,2) `) await queryFn( - 'UPDATE state_user_transactions SET transaction_type_id = 2 WHERE transaction_type_id = 3;', + 'UPDATE state_user_transactions SET type_id = 2 WHERE type_id = 3;', ) await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `creation_ident_hash`;') await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `pubkey`;') diff --git a/database/migrations/0027-clean_transaction_table.ts b/database/migrations/0027-clean_transaction_table.ts index b5a0e0e2e..824515a01 100644 --- a/database/migrations/0027-clean_transaction_table.ts +++ b/database/migrations/0027-clean_transaction_table.ts @@ -23,8 +23,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis // drop column `creation_ident_hash`, it is not needed await queryFn('ALTER TABLE `transactions` DROP COLUMN `creation_ident_hash`;') - // rename `transaction_type_id` to `type_id` - await queryFn('ALTER TABLE `transactions` RENAME COLUMN transaction_type_id TO type_id;') + // rename `type_id` to `type_id` + await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO type_id;') // rename `linked_state_user_transaction_id` to `linked_transaction_id` await queryFn( 'ALTER TABLE `transactions` RENAME COLUMN linked_state_user_transaction_id TO linked_transaction_id;', @@ -43,7 +43,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn( 'ALTER TABLE `transactions` RENAME COLUMN linked_transaction_id TO linked_state_user_transaction_id;', ) - await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO transaction_type_id;') + await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO type_id;') await queryFn( 'ALTER TABLE `transactions` ADD COLUMN `creation_ident_hash` binary(32) DEFAULT NULL AFTER `linked_state_user_transaction_id`;', ) diff --git a/database/migrations/0028-decimal_types.ts b/database/migrations/0028-decimal_types.ts index 7b158d6ee..0bb9e1db1 100644 --- a/database/migrations/0028-decimal_types.ts +++ b/database/migrations/0028-decimal_types.ts @@ -40,7 +40,7 @@ interface Decay { duration: number | null } -export enum TransactionTypeId { +export enum TypeId { CREATION = 1, SEND = 2, RECEIVE = 3, @@ -162,7 +162,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis // This should also fix the rounding error on amount let decAmount = new Decimal(transaction.amount).dividedBy(10000).toDecimalPlaces(2) - if (transaction.type_id === TransactionTypeId.SEND) { + if (transaction.type_id === TypeId.SEND) { decAmount = decAmount.mul(-1) } const decayStartDate = previous ? previous.balance_date : transaction.balance_date diff --git a/database/migrations/0029-clean_transaction_table.ts b/database/migrations/0029-clean_transaction_table.ts index 0b9e2cc0d..ecf0dc208 100644 --- a/database/migrations/0029-clean_transaction_table.ts +++ b/database/migrations/0029-clean_transaction_table.ts @@ -61,7 +61,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn(` INSERT INTO \`state_balances\` (state_user_id, modified, record_date, amount) - SELECT user_id as state_user_id, balance_date as modified, balance_date as record_date, amount * 10000 as amount FROM + SELECT user_id as state_user_id, balance_date as modified, balance_date as record_date, amount as amount FROM (SELECT user_id as uid, MAX(balance_date) AS date FROM transactions GROUP BY uid) AS t LEFT JOIN transactions ON t.uid = transactions.user_id AND t.date = transactions.balance_date; `) @@ -96,9 +96,9 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom temp_dec_old_balance = dec_balance, temp_dec_diff_send_sender_final_balance = 0, temp_dec_send_sender_final_balance = dec_balance, - balance = dec_balance * 10000, - send_sender_final_balance = dec_balance * 10000, - amount = dec_amount * 10000; + balance = dec_balance, + send_sender_final_balance = dec_balance, + amount = dec_amount; `) await queryFn('ALTER TABLE `transactions` MODIFY COLUMN `amount` bigint(20) NOT NULL;') diff --git a/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio b/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio index 07c4f6284..daad0b3c7 100644 --- a/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio +++ b/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio @@ -1,6 +1,6 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -435,40 +435,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -478,7 +478,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -538,7 +538,7 @@ - + diff --git a/docu/other/db/cake_gradido_single_dev_node-1.sql b/docu/other/db/cake_gradido_single_dev_node-1.sql index 7026e52cd..acce4dce1 100644 --- a/docu/other/db/cake_gradido_single_dev_node-1.sql +++ b/docu/other/db/cake_gradido_single_dev_node-1.sql @@ -126,7 +126,7 @@ CREATE TABLE `state_created` ( CREATE TABLE `state_errors` ( `id` int(11) NOT NULL, `state_user_id` int(11) NOT NULL, - `transaction_type_id` int(11) NOT NULL, + `type_id` int(11) NOT NULL, `created` datetime NOT NULL, `message_json` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -194,7 +194,7 @@ CREATE TABLE `state_users` ( CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `group_id` int(11) NOT NULL, - `transaction_type_id` int(11) NOT NULL, + `type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `memo` varchar(255) COLLATE utf8_bin NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP diff --git a/docu/other/db/cake_gradido_single_node.sql b/docu/other/db/cake_gradido_single_node.sql index 7026e52cd..acce4dce1 100644 --- a/docu/other/db/cake_gradido_single_node.sql +++ b/docu/other/db/cake_gradido_single_node.sql @@ -126,7 +126,7 @@ CREATE TABLE `state_created` ( CREATE TABLE `state_errors` ( `id` int(11) NOT NULL, `state_user_id` int(11) NOT NULL, - `transaction_type_id` int(11) NOT NULL, + `type_id` int(11) NOT NULL, `created` datetime NOT NULL, `message_json` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -194,7 +194,7 @@ CREATE TABLE `state_users` ( CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `group_id` int(11) NOT NULL, - `transaction_type_id` int(11) NOT NULL, + `type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `memo` varchar(255) COLLATE utf8_bin NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP diff --git a/docu/other/db/community_db.txt b/docu/other/db/community_db.txt index b1e125d1f..0942d1970 100644 --- a/docu/other/db/community_db.txt +++ b/docu/other/db/community_db.txt @@ -27,7 +27,7 @@ state_users id index group_id public_key email first_name last_name state_errors -id state_user_id transaction_type_id created message_json +id state_user_id type_id created message_json state_balances id state_user_id modified amount @@ -48,7 +48,7 @@ id transaction_id signature pubkey transactions int64 -id state_group_id transaction_type_id tx_hash received +id state_group_id type_id tx_hash received transaction_send_coins id transaction_id state_user_id receiver_public receiver_user_id amount sender_final_balance diff --git a/docu/other/db/mirror_db.txt b/docu/other/db/mirror_db.txt index 37ef59011..40a6cda22 100644 --- a/docu/other/db/mirror_db.txt +++ b/docu/other/db/mirror_db.txt @@ -8,7 +8,7 @@ id transaction_id signature pubkey transactions int64 -id group_id timestamp transaction_type_id hash received +id group_id timestamp type_id hash received transaction_bins id transaction_id filename start size @@ -16,5 +16,5 @@ id transaction_id filename start size state_created id transaction_id month year short_ident_hash -Für mehr Performance, jeweils eine transactions, transaction_bins und transaction_signatures +F�r mehr Performance, jeweils eine transactions, transaction_bins und transaction_signatures Tabelle pro Gruppe diff --git a/docu/other/db/transactions.sql b/docu/other/db/transactions.sql index 35b06a11f..7c5ffd99a 100644 --- a/docu/other/db/transactions.sql +++ b/docu/other/db/transactions.sql @@ -2,7 +2,7 @@ CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `state_group_id` int(11) NOT NULL, - `transaction_type_id` int(11) NOT NULL, + `type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 066eec5e1..ebb0266a1 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -122,7 +122,7 @@ export default { }, computed: { duration() { - return this.$moment.duration((this.decay.end - this.decay.start) * 1000)._data + return this.$moment.duration(this.decay.end - this.decay.start)._data }, }, } From ae4ad937aa9af6e1ce6833f20ffa4d869f5a90f2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 4 Mar 2022 14:50:20 +0100 Subject: [PATCH 2/8] fix transaction type id - too much change --- backend/src/graphql/model/Transaction.ts | 6 +++--- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- backend/src/graphql/resolver/TransactionResolver.ts | 6 +++--- backend/src/typeorm/repository/Transaction.ts | 4 ++-- backend/src/util/virtualDecayTransaction.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 3cec757e2..cf2e899b2 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import { Decay } from './Decay' import { Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import { User } from './User' @ObjectType() @@ -41,8 +41,8 @@ export class Transaction { @Field(() => Number, { nullable: true }) previous: number | null - @Field(() => TypeId) - typeId: TypeId + @Field(() => TransactionTypeId) + typeId: TransactionTypeId @Field(() => Decimal) amount: Decimal diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3ce052be4..39e6dab3c 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -26,7 +26,7 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation' import { hasElopageBuys } from '../../util/hasElopageBuys' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import Decimal from 'decimal.js-light' // const EMAIL_OPT_IN_REGISTER = 1 @@ -321,7 +321,7 @@ export class AdminResolver { newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount))) const transaction = new Transaction() - transaction.typeId = TypeId.CREATION + transaction.typeId = TransactionTypeId.CREATION transaction.memo = pendingCreation.memo transaction.userId = pendingCreation.userId // TODO pending creations decimal diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 1451609ad..14b80a5ea 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -24,7 +24,7 @@ import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' import { apiPost } from '../../apis/HttpRequest' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import { calculateBalance, isHexPublicKey } from '../../util/validate' import { RIGHTS } from '../../auth/RIGHTS' import { User } from '../model/User' @@ -173,7 +173,7 @@ export class TransactionResolver { try { // transaction const transactionSend = new dbTransaction() - transactionSend.typeId = TypeId.SEND + transactionSend.typeId = TransactionTypeId.SEND transactionSend.memo = memo transactionSend.userId = senderUser.id transactionSend.linkedUserId = recipientUser.id @@ -186,7 +186,7 @@ export class TransactionResolver { await queryRunner.manager.insert(dbTransaction, transactionSend) const transactionReceive = new dbTransaction() - transactionReceive.typeId = TypeId.RECEIVE + transactionReceive.typeId = TransactionTypeId.RECEIVE transactionReceive.memo = memo transactionReceive.userId = recipientUser.id transactionReceive.linkedUserId = senderUser.id diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 4353aa981..e1af105f8 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' import { Order } from '../../graphql/enum/Order' -import { TypeId } from '../../graphql/enum/TypeId' +import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' @EntityRepository(Transaction) export class TransactionRepository extends Repository { @@ -16,7 +16,7 @@ export class TransactionRepository extends Repository { return this.createQueryBuilder('userTransaction') .where('userTransaction.userId = :userId', { userId }) .andWhere('userTransaction.typeId = :typeId', { - typeId: TypeId.CREATION, + typeId: TransactionTypeId.CREATION, }) .orderBy('userTransaction.balanceDate', order) .limit(limit) diff --git a/backend/src/util/virtualDecayTransaction.ts b/backend/src/util/virtualDecayTransaction.ts index 31e9e9258..df3482716 100644 --- a/backend/src/util/virtualDecayTransaction.ts +++ b/backend/src/util/virtualDecayTransaction.ts @@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light' import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { calculateDecay } from './decay' -import { TypeId } from '../graphql/enum/TypeId' +import { TransactionTypeId } from '../graphql/enum/TransactionTypeId' import { Transaction } from '../graphql/model/Transaction' import { User } from '../graphql/model/User' @@ -19,7 +19,7 @@ const virtualDecayTransaction = ( id: -1, userId: -1, previous: -1, - typeId: TypeId.DECAY, + typeId: TransactionTypeId.DECAY, amount: decay.decay ? decay.decay : new Decimal(0), // new Decimal(0), // this kinda is wrong, but helps with the frontend query balance: decay.balance, balanceDate: time, From 22c65aa92924efbd7bf4f739c95d383696cd64af Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 4 Mar 2022 15:12:51 +0100 Subject: [PATCH 3/8] renamed TypeId to TransactiontypeId fixed admin creation (backend part) --- .../enum/{TypeId.ts => TransactionTypeId.ts} | 6 ++-- backend/src/graphql/resolver/AdminResolver.ts | 28 +++++++++++-------- .../Transaction.ts | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) rename backend/src/graphql/enum/{TypeId.ts => TransactionTypeId.ts} (66%) diff --git a/backend/src/graphql/enum/TypeId.ts b/backend/src/graphql/enum/TransactionTypeId.ts similarity index 66% rename from backend/src/graphql/enum/TypeId.ts rename to backend/src/graphql/enum/TransactionTypeId.ts index 29916331c..497ad5055 100644 --- a/backend/src/graphql/enum/TypeId.ts +++ b/backend/src/graphql/enum/TransactionTypeId.ts @@ -1,6 +1,6 @@ import { registerEnumType } from 'type-graphql' -export enum TypeId { +export enum TransactionTypeId { CREATION = 1, SEND = 2, RECEIVE = 3, @@ -8,7 +8,7 @@ export enum TypeId { DECAY = 4, } -registerEnumType(TypeId, { - name: 'TypeId', // this one is mandatory +registerEnumType(TransactionTypeId, { + name: 'TransactionTypeId', // this one is mandatory description: 'Type of the transaction', // this one is optional }) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 39e6dab3c..4ea1f2fd1 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -28,9 +28,12 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' import { TransactionTypeId } from '../enum/TransactionTypeId' import Decimal from 'decimal.js-light' +import { Decay } from '../model/Decay' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? +const MAX_CREATION_AMOUNT = 1000 +const FULL_CREATION_AVAILABLE = [MAX_CREATION_AMOUNT, MAX_CREATION_AMOUNT, MAX_CREATION_AMOUNT] @Resolver() export class AdminResolver { @@ -104,7 +107,7 @@ export class AdminResolver { const userCreations = creations.find((c) => c.id === user.id) const adminUser = new UserAdmin( user, - userCreations ? userCreations.creations : [1000, 1000, 1000], + userCreations ? userCreations.creations : FULL_CREATION_AVAILABLE, await hasElopageBuys(user.email), emailConfirmationSend, ) @@ -270,11 +273,11 @@ export class AdminResolver { return { ...pendingCreation, - amount: Number(parseInt(pendingCreation.amount.toString()) / 10000), + amount: Number(pendingCreation.amount.toString()), firstName: user ? user.firstName : '', lastName: user ? user.lastName : '', email: user ? user.email : '', - creation: creation ? creation.creations : [1000, 1000, 1000], + creation: creation ? creation.creations : FULL_CREATION_AVAILABLE, } }) } @@ -300,7 +303,7 @@ export class AdminResolver { if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a creation.') const creations = await getUserCreation(pendingCreation.userId, false) - if (!isCreationValid(creations, Number(pendingCreation.amount) / 10000, pendingCreation.date)) { + if (!isCreationValid(creations, Number(pendingCreation.amount), pendingCreation.date)) { throw new Error('Creation is not valid!!') } @@ -310,25 +313,26 @@ export class AdminResolver { const lastTransaction = await transactionRepository.findLastForUser(pendingCreation.userId) let newBalance = new Decimal(0) + let decay: Decay | null = null if (lastTransaction) { - newBalance = calculateDecay( - lastTransaction.balance, - lastTransaction.balanceDate, - receivedCallDate, - ).balance + decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, receivedCallDate) + newBalance = decay.balance } // TODO pending creations decimal - newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount))) + newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount)).toString()) const transaction = new Transaction() transaction.typeId = TransactionTypeId.CREATION transaction.memo = pendingCreation.memo transaction.userId = pendingCreation.userId + transaction.previous = lastTransaction ? lastTransaction.id : null // TODO pending creations decimal transaction.amount = new Decimal(Number(pendingCreation.amount)) transaction.creationDate = pendingCreation.date transaction.balance = newBalance transaction.balanceDate = receivedCallDate + transaction.decay = decay ? decay.decay : new Decimal(0) + transaction.decayStart = decay ? decay.start : null await transaction.save() await AdminPendingCreation.delete(pendingCreation) @@ -344,7 +348,7 @@ interface CreationMap { async function getUserCreation(id: number, includePending = true): Promise { const creations = await getUserCreations([id], includePending) - return creations[0] ? creations[0].creations : [1000, 1000, 1000] + return creations[0] ? creations[0].creations : FULL_CREATION_AVAILABLE } async function getUserCreations(ids: number[], includePending = true): Promise { @@ -384,7 +388,7 @@ async function getUserCreations(ids: number[], includePending = true): Promise parseInt(raw.month) === month && parseInt(raw.id) === id, ) - return 1000 - (creation ? Number(creation.sum) / 10000 : 0) + return MAX_CREATION_AMOUNT - (creation ? Number(creation.sum) : 0) }), } }) diff --git a/database/entity/0029-clean_transaction_table/Transaction.ts b/database/entity/0029-clean_transaction_table/Transaction.ts index 7989e918a..1212d62ce 100644 --- a/database/entity/0029-clean_transaction_table/Transaction.ts +++ b/database/entity/0029-clean_transaction_table/Transaction.ts @@ -11,7 +11,7 @@ export class Transaction extends BaseEntity { userId: number @Column({ unsigned: true, nullable: true, default: null }) - previous: number + previous: number | null @Column({ name: 'type_id', unsigned: true, nullable: false }) typeId: number From c728b13f43b39a7d9f10643b0feba91b35206567 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 4 Mar 2022 15:33:49 +0100 Subject: [PATCH 4/8] undo changes --- .../graphics/CommunityDBSkeema.drawio | 52 +++++++++---------- .../db/cake_gradido_single_dev_node-1.sql | 4 +- docu/other/db/cake_gradido_single_node.sql | 4 +- docu/other/db/community_db.txt | 4 +- docu/other/db/mirror_db.txt | 4 +- docu/other/db/transactions.sql | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio b/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio index daad0b3c7..07c4f6284 100644 --- a/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio +++ b/docu/Concepts/TechnicalRequirements/graphics/CommunityDBSkeema.drawio @@ -1,6 +1,6 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -435,40 +435,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -478,7 +478,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -538,7 +538,7 @@ - + diff --git a/docu/other/db/cake_gradido_single_dev_node-1.sql b/docu/other/db/cake_gradido_single_dev_node-1.sql index acce4dce1..7026e52cd 100644 --- a/docu/other/db/cake_gradido_single_dev_node-1.sql +++ b/docu/other/db/cake_gradido_single_dev_node-1.sql @@ -126,7 +126,7 @@ CREATE TABLE `state_created` ( CREATE TABLE `state_errors` ( `id` int(11) NOT NULL, `state_user_id` int(11) NOT NULL, - `type_id` int(11) NOT NULL, + `transaction_type_id` int(11) NOT NULL, `created` datetime NOT NULL, `message_json` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -194,7 +194,7 @@ CREATE TABLE `state_users` ( CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `group_id` int(11) NOT NULL, - `type_id` int(11) NOT NULL, + `transaction_type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `memo` varchar(255) COLLATE utf8_bin NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP diff --git a/docu/other/db/cake_gradido_single_node.sql b/docu/other/db/cake_gradido_single_node.sql index acce4dce1..7026e52cd 100644 --- a/docu/other/db/cake_gradido_single_node.sql +++ b/docu/other/db/cake_gradido_single_node.sql @@ -126,7 +126,7 @@ CREATE TABLE `state_created` ( CREATE TABLE `state_errors` ( `id` int(11) NOT NULL, `state_user_id` int(11) NOT NULL, - `type_id` int(11) NOT NULL, + `transaction_type_id` int(11) NOT NULL, `created` datetime NOT NULL, `message_json` text NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -194,7 +194,7 @@ CREATE TABLE `state_users` ( CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `group_id` int(11) NOT NULL, - `type_id` int(11) NOT NULL, + `transaction_type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `memo` varchar(255) COLLATE utf8_bin NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP diff --git a/docu/other/db/community_db.txt b/docu/other/db/community_db.txt index 0942d1970..b1e125d1f 100644 --- a/docu/other/db/community_db.txt +++ b/docu/other/db/community_db.txt @@ -27,7 +27,7 @@ state_users id index group_id public_key email first_name last_name state_errors -id state_user_id type_id created message_json +id state_user_id transaction_type_id created message_json state_balances id state_user_id modified amount @@ -48,7 +48,7 @@ id transaction_id signature pubkey transactions int64 -id state_group_id type_id tx_hash received +id state_group_id transaction_type_id tx_hash received transaction_send_coins id transaction_id state_user_id receiver_public receiver_user_id amount sender_final_balance diff --git a/docu/other/db/mirror_db.txt b/docu/other/db/mirror_db.txt index 40a6cda22..37ef59011 100644 --- a/docu/other/db/mirror_db.txt +++ b/docu/other/db/mirror_db.txt @@ -8,7 +8,7 @@ id transaction_id signature pubkey transactions int64 -id group_id timestamp type_id hash received +id group_id timestamp transaction_type_id hash received transaction_bins id transaction_id filename start size @@ -16,5 +16,5 @@ id transaction_id filename start size state_created id transaction_id month year short_ident_hash -F�r mehr Performance, jeweils eine transactions, transaction_bins und transaction_signatures +Für mehr Performance, jeweils eine transactions, transaction_bins und transaction_signatures Tabelle pro Gruppe diff --git a/docu/other/db/transactions.sql b/docu/other/db/transactions.sql index 7c5ffd99a..35b06a11f 100644 --- a/docu/other/db/transactions.sql +++ b/docu/other/db/transactions.sql @@ -2,7 +2,7 @@ CREATE TABLE `transactions` ( `id` bigint(20) NOT NULL, `state_group_id` int(11) NOT NULL, - `type_id` int(11) NOT NULL, + `transaction_type_id` int(11) NOT NULL, `tx_hash` binary(32) NOT NULL, `received` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) From ed852482893b5efa987e1c33fd63fa3031e9d0a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 4 Mar 2022 15:38:48 +0100 Subject: [PATCH 5/8] undo changes --- database/entity/0001-init_db/Transaction.ts | 4 +-- .../entity/0001-init_db/UserTransaction.ts | 4 +-- .../Transaction.ts | 4 +-- .../Transaction.ts | 4 +-- .../Transaction.ts | 4 +-- database/migrations/0001-init_db.ts | 6 ++--- .../0014-drop_unused_tables_with_data.ts | 2 +- .../0022-delete_decay_start_block.ts | 2 +- .../0024-combine_transaction_tables.ts | 6 ++--- .../0026-combine_transaction_tables2.ts | 26 +++++++++---------- .../0027-clean_transaction_table.ts | 6 ++--- database/migrations/0028-decimal_types.ts | 4 +-- .../0029-clean_transaction_table.ts | 8 +++--- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/database/entity/0001-init_db/Transaction.ts b/database/entity/0001-init_db/Transaction.ts index a1fd75b4d..a33fbd0be 100644 --- a/database/entity/0001-init_db/Transaction.ts +++ b/database/entity/0001-init_db/Transaction.ts @@ -10,8 +10,8 @@ export class Transaction extends BaseEntity { @Column({ name: 'state_group_id', unsigned: true, default: null }) stateGroupId: number - @Column({ name: 'type_id', unsigned: true, nullable: false }) - typeId: number + @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) + transactionTypeId: number @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null }) txHash: Buffer diff --git a/database/entity/0001-init_db/UserTransaction.ts b/database/entity/0001-init_db/UserTransaction.ts index a15200332..7e24b66b0 100644 --- a/database/entity/0001-init_db/UserTransaction.ts +++ b/database/entity/0001-init_db/UserTransaction.ts @@ -11,8 +11,8 @@ export class UserTransaction extends BaseEntity { @Column({ name: 'transaction_id' }) transactionId: number - @Column({ name: 'type_id' }) - typeId: number + @Column({ name: 'transaction_type_id' }) + transactionTypeId: number @Column({ name: 'balance', type: 'bigint' }) balance: number diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts index 5cfaabfd5..5410d010b 100644 --- a/database/entity/0016-transaction_signatures/Transaction.ts +++ b/database/entity/0016-transaction_signatures/Transaction.ts @@ -8,8 +8,8 @@ export class Transaction extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'type_id', unsigned: true, nullable: false }) - typeId: number + @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) + transactionTypeId: number @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null }) txHash: Buffer diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts index e914bf313..5834c007a 100644 --- a/database/entity/0024-combine_transaction_tables/Transaction.ts +++ b/database/entity/0024-combine_transaction_tables/Transaction.ts @@ -6,8 +6,8 @@ export class Transaction extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'type_id', unsigned: true, nullable: false }) - typeId: number + @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) + transactionTypeId: number @Column({ name: 'user_id', unsigned: true, nullable: false }) userId: number diff --git a/database/entity/0026-combine_transaction_tables2/Transaction.ts b/database/entity/0026-combine_transaction_tables2/Transaction.ts index 542f7b2c7..77f23e4e4 100644 --- a/database/entity/0026-combine_transaction_tables2/Transaction.ts +++ b/database/entity/0026-combine_transaction_tables2/Transaction.ts @@ -11,8 +11,8 @@ export class Transaction extends BaseEntity { @Column({ name: 'transaction_id', unsigned: true, nullable: false }) transactionId: number - @Column({ name: 'type_id', unsigned: true, nullable: false }) - typeId: number + @Column({ name: 'transaction_type_id', unsigned: true, nullable: false }) + transactionTypeId: number @Column({ type: 'bigint', nullable: false }) amount: BigInt diff --git a/database/migrations/0001-init_db.ts b/database/migrations/0001-init_db.ts index 2c7dea0b4..e26c2c1a7 100644 --- a/database/migrations/0001-init_db.ts +++ b/database/migrations/0001-init_db.ts @@ -140,7 +140,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis CREATE TABLE IF NOT EXISTS \`state_errors\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`state_user_id\` int(10) unsigned NOT NULL, - \`type_id\` int(10) unsigned NOT NULL, + \`transaction_type_id\` int(10) unsigned NOT NULL, \`created\` datetime NOT NULL, \`message_json\` text COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (\`id\`) @@ -196,7 +196,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT, \`state_user_id\` int UNSIGNED NOT NULL, \`transaction_id\` int UNSIGNED NOT NULL, - \`type_id\` int UNSIGNED NOT NULL, + \`transaction_type_id\` int UNSIGNED NOT NULL, \`balance\` bigint(20) DEFAULT 0, \`balance_date\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (\`id\`) @@ -304,7 +304,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis CREATE TABLE IF NOT EXISTS \`transactions\` ( \`id\` bigint(20) unsigned NOT NULL AUTO_INCREMENT, \`state_group_id\` int(10) unsigned DEFAULT NULL, - \`type_id\` int(10) unsigned NOT NULL, + \`transaction_type_id\` int(10) unsigned NOT NULL, \`tx_hash\` binary(48) DEFAULT NULL, \`memo\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, \`received\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/database/migrations/0014-drop_unused_tables_with_data.ts b/database/migrations/0014-drop_unused_tables_with_data.ts index 0d2c9903d..af1e27cb4 100644 --- a/database/migrations/0014-drop_unused_tables_with_data.ts +++ b/database/migrations/0014-drop_unused_tables_with_data.ts @@ -292,7 +292,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom CREATE TABLE \`state_errors\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`state_user_id\` int(10) unsigned NOT NULL, - \`type_id\` int(10) unsigned NOT NULL, + \`transaction_type_id\` int(10) unsigned NOT NULL, \`created\` datetime NOT NULL, \`message_json\` text COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (\`id\`) diff --git a/database/migrations/0022-delete_decay_start_block.ts b/database/migrations/0022-delete_decay_start_block.ts index 7f31ab792..a31f9c441 100644 --- a/database/migrations/0022-delete_decay_start_block.ts +++ b/database/migrations/0022-delete_decay_start_block.ts @@ -9,7 +9,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Remove transactions with type 9 (start decay block). This should affect exactly 1 row - await queryFn(`DELETE FROM transactions WHERE type_id = 9;`) + await queryFn(`DELETE FROM transactions WHERE transaction_type_id = 9;`) } export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts index e80ca9922..5b8ec8be8 100644 --- a/database/migrations/0024-combine_transaction_tables.ts +++ b/database/migrations/0024-combine_transaction_tables.ts @@ -9,7 +9,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { // Create new `user_id` column (former `state_user_id`), with a temporary default of null await queryFn( - 'ALTER TABLE `transactions` ADD COLUMN `user_id` int(10) unsigned DEFAULT NULL AFTER `type_id`;', + 'ALTER TABLE `transactions` ADD COLUMN `user_id` int(10) unsigned DEFAULT NULL AFTER `transaction_type_id`;', ) // Create new `amount` column, with a temporary default of null await queryFn( @@ -105,7 +105,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom send_receiver_public_key AS receiver_public_key, send_receiver_user_id AS receiver_user_id, amount, send_sender_final_balance AS sender_final_balance FROM transactions - WHERE type_id = 2 ); + WHERE transaction_type_id = 2 ); `) await queryFn(` @@ -115,7 +115,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom ( SELECT id AS transaction_id, user_id AS state_user_id, amount, creation_ident_hash AS ident_hash, creation_date AS target_date FROM transactions - WHERE type_id = 1 ); + WHERE transaction_type_id = 1 ); `) await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_sender_final_balance`;') diff --git a/database/migrations/0026-combine_transaction_tables2.ts b/database/migrations/0026-combine_transaction_tables2.ts index 5c31ad4e1..3abf77354 100644 --- a/database/migrations/0026-combine_transaction_tables2.ts +++ b/database/migrations/0026-combine_transaction_tables2.ts @@ -31,7 +31,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis await queryFn('ALTER TABLE `state_user_transactions` RENAME COLUMN state_user_id TO user_id;') // Create new `amount` column, with a temporary default of null await queryFn( - 'ALTER TABLE `state_user_transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `type_id`;', + 'ALTER TABLE `state_user_transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `transaction_type_id`;', ) // Create new `send_sender_final_balance` await queryFn( @@ -89,7 +89,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.pubkey, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash - WHERE state_user_transactions.type_id = 1; + WHERE state_user_transactions.transaction_type_id = 1; `) // Insert Data from `transactions` for sendCoin sender @@ -104,7 +104,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.linked_user_id = transactions.send_receiver_user_id, state_user_transactions.linked_state_user_transaction_id = ( SELECT id FROM state_user_transactions AS sut - WHERE sut.type_id = 2 + WHERE sut.transaction_type_id = 2 AND sut.transaction_id = state_user_transactions.transaction_id AND sut.user_id = transactions.send_receiver_user_id ), @@ -112,7 +112,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.pubkey, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash - WHERE state_user_transactions.type_id = 2 + WHERE state_user_transactions.transaction_type_id = 2 AND state_user_transactions.user_id = transactions.user_id; `) @@ -128,7 +128,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.linked_user_id = transactions.user_id, state_user_transactions.linked_state_user_transaction_id = ( SELECT id FROM state_user_transactions AS sut - WHERE sut.type_id = 2 + WHERE sut.transaction_type_id = 2 AND sut.transaction_id = state_user_transactions.transaction_id AND sut.user_id = transactions.user_id ), @@ -136,8 +136,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis state_user_transactions.signature = transactions.signature, state_user_transactions.pubkey = transactions.send_receiver_public_key, state_user_transactions.creation_ident_hash = transactions.creation_ident_hash, - state_user_transactions.type_id = 3 - WHERE state_user_transactions.type_id = 2 + state_user_transactions.transaction_type_id = 3 + WHERE state_user_transactions.transaction_type_id = 2 AND state_user_transactions.user_id = transactions.send_receiver_user_id; `) @@ -161,7 +161,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn('RENAME TABLE `transactions` TO `state_user_transactions`;') await queryFn(`CREATE TABLE \`transactions\` ( \`id\` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - \`type_id\` int(10) unsigned NOT NULL, + \`transaction_type_id\` int(10) unsigned NOT NULL, \`user_id\` int(10) unsigned NOT NULL, \`amount\` bigint(20) NOT NULL, \`tx_hash\` binary(48) DEFAULT NULL, @@ -179,13 +179,13 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom `) await queryFn(` INSERT INTO transactions ( - id, type_id, user_id, amount, + id, transaction_type_id, user_id, amount, tx_hash, memo, received, signature, pubkey, creation_ident_hash, creation_date, send_receiver_public_key, send_receiver_user_id, send_sender_final_balance ) - SELECT transaction_id AS id, type_id, + SELECT transaction_id AS id, transaction_type_id, user_id, amount, tx_hash, memo, received, signature, pubkey, creation_ident_hash, creation_date, send_receiver_public_key, @@ -194,12 +194,12 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom FROM state_user_transactions LEFT JOIN ( SELECT id, pubkey AS send_receiver_public_key FROM state_user_transactions AS sut - WHERE sut.type_id = 3 + WHERE sut.transaction_type_id = 3 ) AS sutj ON sutj.id = state_user_transactions.id - WHERE type_id IN (1,2) + WHERE transaction_type_id IN (1,2) `) await queryFn( - 'UPDATE state_user_transactions SET type_id = 2 WHERE type_id = 3;', + 'UPDATE state_user_transactions SET transaction_type_id = 2 WHERE transaction_type_id = 3;', ) await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `creation_ident_hash`;') await queryFn('ALTER TABLE `state_user_transactions` DROP COLUMN `pubkey`;') diff --git a/database/migrations/0027-clean_transaction_table.ts b/database/migrations/0027-clean_transaction_table.ts index 824515a01..b5a0e0e2e 100644 --- a/database/migrations/0027-clean_transaction_table.ts +++ b/database/migrations/0027-clean_transaction_table.ts @@ -23,8 +23,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis // drop column `creation_ident_hash`, it is not needed await queryFn('ALTER TABLE `transactions` DROP COLUMN `creation_ident_hash`;') - // rename `type_id` to `type_id` - await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO type_id;') + // rename `transaction_type_id` to `type_id` + await queryFn('ALTER TABLE `transactions` RENAME COLUMN transaction_type_id TO type_id;') // rename `linked_state_user_transaction_id` to `linked_transaction_id` await queryFn( 'ALTER TABLE `transactions` RENAME COLUMN linked_state_user_transaction_id TO linked_transaction_id;', @@ -43,7 +43,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn( 'ALTER TABLE `transactions` RENAME COLUMN linked_transaction_id TO linked_state_user_transaction_id;', ) - await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO type_id;') + await queryFn('ALTER TABLE `transactions` RENAME COLUMN type_id TO transaction_type_id;') await queryFn( 'ALTER TABLE `transactions` ADD COLUMN `creation_ident_hash` binary(32) DEFAULT NULL AFTER `linked_state_user_transaction_id`;', ) diff --git a/database/migrations/0028-decimal_types.ts b/database/migrations/0028-decimal_types.ts index 0bb9e1db1..7b158d6ee 100644 --- a/database/migrations/0028-decimal_types.ts +++ b/database/migrations/0028-decimal_types.ts @@ -40,7 +40,7 @@ interface Decay { duration: number | null } -export enum TypeId { +export enum TransactionTypeId { CREATION = 1, SEND = 2, RECEIVE = 3, @@ -162,7 +162,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis // This should also fix the rounding error on amount let decAmount = new Decimal(transaction.amount).dividedBy(10000).toDecimalPlaces(2) - if (transaction.type_id === TypeId.SEND) { + if (transaction.type_id === TransactionTypeId.SEND) { decAmount = decAmount.mul(-1) } const decayStartDate = previous ? previous.balance_date : transaction.balance_date diff --git a/database/migrations/0029-clean_transaction_table.ts b/database/migrations/0029-clean_transaction_table.ts index ecf0dc208..0b9e2cc0d 100644 --- a/database/migrations/0029-clean_transaction_table.ts +++ b/database/migrations/0029-clean_transaction_table.ts @@ -61,7 +61,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn(` INSERT INTO \`state_balances\` (state_user_id, modified, record_date, amount) - SELECT user_id as state_user_id, balance_date as modified, balance_date as record_date, amount as amount FROM + SELECT user_id as state_user_id, balance_date as modified, balance_date as record_date, amount * 10000 as amount FROM (SELECT user_id as uid, MAX(balance_date) AS date FROM transactions GROUP BY uid) AS t LEFT JOIN transactions ON t.uid = transactions.user_id AND t.date = transactions.balance_date; `) @@ -96,9 +96,9 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom temp_dec_old_balance = dec_balance, temp_dec_diff_send_sender_final_balance = 0, temp_dec_send_sender_final_balance = dec_balance, - balance = dec_balance, - send_sender_final_balance = dec_balance, - amount = dec_amount; + balance = dec_balance * 10000, + send_sender_final_balance = dec_balance * 10000, + amount = dec_amount * 10000; `) await queryFn('ALTER TABLE `transactions` MODIFY COLUMN `amount` bigint(20) NOT NULL;') From 2bea864caa548d39fdeecc9b39d293a34b06e334 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 4 Mar 2022 15:42:54 +0100 Subject: [PATCH 6/8] remove console.log --- admin/src/components/CreationTransactionListFormular.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 2dba0c40f..f4fbe7c8b 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -59,7 +59,6 @@ export default { }, }) .then((result) => { - console.log('getTransactions', result.data) this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation') }) .catch((error) => { From e39502c070c53b04dc41e8f8bd5ef18abb35aab7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 4 Mar 2022 15:51:43 +0100 Subject: [PATCH 7/8] yarn lint --fix --- .../src/views/Pages/AccountOverview/GddTransactionList.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index cb2bd92f5..a0af973f3 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -53,7 +53,11 @@
- {{ typeId !== 'DECAY' ? (linkedUser.firstName + linkedUser.lastName ) : $t('decay.decay_since_last_transaction') }} + {{ + typeId !== 'DECAY' + ? linkedUser.firstName + linkedUser.lastName + : $t('decay.decay_since_last_transaction') + }}
From 231602676cd7ce7d5f5ffeb2776bedbd403590e1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 4 Mar 2022 16:09:03 +0100 Subject: [PATCH 8/8] yarn test fixed --- frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index d12c5e43e..87362a6c3 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -153,7 +153,7 @@ describe('DashboardLayoutGdd', () => { apolloMock.mockResolvedValue({ data: { transactionList: { - gdtSum: 100, + balanceGDT: 100, count: 4, balance: 1450, decay: 1250, @@ -179,7 +179,7 @@ describe('DashboardLayoutGdd', () => { }) it('updates balance', () => { - expect(wrapper.vm.balance).toBe(1250) + expect(wrapper.vm.balance).toBe(1450) }) it('updates transactions', () => {