From d23a060abaa988c5d6f74a81815dc39f1ca33c6e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 19 Jul 2022 12:10:09 +0200
Subject: [PATCH 01/40] 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 <heine.hannes@gmail.com>
Date: Tue, 19 Jul 2022 12:10:59 +0200
Subject: [PATCH 02/40] 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<boolean> => {
+  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 <heine.hannes@gmail.com>
Date: Tue, 19 Jul 2022 12:11:57 +0200
Subject: [PATCH 03/40] 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 <heine.hannes@gmail.com>
Date: Tue, 19 Jul 2022 12:24:42 +0200
Subject: [PATCH 04/40] 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 <heine.hannes@gmail.com>
Date: Thu, 11 Aug 2022 14:40:22 +0200
Subject: [PATCH 05/40] Update backend/src/mailer/text/transactionReceived.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 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 <heine.hannes@gmail.com>
Date: Thu, 11 Aug 2022 14:40:36 +0200
Subject: [PATCH 06/40] Update backend/src/mailer/text/transactionReceived.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 07:40:48 +0200
Subject: [PATCH 07/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 07:41:45 +0200
Subject: [PATCH 08/40] 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<boolean> => {
+  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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 07:42:27 +0200
Subject: [PATCH 09/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 07:49:11 +0200
Subject: [PATCH 10/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 07:52:04 +0200
Subject: [PATCH 11/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 09:19:49 +0200
Subject: [PATCH 12/40] 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 <bibi@bloxberg.de>`,
+      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<boolean> => {
-  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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 09:20:14 +0200
Subject: [PATCH 13/40] 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 <bibi@bloxberg.de>`,
-      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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 09:20:34 +0200
Subject: [PATCH 14/40] 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<boolean> => {
+  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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 09:20:56 +0200
Subject: [PATCH 15/40] 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 <bibi@bloxberg.de>`,
+      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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 14:43:30 +0200
Subject: [PATCH 16/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 14:44:00 +0200
Subject: [PATCH 17/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 14:44:22 +0200
Subject: [PATCH 18/40] 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 <heine.hannes@gmail.com>
Date: Fri, 9 Sep 2022 14:54:37 +0200
Subject: [PATCH 19/40] 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 <heine.hannes@gmail.com>
Date: Mon, 12 Sep 2022 11:35:01 +0200
Subject: [PATCH 20/40] 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 <bibi@bloxberg.de>',
+      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 <heine.hannes@gmail.com>
Date: Mon, 12 Sep 2022 11:35:31 +0200
Subject: [PATCH 21/40] 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 <heine.hannes@gmail.com>
Date: Mon, 12 Sep 2022 11:35:56 +0200
Subject: [PATCH 22/40] 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<boolean> => {
+  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 <heine.hannes@gmail.com>
Date: Mon, 12 Sep 2022 11:36:24 +0200
Subject: [PATCH 23/40] 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 a87667af02206293072ea7148b9d3a9ceff9dd5d Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 08:34:41 +0200
Subject: [PATCH 24/40] Update
 backend/src/mailer/sendAddedContributionMessageEmail.test.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 09:03:28 +0200
Subject: [PATCH 25/40] 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 09:04:39 +0200
Subject: [PATCH 26/40] 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 09:31:39 +0200
Subject: [PATCH 27/40] 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 11:20:50 +0200
Subject: [PATCH 28/40] 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 11:22:42 +0200
Subject: [PATCH 29/40] 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 <heine.hannes@gmail.com>
Date: Wed, 14 Sep 2022 11:28:28 +0200
Subject: [PATCH 30/40] 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!

From dbc32973056a1d3f004c95837f649d6de3fc791a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 15 Sep 2022 21:02:16 +0200
Subject: [PATCH 31/40] change support mail

---
 frontend/src/pages/InfoStatistic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 309404f48..7d65c4928 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -83,7 +83,7 @@ export default {
       countAdminUser: null,
       itemsContributionLinks: [],
       itemsAdminUser: [],
-      supportMail: 'support@supportemail.de',
+      supportMail: 'support@gradido.net',
       membersCount: '1203',
       totalUsers: null,
       totalGradidoCreated: null,

From f19b5217264a59bb0823f39b4574709c6edabb8f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 09:01:29 +0200
Subject: [PATCH 32/40] add support mail in env

---
 deployment/bare_metal/.env.dist      | 4 +++-
 deployment/bare_metal/install.sh     | 2 +-
 frontend/.env.dist                   | 7 +++++--
 frontend/.env.template               | 5 ++++-
 frontend/src/config/index.js         | 7 ++++++-
 frontend/src/pages/InfoStatistic.vue | 2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 1255104c9..ebb6717e7 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -61,7 +61,7 @@ EVENT_PROTOCOL_DISABLED=false
 DATABASE_CONFIG_VERSION=v1.2022-03-18
 
 # frontend
-FRONTEND_CONFIG_VERSION=v2.2022-04-07
+FRONTEND_CONFIG_VERSION=v3.2022-09-16
 
 GRAPHQL_URI=https://stage1.gradido.net/graphql
 ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}
@@ -77,6 +77,8 @@ META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natü
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
 META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
 
+SUPPORT_MAIL=support@supportmail.com
+
 # admin
 ADMIN_CONFIG_VERSION=v1.2022-03-18
 
diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
index 0fcf6d847..9366cbc75 100755
--- a/deployment/bare_metal/install.sh
+++ b/deployment/bare_metal/install.sh
@@ -75,7 +75,7 @@ pm2 startup
 sudo apt-get install -y certbot
 sudo apt-get install -y python3-certbot-nginx
 sudo certbot
-> Enter email address (used for urgent renewal and security notices) > support@gradido.net
+> Enter email address (used for urgent renewal and security notices) > e.g. support@supportmail.com
 > Please read the Terms of Service at > Y
 > Would you be willing, once your first certificate is successfully issued, to > N
 > No names were found in your configuration files. Please enter in your domain > stage1.gradido.net
diff --git a/frontend/.env.dist b/frontend/.env.dist
index 65d9ae305..4127f339a 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,4 +1,4 @@
-CONFIG_VERSION=v2.2022-04-07
+CONFIG_VERSION=v3.2022-09-16
 
 # Environment
 DEFAULT_PUBLISHER_ID=2896
@@ -21,4 +21,7 @@ META_DESCRIPTION_DE="Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Men
 META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all."
 META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem"
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
-META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
\ No newline at end of file
+META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
+
+# Support Mail 
+SUPPORT_MAIL=support@supportmail.com
\ No newline at end of file
diff --git a/frontend/.env.template b/frontend/.env.template
index 6d6b83fc7..0b9d34b38 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -21,4 +21,7 @@ META_DESCRIPTION_DE=$META_DESCRIPTION_DE
 META_DESCRIPTION_EN=$META_DESCRIPTION_EN
 META_KEYWORDS_DE=$META_KEYWORDS_DE
 META_KEYWORDS_EN=$META_KEYWORDS_EN
-META_AUTHOR=$META_AUTHOR
\ No newline at end of file
+META_AUTHOR=$META_AUTHOR
+
+# Support Mail 
+SUPPORT_MAIL=$SUPPORT_MAIL
\ No newline at end of file
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 917a25d70..5ab5f2392 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -8,7 +8,7 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v2.2022-04-07',
+    EXPECTED: 'v3.2022-09-16',
     CURRENT: '',
   },
 }
@@ -60,6 +60,10 @@ const meta = {
   META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
 }
 
+const supportmail = {
+  SUPPORT_MAIL: process.env.SUPPORT_MAIL || 'support@supportmail.com',
+}
+
 // Check config version
 constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
 if (
@@ -79,6 +83,7 @@ const CONFIG = {
   ...endpoints,
   ...community,
   ...meta,
+  ...supportmail,
 }
 
 module.exports = CONFIG
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 7d65c4928..1e09f83ed 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -83,7 +83,7 @@ export default {
       countAdminUser: null,
       itemsContributionLinks: [],
       itemsAdminUser: [],
-      supportMail: 'support@gradido.net',
+      supportMail: CONFIG.SUPPORT_MAIL,
       membersCount: '1203',
       totalUsers: null,
       totalGradidoCreated: null,

From cfdec3d1226a029e719d28d0db5c09cccf267bd2 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Fri, 16 Sep 2022 13:45:20 +0200
Subject: [PATCH 33/40] Fixed wrong handling of dates in tests failing
 depending on the day you execute them

---
 backend/src/graphql/resolver/UserResolver.test.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 2c6406939..367f82b4f 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -261,14 +261,21 @@ describe('UserResolver', () => {
           const peter = await User.findOneOrFail({ id: user[0].id })
           peter.isAdmin = new Date()
           await peter.save()
+
+          // date statement
+          const actualDate = new Date()
+          const futureDate = new Date() // Create a future day from the executed day
+          futureDate.setDate(futureDate.getDate() + 1)
+
           // factory logs in as Peter Lustig
           link = await contributionLinkFactory(testEnv, {
             name: 'Dokumenta 2022',
             memo: 'Vielen Dank für deinen Besuch bei der Dokumenta 2022',
             amount: 200,
-            validFrom: new Date(2022, 5, 18),
-            validTo: new Date(2022, 8, 25),
+            validFrom: actualDate,
+            validTo: futureDate,
           })
+
           resetToken()
           await mutate({
             mutation: createUser,

From 5f94cfca88de2896624a8de48c4457adf8331556 Mon Sep 17 00:00:00 2001
From: jjimenezgarcia <99907380+jjimenezgarcia@users.noreply.github.com>
Date: Mon, 19 Sep 2022 15:40:59 +0200
Subject: [PATCH 34/40] Update
 backend/src/graphql/resolver/UserResolver.test.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 backend/src/graphql/resolver/UserResolver.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 367f82b4f..5be3c3e20 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -176,7 +176,7 @@ describe('UserResolver', () => {
         expect(EventProtocol.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
-            userId: expect.any(Number), // as it is randomly generated
+            userId: user.id,
           }),
         )
       })

From 1203dada61f234a8afc8ca4878c06b7fccb44a5b Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Mon, 19 Sep 2022 19:18:06 +0200
Subject: [PATCH 35/40] ids are now checked in event creation

---
 backend/src/graphql/resolver/UserResolver.test.ts | 9 ++++++---
 backend/src/graphql/resolver/UserResolver.ts      | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 5be3c3e20..13715e088 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -176,7 +176,7 @@ describe('UserResolver', () => {
         expect(EventProtocol.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
-            userId: user.id,
+            userId: user[0].id,
           }),
         )
       })
@@ -295,7 +295,7 @@ describe('UserResolver', () => {
           expect(EventProtocol.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.ACTIVATE_ACCOUNT,
-              userId: expect.any(Number), // as it is randomly generated
+              userId: user[0].id,
             }),
           )
         })
@@ -605,6 +605,8 @@ bei Gradidio sei dabei!`,
       })
 
       describe('authenticated', () => {
+        let user: User[]
+
         const variables = {
           email: 'bibi@bloxberg.de',
           password: 'Aa12345_',
@@ -612,6 +614,7 @@ bei Gradidio sei dabei!`,
 
         beforeAll(async () => {
           await query({ query: login, variables })
+          user = await User.find()
         })
 
         afterAll(() => {
@@ -643,7 +646,7 @@ bei Gradidio sei dabei!`,
           expect(EventProtocol.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.LOGIN,
-              userId: expect.any(Number), // as it is randomly generated
+              userId: user[0].id,
             }),
           )
         })
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index fad0fadd3..f2fd048fc 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -622,9 +622,11 @@ export class UserResolver {
       })
 
       await queryRunner.commitTransaction()
+
       const eventActivateAccount = new EventActivateAccount()
       eventActivateAccount.userId = user.id
       eventProtocol.writeEvent(event.setEventActivateAccount(eventActivateAccount))
+
       logger.info('User data written successfully...')
     } catch (e) {
       await queryRunner.rollbackTransaction()

From bf6ed35c6e1b359599fa6f28483e8e3c8eb65587 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 12:05:49 +0200
Subject: [PATCH 36/40] Change text template of ContributionMessageReceived.

---
 .../src/mailer/text/contributionMessageReceived.ts   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts
index 4affb71a8..b0c9c4d30 100644
--- a/backend/src/mailer/text/contributionMessageReceived.ts
+++ b/backend/src/mailer/text/contributionMessageReceived.ts
@@ -14,17 +14,15 @@ export const contributionMessageReceived = {
     }): string =>
       `Hallo ${data.recipientFirstName} ${data.recipientLastName},
 
-Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten.
-Die Rückfrage lautet:
+du hast soeben zu deinem eingereichten Gemeinwohl-Beitrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten.
 
-${data.message}
+Bitte beantworte die Rückfrage in deinem Gradido-Konto im Menü "Gemeinschaft" im Tab "Meine Beiträge zum Gemeinwohl"!
+
+Link zu deinem Konto: ${data.overviewURL}
 
 Bitte antworte nicht auf diese E-Mail!
 
 Mit freundlichen Grüßen,
-dein Gradido-Team
-
-
-Link zu deinem Konto: ${data.overviewURL}`,
+dein Gradido-Team`,
   },
 }

From 6c446fb4772d7af635658c6d25e86eb68b9a6029 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 12:07:19 +0200
Subject: [PATCH 37/40] Change text template of transactionReceived.

---
 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 2764d1b60..c533b5b1f 100644
--- a/backend/src/mailer/text/transactionReceived.ts
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -19,17 +19,13 @@ export const transactionReceived = {
 Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
         data.senderLastName
       } (${data.senderEmail}) erhalten.
-${data.senderFirstName} ${data.senderLastName} schreibt:
 
-${data.memo}
+Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL}
 
 Bitte antworte nicht auf diese E-Mail!
 
 Mit freundlichen Grüßen,
-dein Gradido-Team
-
-
-Link zu deinem Konto: ${data.overviewURL}`,
+dein Gradido-Team`,
   },
 }
 

From 3b3a963ac5cc4c1a35b63a45957b71292d31ce89 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 12:09:36 +0200
Subject: [PATCH 38/40] Change text template of contributionConfirmed.

---
 backend/src/mailer/text/contributionConfirmed.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/mailer/text/contributionConfirmed.ts b/backend/src/mailer/text/contributionConfirmed.ts
index 2d9fce6a8..dc82d7615 100644
--- a/backend/src/mailer/text/contributionConfirmed.ts
+++ b/backend/src/mailer/text/contributionConfirmed.ts
@@ -14,9 +14,10 @@ export const contributionConfirmed = {
     }): string =>
       `Hallo ${data.recipientFirstName} ${data.recipientLastName},
 
-Dein Gradido Schöpfungsantrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${
-        data.senderLastName
-      } bestätigt.
+Dein eingereichter Gemeinwohl-Beitrag "${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!

From 686c43fa895ced5ad94042b2469365ccabe35d10 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 12:12:23 +0200
Subject: [PATCH 39/40] Change text of linkRedeemed template.

---
 backend/src/mailer/text/transactionReceived.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts
index c533b5b1f..4f10f41c8 100644
--- a/backend/src/mailer/text/transactionReceived.ts
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -47,15 +47,16 @@ export const transactionLinkRedeemed = {
 
 ${data.senderFirstName} ${data.senderLastName} (${
         data.senderEmail
-      }) hat soeben deinen Link eingelösst.
+      }) hat soeben deinen Link eingelöst.
+
 Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD,
 Memo: ${data.memo}
 
+Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL}
+
 Bitte antworte nicht auf diese E-Mail!
 
 Mit freundlichen Grüßen,
