From d23a060abaa988c5d6f74a81815dc39f1ca33c6e Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 19 Jul 2022 12:10:09 +0200 Subject: [PATCH 01/32] Add text to send to the sender of a transaction link after the receiver redeem it. --- .../src/mailer/text/transactionReceived.ts | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index 07d03ad45..336cee3b3 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -29,6 +29,41 @@ Mit freundlichen Grüßen, dein Gradido-Team +Link zu deinem Konto: ${data.overviewURL}`, + }, +} + +export const transactionLinkRedeemed = { + de: { + subject: 'Gradido link eingelösst', + text: (data: { + email: string + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + senderEmail: string + amount: Decimal + memo: string + overviewURL: string + }): string => + `Hallo ${data.recipientFirstName} ${data.recipientLastName} + +${data.senderFirstName} ${data.senderLastName} (${ + data.senderEmail + }) hat soeben dein Link eingelösst. +Du hattest ihm ${data.amount.toFixed(2).replace('.', ',')} GDD, +mit dem folgenden Text: + +${data.memo} + +gesendet. + +Bitte antworte nicht auf diese E-Mail! + +Mit freundlichen Grüßen, +dein Gradido-Team + Link zu deinem Konto: ${data.overviewURL}`, }, } From c1ec142121a1e7ec682cb2037f26c99f0abf7e11 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 19 Jul 2022 12:10:59 +0200 Subject: [PATCH 02/32] Add method to send email to sender of a transactionLink after the receiver redeemed it. --- .../mailer/sendTransactionReceivedEmail.ts | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts index 692f92f9a..55f63e37e 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.ts @@ -1,7 +1,7 @@ import { backendLogger as logger } from '@/server/logger' import Decimal from 'decimal.js-light' import { sendEMail } from './sendEMail' -import { transactionReceived } from './text/transactionReceived' +import { transactionLinkRedeemed, transactionReceived } from './text/transactionReceived' export const sendTransactionReceivedEmail = (data: { senderFirstName: string @@ -26,3 +26,27 @@ export const sendTransactionReceivedEmail = (data: { text: transactionReceived.de.text(data), }) } + +export const sendTransactionLinkRedeemedEmail = (data: { + email: string + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + senderEmail: string + amount: Decimal + memo: string + overviewURL: string +}): Promise => { + logger.info( + `sendEmail(): to=${data.recipientFirstName} ${data.recipientLastName}, + <${data.email}>, + subject=${transactionLinkRedeemed.de.subject}, + text=${transactionLinkRedeemed.de.text(data)}`, + ) + return sendEMail({ + to: `${data.recipientFirstName} ${data.recipientLastName} <${data.email}>`, + subject: transactionLinkRedeemed.de.subject, + text: transactionLinkRedeemed.de.text(data), + }) +} From 97a83e633a37cc4031e0b465340910a567ee3326 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 19 Jul 2022 12:11:57 +0200 Subject: [PATCH 03/32] Add block to send the email to the sender of a transactionLink after the receiver redeemed it. --- .../src/graphql/resolver/TransactionResolver.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 023e5b2ff..f09657ca4 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -8,7 +8,7 @@ import { Context, getUser } from '@/server/context' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { getCustomRepository, getConnection } from '@dbTools/typeorm' -import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' +import { sendTransactionLinkRedeemedEmail, sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' import { Transaction } from '@model/Transaction' import { TransactionList } from '@model/TransactionList' @@ -156,6 +156,19 @@ export const executeTransaction = async ( memo, overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, }) + if (transactionLink) { + await sendTransactionLinkRedeemedEmail({ + senderFirstName: recipient.firstName, + senderLastName: recipient.lastName, + recipientFirstName: sender.firstName, + recipientLastName: sender.lastName, + email: sender.email, + senderEmail: recipient.email, + amount, + memo, + overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, + }) + } logger.info(`finished executeTransaction successfully`) return true } From 93e0451124890b476f01df7bf00e8e07d33984b8 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 19 Jul 2022 12:24:42 +0200 Subject: [PATCH 04/32] Fix linting. --- backend/src/graphql/resolver/TransactionResolver.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index f09657ca4..a128de520 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -8,7 +8,10 @@ import { Context, getUser } from '@/server/context' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { getCustomRepository, getConnection } from '@dbTools/typeorm' -import { sendTransactionLinkRedeemedEmail, sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' +import { + sendTransactionLinkRedeemedEmail, + sendTransactionReceivedEmail, +} from '@/mailer/sendTransactionReceivedEmail' import { Transaction } from '@model/Transaction' import { TransactionList } from '@model/TransactionList' From 96b2b9a416ab3babbea31a6438d43454255b268a Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 11 Aug 2022 14:40:22 +0200 Subject: [PATCH 05/32] Update backend/src/mailer/text/transactionReceived.ts Co-authored-by: Moriz Wahl --- backend/src/mailer/text/transactionReceived.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index 336cee3b3..50cdd2ff5 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -51,7 +51,7 @@ export const transactionLinkRedeemed = { ${data.senderFirstName} ${data.senderLastName} (${ data.senderEmail - }) hat soeben dein Link eingelösst. + }) hat soeben deinen Link eingelösst. Du hattest ihm ${data.amount.toFixed(2).replace('.', ',')} GDD, mit dem folgenden Text: From 75d9867c5519239d977b1ed43054a17ba4114991 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 11 Aug 2022 14:40:36 +0200 Subject: [PATCH 06/32] Update backend/src/mailer/text/transactionReceived.ts Co-authored-by: Moriz Wahl --- backend/src/mailer/text/transactionReceived.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index 50cdd2ff5..2764d1b60 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -52,12 +52,8 @@ export const transactionLinkRedeemed = { ${data.senderFirstName} ${data.senderLastName} (${ data.senderEmail }) hat soeben deinen Link eingelösst. -Du hattest ihm ${data.amount.toFixed(2).replace('.', ',')} GDD, -mit dem folgenden Text: - -${data.memo} - -gesendet. +Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD, +Memo: ${data.memo} Bitte antworte nicht auf diese E-Mail! From d08b609088e8f7278cdd4c3dbf172b881ac289ff Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 07:40:48 +0200 Subject: [PATCH 07/32] Define the german text for the email addedContributionMessage. --- .../text/contributionMessageReceived.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 backend/src/mailer/text/contributionMessageReceived.ts diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts new file mode 100644 index 000000000..ca0d68d3d --- /dev/null +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -0,0 +1,30 @@ +export const contributionMessageReceived = { + de: { + subject: 'Gradido Frage zur Schöpfung', + text: (data: { + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + recipientEmail: string + senderEmail: string + contributionMemo: string + message: string + overviewURL: string + }): string => + `Hallo ${data.recipientFirstName} ${data.recipientLastName} + +Du hast soeben eine nachfrage zur Schöpfung "${data.contributionMemo}" von ${data.senderFirstName} ${data.senderLastName} (${data.senderEmail}) erhalten. +${data.senderFirstName} ${data.senderLastName} schreibt: + +${data.message} + +Bitte antworte nicht auf diese E-Mail! + +Mit freundlichen Grüßen, +dein Gradido-Team + + +Link zu deinem Konto: ${data.overviewURL}`, + }, +} From d2ff8991001e97cf12e99043edca787be8e0f91b Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 07:41:45 +0200 Subject: [PATCH 08/32] Add method for sending EMail when their is a new contributionMessage from admin. --- .../mailer/sendTransactionReceivedEmail.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts index 692f92f9a..d1c79133e 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.ts @@ -2,6 +2,7 @@ import { backendLogger as logger } from '@/server/logger' import Decimal from 'decimal.js-light' import { sendEMail } from './sendEMail' import { transactionReceived } from './text/transactionReceived' +import { contributionMessageReceived } from './text/contributionMessageReceived' export const sendTransactionReceivedEmail = (data: { senderFirstName: string @@ -26,3 +27,26 @@ export const sendTransactionReceivedEmail = (data: { text: transactionReceived.de.text(data), }) } + +export const sendAddedContributionMessageEmail = (data: { + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + recipientEmail: string + senderEmail: string + contributionMemo: string + message: string + overviewURL: string +}): Promise => { + logger.info( + `sendEmail(): to=${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>, + subject=${contributionMessageReceived.de.subject}, + text=${contributionMessageReceived.de.text(data)}`, + ) + return sendEMail({ + to: `${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>`, + subject: contributionMessageReceived.de.subject, + text: contributionMessageReceived.de.text(data), + }) +} From d73143cfdf6f5097c57704d263f4c776508b6761 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 07:42:27 +0200 Subject: [PATCH 09/32] Call method to send Email when an admin add a new contributionmessage. --- backend/src/graphql/resolver/AdminResolver.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ac3936e4f..388083fd3 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -66,6 +66,7 @@ import { ContributionMessage as DbContributionMessage } from '@entity/Contributi import ContributionMessageArgs from '@arg/ContributionMessageArgs' import { ContributionMessageType } from '@enum/MessageType' import { ContributionMessage } from '@model/ContributionMessage' +import { sendAddedContributionMessageEmail } from '@/mailer/sendTransactionReceivedEmail' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? @@ -737,6 +738,20 @@ export class AdminResolver { await queryRunner.manager.update(Contribution, { id: contributionId }, contribution) } await queryRunner.commitTransaction() + const contributionUser = await dbUser.findOne({ id: contribution.userId }) + if (contributionUser) { + await sendAddedContributionMessageEmail({ + senderFirstName: user.firstName, + senderLastName: user.lastName, + recipientFirstName: contributionUser.firstName, + recipientLastName: contributionUser.lastName, + recipientEmail: contributionUser.email, + senderEmail: user.email, + contribution.memo, + message, + overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, + }) + } } catch (e) { await queryRunner.rollbackTransaction() logger.error(`ContributionMessage was not successful: ${e}`) From 690b18c307b76b1e16e46ada33546e7293e31182 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 07:49:11 +0200 Subject: [PATCH 10/32] Remove email of admin who sends message. --- backend/src/mailer/text/contributionMessageReceived.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index ca0d68d3d..e0a19d7dc 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -14,7 +14,7 @@ export const contributionMessageReceived = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName} -Du hast soeben eine nachfrage zur Schöpfung "${data.contributionMemo}" von ${data.senderFirstName} ${data.senderLastName} (${data.senderEmail}) erhalten. +Du hast soeben eine nachfrage zur Schöpfung "${data.contributionMemo}" von ${data.senderFirstName} ${data.senderLastName} erhalten. ${data.senderFirstName} ${data.senderLastName} schreibt: ${data.message} From 663097c378617e2957cf71a80c4e0c600de88d74 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 07:52:04 +0200 Subject: [PATCH 11/32] Fix data with named contributionMemo instead. --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 388083fd3..34b0f5ccf 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -747,7 +747,7 @@ export class AdminResolver { recipientLastName: contributionUser.lastName, recipientEmail: contributionUser.email, senderEmail: user.email, - contribution.memo, + contributionMemo: contribution.memo, message, overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, }) From 032348f8c27e9480ab774082f3b8f7c366a43abd Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 09:19:49 +0200 Subject: [PATCH 12/32] Remove addedContributionMessageEmail from this file. --- .../sendTransactionReceivedEmail.test.ts | 35 ++++++++++++++++++- .../mailer/sendTransactionReceivedEmail.ts | 23 ------------ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts index 75631cc7a..18d917cc6 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts @@ -1,4 +1,7 @@ -import { sendTransactionReceivedEmail } from './sendTransactionReceivedEmail' +import { + sendAddedContributionMessageEmail, + sendTransactionReceivedEmail, +} from './sendTransactionReceivedEmail' import { sendEMail } from './sendEMail' import Decimal from 'decimal.js-light' @@ -38,3 +41,33 @@ describe('sendTransactionReceivedEmail', () => { }) }) }) + +describe('sendAddedContributionMessageEmail', () => { + beforeEach(async () => { + jest.clearAllMocks() + await sendAddedContributionMessageEmail({ + senderFirstName: 'Peter', + senderLastName: 'Lustig', + recipientFirstName: 'Bibi', + recipientLastName: 'Bloxberg', + recipientEmail: 'bibi@bloxberg.de', + senderEmail: 'peter@lustig.de', + contributionMemo: 'Vielen herzlichen Dank für den neuen Hexenbesen!', + message: 'Was für ein Besen ist es geworden?', + overviewURL: 'http://localhost/overview', + }) + }) + + it('calls sendEMail', () => { + expect(sendEMail).toBeCalledWith({ + to: `Bibi Bloxberg `, + subject: 'Gradido Frage zur Schöpfung', + text: + expect.stringContaining('Hallo Bibi Bloxberg') && + expect.stringContaining('Peter Lustig') && + expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') && + expect.stringContaining('Was für ein Besen ist es geworden?') && + expect.stringContaining('http://localhost/overview'), + }) + }) +}) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts index d1c79133e..3e5171251 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.ts @@ -27,26 +27,3 @@ export const sendTransactionReceivedEmail = (data: { text: transactionReceived.de.text(data), }) } - -export const sendAddedContributionMessageEmail = (data: { - senderFirstName: string - senderLastName: string - recipientFirstName: string - recipientLastName: string - recipientEmail: string - senderEmail: string - contributionMemo: string - message: string - overviewURL: string -}): Promise => { - logger.info( - `sendEmail(): to=${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>, - subject=${contributionMessageReceived.de.subject}, - text=${contributionMessageReceived.de.text(data)}`, - ) - return sendEMail({ - to: `${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>`, - subject: contributionMessageReceived.de.subject, - text: contributionMessageReceived.de.text(data), - }) -} From d49d5f6bb7bcb271a38888a98548bcac6755f3c3 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 09:20:14 +0200 Subject: [PATCH 13/32] Remove addedContributionMessageEmail test from this file. --- .../sendTransactionReceivedEmail.test.ts | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts index 18d917cc6..75631cc7a 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts @@ -1,7 +1,4 @@ -import { - sendAddedContributionMessageEmail, - sendTransactionReceivedEmail, -} from './sendTransactionReceivedEmail' +import { sendTransactionReceivedEmail } from './sendTransactionReceivedEmail' import { sendEMail } from './sendEMail' import Decimal from 'decimal.js-light' @@ -41,33 +38,3 @@ describe('sendTransactionReceivedEmail', () => { }) }) }) - -describe('sendAddedContributionMessageEmail', () => { - beforeEach(async () => { - jest.clearAllMocks() - await sendAddedContributionMessageEmail({ - senderFirstName: 'Peter', - senderLastName: 'Lustig', - recipientFirstName: 'Bibi', - recipientLastName: 'Bloxberg', - recipientEmail: 'bibi@bloxberg.de', - senderEmail: 'peter@lustig.de', - contributionMemo: 'Vielen herzlichen Dank für den neuen Hexenbesen!', - message: 'Was für ein Besen ist es geworden?', - overviewURL: 'http://localhost/overview', - }) - }) - - it('calls sendEMail', () => { - expect(sendEMail).toBeCalledWith({ - to: `Bibi Bloxberg `, - subject: 'Gradido Frage zur Schöpfung', - text: - expect.stringContaining('Hallo Bibi Bloxberg') && - expect.stringContaining('Peter Lustig') && - expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') && - expect.stringContaining('Was für ein Besen ist es geworden?') && - expect.stringContaining('http://localhost/overview'), - }) - }) -}) From 5aea6f9d9debae25660f7505128bc27f199f6b49 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 09:20:34 +0200 Subject: [PATCH 14/32] Move sendAddedContributionMessageEmail to new file. --- .../sendAddedContributionMessageEmail.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 backend/src/mailer/sendAddedContributionMessageEmail.ts diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.ts b/backend/src/mailer/sendAddedContributionMessageEmail.ts new file mode 100644 index 000000000..14d5f6d31 --- /dev/null +++ b/backend/src/mailer/sendAddedContributionMessageEmail.ts @@ -0,0 +1,26 @@ +import { backendLogger as logger } from '@/server/logger' +import { sendEMail } from './sendEMail' +import { contributionMessageReceived } from './text/contributionMessageReceived' + +export const sendAddedContributionMessageEmail = (data: { + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + recipientEmail: string + senderEmail: string + contributionMemo: string + message: string + overviewURL: string +}): Promise => { + logger.info( + `sendEmail(): to=${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>, + subject=${contributionMessageReceived.de.subject}, + text=${contributionMessageReceived.de.text(data)}`, + ) + return sendEMail({ + to: `${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>`, + subject: contributionMessageReceived.de.subject, + text: contributionMessageReceived.de.text(data), + }) +} From 2651a8afcac85b10389841ccf368a70d177151b4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 09:20:56 +0200 Subject: [PATCH 15/32] Move test for sendAddedContributionMessageEmail. --- .../sendAddedContributionMessageEmail.test.ts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 backend/src/mailer/sendAddedContributionMessageEmail.test.ts diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts new file mode 100644 index 000000000..8b1bc2727 --- /dev/null +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -0,0 +1,31 @@ +import { sendAddedContributionMessageEmail } from './sendAddedContributionMessageEmail' +import { sendEMail } from './sendEMail' + +describe('sendAddedContributionMessageEmail', () => { + beforeEach(async () => { + await sendAddedContributionMessageEmail({ + senderFirstName: 'Peter', + senderLastName: 'Lustig', + recipientFirstName: 'Bibi', + recipientLastName: 'Bloxberg', + recipientEmail: 'bibi@bloxberg.de', + senderEmail: 'peter@lustig.de', + contributionMemo: 'Vielen herzlichen Dank für den neuen Hexenbesen!', + message: 'Was für ein Besen ist es geworden?', + overviewURL: 'http://localhost/overview', + }) + }) + + it('calls sendEMail', () => { + expect(sendEMail).toBeCalledWith({ + to: `Bibi Bloxberg `, + subject: 'Gradido Frage zur Schöpfung', + text: + expect.stringContaining('Hallo Bibi Bloxberg') && + expect.stringContaining('Peter Lustig') && + expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') && + expect.stringContaining('Was für ein Besen ist es geworden?') && + expect.stringContaining('http://localhost/overview'), + }) + }) +}) From 655e4058660ee42d878cbe312245dd38018ed59a Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 14:43:30 +0200 Subject: [PATCH 16/32] Change text of email. --- backend/src/mailer/text/contributionMessageReceived.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index e0a19d7dc..4affb71a8 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -12,10 +12,10 @@ export const contributionMessageReceived = { message: string overviewURL: string }): string => - `Hallo ${data.recipientFirstName} ${data.recipientLastName} + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Du hast soeben eine nachfrage zur Schöpfung "${data.contributionMemo}" von ${data.senderFirstName} ${data.senderLastName} erhalten. -${data.senderFirstName} ${data.senderLastName} schreibt: +Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten. +Die Rückfrage lautet: ${data.message} From 93e7684eda56f1ac42b22ea1fb08b2abce87af52 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 14:44:00 +0200 Subject: [PATCH 17/32] Change import to the new file. --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 34b0f5ccf..a1c091283 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -66,7 +66,7 @@ import { ContributionMessage as DbContributionMessage } from '@entity/Contributi import ContributionMessageArgs from '@arg/ContributionMessageArgs' import { ContributionMessageType } from '@enum/MessageType' import { ContributionMessage } from '@model/ContributionMessage' -import { sendAddedContributionMessageEmail } from '@/mailer/sendTransactionReceivedEmail' +import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? From a3d65228f90c31ff87de16ce8fa4065000edfd96 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 14:44:22 +0200 Subject: [PATCH 18/32] Add sendEmail mock to the test file. --- .../src/mailer/sendAddedContributionMessageEmail.test.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index 8b1bc2727..a35836e2a 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -1,6 +1,13 @@ import { sendAddedContributionMessageEmail } from './sendAddedContributionMessageEmail' import { sendEMail } from './sendEMail' +jest.mock('./sendEMail', () => { + return { + __esModule: true, + sendEMail: jest.fn(), + } +}) + describe('sendAddedContributionMessageEmail', () => { beforeEach(async () => { await sendAddedContributionMessageEmail({ From 42f667674ef4ecca73c48764023bb1812425ddd1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 9 Sep 2022 14:54:37 +0200 Subject: [PATCH 19/32] Remove unused import. --- backend/src/mailer/sendTransactionReceivedEmail.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts index 3e5171251..692f92f9a 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.ts @@ -2,7 +2,6 @@ import { backendLogger as logger } from '@/server/logger' import Decimal from 'decimal.js-light' import { sendEMail } from './sendEMail' import { transactionReceived } from './text/transactionReceived' -import { contributionMessageReceived } from './text/contributionMessageReceived' export const sendTransactionReceivedEmail = (data: { senderFirstName: string From 72f85c0d598799f959262f4ca8ad1da29b38e4e1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 12 Sep 2022 11:35:01 +0200 Subject: [PATCH 20/32] Add test for sendContributionConfirmedEmail. --- .../sendContributionConfirmedEmail.test.ts | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 backend/src/mailer/sendContributionConfirmedEmail.test.ts diff --git a/backend/src/mailer/sendContributionConfirmedEmail.test.ts b/backend/src/mailer/sendContributionConfirmedEmail.test.ts new file mode 100644 index 000000000..7fcb7c993 --- /dev/null +++ b/backend/src/mailer/sendContributionConfirmedEmail.test.ts @@ -0,0 +1,39 @@ +import Decimal from 'decimal.js-light' +import { sendContributionConfirmedEmail } from './sendContributionConfirmedEmail' +import { sendEMail } from './sendEMail' + +jest.mock('./sendEMail', () => { + return { + __esModule: true, + sendEMail: jest.fn(), + } +}) + +describe('sendContributionConfirmedEmail', () => { + beforeEach(async () => { + await sendContributionConfirmedEmail({ + senderFirstName: 'Peter', + senderLastName: 'Lustig', + recipientFirstName: 'Bibi', + recipientLastName: 'Bloxberg', + recipientEmail: 'bibi@bloxberg.de', + contributionMemo: 'Vielen herzlichen Dank für den neuen Hexenbesen!', + contributionAmount: new Decimal(200.0), + overviewURL: 'http://localhost/overview', + }) + }) + + it('calls sendEMail', () => { + expect(sendEMail).toBeCalledWith({ + to: 'Bibi Bloxberg ', + subject: 'Schöpfung wurde bestätigt', + text: + expect.stringContaining('Hallo Bibi Bloxberg') && + expect.stringContaining( + 'Deine Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben bestätigt.', + ) && + expect.stringContaining('Betrag: 200,00 GDD') && + expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), + }) + }) +}) From 7812a941b5f35ba337065c7ef10b42b77c997e95 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 12 Sep 2022 11:35:31 +0200 Subject: [PATCH 21/32] Add EMail text for contributionConfirmed. --- .../src/mailer/text/contributionConfirmed.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 backend/src/mailer/text/contributionConfirmed.ts diff --git a/backend/src/mailer/text/contributionConfirmed.ts b/backend/src/mailer/text/contributionConfirmed.ts new file mode 100644 index 000000000..d5d35fdda --- /dev/null +++ b/backend/src/mailer/text/contributionConfirmed.ts @@ -0,0 +1,30 @@ +import Decimal from 'decimal.js-light' + +export const contributionConfirmed = { + de: { + subject: 'Schöpfung wurde bestätigt', + text: (data: { + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + contributionMemo: string + contributionAmount: Decimal + overviewURL: string + }): string => + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, + +Deine Gradido Schöpfungsantrag "${data.contributionMemo}" wurde soeben von ${ + data.senderFirstName + } ${data.senderLastName} bestätigt. +Betrag: ${data.contributionAmount.toFixed(2).replace('.', ',')} GDD + +Bitte antworte nicht auf diese E-Mail! + +Mit freundlichen Grüßen, +dein Gradido-Team + + +Link zu deinem Konto: ${data.overviewURL}`, + }, +} From 0356ae6f2645514cae2a702f4485798eddbd1a3a Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 12 Sep 2022 11:35:56 +0200 Subject: [PATCH 22/32] Add method to send email when contribution has been confirmed. --- .../mailer/sendContributionConfirmedEmail.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 backend/src/mailer/sendContributionConfirmedEmail.ts diff --git a/backend/src/mailer/sendContributionConfirmedEmail.ts b/backend/src/mailer/sendContributionConfirmedEmail.ts new file mode 100644 index 000000000..439d240eb --- /dev/null +++ b/backend/src/mailer/sendContributionConfirmedEmail.ts @@ -0,0 +1,26 @@ +import { backendLogger as logger } from '@/server/logger' +import Decimal from 'decimal.js-light' +import { sendEMail } from './sendEMail' +import { contributionConfirmed } from './text/contributionConfirmed' + +export const sendContributionConfirmedEmail = (data: { + senderFirstName: string + senderLastName: string + recipientFirstName: string + recipientLastName: string + recipientEmail: string + contributionMemo: string + contributionAmount: Decimal + overviewURL: string +}): Promise => { + logger.info( + `sendEmail(): to=${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>, + subject=${contributionConfirmed.de.subject}, + text=${contributionConfirmed.de.text(data)}`, + ) + return sendEMail({ + to: `${data.recipientFirstName} ${data.recipientLastName} <${data.recipientEmail}>`, + subject: contributionConfirmed.de.subject, + text: contributionConfirmed.de.text(data), + }) +} From 7ab7380f0942e228175f040a672a867f900f891c Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 12 Sep 2022 11:36:24 +0200 Subject: [PATCH 23/32] Call new method to send confirmedContribution EMail to the user. --- backend/src/graphql/resolver/AdminResolver.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ac3936e4f..5904299a0 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -66,6 +66,7 @@ import { ContributionMessage as DbContributionMessage } from '@entity/Contributi import ContributionMessageArgs from '@arg/ContributionMessageArgs' import { ContributionMessageType } from '@enum/MessageType' import { ContributionMessage } from '@model/ContributionMessage' +import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? @@ -470,6 +471,16 @@ export class AdminResolver { await queryRunner.commitTransaction() logger.info('creation commited successfuly.') + sendContributionConfirmedEmail({ + senderFirstName: moderatorUser.firstName, + senderLastName: moderatorUser.lastName, + recipientFirstName: user.firstName, + recipientLastName: user.lastName, + recipientEmail: user.email, + contributionMemo: contribution.memo, + contributionAmount: contribution.amount, + overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, + }) } catch (e) { await queryRunner.rollbackTransaction() logger.error(`Creation was not successful: ${e}`) From f7454e31460b4d6923f81a23a1f17d5be5b1d3ac Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 13 Sep 2022 10:18:16 +0200 Subject: [PATCH 24/32] fix bug --- .../src/components/Contributions/ContributionList.vue | 6 ++++++ .../components/Contributions/ContributionListItem.vue | 9 +++++++-- frontend/src/pages/Community.vue | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue index 11cc0f9dd..ca4e7a9a0 100644 --- a/frontend/src/components/Contributions/ContributionList.vue +++ b/frontend/src/components/Contributions/ContributionList.vue @@ -4,6 +4,7 @@ {{ memo }}
@@ -141,6 +141,11 @@ export default { type: Number, required: true, }, + allContribution: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 8906f40e7..c98bfff2d 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -73,6 +73,7 @@ :contributionCount="contributionCountAll" :showPagination="true" :pageSize="pageSizeAll" + :allContribution="true" /> From 65318c4498ca509be82c617db813f350db4bdd92 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 13 Sep 2022 13:37:30 +0200 Subject: [PATCH 25/32] release: Version 1.12.1 --- CHANGELOG.md | 7 +++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 352286e45..46a704739 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.12.1](https://github.com/gradido/gradido/compare/1.12.0...1.12.1) + +- fix: 🍰 Show Not Icons In `allContribution` List [`#2195`](https://github.com/gradido/gradido/pull/2195) + #### [1.12.0](https://github.com/gradido/gradido/compare/1.11.0...1.12.0) +> 12 September 2022 + +- release: v1.12.0 [`#2191`](https://github.com/gradido/gradido/pull/2191) - if message empty else disabled button [`#2189`](https://github.com/gradido/gradido/pull/2189) - messages show if Confirmed [`#2185`](https://github.com/gradido/gradido/pull/2185) - text in messages smaller [`#2186`](https://github.com/gradido/gradido/pull/2186) diff --git a/admin/package.json b/admin/package.json index f31b43bbd..f56ae0a87 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.12.0", + "version": "1.12.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index b826183b6..2a054314f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.12.0", + "version": "1.12.1", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 40e5d0294..cabb1b47a 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.12.0", + "version": "1.12.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/frontend/package.json b/frontend/package.json index b3832b080..011193b58 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.12.0", + "version": "1.12.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 519c1b59c..8bc24d402 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.12.0", + "version": "1.12.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From a87667af02206293072ea7148b9d3a9ceff9dd5d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 14 Sep 2022 08:34:41 +0200 Subject: [PATCH 26/32] Update backend/src/mailer/sendAddedContributionMessageEmail.test.ts Co-authored-by: Moriz Wahl --- backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index a35836e2a..d867fd55b 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -30,7 +30,7 @@ describe('sendAddedContributionMessageEmail', () => { text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining('Peter Lustig') && - expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') && + expect.stringContaining('Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Rückfrage von Peter Lustig erhalten.') && expect.stringContaining('Was für ein Besen ist es geworden?') && expect.stringContaining('http://localhost/overview'), }) From d65bd827ca87648975faa77c18a24cfb5be52860 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 09:03:28 +0200 Subject: [PATCH 27/32] Change search to get the contribution.user instead of queriing it after wards. --- backend/src/graphql/resolver/AdminResolver.ts | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a1c091283..9b9c1d8d1 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -714,7 +714,10 @@ export class AdminResolver { await queryRunner.startTransaction('READ UNCOMMITTED') const contributionMessage = DbContributionMessage.create() try { - const contribution = await Contribution.findOne({ id: contributionId }) + const contribution = await Contribution.findOne({ + where: { id: contributionId }, + relations: ['user'], + }) if (!contribution) { throw new Error('Contribution not found') } @@ -738,20 +741,18 @@ export class AdminResolver { await queryRunner.manager.update(Contribution, { id: contributionId }, contribution) } await queryRunner.commitTransaction() - const contributionUser = await dbUser.findOne({ id: contribution.userId }) - if (contributionUser) { - await sendAddedContributionMessageEmail({ - senderFirstName: user.firstName, - senderLastName: user.lastName, - recipientFirstName: contributionUser.firstName, - recipientLastName: contributionUser.lastName, - recipientEmail: contributionUser.email, - senderEmail: user.email, - contributionMemo: contribution.memo, - message, - overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, - }) - } + + await sendAddedContributionMessageEmail({ + senderFirstName: user.firstName, + senderLastName: user.lastName, + recipientFirstName: contribution.user.firstName, + recipientLastName: contribution.user.lastName, + recipientEmail: contribution.user.email, + senderEmail: user.email, + contributionMemo: contribution.memo, + message, + overviewURL: CONFIG.EMAIL_LINK_OVERVIEW, + }) } catch (e) { await queryRunner.rollbackTransaction() logger.error(`ContributionMessage was not successful: ${e}`) From 0820d8d529e44e6a466bd33bb02215ec4a2f848b Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 09:04:39 +0200 Subject: [PATCH 28/32] Tests that the method sendAddedContributionMessageEmail is called. --- .../ContributionMessageResolver.test.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index c0e330750..40e9e2ace 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -12,6 +12,14 @@ import { listContributionMessages, login } from '@/seeds/graphql/queries' import { userFactory } from '@/seeds/factory/user' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' +import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail' + +jest.mock('@/mailer/sendAddedContributionMessageEmail', () => { + return { + __esModule: true, + sendAddedContributionMessageEmail: jest.fn(), + } +}) let mutate: any, query: any, con: any let testEnv: any @@ -151,6 +159,20 @@ describe('ContributionMessageResolver', () => { }), ) }) + + it('calls sendAddedContributionMessageEmail', async () => { + expect(sendAddedContributionMessageEmail).toBeCalledWith({ + senderFirstName: 'Peter', + senderLastName: 'Lustig', + recipientFirstName: 'Bibi', + recipientLastName: 'Bloxberg', + recipientEmail: 'bibi@bloxberg.de', + senderEmail: 'peter@lustig.de', + contributionMemo: 'Test env contribution', + message: 'Admin Test', + overviewURL: 'http://localhost/overview', + }) + }) }) }) }) From 3b810b2addf33494d5f457b3f70cfebd8b2260dd Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 09:31:39 +0200 Subject: [PATCH 29/32] Tests that sendContributionConfirmedEmail is called, removed contributionAmount since it can not be checked. --- .../graphql/resolver/AdminResolver.test.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index f0ce064b4..74669a40a 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -40,6 +40,8 @@ import Decimal from 'decimal.js-light' import { Contribution } from '@entity/Contribution' import { Transaction as DbTransaction } from '@entity/Transaction' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' +import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail' +import { Any } from '@dbTools/typeorm' // mock account activation email to avoid console spam jest.mock('@/mailer/sendAccountActivationEmail', () => { @@ -49,6 +51,14 @@ jest.mock('@/mailer/sendAccountActivationEmail', () => { } }) +// mock account activation email to avoid console spam +jest.mock('@/mailer/sendContributionConfirmedEmail', () => { + return { + __esModule: true, + sendContributionConfirmedEmail: jest.fn(), + } +}) + let mutate: any, query: any, con: any let testEnv: any @@ -1450,6 +1460,20 @@ describe('AdminResolver', () => { expect(transaction[0].linkedUserId).toEqual(null) expect(transaction[0].typeId).toEqual(1) }) + + it('calls sendContributionConfirmedEmail', async () => { + expect(sendContributionConfirmedEmail).toBeCalledWith( + expect.objectContaining({ + contributionMemo: 'Herzlich Willkommen bei Gradido liebe Bibi!', + overviewURL: 'http://localhost/overview', + recipientEmail: 'bibi@bloxberg.de', + recipientFirstName: 'Bibi', + recipientLastName: 'Bloxberg', + senderFirstName: 'Peter', + senderLastName: 'Lustig', + }), + ) + }) }) describe('confirm two creations one after the other quickly', () => { From 6d15ea5c2b337d5b686b649160c0789943d9f56c Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 11:20:50 +0200 Subject: [PATCH 30/32] Remove unused import. --- backend/src/graphql/resolver/AdminResolver.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 74669a40a..75c672bd5 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -41,7 +41,6 @@ import { Contribution } from '@entity/Contribution' import { Transaction as DbTransaction } from '@entity/Transaction' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail' -import { Any } from '@dbTools/typeorm' // mock account activation email to avoid console spam jest.mock('@/mailer/sendAccountActivationEmail', () => { From e3257c1f717cc32ac589b0e8c016bf121de6b34e Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 11:22:42 +0200 Subject: [PATCH 31/32] Fix prettier. --- backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index d867fd55b..1151a0abc 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -30,7 +30,9 @@ describe('sendAddedContributionMessageEmail', () => { text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining('Peter Lustig') && - expect.stringContaining('Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Rückfrage von Peter Lustig erhalten.') && + expect.stringContaining( + 'Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Rückfrage von Peter Lustig erhalten.', + ) && expect.stringContaining('Was für ein Besen ist es geworden?') && expect.stringContaining('http://localhost/overview'), }) From a2309ea1a552335f6b95ca7fa6855e3aada801c4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 14 Sep 2022 11:28:28 +0200 Subject: [PATCH 32/32] Correct text, 'Deine' => 'Dein'. --- backend/src/mailer/sendContributionConfirmedEmail.test.ts | 2 +- backend/src/mailer/text/contributionConfirmed.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/mailer/sendContributionConfirmedEmail.test.ts b/backend/src/mailer/sendContributionConfirmedEmail.test.ts index 7fcb7c993..1935144fd 100644 --- a/backend/src/mailer/sendContributionConfirmedEmail.test.ts +++ b/backend/src/mailer/sendContributionConfirmedEmail.test.ts @@ -30,7 +30,7 @@ describe('sendContributionConfirmedEmail', () => { text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining( - 'Deine Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben bestätigt.', + 'Dein Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben bestätigt.', ) && expect.stringContaining('Betrag: 200,00 GDD') && expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), diff --git a/backend/src/mailer/text/contributionConfirmed.ts b/backend/src/mailer/text/contributionConfirmed.ts index d5d35fdda..2d9fce6a8 100644 --- a/backend/src/mailer/text/contributionConfirmed.ts +++ b/backend/src/mailer/text/contributionConfirmed.ts @@ -14,9 +14,9 @@ export const contributionConfirmed = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Deine Gradido Schöpfungsantrag "${data.contributionMemo}" wurde soeben von ${ - data.senderFirstName - } ${data.senderLastName} bestätigt. +Dein Gradido Schöpfungsantrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${ + data.senderLastName + } bestätigt. Betrag: ${data.contributionAmount.toFixed(2).replace('.', ',')} GDD Bitte antworte nicht auf diese E-Mail!