Merge pull request #2187 from gradido/2134-send-email-when-admin-writes-message-to-contribution

feat: 🍰 Send email when admin writes message to contribution

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/sendAddedContributionMessageEmail'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -713,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')
       }
@@ -737,6 +741,18 @@ export class AdminResolver {
         await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
       }
       await queryRunner.commitTransaction()
+
+      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}`)

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',
+          })
+        })
       })
     })
   })

backend/src/mailer/sendAddedContributionMessageEmail.test.ts

@@ -0,0 +1,40 @@
+import { sendAddedContributionMessageEmail } from './sendAddedContributionMessageEmail'
+import { sendEMail } from './sendEMail'
+
+jest.mock('./sendEMail', () => {
+  return {
+    __esModule: true,
+    sendEMail: jest.fn(),
+  }
+})
+
+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(
+          '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'),
+    })
+  })
+})

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),
+  })
+}

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 zu deinem eingereichten Gradido Schöpfungsantrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten.
+Die Rückfrage lautet:
+
+${data.message}
+
+Bitte antworte nicht auf diese E-Mail!
+
+Mit freundlichen Grüßen,
+dein Gradido-Team
+
+
+Link zu deinem Konto: ${data.overviewURL}`,
+  },
+}