-dein Gradido-Team
-
-Link zu deinem Konto: ${data.overviewURL}`,
+dein Gradido-Team`,
   },
 }

From 6c0cb17196e82119f16e57f9130006361ab112ea Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 12:41:25 +0200
Subject: [PATCH 40/40] Refactor sendTransactionLinkredeemed .

---
 .../graphql/resolver/TransactionResolver.ts   |  7 +--
 .../sendTransactionLinkRedeemed.test.ts       | 44 +++++++++++++++++++
 .../src/mailer/sendTransactionLinkRedeemed.ts | 28 ++++++++++++
 .../sendTransactionReceivedEmail.test.ts      |  2 -
 .../mailer/sendTransactionReceivedEmail.ts    | 27 +-----------
 .../mailer/text/transactionLinkRedeemed.ts    | 33 ++++++++++++++
 .../src/mailer/text/transactionReceived.ts    | 33 --------------
 7 files changed, 108 insertions(+), 66 deletions(-)
 create mode 100644 backend/src/mailer/sendTransactionLinkRedeemed.test.ts
 create mode 100644 backend/src/mailer/sendTransactionLinkRedeemed.ts
 create mode 100644 backend/src/mailer/text/transactionLinkRedeemed.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 1d8748f58..c192ae9dc 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -8,10 +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 {
-  sendTransactionLinkRedeemedEmail,
-  sendTransactionReceivedEmail,
-} from '@/mailer/sendTransactionReceivedEmail'
+import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail'
 
 import { Transaction } from '@model/Transaction'
 import { TransactionList } from '@model/TransactionList'
@@ -38,6 +35,7 @@ import Decimal from 'decimal.js-light'
 
 import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
+import { sendTransactionLinkRedeemedEmail } from '@/mailer/sendTransactionLinkRedeemed'
 
 export const executeTransaction = async (
   amount: Decimal,
@@ -154,7 +152,6 @@ export const executeTransaction = async (
     email: recipient.email,
     senderEmail: sender.email,
     amount,
-    memo,
     overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
   })
   if (transactionLink) {
diff --git a/backend/src/mailer/sendTransactionLinkRedeemed.test.ts b/backend/src/mailer/sendTransactionLinkRedeemed.test.ts
new file mode 100644
index 000000000..b56ff40a1
--- /dev/null
+++ b/backend/src/mailer/sendTransactionLinkRedeemed.test.ts
@@ -0,0 +1,44 @@
+import { sendEMail } from './sendEMail'
+import Decimal from 'decimal.js-light'
+import { sendTransactionLinkRedeemedEmail } from './sendTransactionLinkRedeemed'
+
+jest.mock('./sendEMail', () => {
+  return {
+    __esModule: true,
+    sendEMail: jest.fn(),
+  }
+})
+
+describe('sendTransactionLinkRedeemedEmail', () => {
+  beforeEach(async () => {
+    await sendTransactionLinkRedeemedEmail({
+      email: 'bibi@bloxberg.de',
+      senderFirstName: 'Peter',
+      senderLastName: 'Lustig',
+      recipientFirstName: 'Bibi',
+      recipientLastName: 'Bloxberg',
+      senderEmail: 'peter@lustig.de',
+      amount: new Decimal(42.0),
+      memo: 'Vielen Dank dass Du dabei bist',
+      overviewURL: 'http://localhost/overview',
+    })
+  })
+
+  it('calls sendEMail', () => {
+    expect(sendEMail).toBeCalledWith({
+      to: `Bibi Bloxberg <bibi@bloxberg.de>`,
+      subject: 'Gradido-Link wurde eingelöst',
+      text:
+        expect.stringContaining('Hallo Bibi Bloxberg') &&
+        expect.stringContaining(
+          'Peter Lustig (peter@lustig.de) hat soeben deinen Link eingelöst.',
+        ) &&
+        expect.stringContaining('Betrag: 42,00 GDD,') &&
+        expect.stringContaining('Memo: Vielen Dank dass Du dabei bist') &&
+        expect.stringContaining(
+          'Details zur Transaktion findest du in deinem Gradido-Konto: http://localhost/overview',
+        ) &&
+        expect.stringContaining('Bitte antworte nicht auf diese E-Mail!'),
+    })
+  })
+})
diff --git a/backend/src/mailer/sendTransactionLinkRedeemed.ts b/backend/src/mailer/sendTransactionLinkRedeemed.ts
new file mode 100644
index 000000000..a78f3b3c9
--- /dev/null
+++ b/backend/src/mailer/sendTransactionLinkRedeemed.ts
@@ -0,0 +1,28 @@
+import { backendLogger as logger } from '@/server/logger'
+import Decimal from 'decimal.js-light'
+import { sendEMail } from './sendEMail'
+import { transactionLinkRedeemed } from './text/transactionLinkRedeemed'
+
+export const sendTransactionLinkRedeemedEmail = (data: {
+  email: string
+  senderFirstName: string
+  senderLastName: string
+  recipientFirstName: string
+  recipientLastName: string
+  senderEmail: string
+  amount: Decimal
+  memo: string
+  overviewURL: string
+}): Promise<boolean> => {
+  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),
+  })
+}
diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
index 75631cc7a..9f2ba9938 100644
--- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts
+++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
@@ -19,7 +19,6 @@ describe('sendTransactionReceivedEmail', () => {
       email: 'peter@lustig.de',
       senderEmail: 'bibi@bloxberg.de',
       amount: new Decimal(42.0),
-      memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!',
       overviewURL: 'http://localhost/overview',
     })
   })
