From 25b1a5a83e64ae6cec4e64cd3076ac12d7dce641 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 6 Mar 2022 11:52:29 +0100 Subject: [PATCH 1/4] admin area creation transaction list --- .../CreationTransactionListFormular.vue | 24 +++++++++-------- admin/src/graphql/transactionList.js | 27 +++++-------------- .../graphql/resolver/TransactionResolver.ts | 2 +- backend/src/typeorm/repository/Transaction.ts | 4 +-- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index f4fbe7c8b..0b78ca4b8 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -15,30 +15,32 @@ export default { return { fields: [ { - key: 'date', + key: 'creationDate', label: this.$t('transactionlist.date'), formatter: (value, key, item) => { return this.$d(new Date(value)) }, }, { - key: 'balance', + key: 'amount', label: this.$t('transactionlist.amount'), formatter: (value, key, item) => { return `${value} GDD` }, }, - { key: 'name', label: this.$t('transactionlist.community') }, + { + key: 'linkedUser', + label: this.$t('transactionlist.community'), + formatter: (value, key, item) => { + return `${value.firstName} ${value.lastName}` + }, + }, { key: 'memo', label: this.$t('transactionlist.memo') }, { - key: 'decay', - label: this.$t('transactionlist.decay'), + key: 'balanceDate', + label: this.$t('transactionlist.balanceDate'), formatter: (value, key, item) => { - if (value && value.balance >= 0) { - return value.balance - } else { - return '0' - } + return this.$d(new Date(value)) }, }, ], @@ -59,7 +61,7 @@ export default { }, }) .then((result) => { - this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation') + this.items = result.data.transactionList.transactions }) .catch((error) => { this.toastError(error.message) diff --git a/admin/src/graphql/transactionList.js b/admin/src/graphql/transactionList.js index 8ae5cde42..2ac81bf64 100644 --- a/admin/src/graphql/transactionList.js +++ b/admin/src/graphql/transactionList.js @@ -15,28 +15,15 @@ export const transactionList = gql` onlyCreations: $onlyCreations userId: $userId ) { - gdtSum - count - balance - decay - decayDate transactions { - type - balance - decayStart - decayEnd - decayDuration + id + amount + balanceDate + creationDate memo - transactionId - name - email - date - decay { - balance - decayStart - decayEnd - decayDuration - decayStartBlock + linkedUser { + firstName + lastName } } } diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 14b80a5ea..848ef5d43 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -112,7 +112,7 @@ export class TransactionResolver { const transactions: Transaction[] = [] // decay transaction - if (currentPage === 1 && order === Order.DESC) { + if (!onlyCreations && currentPage === 1 && order === Order.DESC) { transactions.push( virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self), ) diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 2abcb4090..e1af105f8 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -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: TransactionTypeId.CREATION, }) .orderBy('userTransaction.balanceDate', order) .limit(limit) From 8618d7894e2787b4fe036a708673e51c09d34c3c Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 6 Mar 2022 12:00:38 +0100 Subject: [PATCH 2/4] yarn test fixed --- .../CreationTransactionListFormular.spec.js | 44 ++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 7331184b7..5acff8ab7 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -9,41 +9,25 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ transactionList: { transactions: [ { - type: 'creation', - balance: 100, - decayStart: 0, - decayEnd: 0, - decayDuration: 0, + id: 1, + amount: 100, + balanceDate: 0, + creationDate: new Date(), memo: 'Testing', - transactionId: 1, - name: 'Gradido Akademie', - email: 'bibi@bloxberg.de', - date: new Date(), - decay: { - balance: 0.01, - decayStart: 0, - decayEnd: 0, - decayDuration: 0, - decayStartBlock: 0, + linkedUser: { + firstName: 'Gradido', + lastName: 'Akademie', }, }, { - type: 'creation', - balance: 200, - decayStart: 0, - decayEnd: 0, - decayDuration: 0, + id: 2, + amount: 200, + balanceDate: 0, + creationDate: new Date(), memo: 'Testing 2', - transactionId: 2, - name: 'Gradido Akademie', - email: 'bibi@bloxberg.de', - date: new Date(), - decay: { - balance: 0.01, - decayStart: 0, - decayEnd: 0, - decayDuration: 0, - decayStartBlock: 0, + linkedUser: { + firstName: 'Gradido', + lastName: 'Akademie', }, }, ], From ca46f3f6a54b0882c379c2d4eb6e4ac36b365aa6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 6 Mar 2022 12:08:13 +0100 Subject: [PATCH 3/4] add locales for transactionlist.balanceDate --- admin/src/locales/de.json | 3 ++- admin/src/locales/en.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 4c85db8db..2982c0343 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -79,7 +79,8 @@ "date": "Datum", "decay": "Vergänglichkeit", "memo": "Nachricht", - "title": "Alle geschöpften Transaktionen für den Nutzer" + "title": "Alle geschöpften Transaktionen für den Nutzer", + "balanceDate": "Schöpfungsdatum" }, "undelete_user": "Nutzer wiederherstellen", "unregistered_emails": "Nur unregistrierte Nutzer", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index b7a7b5013..770c3967b 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -79,7 +79,8 @@ "date": "Date", "decay": "Decay", "memo": "Message", - "title": "All creation-transactions for the user" + "title": "All creation-transactions for the user", + "balanceDate": "Creation date" }, "undelete_user": "Undelete User", "unregistered_emails": "Only unregistered users", From 5ecd9a9baccb403defd8ed335c7f090e77cecf6a Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 6 Mar 2022 12:08:39 +0100 Subject: [PATCH 4/4] yarn locales --fix --- admin/src/locales/de.json | 4 ++-- admin/src/locales/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 2982c0343..2a05f6ff0 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -75,12 +75,12 @@ "transaction": "Transaktion", "transactionlist": { "amount": "Betrag", + "balanceDate": "Schöpfungsdatum", "community": "Gemeinschaft", "date": "Datum", "decay": "Vergänglichkeit", "memo": "Nachricht", - "title": "Alle geschöpften Transaktionen für den Nutzer", - "balanceDate": "Schöpfungsdatum" + "title": "Alle geschöpften Transaktionen für den Nutzer" }, "undelete_user": "Nutzer wiederherstellen", "unregistered_emails": "Nur unregistrierte Nutzer", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 770c3967b..898c49ded 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -75,12 +75,12 @@ "transaction": "Transaction", "transactionlist": { "amount": "Amount", + "balanceDate": "Creation date", "community": "Community", "date": "Date", "decay": "Decay", "memo": "Message", - "title": "All creation-transactions for the user", - "balanceDate": "Creation date" + "title": "All creation-transactions for the user" }, "undelete_user": "Undelete User", "unregistered_emails": "Only unregistered users",