From d0dc8dc0fd653a3ef3cbb158dfc513be37192187 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 Mar 2022 13:16:53 +0200 Subject: [PATCH 1/3] the backend returns an array of errors, we display the first --- frontend/src/pages/Send.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue index 270187bec..903de6e49 100644 --- a/frontend/src/pages/Send.vue +++ b/frontend/src/pages/Send.vue @@ -134,7 +134,7 @@ export default { this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendSuccess }) .catch((err) => { - this.errorResult = err.message + this.errorResult = err[0].message this.error = true this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError }) From 06dcb2380e19892587ac120e4e8420e0162c1be6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 31 Mar 2022 13:48:15 +0200 Subject: [PATCH 2/3] seed creations months ago from now --- .../src/seeds/creation/CreationInterface.ts | 2 ++ backend/src/seeds/creation/index.ts | 13 ++++++------ backend/src/seeds/factory/creation.ts | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/backend/src/seeds/creation/CreationInterface.ts b/backend/src/seeds/creation/CreationInterface.ts index 8723f441d..3e0f3cf6c 100644 --- a/backend/src/seeds/creation/CreationInterface.ts +++ b/backend/src/seeds/creation/CreationInterface.ts @@ -4,4 +4,6 @@ export interface CreationInterface { memo: string creationDate: string confirmed?: boolean + // number of months to move the confirmed creation to the past + moveCreationDate?: number } diff --git a/backend/src/seeds/creation/index.ts b/backend/src/seeds/creation/index.ts index 7396a7ec8..20d30d94c 100644 --- a/backend/src/seeds/creation/index.ts +++ b/backend/src/seeds/creation/index.ts @@ -1,29 +1,28 @@ import { CreationInterface } from './CreationInterface' - -const lastMonth = (date: Date): string => { - return new Date(date.getFullYear(), date.getMonth() - 1, 1).toISOString() -} +import { nMonthsBefore } from '../factory/creation' export const creations: CreationInterface[] = [ { email: 'bibi@bloxberg.de', amount: 1000, memo: 'Herzlich Willkommen bei Gradido!', - creationDate: lastMonth(new Date()), + creationDate: nMonthsBefore(new Date()), confirmed: true, + moveCreationDate: 12, }, { email: 'bob@baumeister.de', amount: 1000, memo: 'Herzlich Willkommen bei Gradido!', - creationDate: lastMonth(new Date()), + creationDate: nMonthsBefore(new Date()), confirmed: true, + moveCreationDate: 8, }, { email: 'raeuber@hotzenplotz.de', amount: 1000, memo: 'Herzlich Willkommen bei Gradido!', - creationDate: lastMonth(new Date()), + creationDate: nMonthsBefore(new Date()), confirmed: true, }, ] diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index d4d4c8101..64f693360 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -6,9 +6,14 @@ import { login } from '@/seeds/graphql/queries' import { CreationInterface } from '@/seeds/creation/CreationInterface' import { ApolloServerTestClient } from 'apollo-server-testing' import { User } from '@entity/User' +import { Transaction } from '@entity/Transaction' import { AdminPendingCreation } from '@entity/AdminPendingCreation' // import CONFIG from '@/config/index' +export const nMonthsBefore = (date: Date, months = 1): string => { + return new Date(date.getFullYear(), date.getMonth() - months, 1).toISOString() +} + export const creationFactory = async ( client: ApolloServerTestClient, creation: CreationInterface, @@ -34,5 +39,21 @@ export const creationFactory = async ( }) await mutate({ mutation: confirmPendingCreation, variables: { id: pendingCreation.id } }) + + if (creation.moveCreationDate) { + const transaction = await Transaction.findOneOrFail({ + where: { userId: user.id, creationDate: new Date(creation.creationDate) }, + order: { balanceDate: 'DESC' }, + }) + if (transaction.decay.equals(0) && transaction.creationDate) { + transaction.creationDate = new Date( + nMonthsBefore(transaction.creationDate, creation.moveCreationDate), + ) + transaction.balanceDate = new Date( + nMonthsBefore(transaction.balanceDate, creation.moveCreationDate), + ) + await transaction.save() + } + } } } From aee53d17c0e9badfee8d0405094f39e109754355 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 31 Mar 2022 14:11:32 +0200 Subject: [PATCH 3/3] error message from server is toasted correctly --- frontend/src/pages/Send.spec.js | 4 +--- frontend/src/pages/Send.vue | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js index 9fe774e33..802fdf8a7 100644 --- a/frontend/src/pages/Send.spec.js +++ b/frontend/src/pages/Send.spec.js @@ -155,8 +155,6 @@ describe('Send', () => { }) }) - /* LINK */ - describe('transaction form link', () => { beforeEach(async () => { apolloMutationMock.mockResolvedValue({ @@ -261,7 +259,7 @@ describe('Send', () => { }) it('toasts an error message', () => { - expect(toastErrorSpy).toBeCalledWith({ message: 'OUCH!' }) + expect(toastErrorSpy).toBeCalledWith('OUCH!') }) }) }) diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue index 903de6e49..668e24493 100644 --- a/frontend/src/pages/Send.vue +++ b/frontend/src/pages/Send.vue @@ -133,8 +133,8 @@ export default { this.transactionData = { ...EMPTY_TRANSACTION_DATA } this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendSuccess }) - .catch((err) => { - this.errorResult = err[0].message + .catch((error) => { + this.errorResult = error.message this.error = true this.currentTransactionStep = TRANSACTION_STEPS.transactionResultSendError }) @@ -153,7 +153,7 @@ export default { this.updateTransactions({}) }) .catch((error) => { - this.toastError(error) + this.toastError(error.message) }) break default: