From 000ac24865cf54194a281ae75d1c33fe64712d6f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 1 Jul 2023 11:53:54 +0200
Subject: [PATCH 1/2] Test that their is no email send after a moderator
 message.

---
 .../graphql/resolver/ContributionMessageResolver.test.ts  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 12df7f056..e4929483f 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -219,6 +219,10 @@ describe('ContributionMessageResolver', () => {
       })
 
       describe('contribution message type MODERATOR', () => {
+        beforeAll(() => {
+          jest.clearAllMocks()
+        })
+
         it('creates ContributionMessage', async () => {
           await expect(
             mutate({
@@ -243,6 +247,10 @@ describe('ContributionMessageResolver', () => {
             }),
           )
         })
+
+        it("don't call sendAddedContributionMessageEmail", () => {
+          expect(sendAddedContributionMessageEmail).not.toBeCalled()
+        })
       })
     })
   })

From 0b4d7181be9ddacdd7dd35a1074697c7dff17b4c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 1 Jul 2023 11:54:24 +0200
Subject: [PATCH 2/2] Check that the message type is not MODERATOR before
 sending email.

---
 .../resolver/ContributionMessageResolver.ts   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 05a4c5033..0cbc2446c 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -167,15 +167,17 @@ export class ContributionMessageResolver {
         await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution)
       }
 
-      void sendAddedContributionMessageEmail({
-        firstName: contribution.user.firstName,
-        lastName: contribution.user.lastName,
-        email: contribution.user.emailContact.email,
-        language: contribution.user.language,
-        senderFirstName: moderator.firstName,
-        senderLastName: moderator.lastName,
-        contributionMemo: contribution.memo,
-      })
+      if (messageType !== ContributionMessageType.MODERATOR) {
+        void sendAddedContributionMessageEmail({
+          firstName: contribution.user.firstName,
+          lastName: contribution.user.lastName,
+          email: contribution.user.emailContact.email,
+          language: contribution.user.language,
+          senderFirstName: moderator.firstName,
+          senderLastName: moderator.lastName,
+          contributionMemo: contribution.memo,
+        })
+      }
       await queryRunner.commitTransaction()
       await EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE(
         { id: contribution.userId } as DbUser,