@@ -33,7 +32,6 @@ describe('sendTransactionReceivedEmail', () => {
         expect.stringContaining('42,00 GDD') &&
         expect.stringContaining('Bibi Bloxberg') &&
         expect.stringContaining('(bibi@bloxberg.de)') &&
-        expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!') &&
         expect.stringContaining('http://localhost/overview'),
     })
   })
diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts
index 55f63e37e..5e981659c 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 { transactionLinkRedeemed, transactionReceived } from './text/transactionReceived'
+import { transactionReceived } from './text/transactionReceived'
 
 export const sendTransactionReceivedEmail = (data: {
   senderFirstName: string
@@ -11,7 +11,6 @@ export const sendTransactionReceivedEmail = (data: {
   email: string
   senderEmail: string
   amount: Decimal
-  memo: string
   overviewURL: string
 }): Promise<boolean> => {
   logger.info(
@@ -26,27 +25,3 @@ 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<boolean> => {
-  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),
-  })
-}
diff --git a/backend/src/mailer/text/transactionLinkRedeemed.ts b/backend/src/mailer/text/transactionLinkRedeemed.ts
new file mode 100644
index 000000000..4d8e89cae
--- /dev/null
+++ b/backend/src/mailer/text/transactionLinkRedeemed.ts
@@ -0,0 +1,33 @@
+import Decimal from 'decimal.js-light'
+
+export const transactionLinkRedeemed = {
+  de: {
+    subject: 'Gradido-Link wurde eingelöst',
+    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 deinen Link eingelöst.
+  
+  Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD,
+  Memo: ${data.memo}
+  
+  Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL}
+  
+  Bitte antworte nicht auf diese E-Mail!
+  
+  Mit freundlichen Grüßen,
+  dein Gradido-Team`,
+  },
+}
diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts
index 4f10f41c8..ba61ae680 100644
--- a/backend/src/mailer/text/transactionReceived.ts
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -11,7 +11,6 @@ export const transactionReceived = {
       email: string
       senderEmail: string
       amount: Decimal
-      memo: string
       overviewURL: string
     }): string =>
       `Hallo ${data.recipientFirstName} ${data.recipientLastName}
@@ -28,35 +27,3 @@ Mit freundlichen Grüßen,
 dein Gradido-Team`,
   },
 }
-
-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 deinen Link eingelöst.
-
-Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD,
-Memo: ${data.memo}
-
-Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL}
-
-Bitte antworte nicht auf diese E-Mail!
-
-Mit freundlichen Grüßen,
-dein Gradido-Team`,
-  },
-}