From 4e72aafe4d787287429d8e90d0cfe91d68096b97 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sun, 18 Sep 2022 11:22:25 +0200
Subject: [PATCH 01/72] Change the query so that we only look on the
 contributions table.

---
 .../src/graphql/resolver/util/creations.ts    | 61 ++++++++++++-------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index ad15ebec6..3a6a14fda 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -43,39 +43,54 @@ export const getUserCreations = async (
   const dateFilter = 'last_day(curdate() - interval 3 month) + interval 1 day'
   logger.trace('getUserCreations dateFilter', dateFilter)
 
-  const unionString = includePending
-    ? `
-    UNION
-      SELECT contribution_date AS date, amount AS amount, user_id AS userId FROM contributions
-        WHERE user_id IN (${ids.toString()})
-        AND contribution_date >= ${dateFilter}
-        AND confirmed_at IS NULL AND deleted_at IS NULL`
-    : ''
-
-  const unionQuery = await queryRunner.manager.query(`
-    SELECT MONTH(date) AS month, sum(amount) AS sum, userId AS id FROM
-      (SELECT creation_date AS date, amount AS amount, user_id AS userId FROM transactions
-        WHERE user_id IN (${ids.toString()})
-        AND type_id = ${TransactionTypeId.CREATION}
-        AND creation_date >= ${dateFilter}
-      ${unionString}) AS result
-    GROUP BY month, userId
-    ORDER BY date DESC
-  `)
-
+  /** 
+  SELECT MONTH(contribution_date) as month, user_id, created_at, sum(amount), confirmed_at, deleted_at 
+   FROM `contributions`
+   where user_id = 776
+   and contribution_date >= last_day(curdate() - interval 3 month) + interval 1 day
+   and deleted_at IS NULL
+   if(!includePending) and confirmed_at IS NOT NULL
+   group by month, user_id; 
+  */
+  const bookedCreationQuery = queryRunner.manager
+    .createQueryBuilder(Contribution, 'c')
+    .select('month(contribution_date)', 'month')
+    .addSelect('user_id', 'userId')
+    .addSelect('sum(amount)', 'sum')
+    .where(`user_id in (${ids.toString()})`)
+    .andWhere(`contribution_date >= ${dateFilter}`)
+    .andWhere('deleted_at IS NULL')
+    .groupBy('month')
+    .addGroupBy('userId')
+  if (!includePending) {
+    bookedCreationQuery.andWhere('confirmed_at IS NOT NULL')
+  }
+  const bookedCreation = await bookedCreationQuery.getRawMany()
+  // eslint-disable-next-line no-console
+  console.log('openCreation', bookedCreation)
   await queryRunner.release()
 
   return ids.map((id) => {
     return {
       id,
       creations: months.map((month) => {
-        const creation = unionQuery.find(
-          (raw: { month: string; id: string; creation: number[] }) =>
-            parseInt(raw.month) === month && parseInt(raw.id) === id,
+        const creation = bookedCreation.find(
+          (raw: { month: string; userId: string; creation: number[] }) =>
+            parseInt(raw.month) === month && parseInt(raw.userId) === id,
         )
         return MAX_CREATION_AMOUNT.minus(creation ? creation.sum : 0)
       }),
     }
+    // const creations = months.map((month) => {
+    //   const creation = openCreation.find(
+    //     (raw: { month: string; userId: string; creation: number[] }) =>
+    //       parseInt(raw.month) === month && parseInt(raw.userId) === id,
+    //   )
+    //   return MAX_CREATION_AMOUNT.minus(creation ? creation.sum : 0)
+    // })
+    // // eslint-disable-next-line no-console
+    // console.log('id: ', id, 'creations: ', creations.toString())
+    // return { id, creations }
   })
 }
 

From e097c30003ce5162616e5df3fb6294dfaeeaa710 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 11:47:24 +0200
Subject: [PATCH 02/72] Add denied_at is null to query, change variable name of
 query.

---
 backend/src/graphql/resolver/util/creations.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 3a6a14fda..6135d282a 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -1,4 +1,3 @@
-import { TransactionTypeId } from '@/graphql/enum/TransactionTypeId'
 import { backendLogger as logger } from '@/server/logger'
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
@@ -49,10 +48,11 @@ export const getUserCreations = async (
    where user_id = 776
    and contribution_date >= last_day(curdate() - interval 3 month) + interval 1 day
    and deleted_at IS NULL
+   and denied_at IS NULL
    if(!includePending) and confirmed_at IS NOT NULL
    group by month, user_id; 
   */
-  const bookedCreationQuery = queryRunner.manager
+  const sumAmountContributionPerUserAndLast3MonthQuery = queryRunner.manager
     .createQueryBuilder(Contribution, 'c')
     .select('month(contribution_date)', 'month')
     .addSelect('user_id', 'userId')
@@ -60,21 +60,22 @@ export const getUserCreations = async (
     .where(`user_id in (${ids.toString()})`)
     .andWhere(`contribution_date >= ${dateFilter}`)
     .andWhere('deleted_at IS NULL')
+    .andWhere('denied_at IS NULL')
     .groupBy('month')
     .addGroupBy('userId')
   if (!includePending) {
-    bookedCreationQuery.andWhere('confirmed_at IS NOT NULL')
+    sumAmountContributionPerUserAndLast3MonthQuery.andWhere('confirmed_at IS NOT NULL')
   }
-  const bookedCreation = await bookedCreationQuery.getRawMany()
-  // eslint-disable-next-line no-console
-  console.log('openCreation', bookedCreation)
+  const sumAmountContributionPerUserAndLast3Month =
+    await sumAmountContributionPerUserAndLast3MonthQuery.getRawMany()
+
   await queryRunner.release()
 
   return ids.map((id) => {
     return {
       id,
       creations: months.map((month) => {
-        const creation = bookedCreation.find(
+        const creation = sumAmountContributionPerUserAndLast3Month.find(
           (raw: { month: string; userId: string; creation: number[] }) =>
             parseInt(raw.month) === month && parseInt(raw.userId) === id,
         )

From 2ca9945a1b1675ffe402b9734d225840bdb6ce5e Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Wed, 28 Sep 2022 11:09:14 +0200
Subject: [PATCH 03/72] added missing events

---
 backend/src/graphql/resolver/AdminResolver.ts | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index e9ee0b55b..4bf2794dc 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -66,6 +66,8 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionMessage } from '@model/ContributionMessage'
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail'
+import { eventProtocol } from '@/event/EventProtocolEmitter'
+import { Event, EventContributionConfirm, EventContributionCreate, EventContributionLinkDefine, EventSendConfirmationEmail } from '@/event/Event'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -241,6 +243,8 @@ export class AdminResolver {
       logger.error('Contribution could not be saved, Email is not activated')
       throw new Error('Contribution could not be saved, Email is not activated')
     }
+
+    const event = new Event()
     const moderator = getUser(context)
     logger.trace('moderator: ', moderator.id)
     const creations = await getUserCreation(emailContact.userId)
@@ -260,6 +264,13 @@ export class AdminResolver {
 
     logger.trace('contribution to save', contribution)
     await Contribution.save(contribution)
+
+    const eventCreateContribution = new EventContributionCreate()
+    eventCreateContribution.userId = moderator.id
+    eventCreateContribution.amount = amount
+    eventCreateContribution.contributionId = contribution.id
+    await eventProtocol.writeEvent(event.setEventContributionCreate(eventCreateContribution))
+
     return getUserCreation(emailContact.userId)
   }
 
@@ -495,6 +506,13 @@ export class AdminResolver {
         contributionAmount: contribution.amount,
         overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
       })
+
+      const event = new Event()
+      const eventContributionConfirm = new EventContributionConfirm()
+      eventContributionConfirm.xUserId = user.id
+      eventContributionConfirm.amount = contribution.amount
+      eventContributionConfirm.contributionId = contribution.id
+      await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
     } catch (e) {
       await queryRunner.rollbackTransaction()
       logger.error(`Creation was not successful: ${e}`)
@@ -558,6 +576,13 @@ export class AdminResolver {
     // In case EMails are disabled log the activation link for the user
     if (!emailSent) {
       logger.info(`Account confirmation link: ${activationLink}`)
+    } else {
+      const event = new Event()
+      const eventSendConfirmationEmail = new EventSendConfirmationEmail()
+      eventSendConfirmationEmail.userId = user.id
+      await eventProtocol.writeEvent(
+        event.setEventSendConfirmationEmail(eventSendConfirmationEmail),
+      )
     }
 
     return true
@@ -660,6 +685,13 @@ export class AdminResolver {
     dbContributionLink.maxAmountPerMonth = maxAmountPerMonth
     dbContributionLink.maxPerCycle = maxPerCycle
     await dbContributionLink.save()
+
+    const event = new Event()
+    const eventContributionLinkDefine = new EventContributionLinkDefine()
+    await eventProtocol.writeEvent(
+      event.setEventContributionLinkDefine(eventContributionLinkDefine),
+    )
+
     logger.debug(`createContributionLink successful!`)
     return new ContributionLink(dbContributionLink)
   }

From 33eeab344f6e2b479452ab51599b17d5eb045026 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Wed, 28 Sep 2022 11:14:16 +0200
Subject: [PATCH 04/72] added missing error logs

---
 backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 4bf2794dc..660f5ab31 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -148,11 +148,13 @@ export class AdminResolver {
     const user = await dbUser.findOne({ id: userId })
     // user exists ?
     if (!user) {
+      logger.error(`Could not find user with userId: ${userId}`)
       throw new Error(`Could not find user with userId: ${userId}`)
     }
     // administrator user changes own role?
     const moderatorUser = getUser(context)
     if (moderatorUser.id === userId) {
+      logger.error('Administrator can not change his own role!')
       throw new Error('Administrator can not change his own role!')
     }
     // change isAdmin
@@ -161,6 +163,7 @@ export class AdminResolver {
         if (isAdmin === true) {
           user.isAdmin = new Date()
         } else {
+          logger.error('User is already a usual user!')
           throw new Error('User is already a usual user!')
         }
         break
@@ -168,6 +171,7 @@ export class AdminResolver {
         if (isAdmin === false) {
           user.isAdmin = null
         } else {
+          logger.error('User is already admin!')
           throw new Error('User is already admin!')
         }
         break
@@ -186,11 +190,13 @@ export class AdminResolver {
     const user = await dbUser.findOne({ id: userId })
     // user exists ?
     if (!user) {
+      logger.error(`Could not find user with userId: ${userId}`)
       throw new Error(`Could not find user with userId: ${userId}`)
     }
     // moderator user disabled own account?
     const moderatorUser = getUser(context)
     if (moderatorUser.id === userId) {
+      logger.error('Moderator can not delete his own account!')
       throw new Error('Moderator can not delete his own account!')
     }
     // soft-delete user
@@ -204,9 +210,11 @@ export class AdminResolver {
   async unDeleteUser(@Arg('userId', () => Int) userId: number): Promise<Date | null> {
     const user = await dbUser.findOne({ id: userId }, { withDeleted: true })
     if (!user) {
+      logger.error(`Could not find user with userId: ${userId}`)
       throw new Error(`Could not find user with userId: ${userId}`)
     }
     if (!user.deletedAt) {
+      logger.error('User is not deleted')
       throw new Error('User is not deleted')
     }
     await user.recover()
@@ -781,9 +789,11 @@ export class AdminResolver {
         relations: ['user'],
       })
       if (!contribution) {
+        logger.error('Contribution not found')
         throw new Error('Contribution not found')
       }
       if (contribution.userId === user.id) {
+        logger.error('Admin can not answer on own contribution')
         throw new Error('Admin can not answer on own contribution')
       }
       if (!contribution.user.emailContact) {

From 0f1f9baa8dd0f836a0f1112a98865118968f5647 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Wed, 28 Sep 2022 11:57:49 +0200
Subject: [PATCH 05/72] added tests for events

---
 .../graphql/resolver/AdminResolver.test.ts    | 27 ++++++++++++++++++
 backend/src/graphql/resolver/AdminResolver.ts | 28 +++++++++----------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index b1b4e469e..c132cb10f 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -41,6 +41,8 @@ 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 { EventProtocol } from '@entity/EventProtocol'
+import { EventProtocolType } from '@/event/EventProtocolType'
 
 // mock account activation email to avoid console spam
 jest.mock('@/mailer/sendAccountActivationEmail', () => {
@@ -1037,6 +1039,15 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('stores the create contribution event in the database', async () => {
+                await expect(EventProtocol.find()).resolves.toContainEqual(
+                  expect.objectContaining({
+                    type: EventProtocolType.CONTRIBUTION_CREATE,
+                    userId: admin.id,
+                  }),
+                )
+              })
             })
 
             describe('second creation surpasses the available amount ', () => {
@@ -1451,6 +1462,14 @@ describe('AdminResolver', () => {
               )
             })
 
+            it('stores the contribution confirm event in the database', async () => {
+              await expect(EventProtocol.find()).resolves.toContainEqual(
+                expect.objectContaining({
+                  type: EventProtocolType.CONTRIBUTION_CONFIRM,
+                }),
+              )
+            })
+
             it('creates a transaction', async () => {
               const transaction = await DbTransaction.find()
               expect(transaction[0].amount.toString()).toBe('450')
@@ -1475,6 +1494,14 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('stores the send confirmation email event in the database', async () => {
+              await expect(EventProtocol.find()).resolves.toContainEqual(
+                expect.objectContaining({
+                  type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
+                }),
+              )
+            })
           })
 
           describe('confirm two creations one after the other quickly', () => {
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 660f5ab31..b03da9dc4 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -67,7 +67,12 @@ import { ContributionMessage } from '@model/ContributionMessage'
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail'
 import { eventProtocol } from '@/event/EventProtocolEmitter'
-import { Event, EventContributionConfirm, EventContributionCreate, EventContributionLinkDefine, EventSendConfirmationEmail } from '@/event/Event'
+import {
+  Event,
+  EventContributionConfirm,
+  EventContributionCreate,
+  EventSendConfirmationEmail,
+} from '@/event/Event'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -514,13 +519,6 @@ export class AdminResolver {
         contributionAmount: contribution.amount,
         overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
       })
-
-      const event = new Event()
-      const eventContributionConfirm = new EventContributionConfirm()
-      eventContributionConfirm.xUserId = user.id
-      eventContributionConfirm.amount = contribution.amount
-      eventContributionConfirm.contributionId = contribution.id
-      await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
     } catch (e) {
       await queryRunner.rollbackTransaction()
       logger.error(`Creation was not successful: ${e}`)
@@ -528,6 +526,13 @@ export class AdminResolver {
     } finally {
       await queryRunner.release()
     }
+
+    const event = new Event()
+    const eventContributionConfirm = new EventContributionConfirm()
+    eventContributionConfirm.userId = user.id
+    eventContributionConfirm.amount = contribution.amount
+    eventContributionConfirm.contributionId = contribution.id
+    await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
     return true
   }
 
@@ -693,13 +698,6 @@ export class AdminResolver {
     dbContributionLink.maxAmountPerMonth = maxAmountPerMonth
     dbContributionLink.maxPerCycle = maxPerCycle
     await dbContributionLink.save()
-
-    const event = new Event()
-    const eventContributionLinkDefine = new EventContributionLinkDefine()
-    await eventProtocol.writeEvent(
-      event.setEventContributionLinkDefine(eventContributionLinkDefine),
-    )
-
     logger.debug(`createContributionLink successful!`)
     return new ContributionLink(dbContributionLink)
   }

From a756f0a4cc7c078e106f5c2515864d4196703cdf Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Wed, 28 Sep 2022 12:47:00 +0200
Subject: [PATCH 06/72] all tests completed

---
 .../graphql/resolver/AdminResolver.test.ts    | 189 ++++++++++++++++++
 .../src/graphql/resolver/util/creations.ts    |   2 +-
 2 files changed, 190 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index c132cb10f..6576a7d04 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -43,6 +43,7 @@ import { ContributionLink as DbContributionLink } from '@entity/ContributionLink
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { EventProtocol } from '@entity/EventProtocol'
 import { EventProtocolType } from '@/event/EventProtocolType'
+import { logger } from '@test/testSetup'
 
 // mock account activation email to avoid console spam
 jest.mock('@/mailer/sendAccountActivationEmail', () => {
@@ -144,6 +145,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(`Could not find user with userId: ${admin.id + 1}`)
+          })
         })
 
         describe('change role with success', () => {
@@ -196,6 +201,9 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('Administrator can not change his own role!')
+            })
           })
 
           describe('user has already role to be set', () => {
@@ -213,6 +221,10 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith('User is already admin!')
+              })
             })
 
             describe('to usual user', () => {
@@ -229,6 +241,10 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith('User is already a usual user!')
+              })
             })
           })
         })
@@ -297,6 +313,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(`Could not find user with userId: ${admin.id + 1}`)
+          })
         })
 
         describe('delete self', () => {
@@ -309,6 +329,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('Moderator can not delete his own account!')
+          })
         })
 
         describe('delete with success', () => {
@@ -338,6 +362,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(`Could not find user with userId: ${user.id}`)
+            })
           })
         })
       })
@@ -405,6 +433,10 @@ describe('AdminResolver', () => {
               }),
             )
           })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(`Could not find user with userId: ${admin.id + 1}`)
+          })
         })
 
         describe('user to undelete is not deleted', () => {
@@ -422,6 +454,10 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('User is not deleted')
+          })
+
           describe('undelete deleted user', () => {
             beforeAll(async () => {
               await mutate({ mutation: deleteUser, variables: { userId: user.id } })
@@ -909,6 +945,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'Could not find user with email: bibi@bloxberg.de',
+              )
+            })
           })
 
           describe('user to create for is deleted', () => {
@@ -928,6 +970,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'This user was deleted. Cannot create a contribution.',
+              )
+            })
           })
 
           describe('user to create for has email not confirmed', () => {
@@ -947,6 +995,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'Contribution could not be saved, Email is not activated',
+              )
+            })
           })
 
           describe('valid user to create for', () => {
@@ -967,6 +1021,13 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith(
+                  'No information for available creations with the given creationDate=',
+                  new Date('not-valid').toString(),
+                )
+              })
             })
 
             describe('date of creation is four months ago', () => {
@@ -987,6 +1048,13 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith(
+                  'No information for available creations with the given creationDate=',
+                  variables.creationDate,
+                )
+              })
             })
 
             describe('date of creation is in the future', () => {
@@ -1007,6 +1075,13 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith(
+                  'No information for available creations with the given creationDate=',
+                  variables.creationDate,
+                )
+              })
             })
 
             describe('amount of creation is too high', () => {
@@ -1024,6 +1099,12 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith(
+                  'The amount (2000 GDD) to be created exceeds the amount (1000 GDD) still available for this month.',
+                )
+              })
             })
 
             describe('creation is valid', () => {
@@ -1065,6 +1146,12 @@ describe('AdminResolver', () => {
                   }),
                 )
               })
+
+              it('logs the error thrown', () => {
+                expect(logger.error).toBeCalledWith(
+                  'The amount (1000 GDD) to be created exceeds the amount (800 GDD) still available for this month.',
+                )
+              })
             })
           })
         })
@@ -1143,6 +1230,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'Could not find UserContact with email: bob@baumeister.de',
+              )
+            })
           })
 
           describe('user for creation to update is deleted', () => {
@@ -1164,6 +1257,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('User was deleted (stephen@hawking.uk)')
+            })
           })
 
           describe('creation does not exist', () => {
@@ -1185,6 +1282,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('No contribution found to given id.')
+            })
           })
 
           describe('user email does not match creation user', () => {
@@ -1210,6 +1311,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'user of the pending contribution and send user does not correspond',
+              )
+            })
           })
 
           describe('creation update is not valid', () => {
@@ -1235,6 +1342,12 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith(
+                'The amount (1900 GDD) to be created exceeds the amount (500 GDD) still available for this month.',
+              )
+            })
           })
 
           describe('creation update is successful changing month', () => {
@@ -1371,6 +1484,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('Contribution not found for given id: -1')
+            })
           })
 
           describe('creation id does exist', () => {
@@ -1407,6 +1524,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('Contribution not found for given id: -1')
+            })
           })
 
           describe('confirm own creation', () => {
@@ -1434,6 +1555,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('Moderator can not confirm own contribution')
+            })
           })
 
           describe('confirm creation for other user', () => {
@@ -2041,6 +2166,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              'Start-Date is not initialized. A Start-Date must be set!',
+            )
+          })
+
           it('returns an error if missing endDate', async () => {
             await expect(
               mutate({
@@ -2057,6 +2188,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              'End-Date is not initialized. An End-Date must be set!',
+            )
+          })
+
           it('returns an error if endDate is before startDate', async () => {
             await expect(
               mutate({
@@ -2076,6 +2213,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              `The value of validFrom must before or equals the validTo!`,
+            )
+          })
+
           it('returns an error if name is an empty string', async () => {
             await expect(
               mutate({
@@ -2092,6 +2235,10 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('The name must be initialized!')
+          })
+
           it('returns an error if name is shorter than 5 characters', async () => {
             await expect(
               mutate({
@@ -2112,6 +2259,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              `The value of 'name' with a length of 3 did not fulfill the requested bounderies min=5 and max=100`,
+            )
+          })
+
           it('returns an error if name is longer than 100 characters', async () => {
             await expect(
               mutate({
@@ -2132,6 +2285,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              `The value of 'name' with a length of 101 did not fulfill the requested bounderies min=5 and max=100`,
+            )
+          })
+
           it('returns an error if memo is an empty string', async () => {
             await expect(
               mutate({
@@ -2148,6 +2307,10 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('The memo must be initialized!')
+          })
+
           it('returns an error if memo is shorter than 5 characters', async () => {
             await expect(
               mutate({
@@ -2168,6 +2331,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              `The value of 'memo' with a length of 3 did not fulfill the requested bounderies min=5 and max=255`,
+            )
+          })
+
           it('returns an error if memo is longer than 255 characters', async () => {
             await expect(
               mutate({
@@ -2188,6 +2357,12 @@ describe('AdminResolver', () => {
             )
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              `The value of 'memo' with a length of 256 did not fulfill the requested bounderies min=5 and max=255`,
+            )
+          })
+
           it('returns an error if amount is not positive', async () => {
             await expect(
               mutate({
@@ -2205,6 +2380,12 @@ describe('AdminResolver', () => {
               }),
             )
           })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith(
+              'The amount=0 must be initialized with a positiv value!',
+            )
+          })
         })
 
         describe('listContributionLinks', () => {
@@ -2260,6 +2441,10 @@ describe('AdminResolver', () => {
             })
           })
 
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('Contribution Link not found to given id: -1')
+          })
+
           describe('valid id', () => {
             let linkId: number
             beforeAll(async () => {
@@ -2325,6 +2510,10 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('logs the error thrown', () => {
+              expect(logger.error).toBeCalledWith('Contribution Link not found to given id: -1')
+            })
           })
 
           describe('valid id', () => {
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 4f1cec0e0..9987dfae6 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -21,7 +21,7 @@ export const validateContribution = (
   if (index < 0) {
     logger.error(
       'No information for available creations with the given creationDate=',
-      creationDate,
+      creationDate.toString(),
     )
     throw new Error('No information for available creations for the given date')
   }

From df2519784211723a52c9415770a0c6c66cc3a4d2 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Thu, 29 Sep 2022 11:39:01 +0200
Subject: [PATCH 07/72] solved unnecessary date creation regarding one invalid
 date testing

---
 backend/src/graphql/resolver/AdminResolver.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 6576a7d04..53097abbe 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -1025,7 +1025,7 @@ describe('AdminResolver', () => {
               it('logs the error thrown', () => {
                 expect(logger.error).toBeCalledWith(
                   'No information for available creations with the given creationDate=',
-                  new Date('not-valid').toString(),
+                  'Invalid Date',
                 )
               })
             })

From ce3d9b1708d9ba27f6fabc93fe3787990fa3c32a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 4 Oct 2022 12:43:51 +0200
Subject: [PATCH 08/72] find link and replace to <a> element

---
 .../slots/ContributionMessagesListItem.vue    | 20 +++++++++++++++++++
 .../slots/IsModerator.vue                     |  2 +-
 .../slots/IsNotModerator.vue                  |  2 +-
 .../ContributionMessagesListItem.vue          | 17 +++++++++++++++-
 .../slots/IsModerator.vue                     |  2 +-
 .../slots/IsNotModerator.vue                  |  2 +-
 6 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index fa5bdd940..c0bb7558c 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -23,5 +23,25 @@ export default {
       },
     },
   },
+  data() {
+    return {
+      pattern:
+        // eslint-disable-next-line no-useless-escape
+        /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi,
+      messageObject: this.message,
+    }
+  },
+  methods: {
+    linkify(inputText) {
+      // console.log(inputText.match(this.pattern))
+      this.messageObject.message = inputText.replace(
+        this.pattern,
+        "<i><a href='$1' target='_blank'>$1</a></i>",
+      )
+    },
+  },
+  created() {
+    this.linkify(this.messageObject.message)
+  },
 }
 </script>
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index 0224e042f..6363e4aa2 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -5,7 +5,7 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="message.message"></div>
     </div>
   </div>
 </template>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 64946c557..f45d4f890 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -4,7 +4,7 @@
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="message.message"></div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 5fde8f825..9e0b49313 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-not-moderator v-if="isNotModerator" :message="message"></is-not-moderator>
+    <is-not-moderator v-if="isNotModerator" :message="messageObject"></is-not-moderator>
     <is-moderator v-else :message="message"></is-moderator>
   </div>
 </template>
@@ -25,6 +25,9 @@ export default {
   },
   data() {
     return {
+      // eslint-disable-next-line no-useless-escape
+      pattern: /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi,
+      messageObject: this.message,
       storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
       moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
     }
@@ -34,5 +37,17 @@ export default {
       return this.storeName === this.moderationName
     },
   },
+  methods: {
+    linkify(inputText) {
+      // console.log(inputText.match(this.pattern))
+      this.messageObject.message = inputText.replace(
+        this.pattern,
+        "<i><a href='$1' target='_blank'>$1</a></i>",
+      )
+    },
+  },
+  created() {
+    this.linkify(this.messageObject.message)
+  },
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 343b92d97..d0810d9fb 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -4,7 +4,7 @@
     <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
     <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
     <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    <div class="mt-2">{{ message.message }}</div>
+    <div class="mt-2" v-html="message.message"></div>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8efca7270..c726cb8ef 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -4,7 +4,7 @@
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="message.message"></div>
     </div>
   </div>
 </template>

From 68e24a597328d178af4b96f49d235d183be8990c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 5 Oct 2022 08:19:11 +0200
Subject: [PATCH 09/72] strip html from text

---
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 .../ContributionMessages/ContributionMessagesFormular.vue       | 2 +-
 frontend/src/components/Contributions/ContributionForm.vue      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index c9c285eef..695ae5109 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -47,7 +47,7 @@ export default {
           mutation: adminCreateContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.form.text,
+            message: this.form.text.replace(/(<([^>]+)>)/gi, ''),
           },
         })
         .then((result) => {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 1a5928cc3..c2af2a04f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -47,7 +47,7 @@ export default {
           mutation: createContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.form.text,
+            message: this.form.text.replace(/(<([^>]+)>)/gi, ''),
           },
         })
         .then((result) => {
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 47f2be4c4..ea170a5d6 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -108,6 +108,7 @@ export default {
     submit() {
       this.form.amount = this.numberFormat(this.form.amount)
       // spreading is needed for testing
+      this.form.memo = this.form.memo.replace(/(<([^>]+)>)/gi, '')
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
       this.reset()
     },

From 34b6e0d48f487294573c9c603e70225a09622f62 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Fri, 7 Oct 2022 12:32:00 +0200
Subject: [PATCH 10/72] added new events

---
 backend/src/event/Event.ts             | 68 +++++++++++++++++++++++++-
 backend/src/event/EventProtocolType.ts |  8 +++
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index cec94e5bf..8523d13ce 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -74,6 +74,14 @@ export class EventContributionConfirm extends EventBasicCtX {}
 export class EventContributionDeny extends EventBasicCtX {}
 export class EventContributionLinkDefine extends EventBasicCt {}
 export class EventContributionLinkActivateRedeem extends EventBasicCt {}
+export class EventDeleteUser extends EventBasicUserId {}
+export class EventUndeleteUser extends EventBasicUserId {}
+export class EventChangeUserRole extends EventBasicUserId {}
+export class EventAdminUpdateContribution extends EventBasicCt {}
+export class EventAdminDeleteContribution extends EventBasicCt {}
+export class EventCreateContributionLink extends EventBasicCt {}
+export class EventDeleteContributionLink extends EventBasicCt {}
+export class EventUpdateContributionLink extends EventBasicCt {}
 
 export class Event {
   constructor()
@@ -318,14 +326,14 @@ export class Event {
   }
 
   public setEventContributionConfirm(ev: EventContributionConfirm): Event {
-    this.setByBasicCtX(ev.userId, ev.xUserId, ev.xCommunityId, ev.contributionId, ev.amount)
+    this.setByBasicCtX(ev.userId, ev.contributionId, ev.amount, ev.xUserId, ev.xCommunityId)
     this.type = EventProtocolType.CONTRIBUTION_CONFIRM
 
     return this
   }
 
   public setEventContributionDeny(ev: EventContributionDeny): Event {
-    this.setByBasicCtX(ev.userId, ev.xUserId, ev.xCommunityId, ev.contributionId, ev.amount)
+    this.setByBasicCtX(ev.userId, ev.contributionId, ev.amount, ev.xUserId, ev.xCommunityId)
     this.type = EventProtocolType.CONTRIBUTION_DENY
 
     return this
@@ -345,6 +353,62 @@ export class Event {
     return this
   }
 
+  public setEventDeleteUser(ev: EventDeleteUser): Event {
+    this.setByBasicUser(ev.userId)
+    this.type = EventProtocolType.DELETE_USER
+
+    return this
+  }
+
+  public setEventUndeleteUser(ev: EventUndeleteUser): Event {
+    this.setByBasicUser(ev.userId)
+    this.type = EventProtocolType.UNDELETE_USER
+
+    return this
+  }
+
+  public setEventChangeUserRole(ev: EventChangeUserRole): Event {
+    this.setByBasicUser(ev.userId)
+    this.type = EventProtocolType.CHANGE_USER_ROLE
+
+    return this
+  }
+
+  public setEventAdminUpdateContribution(ev: EventAdminUpdateContribution): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_UPDATE_CONTRIBUTION
+
+    return this
+  }
+
+  public setEventAdminDeleteContribution(ev: EventAdminDeleteContribution): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_DELETE_CONTRIBUTION
+
+    return this
+  }
+
+  public setEventCreateContributionLink(ev: EventCreateContributionLink): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.CREATE_CONTRIBUTION_LINK
+
+    return this
+  }
+
+  public setEventDeleteContributionLink(ev: EventDeleteContributionLink): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.DELETE_CONTRIBUTION_LINK
+
+    return this
+  }
+
+  public setEventUpdateContributionLink(ev: EventUpdateContributionLink): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.UPDATE_CONTRIBUTION_LINK
+
+    return this
+  }
+
   setByBasicUser(userId: number): Event {
     this.setEventBasic()
     this.userId = userId
diff --git a/backend/src/event/EventProtocolType.ts b/backend/src/event/EventProtocolType.ts
index d53eb6961..a487fdd0b 100644
--- a/backend/src/event/EventProtocolType.ts
+++ b/backend/src/event/EventProtocolType.ts
@@ -35,4 +35,12 @@ export enum EventProtocolType {
   CONTRIBUTION_UPDATE = 'CONTRIBUTION_UPDATE',
   USER_CREATE_CONTRIBUTION_MESSAGE = 'USER_CREATE_CONTRIBUTION_MESSAGE',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
+  DELETE_USER = 'DELETE_USER',
+  UNDELETE_USER = 'UNDELETE_USER',
+  CHANGE_USER_ROLE = 'CHANGE_USER_ROLE',
+  ADMIN_UPDATE_CONTRIBUTION = 'ADMIN_UPDATE_CONTRIBUTION',
+  ADMIN_DELETE_CONTRIBUTION = 'ADMIN_DELETE_CONTRIBUTION',
+  CREATE_CONTRIBUTION_LINK = 'CREATE_CONTRIBUTION_LINK',
+  DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
+  UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
 }

From 088e30daae30c623e814cd08e5133077b771e678 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Fri, 7 Oct 2022 12:36:31 +0200
Subject: [PATCH 11/72] added admin events for contributions

---
 backend/src/event/Event.ts             | 24 ++++++++++++++++++++++++
 backend/src/event/EventProtocolType.ts |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index 8523d13ce..09a31d4e0 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -66,6 +66,9 @@ export class EventTransactionCreation extends EventBasicTx {}
 export class EventTransactionReceive extends EventBasicTxX {}
 export class EventTransactionReceiveRedeem extends EventBasicTxX {}
 export class EventContributionCreate extends EventBasicCt {}
+export class EventAdminContributionCreate extends EventBasicCt {}
+export class EventAdminContributionDelete extends EventBasicCt {}
+export class EventAdminContributionUpdate extends EventBasicCt {}
 export class EventUserCreateContributionMessage extends EventBasicCtMsg {}
 export class EventAdminCreateContributionMessage extends EventBasicCtMsg {}
 export class EventContributionDelete extends EventBasicCt {}
@@ -297,6 +300,27 @@ export class Event {
     return this
   }
 
+  public setEventAdminContributionCreate(ev: EventAdminContributionCreate): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_CONTRIBUTION_CREATE
+
+    return this
+  }
+
+  public setEventAdminContributionDelete(ev: EventAdminContributionDelete): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_CONTRIBUTION_DELETE
+
+    return this
+  }
+
+  public setEventAdminContributionUpdate(ev: EventAdminContributionUpdate): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_CONTRIBUTION_UPDATE
+
+    return this
+  }
+
   public setEventUserCreateContributionMessage(ev: EventUserCreateContributionMessage): Event {
     this.setByBasicCtMsg(ev.userId, ev.contributionId, ev.amount, ev.messageId)
     this.type = EventProtocolType.USER_CREATE_CONTRIBUTION_MESSAGE
diff --git a/backend/src/event/EventProtocolType.ts b/backend/src/event/EventProtocolType.ts
index a487fdd0b..b7c2f0151 100644
--- a/backend/src/event/EventProtocolType.ts
+++ b/backend/src/event/EventProtocolType.ts
@@ -33,6 +33,9 @@ export enum EventProtocolType {
   CONTRIBUTION_LINK_ACTIVATE_REDEEM = 'CONTRIBUTION_LINK_ACTIVATE_REDEEM',
   CONTRIBUTION_DELETE = 'CONTRIBUTION_DELETE',
   CONTRIBUTION_UPDATE = 'CONTRIBUTION_UPDATE',
+  ADMIN_CONTRIBUTION_CREATE = 'ADMIN_CONTRIBUTION_CREATE',
+  ADMIN_CONTRIBUTION_DELETE = 'ADMIN_CONTRIBUTION_DELETE',
+  ADMIN_CONTRIBUTION_UPDATE = 'ADMIN_CONTRIBUTION_UPDATE',
   USER_CREATE_CONTRIBUTION_MESSAGE = 'USER_CREATE_CONTRIBUTION_MESSAGE',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
   DELETE_USER = 'DELETE_USER',

From a50871185f19909e7f7019621edd2c253ba4e030 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Fri, 7 Oct 2022 12:47:07 +0200
Subject: [PATCH 12/72] new contribution related admin events implemented and
 working

---
 .../graphql/resolver/AdminResolver.test.ts    | 31 ++++++++++++++--
 backend/src/graphql/resolver/AdminResolver.ts | 35 +++++++++++++++----
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 53097abbe..ad847bde1 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -1121,10 +1121,10 @@ describe('AdminResolver', () => {
                 )
               })
 
-              it('stores the create contribution event in the database', async () => {
+              it('stores the admin create contribution event in the database', async () => {
                 await expect(EventProtocol.find()).resolves.toContainEqual(
                   expect.objectContaining({
-                    type: EventProtocolType.CONTRIBUTION_CREATE,
+                    type: EventProtocolType.ADMIN_CONTRIBUTION_CREATE,
                     userId: admin.id,
                   }),
                 )
@@ -1376,6 +1376,15 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('stores the admin update contribution event in the database', async () => {
+              await expect(EventProtocol.find()).resolves.toContainEqual(
+                expect.objectContaining({
+                  type: EventProtocolType.ADMIN_CONTRIBUTION_UPDATE,
+                  userId: admin.id,
+                }),
+              )
+            })
           })
 
           describe('creation update is successful without changing month', () => {
@@ -1404,6 +1413,15 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('stores the admin update contribution event in the database', async () => {
+              await expect(EventProtocol.find()).resolves.toContainEqual(
+                expect.objectContaining({
+                  type: EventProtocolType.ADMIN_CONTRIBUTION_UPDATE,
+                  userId: admin.id,
+                }),
+              )
+            })
           })
         })
 
@@ -1505,6 +1523,15 @@ describe('AdminResolver', () => {
                 }),
               )
             })
+
+            it('stores the admin  delete contribution event in the database', async () => {
+              await expect(EventProtocol.find()).resolves.toContainEqual(
+                expect.objectContaining({
+                  type: EventProtocolType.ADMIN_CONTRIBUTION_DELETE,
+                  userId: admin.id,
+                }),
+              )
+            })
           })
         })
 
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index b03da9dc4..f228c01e3 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -69,8 +69,10 @@ import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributio
 import { eventProtocol } from '@/event/EventProtocolEmitter'
 import {
   Event,
+  EventAdminContributionCreate,
+  EventAdminContributionDelete,
+  EventAdminContributionUpdate,
   EventContributionConfirm,
-  EventContributionCreate,
   EventSendConfirmationEmail,
 } from '@/event/Event'
 
@@ -278,11 +280,13 @@ export class AdminResolver {
     logger.trace('contribution to save', contribution)
     await Contribution.save(contribution)
 
-    const eventCreateContribution = new EventContributionCreate()
-    eventCreateContribution.userId = moderator.id
-    eventCreateContribution.amount = amount
-    eventCreateContribution.contributionId = contribution.id
-    await eventProtocol.writeEvent(event.setEventContributionCreate(eventCreateContribution))
+    const eventAdminCreateContribution = new EventAdminContributionCreate()
+    eventAdminCreateContribution.userId = moderator.id
+    eventAdminCreateContribution.amount = amount
+    eventAdminCreateContribution.contributionId = contribution.id
+    await eventProtocol.writeEvent(
+      event.setEventAdminContributionCreate(eventAdminCreateContribution),
+    )
 
     return getUserCreation(emailContact.userId)
   }
@@ -382,6 +386,15 @@ export class AdminResolver {
 
     result.creation = await getUserCreation(user.id)
 
+    const event = new Event()
+    const eventAdminContributionUpdate = new EventAdminContributionUpdate()
+    eventAdminContributionUpdate.userId = user.id
+    eventAdminContributionUpdate.amount = amount
+    eventAdminContributionUpdate.contributionId = contributionToUpdate.id
+    await eventProtocol.writeEvent(
+      event.setEventAdminContributionUpdate(eventAdminContributionUpdate),
+    )
+
     return result
   }
 
@@ -431,6 +444,16 @@ export class AdminResolver {
     contribution.contributionStatus = ContributionStatus.DELETED
     await contribution.save()
     const res = await contribution.softRemove()
+
+    const event = new Event()
+    const eventAdminContributionDelete = new EventAdminContributionDelete()
+    eventAdminContributionDelete.userId = contribution.userId
+    eventAdminContributionDelete.amount = contribution.amount
+    eventAdminContributionDelete.contributionId = contribution.id
+    await eventProtocol.writeEvent(
+      event.setEventAdminContributionDelete(eventAdminContributionDelete),
+    )
+
     return !!res
   }
 

From f6b386101d5c75ab1dbfdfd935a0de1b335f5cf8 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Thu, 13 Oct 2022 12:18:38 +0200
Subject: [PATCH 13/72] test start

---
 .../resolver/TransactionResolver.test.ts       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 backend/src/graphql/resolver/TransactionResolver.test.ts

diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
new file mode 100644
index 000000000..f6475e62f
--- /dev/null
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -0,0 +1,18 @@
+import { cleanDB, testEnvironment } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
+let mutate: any, query: any, con: any
+let testEnv: any
+
+beforeAll(async () => {
+  testEnv = await testEnvironment(logger)
+  mutate = testEnv.mutate
+  query = testEnv.query
+  con = testEnv.con
+  await cleanDB()
+})
+
+afterAll(async () => {
+  await cleanDB()
+  await con.close()
+})
\ No newline at end of file

From 0b68f2f74b2606128c9d14ae1586e1e59e98fc14 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Thu, 13 Oct 2022 13:44:39 +0200
Subject: [PATCH 14/72] tests up and working

---
 backend/src/config/index.ts                   |   2 +-
 .../resolver/TransactionResolver.test.ts      | 284 +++++++++++++++++-
 .../graphql/resolver/TransactionResolver.ts   |   9 +-
 3 files changed, 290 insertions(+), 5 deletions(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 3e6bafd9f..b622293ad 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0049-add_user_contacts_table',
+  DB_VERSION: '0050-add_messageId_to_event_protocol',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index f6475e62f..87ada724d 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -1,5 +1,20 @@
-import { cleanDB, testEnvironment } from '@test/helpers'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
+import { userFactory } from '@/seeds/factory/user'
+import {
+  confirmContribution,
+  createContribution,
+  createUser,
+  sendCoins,
+} from '@/seeds/graphql/mutations'
+import { login } from '@/seeds/graphql/queries'
+import { bobBaumeister } from '@/seeds/users/bob-baumeister'
+import { peterLustig } from '@/seeds/users/peter-lustig'
+import { User } from '@entity/User'
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
+import { GraphQLError } from 'graphql'
 
 let mutate: any, query: any, con: any
 let testEnv: any
@@ -15,4 +30,269 @@ beforeAll(async () => {
 afterAll(async () => {
   await cleanDB()
   await con.close()
-})
\ No newline at end of file
+})
+
+let bobData: any
+let peterData: any
+let user: User[]
+
+describe('send coins', () => {
+  beforeAll(async () => {
+    await userFactory(testEnv, peterLustig)
+    await userFactory(testEnv, bobBaumeister)
+
+    bobData = {
+      email: 'bob@baumeister.de',
+      password: 'Aa12345_',
+      publisherId: 1234,
+    }
+
+    peterData = {
+      email: 'peter@lustig.de',
+      password: 'Aa12345_',
+      publisherId: 1234,
+    }
+
+    user = await User.find({ relations: ['emailContact'] })
+  })
+
+  afterAll(async () => {
+    await cleanDB()
+  })
+
+  describe('wrong recipient', () => {
+    it('unknown recipient', async () => {
+      await mutate({
+        query: login,
+        variables: bobData,
+      })
+      expect(
+        await mutate({
+          mutation: sendCoins,
+          variables: {
+            email: 'wrong@email.com',
+            amount: 100,
+            memo: 'test',
+          },
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          errors: [new GraphQLError('No user with this credentials')],
+        }),
+      )
+    })
+
+    it('deleted recipient', async () => {
+      // delete bob
+      const bob = await User.findOneOrFail({ id: user[1].id })
+      bob.deletedAt = new Date()
+      await bob.save()
+
+      await mutate({
+        query: login,
+        variables: peterData,
+      })
+
+      expect(
+        await mutate({
+          mutation: sendCoins,
+          variables: {
+            email: 'bob@baumeister.de',
+            amount: 100,
+            memo: 'test',
+          },
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          errors: [new GraphQLError('The recipient account was deleted')],
+        }),
+      )
+
+      // make bob active again
+      bob.deletedAt = null
+      await bob.save()
+    })
+
+    it('recipient account not activated', async () => {
+      resetToken()
+
+      await mutate({
+        mutation: createUser,
+        variables: {
+          email: 'testing@user.de',
+          firstName: 'testing',
+          lastName: 'user',
+          language: 'de',
+          publisherId: 1234,
+        },
+      })
+
+      await mutate({
+        query: login,
+        variables: peterData,
+      })
+
+      expect(
+        await mutate({
+          mutation: sendCoins,
+          variables: {
+            email: 'testing@user.de',
+            amount: 100,
+            memo: 'test',
+          },
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          errors: [new GraphQLError('The recipient account is not activated')],
+        }),
+      )
+    })
+  })
+
+  describe('errors in the transaction itself', () => {
+    beforeAll(async () => {
+      await mutate({
+        query: login,
+        variables: bobData,
+      })
+    })
+
+    describe('sender and recipient are the same', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'bob@baumeister.de',
+              amount: 100,
+              memo: 'test',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('Sender and Recipient are the same.')],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith('Sender and Recipient are the same.')
+      })
+    })
+
+    describe('memo text is too long', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: 100,
+              memo: 'test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test t',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('memo text is too long (255 characters maximum)')],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith('memo text is too long: memo.length=256 > 255')
+      })
+    })
+
+    describe('memo text is too short', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: 100,
+              memo: 'test',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('memo text is too short (5 characters minimum)')],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith('memo text is too short: memo.length=4 < 5')
+      })
+    })
+
+    describe('user has not enough GDD', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: 100,
+              memo: 'testing',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError(`user hasn't enough GDD or amount is < 0`)],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith(
+          `user hasn't enough GDD or amount is < 0 : balance=null`,
+        )
+      })
+    })
+  })
+
+  describe('transaction correct', () => {
+    it('sends the coins', async () => {
+      // make Peter Lustig Admin
+      const peter = await User.findOneOrFail({ id: user[0].id })
+      peter.isAdmin = new Date()
+      await peter.save()
+
+      // create contribution as user bob
+      const contribution = await mutate({
+        mutation: createContribution,
+        variables: { amount: 1000, memo: 'testing', creationDate: new Date().toISOString() },
+      })
+
+      // login as admin
+      await query({ query: login, variables: peterData })
+
+      // confirm the contribution
+      await mutate({
+        mutation: confirmContribution,
+        variables: { id: contribution.data.createContribution.id },
+      })
+
+      // login as bob again
+      await query({ query: login, variables: bobData })
+
+      expect(
+        await mutate({
+          mutation: sendCoins,
+          variables: {
+            email: 'peter@lustig.de',
+            amount: 100,
+            memo: 'testing',
+          },
+        }),
+      ).toEqual(
+        expect.objectContaining({
+          data: {
+            sendCoins: 'true',
+          },
+        }),
+      )
+    })
+  })
+})
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b00d84de6..91114232b 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -55,12 +55,12 @@ export const executeTransaction = async (
   }
 
   if (memo.length > MEMO_MAX_CHARS) {
-    logger.error(`memo text is too long: memo.length=${memo.length} > (${MEMO_MAX_CHARS}`)
+    logger.error(`memo text is too long: memo.length=${memo.length} > ${MEMO_MAX_CHARS}`)
     throw new Error(`memo text is too long (${MEMO_MAX_CHARS} characters maximum)`)
   }
 
   if (memo.length < MEMO_MIN_CHARS) {
-    logger.error(`memo text is too short: memo.length=${memo.length} < (${MEMO_MIN_CHARS}`)
+    logger.error(`memo text is too short: memo.length=${memo.length} < ${MEMO_MIN_CHARS}`)
     throw new Error(`memo text is too short (${MEMO_MIN_CHARS} characters minimum)`)
   }
 
@@ -74,6 +74,7 @@ export const executeTransaction = async (
   )
   logger.debug(`calculated Balance=${sendBalance}`)
   if (!sendBalance) {
+    // josejgi: wrong messages from my point of view, at this point balance is always null, should log inside calculate balance or handle returns in a different way
     logger.error(`user hasn't enough GDD or amount is < 0 : balance=${sendBalance}`)
     throw new Error("user hasn't enough GDD or amount is < 0")
   }
@@ -316,6 +317,10 @@ export class TransactionResolver {
     }
     */
     // const recipientUser = await dbUser.findOne({ id: emailContact.userId })
+
+    /* Code inside this if statement is unreachable (useless by so), 
+    in findUserByEmail() an error is already thrown if the user is not found
+    */
     if (!recipientUser) {
       logger.error(`unknown recipient to UserContact: email=${email}`)
       throw new Error('unknown recipient')

From a4ded0f61e1b0bfe80b636d78bba75c01688e9db Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Thu, 13 Oct 2022 13:57:48 +0200
Subject: [PATCH 15/72] database version

---
 backend/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index b622293ad..3e6bafd9f 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0050-add_messageId_to_event_protocol',
+  DB_VERSION: '0049-add_user_contacts_table',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info

From 91c05fcb9b09395da87fbecd188bb915cc3e9eb1 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Thu, 13 Oct 2022 14:13:23 +0200
Subject: [PATCH 16/72] events implemented and tested

---
 .../resolver/TransactionResolver.test.ts      | 20 +++++++++++++++++++
 .../graphql/resolver/TransactionResolver.ts   | 16 +++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 87ada724d..088475b58 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { EventProtocolType } from '@/event/EventProtocolType'
 import { userFactory } from '@/seeds/factory/user'
 import {
   confirmContribution,
@@ -11,6 +12,7 @@ import {
 import { login } from '@/seeds/graphql/queries'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { peterLustig } from '@/seeds/users/peter-lustig'
+import { EventProtocol } from '@entity/EventProtocol'
 import { User } from '@entity/User'
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
@@ -294,5 +296,23 @@ describe('send coins', () => {
         }),
       )
     })
+
+    it('stores the send transaction event in the database', async () => {
+      expect(EventProtocol.find()).resolves.toContainEqual(
+        expect.objectContaining({
+          type: EventProtocolType.TRANSACTION_SEND,
+          userId: user[1].id,
+        }),
+      )
+    })
+
+    it('stores the receive event in the database', async () => {
+      expect(EventProtocol.find()).resolves.toContainEqual(
+        expect.objectContaining({
+          type: EventProtocolType.TRANSACTION_RECEIVE,
+          userId: user[0].id,
+        }),
+      )
+    })
   })
 })
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 91114232b..2145f2183 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -37,6 +37,8 @@ import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { findUserByEmail } from './UserResolver'
 import { sendTransactionLinkRedeemedEmail } from '@/mailer/sendTransactionLinkRedeemed'
+import { Event, EventTransactionReceive, EventTransactionSend } from '@/event/Event'
+import { eventProtocol } from '@/event/EventProtocolEmitter'
 
 export const executeTransaction = async (
   amount: Decimal,
@@ -136,6 +138,20 @@ export const executeTransaction = async (
 
     await queryRunner.commitTransaction()
     logger.info(`commit Transaction successful...`)
+
+    const eventTransactionSend = new EventTransactionSend()
+    eventTransactionSend.userId = transactionSend.userId
+    eventTransactionSend.xUserId = transactionSend.linkedUserId
+    eventTransactionSend.transactionId = transactionSend.id
+    eventTransactionSend.amount = transactionSend.amount
+    await eventProtocol.writeEvent(new Event().setEventTransactionSend(eventTransactionSend))
+
+    const eventTransactionReceive = new EventTransactionReceive()
+    eventTransactionReceive.userId = transactionReceive.userId
+    eventTransactionReceive.xUserId = transactionReceive.linkedUserId
+    eventTransactionReceive.transactionId = transactionReceive.id
+    eventTransactionReceive.amount = transactionReceive.amount
+    await eventProtocol.writeEvent(new Event().setEventTransactionReceive(eventTransactionReceive))
   } catch (e) {
     await queryRunner.rollbackTransaction()
     logger.error(`Transaction was not successful: ${e}`)

From 85804a1cfae38331bad50b2c6d8cb9ddc8a6a02f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 14 Oct 2022 13:00:57 +0200
Subject: [PATCH 17/72] pattern in data for ContributionForm

---
 .../ContributionMessagesFormular.vue                |  7 +++++--
 .../ContributionMessagesFormular.vue                |  7 +++++--
 .../components/Contributions/ContributionForm.vue   | 13 +++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 695ae5109..8abe55d22 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       form: {
-        text: '',
+        text: ''
       },
     }
   },
@@ -47,7 +47,7 @@ export default {
           mutation: adminCreateContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.form.text.replace(/(<([^>]+)>)/gi, ''),
+            message: this.clearTextFromHtml,
           },
         })
         .then((result) => {
@@ -65,6 +65,9 @@ export default {
     },
   },
   computed: {
+    clearTextFromHtml(){
+      return this.form.text.replace(/(<([^>]+)>)/gi, '')
+    },
     disabled() {
       if (this.form.text !== '') {
         return false
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index c2af2a04f..63a3ca47d 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       form: {
-        text: '',
+        text: ''
       },
     }
   },
@@ -47,7 +47,7 @@ export default {
           mutation: createContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.form.text.replace(/(<([^>]+)>)/gi, ''),
+            message: this.clearTextFromHtml,
           },
         })
         .then((result) => {
@@ -65,6 +65,9 @@ export default {
     },
   },
   computed: {
+    clearTextFromHtml(){
+      return this.form.text.replace(/(<([^>]+)>)/gi, '')
+    },
     disabled() {
       if (this.form.text !== '') {
         return false
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index ea170a5d6..347ec9d9a 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -98,17 +98,19 @@ export default {
       minlength: 5,
       maxlength: 255,
       maximalDate: new Date(),
-      form: this.value, // includes 'id'
+      form: this.value, // includes 'id',
+      patternStripHtml: new RegExp(/(<([^>]+)>)/gi),
+      patternNonDigit: new RegExp(/\D/g)
     }
   },
   methods: {
     numberFormat(value) {
-      return value.replace(/\D/g, '')
+      return value.replace(this.patternNonDigit, '')
     },
     submit() {
-      this.form.amount = this.numberFormat(this.form.amount)
+      this.form.amount = this.form.amount.replace(this.patternNonDigit, '')
       // spreading is needed for testing
-      this.form.memo = this.form.memo.replace(/(<([^>]+)>)/gi, '')
+      this.form.memo = this.memoStripHtml
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
       this.reset()
     },
@@ -128,6 +130,9 @@ export default {
     },
   },
   computed: {
+    memoStripHtml() {
+      return this.form.memo.replace(this.patternStripHtml)
+    },
     minimalDate() {
       // sets the date to the 1st of the previous month
       let date = new Date(this.maximalDate) // has to be a new object, because of 'setMonth' changes the objects date

From 67dbbfae48d74511d0bb4bb56b3a0b8ddb662029 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 14 Oct 2022 13:03:17 +0200
Subject: [PATCH 18/72] fix lint

---
 .../ContributionMessages/ContributionMessagesFormular.vue     | 4 ++--
 .../ContributionMessages/ContributionMessagesFormular.vue     | 4 ++--
 frontend/src/components/Contributions/ContributionForm.vue    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 8abe55d22..11492d53c 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       form: {
-        text: ''
+        text: '',
       },
     }
   },
@@ -65,7 +65,7 @@ export default {
     },
   },
   computed: {
-    clearTextFromHtml(){
+    clearTextFromHtml() {
       return this.form.text.replace(/(<([^>]+)>)/gi, '')
     },
     disabled() {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 63a3ca47d..56732961c 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       form: {
-        text: ''
+        text: '',
       },
     }
   },
@@ -65,7 +65,7 @@ export default {
     },
   },
   computed: {
-    clearTextFromHtml(){
+    clearTextFromHtml() {
       return this.form.text.replace(/(<([^>]+)>)/gi, '')
     },
     disabled() {
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 347ec9d9a..2c0a9f452 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -100,7 +100,7 @@ export default {
       maximalDate: new Date(),
       form: this.value, // includes 'id',
       patternStripHtml: new RegExp(/(<([^>]+)>)/gi),
-      patternNonDigit: new RegExp(/\D/g)
+      patternNonDigit: new RegExp(/\D/g),
     }
   },
   methods: {

From 90dfd1063ba5915d90557a74ce7f849486732537 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 14 Oct 2022 13:31:34 +0200
Subject: [PATCH 19/72] pattern const added

---
 .../ContributionMessagesFormular.vue                |  4 +++-
 .../ContributionMessagesFormular.vue                |  4 +++-
 .../components/Contributions/ContributionForm.vue   | 13 +++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 11492d53c..c01ce8cb5 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -25,6 +25,8 @@
 <script>
 import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
 
+const STRIP_HTML_PATTERN = /(<([^>]+)>)/gi
+
 export default {
   name: 'ContributionMessagesFormular',
   props: {
@@ -66,7 +68,7 @@ export default {
   },
   computed: {
     clearTextFromHtml() {
-      return this.form.text.replace(/(<([^>]+)>)/gi, '')
+      return this.form.text.replace(STRIP_HTML_PATTERN, '')
     },
     disabled() {
       if (this.form.text !== '') {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 56732961c..a5ab81112 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -25,6 +25,8 @@
 <script>
 import { createContributionMessage } from '../../graphql/mutations.js'
 
+const STRIP_HTML_PATTERN = /(<([^>]+)>)/gi
+
 export default {
   name: 'ContributionMessagesFormular',
   props: {
@@ -66,7 +68,7 @@ export default {
   },
   computed: {
     clearTextFromHtml() {
-      return this.form.text.replace(/(<([^>]+)>)/gi, '')
+      return this.form.text.replace(STRIP_HTML_PATTERN, '')
     },
     disabled() {
       if (this.form.text !== '') {
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 2c0a9f452..11671b8d0 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -87,6 +87,9 @@
   </div>
 </template>
 <script>
+const PATTERN_STRIP_HTML = /(<([^>]+)>)/gi
+const PATTERN_NON_DIGIT = /\D/g
+
 export default {
   name: 'ContributionForm',
   props: {
@@ -98,17 +101,15 @@ export default {
       minlength: 5,
       maxlength: 255,
       maximalDate: new Date(),
-      form: this.value, // includes 'id',
-      patternStripHtml: new RegExp(/(<([^>]+)>)/gi),
-      patternNonDigit: new RegExp(/\D/g),
+      form: this.value, // includes 'id'
     }
   },
   methods: {
     numberFormat(value) {
-      return value.replace(this.patternNonDigit, '')
+      return value.replace(PATTERN_NON_DIGIT, '')
     },
     submit() {
-      this.form.amount = this.form.amount.replace(this.patternNonDigit, '')
+      this.form.amount = this.form.amount.replace(PATTERN_NON_DIGIT, '')
       // spreading is needed for testing
       this.form.memo = this.memoStripHtml
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
@@ -131,7 +132,7 @@ export default {
   },
   computed: {
     memoStripHtml() {
-      return this.form.memo.replace(this.patternStripHtml)
+      return this.form.memo.replace(PATTERN_STRIP_HTML, '')
     },
     minimalDate() {
       // sets the date to the 1st of the previous month

From 2fd37a75038eb0f38c7f0e5d97e0705180471678 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Fri, 14 Oct 2022 13:59:41 +0200
Subject: [PATCH 20/72] fixed tests and negative numbers are now detected

---
 .../resolver/TransactionResolver.test.ts      | 240 ++++++++++--------
 .../graphql/resolver/TransactionResolver.ts   |   1 -
 backend/src/util/validate.ts                  |   2 +
 3 files changed, 137 insertions(+), 106 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 088475b58..d5077d314 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -6,15 +6,17 @@ import { userFactory } from '@/seeds/factory/user'
 import {
   confirmContribution,
   createContribution,
-  createUser,
+  login,
   sendCoins,
 } from '@/seeds/graphql/mutations'
-import { login } from '@/seeds/graphql/queries'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
+import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
+import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { EventProtocol } from '@entity/EventProtocol'
+import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
-import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { cleanDB, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 import { GraphQLError } from 'graphql'
 
@@ -42,6 +44,8 @@ describe('send coins', () => {
   beforeAll(async () => {
     await userFactory(testEnv, peterLustig)
     await userFactory(testEnv, bobBaumeister)
+    await userFactory(testEnv, stephenHawking)
+    await userFactory(testEnv, garrickOllivander)
 
     bobData = {
       email: 'bob@baumeister.de',
@@ -62,10 +66,10 @@ describe('send coins', () => {
     await cleanDB()
   })
 
-  describe('wrong recipient', () => {
-    it('unknown recipient', async () => {
+  describe('unknown recipient', () => {
+    it('throws an error', async () => {
       await mutate({
-        query: login,
+        mutation: login,
         variables: bobData,
       })
       expect(
@@ -84,77 +88,59 @@ describe('send coins', () => {
       )
     })
 
-    it('deleted recipient', async () => {
-      // delete bob
-      const bob = await User.findOneOrFail({ id: user[1].id })
-      bob.deletedAt = new Date()
-      await bob.save()
-
-      await mutate({
-        query: login,
-        variables: peterData,
-      })
-
-      expect(
+    describe('deleted recipient', () => {
+      it('throws an error', async () => {
         await mutate({
-          mutation: sendCoins,
-          variables: {
-            email: 'bob@baumeister.de',
-            amount: 100,
-            memo: 'test',
-          },
-        }),
-      ).toEqual(
-        expect.objectContaining({
-          errors: [new GraphQLError('The recipient account was deleted')],
-        }),
-      )
+          mutation: login,
+          variables: peterData,
+        })
 
-      // make bob active again
-      bob.deletedAt = null
-      await bob.save()
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'stephen@hawking.uk',
+              amount: 100,
+              memo: 'test',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('The recipient account was deleted')],
+          }),
+        )
+      })
     })
 
-    it('recipient account not activated', async () => {
-      resetToken()
-
-      await mutate({
-        mutation: createUser,
-        variables: {
-          email: 'testing@user.de',
-          firstName: 'testing',
-          lastName: 'user',
-          language: 'de',
-          publisherId: 1234,
-        },
-      })
-
-      await mutate({
-        query: login,
-        variables: peterData,
-      })
-
-      expect(
+    describe('recipient account not activated', () => {
+      it('throws an error', async () => {
         await mutate({
-          mutation: sendCoins,
-          variables: {
-            email: 'testing@user.de',
-            amount: 100,
-            memo: 'test',
-          },
-        }),
-      ).toEqual(
-        expect.objectContaining({
-          errors: [new GraphQLError('The recipient account is not activated')],
-        }),
-      )
+          mutation: login,
+          variables: peterData,
+        })
+
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'garrick@ollivander.com',
+              amount: 100,
+              memo: 'test',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('The recipient account is not activated')],
+          }),
+        )
+      })
     })
   })
 
   describe('errors in the transaction itself', () => {
     beforeAll(async () => {
       await mutate({
-        query: login,
+        mutation: login,
         variables: bobData,
       })
     })
@@ -254,13 +240,8 @@ describe('send coins', () => {
     })
   })
 
-  describe('transaction correct', () => {
-    it('sends the coins', async () => {
-      // make Peter Lustig Admin
-      const peter = await User.findOneOrFail({ id: user[0].id })
-      peter.isAdmin = new Date()
-      await peter.save()
-
+  describe('user has some GDD', () => {
+    beforeAll(async () => {
       // create contribution as user bob
       const contribution = await mutate({
         mutation: createContribution,
@@ -268,7 +249,7 @@ describe('send coins', () => {
       })
 
       // login as admin
-      await query({ query: login, variables: peterData })
+      await query({ mutation: login, variables: peterData })
 
       // confirm the contribution
       await mutate({
@@ -277,42 +258,91 @@ describe('send coins', () => {
       })
 
       // login as bob again
-      await query({ query: login, variables: bobData })
-
-      expect(
-        await mutate({
-          mutation: sendCoins,
-          variables: {
-            email: 'peter@lustig.de',
-            amount: 100,
-            memo: 'testing',
-          },
-        }),
-      ).toEqual(
-        expect.objectContaining({
-          data: {
-            sendCoins: 'true',
-          },
-        }),
-      )
+      await query({ mutation: login, variables: bobData })
     })
 
-    it('stores the send transaction event in the database', async () => {
-      expect(EventProtocol.find()).resolves.toContainEqual(
-        expect.objectContaining({
-          type: EventProtocolType.TRANSACTION_SEND,
+    afterAll(async () => {
+      await cleanDB()
+    })
+
+    describe('trying to send negative amount', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: -50,
+              memo: 'testing negative',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError(`user hasn't enough GDD or amount is < 0`)],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith(
+          `user hasn't enough GDD or amount is < 0 : balance=null`,
+        )
+      })
+    })
+
+    describe('good transaction', () => {
+      it('sends the coins', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: 50,
+              memo: 'unrepeateable memo',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            data: {
+              sendCoins: 'true',
+            },
+          }),
+        )
+      })
+
+      it('stores the send transaction event in the database', async () => {
+        // Find the exact transaction (sent one is the one with user[1] as user)
+        const transaction = await Transaction.find({
           userId: user[1].id,
-        }),
-      )
-    })
+          memo: 'unrepeateable memo',
+        })
 
-    it('stores the receive event in the database', async () => {
-      expect(EventProtocol.find()).resolves.toContainEqual(
-        expect.objectContaining({
-          type: EventProtocolType.TRANSACTION_RECEIVE,
+        expect(EventProtocol.find()).resolves.toContainEqual(
+          expect.objectContaining({
+            type: EventProtocolType.TRANSACTION_SEND,
+            userId: user[1].id,
+            transactionId: transaction[0].id,
+            xUserId: user[0].id,
+          }),
+        )
+      })
+
+      it('stores the receive event in the database', async () => {
+        // Find the exact transaction (received one is the one with user[0] as user)
+        const transaction = await Transaction.find({
           userId: user[0].id,
-        }),
-      )
+          memo: 'unrepeateable memo',
+        })
+
+        expect(EventProtocol.find()).resolves.toContainEqual(
+          expect.objectContaining({
+            type: EventProtocolType.TRANSACTION_RECEIVE,
+            userId: user[0].id,
+            transactionId: transaction[0].id,
+            xUserId: user[1].id,
+          }),
+        )
+      })
     })
   })
 })
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 2145f2183..486ed87d2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -76,7 +76,6 @@ export const executeTransaction = async (
   )
   logger.debug(`calculated Balance=${sendBalance}`)
   if (!sendBalance) {
-    // josejgi: wrong messages from my point of view, at this point balance is always null, should log inside calculate balance or handle returns in a different way
     logger.error(`user hasn't enough GDD or amount is < 0 : balance=${sendBalance}`)
     throw new Error("user hasn't enough GDD or amount is < 0")
   }
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index 8d1c90ca4..df1d4b1c0 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -26,6 +26,8 @@ async function calculateBalance(
 ): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number } | null> {
   const lastTransaction = await Transaction.findOne({ userId }, { order: { balanceDate: 'DESC' } })
   if (!lastTransaction) return null
+  // negative amount should not be allowed
+  if (amount.greaterThan(0)) return null
 
   const decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, time)
 

From 50a1b67a70e9daf4e024b21ea83775a98eaf5463 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 14 Oct 2022 14:22:06 +0200
Subject: [PATCH 21/72] delete IsModerator.vue IsNotModerator.vue in frontend
 and backend

---
 .../slots/IsModerator.vue                     | 37 -------------------
 .../slots/IsNotModerator.vue                  | 34 -----------------
 .../slots/IsModerator.vue                     | 34 -----------------
 .../slots/IsNotModerator.vue                  | 36 ------------------
 4 files changed, 141 deletions(-)
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsModerator.vue
 delete mode 100644 admin/src/components/ContributionMessages/slots/IsNotModerator.vue
 delete mode 100644 frontend/src/components/ContributionMessages/slots/IsModerator.vue
 delete mode 100644 frontend/src/components/ContributionMessages/slots/IsNotModerator.vue

diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
deleted file mode 100644
index 6363e4aa2..000000000
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <div class="text-right">
-      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2" v-html="message.message"></div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-moderator {
-  clear: both;
-  float: right;
-  width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-</style>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
deleted file mode 100644
index f45d4f890..000000000
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div>
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="message.message"></div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  clear: both;
-  width: 75%;
-  margin-top: 20px;
-}
-</style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
deleted file mode 100644
index d0810d9fb..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="slot-is-moderator">
-    <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
-    <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-    <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-    <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    <div class="mt-2" v-html="message.message"></div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-moderator {
-  clear: both;
-  /* background-color: rgb(255, 242, 227); */
-  width: 75%;
-  margin-top: 20px;
-}
-</style>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
deleted file mode 100644
index c726cb8ef..000000000
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="slot-is-not-moderator">
-    <div class="text-right">
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="message.message"></div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    message: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
-  },
-  computed: {
-    initialLetters() {
-      return `${this.message.userFirstName[0]} ${this.message.userLastName[0]}`
-    },
-  },
-}
-</script>
-<style>
-.slot-is-not-moderator {
-  float: right;
-  width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  clear: both;
-}
-</style>

From cb39745b2324bbf2312435ee5fe207be0f6cec54 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 15 Oct 2022 07:54:58 +0200
Subject: [PATCH 22/72] change linkify to computed

---
 .../slots/ContributionMessagesListItem.vue    | 32 ++++++-------------
 .../ContributionMessagesListItem.vue          | 26 +++++----------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 70ca24cc4..5eae5d7cd 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,21 +1,24 @@
 <template>
   <div class="contribution-messages-list-item">
     <div v-if="message.isModerator" class="text-right is-moderator">
-      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
+      <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="linkify"></div>
     </div>
     <div v-else class="text-left is-not-moderator">
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="linkify"></div>
     </div>
   </div>
 </template>
 <script>
+const PATTERN =
+  /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/gi
+
 export default {
   name: 'ContributionMessagesListItem',
   props: {
@@ -24,26 +27,11 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      pattern:
-        // eslint-disable-next-line no-useless-escape
-        /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi,
-      messageObject: this.message,
-    }
-  },
-  methods: {
-    linkify(inputText) {
-      // console.log(inputText.match(this.pattern))
-      this.messageObject.message = inputText.replace(
-        this.pattern,
-        "<i><a href='$1' target='_blank'>$1</a></i>",
-      )
+  computed: {
+    linkify() {
+      return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
     },
   },
-  created() {
-    this.linkify(this.messageObject.message)
-  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 9ef041ba3..e7b44125c 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,22 +1,24 @@
 <template>
   <div class="contribution-messages-list-item">
     <div v-if="isNotModerator" class="is-not-moderator text-right">
-      <b-avatar :text="initialLetters" variant="info"></b-avatar>
+      <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="linkify"></div>
     </div>
     <div v-else class="is-moderator text-left">
-      <b-avatar square :text="initialLetters" variant="warning"></b-avatar>
+      <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-      <div class="mt-2">{{ message.message }}</div>
+      <div class="mt-2" v-html="linkify"></div>
     </div>
   </div>
 </template>
 
 <script>
+const PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/gi
+
 export default {
   name: 'ContributionMessagesListItem',
   props: {
@@ -27,9 +29,6 @@ export default {
   },
   data() {
     return {
-      // eslint-disable-next-line no-useless-escape
-      pattern: /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gi,
-      messageObject: this.message,
       storeName: `${this.$store.state.firstName} ${this.$store.state.lastName}`,
       moderationName: `${this.message.userFirstName} ${this.message.userLastName}`,
     }
@@ -38,19 +37,10 @@ export default {
     isNotModerator() {
       return this.storeName === this.moderationName
     },
-  },
-  methods: {
-    linkify(inputText) {
-      // console.log(inputText.match(this.pattern))
-      this.messageObject.message = inputText.replace(
-        this.pattern,
-        "<i><a href='$1' target='_blank'>$1</a></i>",
-      )
+    linkify() {
+      return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
     },
   },
-  created() {
-    this.linkify(this.messageObject.message)
-  },
 }
 </script>
 <style>

From 024d66af9cd8dd8e684920eeba319be2543c042a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 15 Oct 2022 07:57:29 +0200
Subject: [PATCH 23/72] chnage name from linkyfi to linkifiedMessage

---
 .../slots/ContributionMessagesListItem.vue                  | 6 +++---
 .../ContributionMessages/ContributionMessagesListItem.vue   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 5eae5d7cd..db832693f 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -5,13 +5,13 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2" v-html="linkify"></div>
+      <div class="mt-2" v-html="linkifiedMessage"></div>
     </div>
     <div v-else class="text-left is-not-moderator">
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="linkify"></div>
+      <div class="mt-2" v-html="linkifiedMessage"></div>
     </div>
   </div>
 </template>
@@ -28,7 +28,7 @@ export default {
     },
   },
   computed: {
-    linkify() {
+    linkifiedMessage() {
       return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
     },
   },
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index e7b44125c..a8a86854d 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -4,14 +4,14 @@
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="linkify"></div>
+      <div class="mt-2" v-html="linkifiedMessage"></div>
     </div>
     <div v-else class="is-moderator text-left">
       <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-      <div class="mt-2" v-html="linkify"></div>
+      <div class="mt-2" v-html="linkifiedMessage"></div>
     </div>
   </div>
 </template>
@@ -37,7 +37,7 @@ export default {
     isNotModerator() {
       return this.storeName === this.moderationName
     },
-    linkify() {
+    linkifiedMessage() {
       return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
     },
   },

From 1848db1ba1f922ee47f98ab083585e039258ffbf Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Tue, 18 Oct 2022 19:51:10 +0200
Subject: [PATCH 24/72] added some log tests

---
 .../resolver/TransactionResolver.test.ts      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index d5077d314..3fdff837e 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -19,6 +19,7 @@ import { User } from '@entity/User'
 import { cleanDB, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 import { GraphQLError } from 'graphql'
+import { findUserByEmail } from './UserResolver'
 
 let mutate: any, query: any, con: any
 let testEnv: any
@@ -88,6 +89,10 @@ describe('send coins', () => {
       )
     })
 
+    it('logs the error thrown', () => {
+      expect(logger.error).toBeCalledWith(`UserContact with email=wrong@email.com does not exists`)
+    })
+
     describe('deleted recipient', () => {
       it('throws an error', async () => {
         await mutate({
@@ -110,6 +115,14 @@ describe('send coins', () => {
           }),
         )
       })
+
+      it('logs the error thrown', async () => {
+        // find peter to check the log
+        const user = await findUserByEmail(peterData.email)
+        expect(logger.error).toBeCalledWith(
+          `The recipient account was deleted: recipientUser=${user}`,
+        )
+      })
     })
 
     describe('recipient account not activated', () => {
@@ -134,6 +147,14 @@ describe('send coins', () => {
           }),
         )
       })
+
+      it('logs the error thrown', async () => {
+        // find peter to check the log
+        const user = await findUserByEmail(peterData.email)
+        expect(logger.error).toBeCalledWith(
+          `The recipient account is not activated: recipientUser=${user}`,
+        )
+      })
     })
   })
 

From d90d366946b8fb60dc737204dcbc65d416b69cab Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Tue, 18 Oct 2022 20:24:30 +0200
Subject: [PATCH 25/72] fixed unnecessary params

---
 backend/src/graphql/resolver/TransactionResolver.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 3fdff837e..b3ad36fcd 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -51,13 +51,11 @@ describe('send coins', () => {
     bobData = {
       email: 'bob@baumeister.de',
       password: 'Aa12345_',
-      publisherId: 1234,
     }
 
     peterData = {
       email: 'peter@lustig.de',
       password: 'Aa12345_',
-      publisherId: 1234,
     }
 
     user = await User.find({ relations: ['emailContact'] })

From 259475755c591e2f014355b9afb4cd68977f7a81 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Tue, 18 Oct 2022 23:24:43 +0200
Subject: [PATCH 26/72] fixed wrong responsabilities of exception throwing and
 implementation of calculateBalance()

---
 .../resolver/TransactionLinkResolver.ts       |  5 +-
 .../resolver/TransactionResolver.test.ts      | 69 +++++++++----------
 .../graphql/resolver/TransactionResolver.ts   | 35 ++++++----
 backend/src/util/utilities.ts                 | 12 ++++
 backend/src/util/validate.ts                  | 37 +++++++---
 5 files changed, 96 insertions(+), 62 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 4724956b4..4ba5dcd0b 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -74,10 +74,7 @@ export class TransactionLinkResolver {
     const holdAvailableAmount = amount.minus(calculateDecay(amount, createdDate, validUntil).decay)
 
     // validate amount
-    const sendBalance = await calculateBalance(user.id, holdAvailableAmount.mul(-1), createdDate)
-    if (!sendBalance) {
-      throw new Error("user hasn't enough GDD or amount is < 0")
-    }
+    await calculateBalance(user.id, holdAvailableAmount, createdDate)
 
     const transactionLink = dbTransactionLink.create()
     transactionLink.userId = user.id
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index b3ad36fcd..d391f8ab9 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -16,7 +16,7 @@ import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { EventProtocol } from '@entity/EventProtocol'
 import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
-import { cleanDB, testEnvironment } from '@test/helpers'
+import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger } from '@test/testSetup'
 import { GraphQLError } from 'graphql'
 import { findUserByEmail } from './UserResolver'
@@ -246,21 +246,49 @@ describe('send coins', () => {
           }),
         ).toEqual(
           expect.objectContaining({
-            errors: [new GraphQLError(`user hasn't enough GDD or amount is < 0`)],
+            errors: [new GraphQLError(`User has not received any GDD yet`)],
           }),
         )
       })
 
       it('logs the error thrown', () => {
         expect(logger.error).toBeCalledWith(
-          `user hasn't enough GDD or amount is < 0 : balance=null`,
+          `No prior transaction found for user with id: ${user[1].id}`,
         )
       })
     })
+
+    describe('sending negative amount', () => {
+      it('throws an error', async () => {
+        expect(
+          await mutate({
+            mutation: sendCoins,
+            variables: {
+              email: 'peter@lustig.de',
+              amount: -50,
+              memo: 'testing negative',
+            },
+          }),
+        ).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('Transaction amount must be greater than 0')],
+          }),
+        )
+      })
+
+      it('logs the error thrown', () => {
+        expect(logger.error).toBeCalledWith('Transaction amount must be greater than 0: -50')
+      })
+    })
   })
 
   describe('user has some GDD', () => {
     beforeAll(async () => {
+      resetToken()
+
+      // login as bob again
+      await query({ mutation: login, variables: bobData })
+
       // create contribution as user bob
       const contribution = await mutate({
         mutation: createContribution,
@@ -280,35 +308,6 @@ describe('send coins', () => {
       await query({ mutation: login, variables: bobData })
     })
 
-    afterAll(async () => {
-      await cleanDB()
-    })
-
-    describe('trying to send negative amount', () => {
-      it('throws an error', async () => {
-        expect(
-          await mutate({
-            mutation: sendCoins,
-            variables: {
-              email: 'peter@lustig.de',
-              amount: -50,
-              memo: 'testing negative',
-            },
-          }),
-        ).toEqual(
-          expect.objectContaining({
-            errors: [new GraphQLError(`user hasn't enough GDD or amount is < 0`)],
-          }),
-        )
-      })
-
-      it('logs the error thrown', () => {
-        expect(logger.error).toBeCalledWith(
-          `user hasn't enough GDD or amount is < 0 : balance=null`,
-        )
-      })
-    })
-
     describe('good transaction', () => {
       it('sends the coins', async () => {
         expect(
@@ -317,7 +316,7 @@ describe('send coins', () => {
             variables: {
               email: 'peter@lustig.de',
               amount: 50,
-              memo: 'unrepeateable memo',
+              memo: 'unrepeatable memo',
             },
           }),
         ).toEqual(
@@ -333,7 +332,7 @@ describe('send coins', () => {
         // Find the exact transaction (sent one is the one with user[1] as user)
         const transaction = await Transaction.find({
           userId: user[1].id,
-          memo: 'unrepeateable memo',
+          memo: 'unrepeatable memo',
         })
 
         expect(EventProtocol.find()).resolves.toContainEqual(
@@ -350,7 +349,7 @@ describe('send coins', () => {
         // Find the exact transaction (received one is the one with user[0] as user)
         const transaction = await Transaction.find({
           userId: user[0].id,
-          memo: 'unrepeateable memo',
+          memo: 'unrepeatable memo',
         })
 
         expect(EventProtocol.find()).resolves.toContainEqual(
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 486ed87d2..afe8a7974 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -39,6 +39,7 @@ import { findUserByEmail } from './UserResolver'
 import { sendTransactionLinkRedeemedEmail } from '@/mailer/sendTransactionLinkRedeemed'
 import { Event, EventTransactionReceive, EventTransactionSend } from '@/event/Event'
 import { eventProtocol } from '@/event/EventProtocolEmitter'
+import { Decay } from '../model/Decay'
 
 export const executeTransaction = async (
   amount: Decimal,
@@ -68,17 +69,8 @@ export const executeTransaction = async (
 
   // validate amount
   const receivedCallDate = new Date()
-  const sendBalance = await calculateBalance(
-    sender.id,
-    amount.mul(-1),
-    receivedCallDate,
-    transactionLink,
-  )
-  logger.debug(`calculated Balance=${sendBalance}`)
-  if (!sendBalance) {
-    logger.error(`user hasn't enough GDD or amount is < 0 : balance=${sendBalance}`)
-    throw new Error("user hasn't enough GDD or amount is < 0")
-  }
+
+  const sendBalance = await calculateBalance(sender.id, amount, receivedCallDate, transactionLink)
 
   const queryRunner = getConnection().createQueryRunner()
   await queryRunner.connect()
@@ -91,7 +83,7 @@ export const executeTransaction = async (
     transactionSend.memo = memo
     transactionSend.userId = sender.id
     transactionSend.linkedUserId = recipient.id
-    transactionSend.amount = amount.mul(-1)
+    transactionSend.amount = amount
     transactionSend.balance = sendBalance.balance
     transactionSend.balanceDate = receivedCallDate
     transactionSend.decay = sendBalance.decay.decay
@@ -108,7 +100,24 @@ export const executeTransaction = async (
     transactionReceive.userId = recipient.id
     transactionReceive.linkedUserId = sender.id
     transactionReceive.amount = amount
-    const receiveBalance = await calculateBalance(recipient.id, amount, receivedCallDate)
+
+    // state received balance
+    let receiveBalance: {
+      balance: Decimal
+      decay: Decay
+      lastTransactionId: number
+    } | null
+
+    // try received balance
+    try {
+      receiveBalance = await calculateBalance(recipient.id, amount, receivedCallDate)
+    } catch (e) {
+      logger.info(
+        `User with no transactions sent: ${recipient.id}, has received a transaction of ${amount} GDD from user: ${sender.id}`,
+      )
+      receiveBalance = null
+    }
+
     transactionReceive.balance = receiveBalance ? receiveBalance.balance : amount
     transactionReceive.balanceDate = receivedCallDate
     transactionReceive.decay = receiveBalance ? receiveBalance.decay.decay : new Decimal(0)
diff --git a/backend/src/util/utilities.ts b/backend/src/util/utilities.ts
index 9abb31554..65214ebb5 100644
--- a/backend/src/util/utilities.ts
+++ b/backend/src/util/utilities.ts
@@ -1,5 +1,17 @@
+import Decimal from 'decimal.js-light'
+
 export const objectValuesToArray = (obj: { [x: string]: string }): Array<string> => {
   return Object.keys(obj).map(function (key) {
     return obj[key]
   })
 }
+
+// to improve code readability, as String is needed, it is handled inside this utility function
+export const decimalAddition = (a: Decimal, b: Decimal): Decimal => {
+  return a.add(b.toString())
+}
+
+// to improve code readability, as String is needed, it is handled inside this utility function
+export const decimalSubtraction = (a: Decimal, b: Decimal): Decimal => {
+  return a.minus(b.toString())
+}
diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index df1d4b1c0..64422b64f 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -5,6 +5,8 @@ import { Decay } from '@model/Decay'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { decimalSubtraction, decimalAddition } from './utilities'
+import { logger } from '@test/testSetup'
 
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()
@@ -23,16 +25,26 @@ async function calculateBalance(
   amount: Decimal,
   time: Date,
   transactionLink?: dbTransactionLink | null,
-): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number } | null> {
+): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number }> {
+  // negative or empty amount should not be allowed
+  if (amount.lessThanOrEqualTo(0)) {
+    logger.error(`Transaction amount must be greater than 0: ${amount}`)
+    throw new Error('Transaction amount must be greater than 0')
+  }
+
+  // check if user has prior transactions
   const lastTransaction = await Transaction.findOne({ userId }, { order: { balanceDate: 'DESC' } })
-  if (!lastTransaction) return null
-  // negative amount should not be allowed
-  if (amount.greaterThan(0)) return null
+
+  if (!lastTransaction) {
+    logger.error(`No prior transaction found for user with id: ${userId}`)
+    throw new Error('User has not received any GDD yet')
+  }
 
   const decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, time)
 
-  // TODO why we have to use toString() here?
-  const balance = decay.balance.add(amount.toString())
+  // new balance is the old balance minus the amount used
+  const balance = decimalSubtraction(decay.balance, amount)
+
   const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
   const { sumHoldAvailableAmount } = await transactionLinkRepository.summary(userId, time)
 
@@ -40,11 +52,16 @@ async function calculateBalance(
   // else we cannot redeem links which are more or equal to half of what an account actually owns
   const releasedLinkAmount = transactionLink ? transactionLink.holdAvailableAmount : new Decimal(0)
 
-  if (
-    balance.minus(sumHoldAvailableAmount.toString()).plus(releasedLinkAmount.toString()).lessThan(0)
-  ) {
-    return null
+  const availableBalance = decimalSubtraction(balance, sumHoldAvailableAmount)
+
+  if (decimalAddition(availableBalance, releasedLinkAmount).lessThan(0)) {
+    logger.error(
+      `Not enough funds for a transaction of ${amount} GDD, user with id: ${userId} has only ${balance} GDD available`,
+    )
+    throw new Error('Not enough funds for transaction')
   }
+
+  logger.debug(`calculated Balance=${balance}`)
   return { balance, lastTransactionId: lastTransaction.id, decay }
 }
 

From 6970cc1725db2aed262afd26d508f4b4d243f2ef Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 20 Oct 2022 11:51:37 +0200
Subject: [PATCH 27/72] fix: Include Deleted Email Contacts in User Search

---
 backend/src/typeorm/repository/User.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 8b3e29859..c20ef85ff 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -28,8 +28,8 @@ export class UserRepository extends Repository<DbUser> {
   ): Promise<[DbUser[], number]> {
     const query = this.createQueryBuilder('user')
       .select(select)
-      .leftJoinAndSelect('user.emailContact', 'emailContact')
       .withDeleted()
+      .leftJoinAndSelect('user.emailContact', 'emailContact')
       .where(
         new Brackets((qb) => {
           qb.where(

From 24b1584ff841fec131b02017f6c24fd6daa7be80 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Oct 2022 05:55:28 +0200
Subject: [PATCH 28/72] linkify messages without v-html

---
 .../ContributionMessagesFormular.vue          |  7 +----
 .../slots/ContributionMessagesListItem.vue    | 28 ++++++++++++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index c01ce8cb5..c9c285eef 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -25,8 +25,6 @@
 <script>
 import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
 
-const STRIP_HTML_PATTERN = /(<([^>]+)>)/gi
-
 export default {
   name: 'ContributionMessagesFormular',
   props: {
@@ -49,7 +47,7 @@ export default {
           mutation: adminCreateContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.clearTextFromHtml,
+            message: this.form.text,
           },
         })
         .then((result) => {
@@ -67,9 +65,6 @@ export default {
     },
   },
   computed: {
-    clearTextFromHtml() {
-      return this.form.text.replace(STRIP_HTML_PATTERN, '')
-    },
     disabled() {
       if (this.form.text !== '') {
         return false
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index db832693f..014fa7393 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -5,19 +5,29 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2" v-html="linkifiedMessage"></div>
+      <div class="mt-2">
+        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+          <span v-else>{{ text }}</span>
+        </span>
+      </div>
     </div>
     <div v-else class="text-left is-not-moderator">
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="linkifiedMessage"></div>
+      <div class="mt-2">
+        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+          <span v-else>{{ text }}</span>
+        </span>
+      </div>
     </div>
   </div>
 </template>
 <script>
 const PATTERN =
-  /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/gi
+  /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
 
 export default {
   name: 'ContributionMessagesListItem',
@@ -29,7 +39,17 @@ export default {
   },
   computed: {
     linkifiedMessage() {
-      return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
+      const linkified = []
+      let string = this.message.message
+      let match
+      while ((match = string.match(PATTERN))) {
+        if (match.index > 0)
+          linkified.push({ type: 'text', text: string.substring(0, match.index) })
+        linkified.push({ type: 'link', text: match[0] })
+        string = string.substring(match.index + match[0].length)
+      }
+      if (string.length > 0) linkified.push({ type: 'text', text: string })
+      return linkified
     },
   },
 }

From e37a2bdf2cfcba2bf906900c435702641c8ddac5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Oct 2022 06:02:06 +0200
Subject: [PATCH 29/72] linkify messages without v-html

---
 .../ContributionMessagesFormular.vue          |  7 +----
 .../ContributionMessagesListItem.vue          | 28 ++++++++++++++++---
 .../Contributions/ContributionForm.vue        |  5 ----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index a5ab81112..1a5928cc3 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -25,8 +25,6 @@
 <script>
 import { createContributionMessage } from '../../graphql/mutations.js'
 
-const STRIP_HTML_PATTERN = /(<([^>]+)>)/gi
-
 export default {
   name: 'ContributionMessagesFormular',
   props: {
@@ -49,7 +47,7 @@ export default {
           mutation: createContributionMessage,
           variables: {
             contributionId: this.contributionId,
-            message: this.clearTextFromHtml,
+            message: this.form.text,
           },
         })
         .then((result) => {
@@ -67,9 +65,6 @@ export default {
     },
   },
   computed: {
-    clearTextFromHtml() {
-      return this.form.text.replace(STRIP_HTML_PATTERN, '')
-    },
     disabled() {
       if (this.form.text !== '') {
         return false
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index a8a86854d..0ad57e4f1 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -4,20 +4,30 @@
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2" v-html="linkifiedMessage"></div>
+      <div class="mt-2">
+        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+          <span v-else>{{ text }}</span>
+        </span>
+      </div>
     </div>
     <div v-else class="is-moderator text-left">
       <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-      <div class="mt-2" v-html="linkifiedMessage"></div>
+      <div class="mt-2">
+        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+          <span v-else>{{ text }}</span>
+        </span>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-const PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/gi
+const PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
 
 export default {
   name: 'ContributionMessagesListItem',
@@ -38,7 +48,17 @@ export default {
       return this.storeName === this.moderationName
     },
     linkifiedMessage() {
-      return this.message.message.replace(PATTERN, "<i><a href='$1' target='_blank'>$1</a></i>")
+      const linkified = []
+      let string = this.message.message
+      let match
+      while ((match = string.match(PATTERN))) {
+        if (match.index > 0)
+          linkified.push({ type: 'text', text: string.substring(0, match.index) })
+        linkified.push({ type: 'link', text: match[0] })
+        string = string.substring(match.index + match[0].length)
+      }
+      if (string.length > 0) linkified.push({ type: 'text', text: string })
+      return linkified
     },
   },
 }
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 50846c70d..71593f2b1 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -88,7 +88,6 @@
   </div>
 </template>
 <script>
-const PATTERN_STRIP_HTML = /(<([^>]+)>)/gi
 const PATTERN_NON_DIGIT = /\D/g
 
 export default {
@@ -112,7 +111,6 @@ export default {
     submit() {
       this.form.amount = this.form.amount.replace(PATTERN_NON_DIGIT, '')
       // spreading is needed for testing
-      this.form.memo = this.memoStripHtml
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
       this.reset()
     },
@@ -132,9 +130,6 @@ export default {
     },
   },
   computed: {
-    memoStripHtml() {
-      return this.form.memo.replace(PATTERN_STRIP_HTML, '')
-    },
     minimalDate() {
       // sets the date to the 1st of the previous month
       let date = new Date(this.maximalDate) // has to be a new object, because of 'setMonth' changes the objects date

From 902222b9c895e2b37f55c83125a25f6252773e96 Mon Sep 17 00:00:00 2001
From: jjimenezgarcia <99907380+jjimenezgarcia@users.noreply.github.com>
Date: Mon, 24 Oct 2022 08:05:37 +0200
Subject: [PATCH 30/72] Update backend/src/util/validate.ts

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

diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts
index 64422b64f..9640cc614 100644
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@@ -6,7 +6,7 @@ import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { decimalSubtraction, decimalAddition } from './utilities'
-import { logger } from '@test/testSetup'
+import { backendLogger as logger } from '@/server/logger'
 
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()

From d513fc2ca5e604faeba63ba0e14286cfbf8b1e8b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Oct 2022 16:31:11 +0200
Subject: [PATCH 31/72] add tests for the links in messages

---
 .../ContributionMessagesListItem.spec.js      | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index 7504854d0..2dc9fb3ce 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -175,4 +175,68 @@ describe('ContributionMessagesListItem', () => {
       })
     })
   })
+
+  describe('links in contribtion message', () => {
+    const propsData = {
+      message: {
+        id: 111,
+        message: 'Lorem ipsum?',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ModeratorItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    let messageField
+
+    describe('message of only one link', () => {
+      beforeEach(() => {
+        propsData.message.message = 'https://gradido.net/de/'
+        wrapper = ModeratorItemWrapper()
+        messageField = wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)')
+      })
+
+      it('contains the link as text', () => {
+        expect(messageField.text()).toBe('https://gradido.net/de/')
+      })
+
+      it('contains a link to the given address', () => {
+        expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/')
+      })
+    })
+
+    describe('message with text and two links', () => {
+      beforeEach(() => {
+        propsData.message.message = `Here you find all you need to know about Gradido: https://gradido.net/de/
+and here is the link to the repository: https://github.com/gradido/gradido`
+        wrapper = ModeratorItemWrapper()
+        messageField = wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)')
+      })
+
+      it('contains the whole text', () => {
+        expect(messageField.text())
+          .toBe(`Here you find all you need to know about Gradido: https://gradido.net/de/
+and here is the link to the repository: https://github.com/gradido/gradido`)
+      })
+
+      it('contains the two links', () => {
+        expect(messageField.findAll('a').at(0).attributes('href')).toBe('https://gradido.net/de/')
+        expect(messageField.findAll('a').at(1).attributes('href')).toBe(
+          'https://github.com/gradido/gradido',
+        )
+      })
+    })
+  })
 })

From 8409e0b751e67aea25250716180db84c1752789a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Oct 2022 16:45:26 +0200
Subject: [PATCH 32/72] linkify messages as component

---
 .../ContributionMessagesListItem.vue          | 23 ++++++++-----------
 .../ContributionMessages/LinkifyMessage.vue   | 20 ++++++++++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/components/ContributionMessages/LinkifyMessage.vue

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 0ad57e4f1..dbcf2fbb6 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -4,33 +4,28 @@
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">
-        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
-          <span v-else>{{ text }}</span>
-        </span>
-      </div>
+      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
     </div>
     <div v-else class="is-moderator text-left">
       <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-      <div class="mt-2">
-        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
-          <span v-else>{{ text }}</span>
-        </span>
-      </div>
+      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
     </div>
   </div>
 </template>
 
 <script>
-const PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
+import LinkifyMessage from '@/components/ContributionMessages/LinkifyMessage.vue'
+
+const LINK_PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
 
 export default {
   name: 'ContributionMessagesListItem',
+  components: {
+    LinkifyMessage,
+  },
   props: {
     message: {
       type: Object,
@@ -51,7 +46,7 @@ export default {
       const linkified = []
       let string = this.message.message
       let match
-      while ((match = string.match(PATTERN))) {
+      while ((match = string.match(LINK_PATTERN))) {
         if (match.index > 0)
           linkified.push({ type: 'text', text: string.substring(0, match.index) })
         linkified.push({ type: 'link', text: match[0] })
diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
new file mode 100644
index 000000000..cea0a30a1
--- /dev/null
+++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
@@ -0,0 +1,20 @@
+<template>
+  <div class="mt-2">
+    <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+      <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+      <span v-else>{{ text }}</span>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LinkifyMessage',
+  props: {
+    linkifiedMessage: {
+      type: Array,
+      required: true,
+    },
+  },
+}
+</script>

From a11352aaad21f9a352fdc77590ee47c4415cca20 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Oct 2022 16:49:05 +0200
Subject: [PATCH 33/72] linkify messages as component in admin interface

---
 .../ContributionMessages/LinkifyMessage.vue   | 20 ++++++
 .../ContributionMessagesListItem.spec.js      | 64 +++++++++++++++++++
 .../slots/ContributionMessagesListItem.vue    | 23 +++----
 3 files changed, 93 insertions(+), 14 deletions(-)
 create mode 100644 admin/src/components/ContributionMessages/LinkifyMessage.vue

diff --git a/admin/src/components/ContributionMessages/LinkifyMessage.vue b/admin/src/components/ContributionMessages/LinkifyMessage.vue
new file mode 100644
index 000000000..cea0a30a1
--- /dev/null
+++ b/admin/src/components/ContributionMessages/LinkifyMessage.vue
@@ -0,0 +1,20 @@
+<template>
+  <div class="mt-2">
+    <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
+      <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+      <span v-else>{{ text }}</span>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LinkifyMessage',
+  props: {
+    linkifiedMessage: {
+      type: Array,
+      required: true,
+    },
+  },
+}
+</script>
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index b8aaba502..c1a4e65c6 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -125,4 +125,68 @@ describe('ContributionMessagesListItem', () => {
       })
     })
   })
+
+  describe('links in contribtion message', () => {
+    const propsData = {
+      message: {
+        id: 111,
+        message: 'Lorem ipsum?',
+        createdAt: '2022-08-29T12:23:27.000Z',
+        updatedAt: null,
+        type: 'DIALOG',
+        userFirstName: 'Peter',
+        userLastName: 'Lustig',
+        userId: 107,
+        __typename: 'ContributionMessage',
+      },
+    }
+
+    const ModeratorItemWrapper = () => {
+      return mount(ContributionMessagesListItem, {
+        localVue,
+        mocks,
+        propsData,
+      })
+    }
+
+    let messageField
+
+    describe('message of only one link', () => {
+      beforeEach(() => {
+        propsData.message.message = 'https://gradido.net/de/'
+        wrapper = ModeratorItemWrapper()
+        messageField = wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)')
+      })
+
+      it('contains the link as text', () => {
+        expect(messageField.text()).toBe('https://gradido.net/de/')
+      })
+
+      it('contains a link to the given address', () => {
+        expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/')
+      })
+    })
+
+    describe('message with text and two links', () => {
+      beforeEach(() => {
+        propsData.message.message = `Here you find all you need to know about Gradido: https://gradido.net/de/
+and here is the link to the repository: https://github.com/gradido/gradido`
+        wrapper = ModeratorItemWrapper()
+        messageField = wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)')
+      })
+
+      it('contains the whole text', () => {
+        expect(messageField.text())
+          .toBe(`Here you find all you need to know about Gradido: https://gradido.net/de/
+and here is the link to the repository: https://github.com/gradido/gradido`)
+      })
+
+      it('contains the two links', () => {
+        expect(messageField.findAll('a').at(0).attributes('href')).toBe('https://gradido.net/de/')
+        expect(messageField.findAll('a').at(1).attributes('href')).toBe(
+          'https://github.com/gradido/gradido',
+        )
+      })
+    })
+  })
 })
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 014fa7393..55b01c592 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -5,32 +5,27 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2">
-        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
-          <span v-else>{{ text }}</span>
-        </span>
-      </div>
+      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
     </div>
     <div v-else class="text-left is-not-moderator">
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2">
-        <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-          <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
-          <span v-else>{{ text }}</span>
-        </span>
-      </div>
+      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
     </div>
   </div>
 </template>
 <script>
-const PATTERN =
+import LinkifyMessage from '@/components/ContributionMessages/LinkifyMessage.vue'
+
+const LINK_PATTERN =
   /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
 
 export default {
   name: 'ContributionMessagesListItem',
+  components: {
+    LinkifyMessage,
+  },
   props: {
     message: {
       type: Object,
@@ -42,7 +37,7 @@ export default {
       const linkified = []
       let string = this.message.message
       let match
-      while ((match = string.match(PATTERN))) {
+      while ((match = string.match(LINK_PATTERN))) {
         if (match.index > 0)
           linkified.push({ type: 'text', text: string.substring(0, match.index) })
         linkified.push({ type: 'link', text: match[0] })

From 3bd339d798d246400361898183a1baa8702c4334 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Mon, 24 Oct 2022 22:01:19 +0200
Subject: [PATCH 34/72] fixed wrong removals of negative numbers

---
 backend/src/graphql/resolver/TransactionResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index afe8a7974..4bdd343b2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -83,7 +83,7 @@ export const executeTransaction = async (
     transactionSend.memo = memo
     transactionSend.userId = sender.id
     transactionSend.linkedUserId = recipient.id
-    transactionSend.amount = amount
+    transactionSend.amount = amount.mul(-1)
     transactionSend.balance = sendBalance.balance
     transactionSend.balanceDate = receivedCallDate
     transactionSend.decay = sendBalance.decay.decay
@@ -151,7 +151,7 @@ export const executeTransaction = async (
     eventTransactionSend.userId = transactionSend.userId
     eventTransactionSend.xUserId = transactionSend.linkedUserId
     eventTransactionSend.transactionId = transactionSend.id
-    eventTransactionSend.amount = transactionSend.amount
+    eventTransactionSend.amount = transactionSend.amount.mul(-1)
     await eventProtocol.writeEvent(new Event().setEventTransactionSend(eventTransactionSend))
 
     const eventTransactionReceive = new EventTransactionReceive()

From f0c39703f17ea5862b175ad99a8afa0e2d9d8b39 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Mon, 24 Oct 2022 22:01:19 +0200
Subject: [PATCH 35/72] fixed wrong removals of negative numbers

---
 backend/src/graphql/resolver/TransactionResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 27af4015a..f0fb2f452 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -83,7 +83,7 @@ export const executeTransaction = async (
     transactionSend.memo = memo
     transactionSend.userId = sender.id
     transactionSend.linkedUserId = recipient.id
-    transactionSend.amount = amount
+    transactionSend.amount = amount.mul(-1)
     transactionSend.balance = sendBalance.balance
     transactionSend.balanceDate = receivedCallDate
     transactionSend.decay = sendBalance.decay.decay
@@ -151,7 +151,7 @@ export const executeTransaction = async (
     eventTransactionSend.userId = transactionSend.userId
     eventTransactionSend.xUserId = transactionSend.linkedUserId
     eventTransactionSend.transactionId = transactionSend.id
-    eventTransactionSend.amount = transactionSend.amount
+    eventTransactionSend.amount = transactionSend.amount.mul(-1)
     await eventProtocol.writeEvent(new Event().setEventTransactionSend(eventTransactionSend))
 
     const eventTransactionReceive = new EventTransactionReceive()

From fcd9e1776ce8c36571665e9c38cbdba9da71501f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 20 Oct 2022 11:51:37 +0200
Subject: [PATCH 36/72] fix: Include Deleted Email Contacts in User Search

---
 backend/src/typeorm/repository/User.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 8b3e29859..c20ef85ff 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -28,8 +28,8 @@ export class UserRepository extends Repository<DbUser> {
   ): Promise<[DbUser[], number]> {
     const query = this.createQueryBuilder('user')
       .select(select)
-      .leftJoinAndSelect('user.emailContact', 'emailContact')
       .withDeleted()
+      .leftJoinAndSelect('user.emailContact', 'emailContact')
       .where(
         new Brackets((qb) => {
           qb.where(

From 7df64eac226b91cf63d4b3d88509a081816e5459 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Oct 2022 06:20:14 +0200
Subject: [PATCH 37/72] changed text

---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a9ad47911..a9aee274d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -34,7 +34,7 @@
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
-      "answerQuestion": "Bitte beantworte die Nachfrage",
+      "answerQuestion": "Bitte beantworte die Rückfrage!",
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "in_progress": "Es gibt eine Rückfrage der Moderatoren.",

From 5d3dda78def40c3ca81a574e65a025c0b3fb3a70 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Oct 2022 11:46:19 +0200
Subject: [PATCH 38/72] change E-Mail Subject

---
 backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 2 +-
 backend/src/mailer/text/contributionMessageReceived.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts
index 1151a0abc..bed8f6214 100644
--- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts
+++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts
@@ -26,7 +26,7 @@ describe('sendAddedContributionMessageEmail', () => {
   it('calls sendEMail', () => {
     expect(sendEMail).toBeCalledWith({
       to: `Bibi Bloxberg <bibi@bloxberg.de>`,
-      subject: 'Gradido Frage zur Schöpfung',
+      subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag',
       text:
         expect.stringContaining('Hallo Bibi Bloxberg') &&
         expect.stringContaining('Peter Lustig') &&
diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts
index b0c9c4d30..af1cabb9f 100644
--- a/backend/src/mailer/text/contributionMessageReceived.ts
+++ b/backend/src/mailer/text/contributionMessageReceived.ts
@@ -1,6 +1,6 @@
 export const contributionMessageReceived = {
   de: {
-    subject: 'Gradido Frage zur Schöpfung',
+    subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag',
     text: (data: {
       senderFirstName: string
       senderLastName: string

From 447bf02a42754310ff43090a575b6d8438a378aa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Oct 2022 13:36:47 +0200
Subject: [PATCH 39/72] fix Pagination Contributions jumps to wrong Page

---
 frontend/src/pages/Community.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index c98bfff2d..786307405 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -231,8 +231,6 @@ export default {
           this.items = listContributions.contributionList
           if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
             this.tabIndex = 1
-          } else {
-            this.tabIndex = 0
           }
         })
         .catch((err) => {

From da7ac58a22f3e7937864b1b52945a85487014945 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Oct 2022 02:49:56 +0200
Subject: [PATCH 40/72] computed for linkified message object in linkify
 message component

---
 .../ContributionMessages/LinkifyMessage.vue   | 22 +++++++++++++++++--
 .../slots/ContributionMessagesListItem.vue    | 22 ++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/ContributionMessages/LinkifyMessage.vue b/admin/src/components/ContributionMessages/LinkifyMessage.vue
index cea0a30a1..3e66b8bf3 100644
--- a/admin/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/admin/src/components/ContributionMessages/LinkifyMessage.vue
@@ -8,13 +8,31 @@
 </template>
 
 <script>
+const LINK_REGEX_PATTERN =
+  /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
+
 export default {
   name: 'LinkifyMessage',
   props: {
-    linkifiedMessage: {
-      type: Array,
+    message: {
+      type: String,
       required: true,
     },
   },
+  computed: {
+    linkifiedMessage() {
+      const linkified = []
+      let string = this.message
+      let match
+      while ((match = string.match(LINK_REGEX_PATTERN))) {
+        if (match.index > 0)
+          linkified.push({ type: 'text', text: string.substring(0, match.index) })
+        linkified.push({ type: 'link', text: match[0] })
+        string = string.substring(match.index + match[0].length)
+      }
+      if (string.length > 0) linkified.push({ type: 'text', text: string })
+      return linkified
+    },
+  },
 }
 </script>
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 55b01c592..30960bd33 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -5,22 +5,19 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
+      <linkify-message :message="message.message"></linkify-message>
     </div>
     <div v-else class="text-left is-not-moderator">
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
+      <linkify-message :message="message.message"></linkify-message>
     </div>
   </div>
 </template>
 <script>
 import LinkifyMessage from '@/components/ContributionMessages/LinkifyMessage.vue'
 
-const LINK_PATTERN =
-  /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
-
 export default {
   name: 'ContributionMessagesListItem',
   components: {
@@ -32,21 +29,6 @@ export default {
       required: true,
     },
   },
-  computed: {
-    linkifiedMessage() {
-      const linkified = []
-      let string = this.message.message
-      let match
-      while ((match = string.match(LINK_PATTERN))) {
-        if (match.index > 0)
-          linkified.push({ type: 'text', text: string.substring(0, match.index) })
-        linkified.push({ type: 'link', text: match[0] })
-        string = string.substring(match.index + match[0].length)
-      }
-      if (string.length > 0) linkified.push({ type: 'text', text: string })
-      return linkified
-    },
-  },
 }
 </script>
 <style>

From 5b9cfe5f28729ce467de00f67784aed6155a7b28 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Oct 2022 02:58:09 +0200
Subject: [PATCH 41/72] computed for linkified message object in linkify
 message component

---
 .../ContributionMessagesListItem.vue          | 19 ++---------------
 .../ContributionMessages/LinkifyMessage.vue   | 21 +++++++++++++++++--
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index dbcf2fbb6..9c7a3a0f2 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -4,14 +4,14 @@
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
+      <linkify-message :message="message.message"></linkify-message>
     </div>
     <div v-else class="is-moderator text-left">
       <b-avatar square variant="warning"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-      <linkify-message :linkifiedMessage="linkifiedMessage"></linkify-message>
+      <linkify-message :message="message.message"></linkify-message>
     </div>
   </div>
 </template>
@@ -19,8 +19,6 @@
 <script>
 import LinkifyMessage from '@/components/ContributionMessages/LinkifyMessage.vue'
 
-const LINK_PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
-
 export default {
   name: 'ContributionMessagesListItem',
   components: {
@@ -42,19 +40,6 @@ export default {
     isNotModerator() {
       return this.storeName === this.moderationName
     },
-    linkifiedMessage() {
-      const linkified = []
-      let string = this.message.message
-      let match
-      while ((match = string.match(LINK_PATTERN))) {
-        if (match.index > 0)
-          linkified.push({ type: 'text', text: string.substring(0, match.index) })
-        linkified.push({ type: 'link', text: match[0] })
-        string = string.substring(match.index + match[0].length)
-      }
-      if (string.length > 0) linkified.push({ type: 'text', text: string })
-      return linkified
-    },
   },
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
index cea0a30a1..5d6ec34cb 100644
--- a/frontend/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
@@ -8,13 +8,30 @@
 </template>
 
 <script>
+const LINK_REGEX_PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
+
 export default {
   name: 'LinkifyMessage',
   props: {
-    linkifiedMessage: {
-      type: Array,
+    message: {
+      type: String,
       required: true,
     },
   },
+  computed: {
+    linkifiedMessage() {
+      const linkified = []
+      let string = this.message
+      let match
+      while ((match = string.match(LINK_REGEX_PATTERN))) {
+        if (match.index > 0)
+          linkified.push({ type: 'text', text: string.substring(0, match.index) })
+        linkified.push({ type: 'link', text: match[0] })
+        string = string.substring(match.index + match[0].length)
+      }
+      if (string.length > 0) linkified.push({ type: 'text', text: string })
+      return linkified
+    },
+  },
 }
 </script>

From 7662d281f73174698cddd1829cdf98e441e65e2c Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Tue, 25 Oct 2022 12:37:08 +0200
Subject: [PATCH 42/72] fixed test with new info

---
 .../graphql/resolver/AdminResolver.test.ts    | 38 +++++++++++--------
 backend/src/graphql/resolver/AdminResolver.ts |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 9100d02b6..5806884b6 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -1300,7 +1300,9 @@ describe('AdminResolver', () => {
                     email: 'bibi@bloxberg.de',
                     amount: new Decimal(300),
                     memo: 'Danke Bibi!',
-                    creationDate: new Date().toString(),
+                    creationDate: creation
+                      ? creation.contributionDate.toString()
+                      : new Date().toString(),
                   },
                 }),
               ).resolves.toEqual(
@@ -1323,7 +1325,7 @@ describe('AdminResolver', () => {
 
           describe('creation update is not valid', () => {
             // as this test has not clearly defined that date, it is a false positive
-            it.skip('throws an error', async () => {
+            it('throws an error', async () => {
               await expect(
                 mutate({
                   mutation: adminUpdateContribution,
@@ -1332,14 +1334,16 @@ describe('AdminResolver', () => {
                     email: 'peter@lustig.de',
                     amount: new Decimal(1900),
                     memo: 'Danke Peter!',
-                    creationDate: new Date().toString(),
+                    creationDate: creation
+                      ? creation.contributionDate.toString()
+                      : new Date().toString(),
                   },
                 }),
               ).resolves.toEqual(
                 expect.objectContaining({
                   errors: [
                     new GraphQLError(
-                      'The amount (1900 GDD) to be created exceeds the amount (500 GDD) still available for this month.',
+                      'The amount (1900 GDD) to be created exceeds the amount (1000 GDD) still available for this month.',
                     ),
                   ],
                 }),
@@ -1348,14 +1352,14 @@ describe('AdminResolver', () => {
 
             it('logs the error thrown', () => {
               expect(logger.error).toBeCalledWith(
-                'The amount (1900 GDD) to be created exceeds the amount (500 GDD) still available for this month.',
+                'The amount (1900 GDD) to be created exceeds the amount (1000 GDD) still available for this month.',
               )
             })
           })
 
           describe('creation update is successful changing month', () => {
             // skipped as changing the month is currently disable
-            it.skip('returns update creation object', async () => {
+            it('returns update creation object', async () => {
               await expect(
                 mutate({
                   mutation: adminUpdateContribution,
@@ -1364,7 +1368,9 @@ describe('AdminResolver', () => {
                     email: 'peter@lustig.de',
                     amount: new Decimal(300),
                     memo: 'Danke Peter!',
-                    creationDate: new Date().toString(),
+                    creationDate: creation
+                      ? creation.contributionDate.toString()
+                      : new Date().toString(),
                   },
                 }),
               ).resolves.toEqual(
@@ -1374,7 +1380,7 @@ describe('AdminResolver', () => {
                       date: expect.any(String),
                       memo: 'Danke Peter!',
                       amount: '300',
-                      creation: ['1000', '1000', '200'],
+                      creation: ['1000', '700', '500'],
                     },
                   },
                 }),
@@ -1393,7 +1399,7 @@ describe('AdminResolver', () => {
 
           describe('creation update is successful without changing month', () => {
             // actually this mutation IS changing the month
-            it.skip('returns update creation object', async () => {
+            it('returns update creation object', async () => {
               await expect(
                 mutate({
                   mutation: adminUpdateContribution,
@@ -1402,7 +1408,9 @@ describe('AdminResolver', () => {
                     email: 'peter@lustig.de',
                     amount: new Decimal(200),
                     memo: 'Das war leider zu Viel!',
-                    creationDate: new Date().toString(),
+                    creationDate: creation
+                      ? creation.contributionDate.toString()
+                      : new Date().toString(),
                   },
                 }),
               ).resolves.toEqual(
@@ -1412,7 +1420,7 @@ describe('AdminResolver', () => {
                       date: expect.any(String),
                       memo: 'Das war leider zu Viel!',
                       amount: '200',
-                      creation: ['1000', '1000', '300'],
+                      creation: ['1000', '800', '500'],
                     },
                   },
                 }),
@@ -1446,10 +1454,10 @@ describe('AdminResolver', () => {
                       lastName: 'Lustig',
                       email: 'peter@lustig.de',
                       date: expect.any(String),
-                      memo: 'Herzlich Willkommen bei Gradido!',
-                      amount: '400',
+                      memo: 'Das war leider zu Viel!',
+                      amount: '200',
                       moderator: admin.id,
-                      creation: ['1000', '600', '500'],
+                      creation: ['1000', '800', '500'],
                     },
                     {
                       id: expect.any(Number),
@@ -1460,7 +1468,7 @@ describe('AdminResolver', () => {
                       memo: 'Grundeinkommen',
                       amount: '500',
                       moderator: admin.id,
-                      creation: ['1000', '600', '500'],
+                      creation: ['1000', '800', '500'],
                     },
                     {
                       id: expect.any(Number),
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 634779bf6..aab84e911 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -348,7 +348,6 @@ export class AdminResolver {
     const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull() },
     })
-
     if (!contributionToUpdate) {
       logger.error('No contribution found to given id.')
       throw new Error('No contribution found to given id.')
@@ -366,6 +365,7 @@ export class AdminResolver {
 
     const creationDateObj = new Date(creationDate)
     let creations = await getUserCreation(user.id)
+
     if (contributionToUpdate.contributionDate.getMonth() === creationDateObj.getMonth()) {
       creations = updateCreations(creations, contributionToUpdate)
     } else {

From b5edc5f4760d4860e612774090d8da357b3a1483 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Oct 2022 13:45:43 +0200
Subject: [PATCH 43/72] clean up

---
 .../src/graphql/resolver/util/creations.ts    | 46 ++-----------------
 1 file changed, 3 insertions(+), 43 deletions(-)

diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index d54ee2ebf..8371f96f1 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -49,16 +49,6 @@ export const getUserCreations = async (
   const dateFilter = 'last_day(curdate() - interval 3 month) + interval 1 day'
   logger.trace('getUserCreations dateFilter=', dateFilter)
 
-  /** 
-  SELECT MONTH(contribution_date) as month, user_id, created_at, sum(amount), confirmed_at, deleted_at 
-   FROM `contributions`
-   where user_id = 776
-   and contribution_date >= last_day(curdate() - interval 3 month) + interval 1 day
-   and deleted_at IS NULL
-   and denied_at IS NULL
-   if(!includePending) and confirmed_at IS NOT NULL
-   group by month, user_id; 
-  */
   const sumAmountContributionPerUserAndLast3MonthQuery = queryRunner.manager
     .createQueryBuilder(Contribution, 'c')
     .select('month(contribution_date)', 'month')
@@ -70,35 +60,15 @@ export const getUserCreations = async (
     .andWhere('denied_at IS NULL')
     .groupBy('month')
     .addGroupBy('userId')
+
   if (!includePending) {
     sumAmountContributionPerUserAndLast3MonthQuery.andWhere('confirmed_at IS NOT NULL')
   }
+
   const sumAmountContributionPerUserAndLast3Month =
     await sumAmountContributionPerUserAndLast3MonthQuery.getRawMany()
 
-  /*
-  const unionString = includePending
-    ? `
-    UNION
-      SELECT contribution_date AS date, amount AS amount, user_id AS userId FROM contributions
-        WHERE user_id IN (${ids.toString()})
-        AND contribution_date >= ${dateFilter}
-        AND confirmed_at IS NULL AND deleted_at IS NULL`
-    : ''
-  logger.trace('getUserCreations unionString=', unionString)
-
-  const unionQuery = await queryRunner.manager.query(`
-    SELECT MONTH(date) AS month, sum(amount) AS sum, userId AS id FROM
-      (SELECT creation_date AS date, amount AS amount, user_id AS userId FROM transactions
-        WHERE user_id IN (${ids.toString()})
-        AND type_id = ${TransactionTypeId.CREATION}
-        AND creation_date >= ${dateFilter}
-      ${unionString}) AS result
-    GROUP BY month, userId
-    ORDER BY date DESC
-  `)
-  logger.trace('getUserCreations unionQuery=', unionQuery)
-  */
+  logger.trace(sumAmountContributionPerUserAndLast3Month)
 
   await queryRunner.release()
 
@@ -113,16 +83,6 @@ export const getUserCreations = async (
         return MAX_CREATION_AMOUNT.minus(creation ? creation.sum : 0)
       }),
     }
-    // const creations = months.map((month) => {
-    //   const creation = openCreation.find(
-    //     (raw: { month: string; userId: string; creation: number[] }) =>
-    //       parseInt(raw.month) === month && parseInt(raw.userId) === id,
-    //   )
-    //   return MAX_CREATION_AMOUNT.minus(creation ? creation.sum : 0)
-    // })
-    // // eslint-disable-next-line no-console
-    // console.log('id: ', id, 'creations: ', creations.toString())
-    // return { id, creations }
   })
 }
 

From b2a1d7d67234380472425832ffd47a918853f4e1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 26 Oct 2022 06:38:49 +0200
Subject: [PATCH 44/72] include pending contributions for validation of
 contribution link, test it

---
 .../resolver/TransactionLinkResolver.test.ts  | 151 ++++++++++++------
 .../resolver/TransactionLinkResolver.ts       |   2 +-
 2 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 3d40adbf6..275242bd3 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -6,8 +6,15 @@ import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { cleanDB, testEnvironment } from '@test/helpers'
 import { userFactory } from '@/seeds/factory/user'
-import { login, createContributionLink, redeemTransactionLink } from '@/seeds/graphql/mutations'
+import {
+  login,
+  createContributionLink,
+  redeemTransactionLink,
+  createContribution,
+  updateContribution,
+} from '@/seeds/graphql/mutations'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import Decimal from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
 
@@ -32,6 +39,7 @@ describe('TransactionLinkResolver', () => {
   describe('redeem daily Contribution Link', () => {
     const now = new Date()
     let contributionLink: DbContributionLink | undefined
+    let contribution: UnconfirmedContribution | undefined
 
     beforeAll(async () => {
       await mutate({
@@ -79,56 +87,59 @@ describe('TransactionLinkResolver', () => {
       )
     })
 
-    it('allows the user to redeem the contribution link', async () => {
-      await expect(
-        mutate({
-          mutation: redeemTransactionLink,
-          variables: {
-            code: 'CL-' + (contributionLink ? contributionLink.code : ''),
-          },
-        }),
-      ).resolves.toMatchObject({
-        data: {
-          redeemTransactionLink: true,
-        },
-        errors: undefined,
-      })
-    })
-
-    it('does not allow the user to redeem the contribution link a second time on the same day', async () => {
-      await expect(
-        mutate({
-          mutation: redeemTransactionLink,
-          variables: {
-            code: 'CL-' + (contributionLink ? contributionLink.code : ''),
-          },
-        }),
-      ).resolves.toMatchObject({
-        errors: [
-          new GraphQLError(
-            'Creation from contribution link was not successful. Error: Contribution link already redeemed today',
-          ),
-        ],
-      })
-    })
-
-    describe('after one day', () => {
+    describe('user has pending contribution of 1000 GDD', () => {
       beforeAll(async () => {
-        jest.useFakeTimers()
-        /* eslint-disable-next-line @typescript-eslint/no-empty-function */
-        setTimeout(() => {}, 1000 * 60 * 60 * 24)
-        jest.runAllTimers()
         await mutate({
           mutation: login,
-          variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+        const result = await mutate({
+          mutation: createContribution,
+          variables: {
+            amount: new Decimal(1000),
+            memo: 'I was brewing potions for the community the whole month',
+            creationDate: now.toISOString(),
+          },
+        })
+        contribution = result.data.createContribution
+      })
+
+      it('does not allow the user to redeem the contribution link', async () => {
+        await expect(
+          mutate({
+            mutation: redeemTransactionLink,
+            variables: {
+              code: 'CL-' + (contributionLink ? contributionLink.code : ''),
+            },
+          }),
+        ).resolves.toMatchObject({
+          errors: [
+            new GraphQLError(
+              'Creation from contribution link was not successful. Error: The amount (5 GDD) to be created exceeds the amount (0 GDD) still available for this month.',
+            ),
+          ],
+        })
+      })
+    })
+
+    describe('user has no pending contributions that would not allow to redeem the link', () => {
+      beforeAll(async () => {
+        await mutate({
+          mutation: login,
+          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+        })
+        await mutate({
+          mutation: updateContribution,
+          variables: {
+            contributionId: contribution ? contribution.id : -1,
+            amount: new Decimal(800),
+            memo: 'I was brewing potions for the community the whole month',
+            creationDate: now.toISOString(),
+          },
         })
       })
 
-      afterAll(() => {
-        jest.useRealTimers()
-      })
-
-      it('allows the user to redeem the contribution link again', async () => {
+      it('allows the user to redeem the contribution link', async () => {
         await expect(
           mutate({
             mutation: redeemTransactionLink,
@@ -160,6 +171,56 @@ describe('TransactionLinkResolver', () => {
           ],
         })
       })
+
+      describe('after one day', () => {
+        beforeAll(async () => {
+          jest.useFakeTimers()
+          /* eslint-disable-next-line @typescript-eslint/no-empty-function */
+          setTimeout(() => {}, 1000 * 60 * 60 * 24)
+          jest.runAllTimers()
+          await mutate({
+            mutation: login,
+            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+          })
+        })
+
+        afterAll(() => {
+          jest.useRealTimers()
+        })
+
+        it('allows the user to redeem the contribution link again', async () => {
+          await expect(
+            mutate({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'CL-' + (contributionLink ? contributionLink.code : ''),
+              },
+            }),
+          ).resolves.toMatchObject({
+            data: {
+              redeemTransactionLink: true,
+            },
+            errors: undefined,
+          })
+        })
+
+        it('does not allow the user to redeem the contribution link a second time on the same day', async () => {
+          await expect(
+            mutate({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'CL-' + (contributionLink ? contributionLink.code : ''),
+              },
+            }),
+          ).resolves.toMatchObject({
+            errors: [
+              new GraphQLError(
+                'Creation from contribution link was not successful. Error: Contribution link already redeemed today',
+              ),
+            ],
+          })
+        })
+      })
     })
   })
 })
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 4ba5dcd0b..74c531c54 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -258,7 +258,7 @@ export class TransactionLinkResolver {
           }
         }
 
-        const creations = await getUserCreation(user.id, false)
+        const creations = await getUserCreation(user.id)
         logger.info('open creations', creations)
         validateContribution(creations, contributionLink.amount, now)
         const contribution = new DbContribution()

From 01b9a856ff070f61b2b4f2ce436c61ace4c0d0fb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 26 Oct 2022 07:31:45 +0200
Subject: [PATCH 45/72] fix: Change Orange Color

---
 frontend/src/assets/scss/custom/gradido-custom/_color.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
index 20fcbefd6..5f4751c32 100644
--- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss
+++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
@@ -33,7 +33,8 @@ $indigo: #5603ad !default;
 $purple: #8965e0 !default;
 $pink: #f3a4b5 !default;
 $red: #f5365c !default;
-$orange: #fb6340 !default;
+// $orange: #fb6340 !default;
+$orange: #8C0505 !default;
 $yellow: #ffd600 !default;
 $green: #2dce89 !default;
 $teal: #11cdef !default;

From 1407ea0e8b3896f19f9ed534f0e1b6a83f07e829 Mon Sep 17 00:00:00 2001
From: joseji <chosejimenez@gmail.com>
Date: Wed, 26 Oct 2022 11:24:04 +0200
Subject: [PATCH 46/72] skipped test for changing month

---
 backend/src/graphql/resolver/AdminResolver.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 5806884b6..b5711cd57 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -1357,7 +1357,7 @@ describe('AdminResolver', () => {
             })
           })
 
-          describe('creation update is successful changing month', () => {
+          describe.skip('creation update is successful changing month', () => {
             // skipped as changing the month is currently disable
             it('returns update creation object', async () => {
               await expect(

From f2903f839ee068b4cff4d08b2eacfd2bca47fb56 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 27 Oct 2022 06:45:14 +0200
Subject: [PATCH 47/72] linting

---
 frontend/src/assets/scss/custom/gradido-custom/_color.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
index 5f4751c32..f42555adf 100644
--- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss
+++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
@@ -33,8 +33,9 @@ $indigo: #5603ad !default;
 $purple: #8965e0 !default;
 $pink: #f3a4b5 !default;
 $red: #f5365c !default;
+
 // $orange: #fb6340 !default;
-$orange: #8C0505 !default;
+$orange: #8c0505 !default;
 $yellow: #ffd600 !default;
 $green: #2dce89 !default;
 $teal: #11cdef !default;

From c3b624f36fcd0207730719628ed34dc48461323e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 27 Oct 2022 19:55:23 +0200
Subject: [PATCH 48/72] add order by clause

---
 backend/src/graphql/resolver/util/creations.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 8371f96f1..abf4017cb 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -60,6 +60,7 @@ export const getUserCreations = async (
     .andWhere('denied_at IS NULL')
     .groupBy('month')
     .addGroupBy('userId')
+    .orderBy('month', 'DESC')
 
   if (!includePending) {
     sumAmountContributionPerUserAndLast3MonthQuery.andWhere('confirmed_at IS NOT NULL')

From 4327c600f92a41ed3160eb397ff750a938d3e832 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 28 Oct 2022 08:59:13 +0200
Subject: [PATCH 49/72] fix: Link in Contribution Messages

---
 frontend/src/components/ContributionMessages/LinkifyMessage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
index 5d6ec34cb..fc577adf9 100644
--- a/frontend/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt-2">
     <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-      <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+      <b-link v-if="type === 'link'" :href="text">{{ text }}</b-link>
       <span v-else>{{ text }}</span>
     </span>
   </div>

From 235b58255f115cb1cf2141729b443a0677e185b7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 28 Oct 2022 09:00:15 +0200
Subject: [PATCH 50/72] fix link in admin interface

---
 admin/src/components/ContributionMessages/LinkifyMessage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/LinkifyMessage.vue b/admin/src/components/ContributionMessages/LinkifyMessage.vue
index 3e66b8bf3..e2ca23902 100644
--- a/admin/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/admin/src/components/ContributionMessages/LinkifyMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt-2">
     <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-      <b-link v-if="type === 'link'" :to="text">{{ text }}</b-link>
+      <b-link v-if="type === 'link'" :href="text">{{ text }}</b-link>
       <span v-else>{{ text }}</span>
     </span>
   </div>

From fd0ebe2be26b62cec31e41f026705b89550f460e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 28 Oct 2022 11:16:12 +0200
Subject: [PATCH 51/72] fix: Contribution Message Links Target Blank

---
 admin/src/components/ContributionMessages/LinkifyMessage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/ContributionMessages/LinkifyMessage.vue b/admin/src/components/ContributionMessages/LinkifyMessage.vue
index e2ca23902..71e30aece 100644
--- a/admin/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/admin/src/components/ContributionMessages/LinkifyMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt-2">
     <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-      <b-link v-if="type === 'link'" :href="text">{{ text }}</b-link>
+      <b-link v-if="type === 'link'" :href="text" target="_blank">{{ text }}</b-link>
       <span v-else>{{ text }}</span>
     </span>
   </div>

From c97dd76e2588e6420367089f5cbafaf0040e1edb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 28 Oct 2022 11:16:59 +0200
Subject: [PATCH 52/72] target blank for contribution message links

---
 frontend/src/components/ContributionMessages/LinkifyMessage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
index fc577adf9..09418858f 100644
--- a/frontend/src/components/ContributionMessages/LinkifyMessage.vue
+++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mt-2">
     <span v-for="({ type, text }, index) in linkifiedMessage" :key="index">
-      <b-link v-if="type === 'link'" :href="text">{{ text }}</b-link>
+      <b-link v-if="type === 'link'" :href="text" target="_blank">{{ text }}</b-link>
       <span v-else>{{ text }}</span>
     </span>
   </div>

From f88db9470ef954ecf35313a7b41cfc73b6706463 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 28 Oct 2022 11:27:56 +0200
Subject: [PATCH 53/72] release: Version 1.13.2

---
 CHANGELOG.md          | 16 ++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4eb48283..fa516f827 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,24 @@ 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.13.2](https://github.com/gradido/gradido/compare/1.13.1...1.13.2)
+
+- fix: 🍰 Links In Contribution Messages Target Blank [`#2306`](https://github.com/gradido/gradido/pull/2306)
+- fix: Link in Contribution Messages [`#2305`](https://github.com/gradido/gradido/pull/2305)
+- Refactor: 🍰 Change the query so that we only look on the ``contributions`` table. [`#2217`](https://github.com/gradido/gradido/pull/2217)
+- Refactor: Admin Resolver Events and Logging [`#2244`](https://github.com/gradido/gradido/pull/2244)
+-  contibution messages, links are recognised [`#2248`](https://github.com/gradido/gradido/pull/2248)
+- fix: Include Deleted Email Contacts in User Search [`#2281`](https://github.com/gradido/gradido/pull/2281)
+- fix: Pagination Contributions jumps to wrong Page [`#2284`](https://github.com/gradido/gradido/pull/2284)
+- fix: Changed some texts in E-Mails and Frontend [`#2276`](https://github.com/gradido/gradido/pull/2276)
+- Feat: 🍰 Add `deletedBy` To Contributions And Admin Can Not Delete Own User Contribution [`#2236`](https://github.com/gradido/gradido/pull/2236)
+- deleted contributions are displayed to the user [`#2277`](https://github.com/gradido/gradido/pull/2277)
+
 #### [1.13.1](https://github.com/gradido/gradido/compare/1.13.0...1.13.1)
 
+> 20 October 2022
+
+- release: Version 1.13.1 [`#2279`](https://github.com/gradido/gradido/pull/2279)
 - Fix: correctly evaluate to EMAIL_TEST_MODE to false [`#2273`](https://github.com/gradido/gradido/pull/2273)
 - Refactor: Contribution resolver logs and events [`#2231`](https://github.com/gradido/gradido/pull/2231)
 
diff --git a/admin/package.json b/admin/package.json
index 2db889771..05972bb33 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.13.1",
+  "version": "1.13.2",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 6cd886735..45ae2897f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "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 0a97b5135..f24bb4150 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "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 2fc892f9f..ff3237b35 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index f306a1e06..95fdb714e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",

From 629ee2fdff77e2b3e5c1298f818081b20a43b75c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 08:01:39 +0100
Subject: [PATCH 54/72] remove horizontal scrollbar in admin overview

---
 admin/src/components/ContentFooter.vue        | 4 ++--
 admin/src/components/ContributionLinkList.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue
index bab3f5d12..a875100f6 100644
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="content-footer">
     <hr />
-    <b-row align-v="center" class="mt-4 justify-content-lg-between">
+    <div align-v="center" class="mt-4 mb-4 justify-content-lg-between">
       <b-col>
         <div class="copyright text-center text-lg-center text-muted">
           {{ $t('footer.copyright.year', { year }) }}
@@ -25,7 +25,7 @@
           </a>
         </div>
       </b-col>
-    </b-row>
+    </div>
   </div>
 </template>
 <script>
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 70a894b16..ef7594fb3 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-link-list">
-    <b-table striped hover :items="items" :fields="fields">
+    <b-table :items="items" :fields="fields" striped hover stacked="lg">
       <template #cell(delete)="data">
         <b-button
           variant="danger"

From 3a5f983c5f21e9a8204ec32adc551eae6e56d678 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:12:07 +0100
Subject: [PATCH 55/72] new Page ContributionLink,vue

---
 .../ContributionLink.spec.js                  |  0
 .../ContributionLink.vue                      |  4 +-
 .../ContributionLinkForm.spec.js              |  2 +-
 .../ContributionLinkForm.vue                  |  0
 .../ContributionLinkList.spec.js              |  2 +-
 .../ContributionLinkList.vue                  |  2 +-
 admin/src/components/NavBar.spec.js           |  4 +-
 admin/src/components/NavBar.vue               |  1 +
 admin/src/locales/de.json                     |  3 +-
 admin/src/locales/en.json                     |  3 +-
 admin/src/pages/ContributionLink.spec.js      | 58 +++++++++++++++++++
 admin/src/pages/ContributionLink.vue          | 45 ++++++++++++++
 admin/src/pages/Overview.spec.js              | 30 ----------
 admin/src/pages/Overview.vue                  | 25 --------
 admin/src/router/router.test.js               |  9 ++-
 admin/src/router/routes.js                    |  4 ++
 16 files changed, 127 insertions(+), 65 deletions(-)
 rename admin/src/components/{ => ContributionLink}/ContributionLink.spec.js (100%)
 rename admin/src/components/{ => ContributionLink}/ContributionLink.vue (91%)
 rename admin/src/components/{ => ContributionLink}/ContributionLinkForm.spec.js (98%)
 rename admin/src/components/{ => ContributionLink}/ContributionLinkForm.vue (100%)
 rename admin/src/components/{ => ContributionLink}/ContributionLinkList.spec.js (98%)
 rename admin/src/components/{ => ContributionLink}/ContributionLinkList.vue (98%)
 create mode 100644 admin/src/pages/ContributionLink.spec.js
 create mode 100644 admin/src/pages/ContributionLink.vue

diff --git a/admin/src/components/ContributionLink.spec.js b/admin/src/components/ContributionLink/ContributionLink.spec.js
similarity index 100%
rename from admin/src/components/ContributionLink.spec.js
rename to admin/src/components/ContributionLink/ContributionLink.spec.js
diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue
similarity index 91%
rename from admin/src/components/ContributionLink.vue
rename to admin/src/components/ContributionLink/ContributionLink.vue
index 5621e4330..b21d82b55 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink/ContributionLink.vue
@@ -35,8 +35,8 @@
   </div>
 </template>
 <script>
-import ContributionLinkForm from './ContributionLinkForm.vue'
-import ContributionLinkList from './ContributionLinkList.vue'
+import ContributionLinkForm from '../ContributionLink/ContributionLinkForm.vue'
+import ContributionLinkList from '../ContributionLink/ContributionLinkList.vue'
 
 export default {
   name: 'ContributionLink',
diff --git a/admin/src/components/ContributionLinkForm.spec.js b/admin/src/components/ContributionLink/ContributionLinkForm.spec.js
similarity index 98%
rename from admin/src/components/ContributionLinkForm.spec.js
rename to admin/src/components/ContributionLink/ContributionLinkForm.spec.js
index 2baefcbe2..92d40c7ad 100644
--- a/admin/src/components/ContributionLinkForm.spec.js
+++ b/admin/src/components/ContributionLink/ContributionLinkForm.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import ContributionLinkForm from './ContributionLinkForm.vue'
-import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
 import { createContributionLink } from '@/graphql/createContributionLink.js'
 
 const localVue = global.localVue
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue
similarity index 100%
rename from admin/src/components/ContributionLinkForm.vue
rename to admin/src/components/ContributionLink/ContributionLinkForm.vue
diff --git a/admin/src/components/ContributionLinkList.spec.js b/admin/src/components/ContributionLink/ContributionLinkList.spec.js
similarity index 98%
rename from admin/src/components/ContributionLinkList.spec.js
rename to admin/src/components/ContributionLink/ContributionLinkList.spec.js
index 44a1851f6..74dfa11be 100644
--- a/admin/src/components/ContributionLinkList.spec.js
+++ b/admin/src/components/ContributionLink/ContributionLinkList.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import ContributionLinkList from './ContributionLinkList.vue'
-import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
+import { toastSuccessSpy, toastErrorSpy } from '../../../test/testSetup'
 // import { deleteContributionLink } from '../graphql/deleteContributionLink'
 
 const localVue = global.localVue
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLink/ContributionLinkList.vue
similarity index 98%
rename from admin/src/components/ContributionLinkList.vue
rename to admin/src/components/ContributionLink/ContributionLinkList.vue
index 70a894b16..230b2fd52 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkList.vue
@@ -46,7 +46,7 @@
 </template>
 <script>
 import { deleteContributionLink } from '@/graphql/deleteContributionLink.js'
-import FigureQrCode from './FigureQrCode.vue'
+import FigureQrCode from '../FigureQrCode.vue'
 
 export default {
   name: 'ContributionLinkList',
diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index c88a8817d..0d9d22905 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -44,7 +44,7 @@ describe('NavBar', () => {
   describe('wallet', () => {
     const assignLocationSpy = jest.fn()
     beforeEach(async () => {
-      await wrapper.findAll('a').at(5).trigger('click')
+      await wrapper.findAll('a').at(6).trigger('click')
     })
 
     it.skip('changes widnow location to wallet', () => {
@@ -63,7 +63,7 @@ describe('NavBar', () => {
       window.location = {
         assign: windowLocationMock,
       }
-      await wrapper.findAll('a').at(6).trigger('click')
+      await wrapper.findAll('a').at(7).trigger('click')
     })
 
     it('redirects to /logout', () => {
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index d3d8367db..48833d15d 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -19,6 +19,7 @@
           >
             {{ $store.state.openCreations }} {{ $t('navbar.open_creation') }}
           </b-nav-item>
+          <b-nav-item to="/contribution-link">{{ $t('navbar.automaticContributions') }}</b-nav-item>
           <b-nav-item @click="wallet">{{ $t('navbar.my-account') }}</b-nav-item>
           <b-nav-item @click="logout">{{ $t('navbar.logout') }}</b-nav-item>
         </b-navbar-nav>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 325d153dd..2016f81a1 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -100,7 +100,8 @@
     "my-account": "Mein Konto",
     "open_creation": "Offene Schöpfungen",
     "overview": "Übersicht",
-    "user_search": "Nutzersuche"
+    "user_search": "Nutzersuche",
+    "automaticContributions":"automatische Beiträge"
   },
   "not_open_creations": "Keine offenen Schöpfungen",
   "open": "offen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8f050c34b..e79050b69 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -100,7 +100,8 @@
     "my-account": "My Account",
     "open_creation": "Open creations",
     "overview": "Overview",
-    "user_search": "User search"
+    "user_search": "User search",
+    "automaticContributions":"Automatic Contributions"
   },
   "not_open_creations": "No open creations",
   "open": "open",
diff --git a/admin/src/pages/ContributionLink.spec.js b/admin/src/pages/ContributionLink.spec.js
new file mode 100644
index 000000000..944c1d052
--- /dev/null
+++ b/admin/src/pages/ContributionLink.spec.js
@@ -0,0 +1,58 @@
+import { mount } from '@vue/test-utils'
+import ContributionLink from './ContributionLink.vue'
+import { listContributionLinks } from '@/graphql/listContributionLinks.js'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValueOnce({
+  data: {
+    listContributionLinks: {
+      links: [
+        {
+          id: 1,
+          name: 'Meditation',
+          memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
+          amount: '200',
+          validFrom: '2022-04-01',
+          validTo: '2022-08-01',
+          cycle: 'täglich',
+          maxPerCycle: '3',
+          maxAmountPerMonth: 0,
+          link: 'https://localhost/redeem/CL-1a2345678',
+        },
+      ],
+      count: 1,
+    },
+  },
+})
+
+const mocks = {
+  $t: jest.fn((t) => t),
+  $d: jest.fn((d) => d),
+  $apollo: {
+    query: apolloQueryMock,
+  },
+}
+
+describe('ContributionLink', () => {
+  // eslint-disable-next-line no-unused-vars
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(ContributionLink, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('calls listContributionLinks', () => {
+      expect(apolloQueryMock).toBeCalledWith(
+        expect.objectContaining({
+          query: listContributionLinks,
+        }),
+      )
+    })
+  })
+})
diff --git a/admin/src/pages/ContributionLink.vue b/admin/src/pages/ContributionLink.vue
new file mode 100644
index 000000000..75667523f
--- /dev/null
+++ b/admin/src/pages/ContributionLink.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="contribution-link">
+    <contribution-link
+      :items="items"
+      :count="count"
+      @get-contribution-links="getContributionLinks"
+    />
+  </div>
+</template>
+<script>
+import { listContributionLinks } from '@/graphql/listContributionLinks.js'
+import ContributionLink from '../components/ContributionLink/ContributionLink.vue'
+
+export default {
+  name: 'ContributionLinks',
+  components: {
+    ContributionLink,
+  },
+  data() {
+    return {
+      items: [],
+      count: 0,
+    }
+  },
+  methods: {
+    getContributionLinks() {
+      this.$apollo
+        .query({
+          query: listContributionLinks,
+          fetchPolicy: 'network-only',
+        })
+        .then((result) => {
+          this.count = result.data.listContributionLinks.count
+          this.items = result.data.listContributionLinks.links
+        })
+        .catch(() => {
+          this.toastError('listContributionLinks has no result, use default data')
+        })
+    },
+  },
+  created() {
+    this.getContributionLinks()
+  },
+}
+</script>
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 1861c5330..affd018a7 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,5 @@
 import { mount } from '@vue/test-utils'
 import Overview from './Overview.vue'
-import { listContributionLinks } from '@/graphql/listContributionLinks.js'
 import { communityStatistics } from '@/graphql/communityStatistics.js'
 import { listUnconfirmedContributions } from '@/graphql/listUnconfirmedContributions.js'
 
@@ -36,27 +35,6 @@ const apolloQueryMock = jest
       },
     },
   })
-  .mockResolvedValueOnce({
-    data: {
-      listContributionLinks: {
-        links: [
-          {
-            id: 1,
-            name: 'Meditation',
-            memo: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l',
-            amount: '200',
-            validFrom: '2022-04-01',
-            validTo: '2022-08-01',
-            cycle: 'täglich',
-            maxPerCycle: '3',
-            maxAmountPerMonth: 0,
-            link: 'https://localhost/redeem/CL-1a2345678',
-          },
-        ],
-        count: 1,
-      },
-    },
-  })
   .mockResolvedValue({
     data: {
       listUnconfirmedContributions: [
@@ -118,14 +96,6 @@ describe('Overview', () => {
       )
     })
 
-    it('calls listContributionLinks', () => {
-      expect(apolloQueryMock).toBeCalledWith(
-        expect.objectContaining({
-          query: listContributionLinks,
-        }),
-      )
-    })
-
     it('commits three pending creations to store', () => {
       expect(storeCommitMock).toBeCalledWith('setOpenCreations', 3)
     })
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index cfa247b8e..57bf7ff8c 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,31 +28,21 @@
         </b-link>
       </b-card-text>
     </b-card>
-    <contribution-link
-      :items="items"
-      :count="count"
-      @get-contribution-links="getContributionLinks"
-    />
     <community-statistic class="mt-5" v-model="statistics" />
   </div>
 </template>
 <script>
-import { listContributionLinks } from '@/graphql/listContributionLinks.js'
 import { communityStatistics } from '@/graphql/communityStatistics.js'
-import ContributionLink from '../components/ContributionLink.vue'
 import CommunityStatistic from '../components/CommunityStatistic.vue'
 import { listUnconfirmedContributions } from '@/graphql/listUnconfirmedContributions.js'
 
 export default {
   name: 'overview',
   components: {
-    ContributionLink,
     CommunityStatistic,
   },
   data() {
     return {
-      items: [],
-      count: 0,
       statistics: {
         totalUsers: null,
         activeUsers: null,
@@ -75,20 +65,6 @@ export default {
           this.$store.commit('setOpenCreations', result.data.listUnconfirmedContributions.length)
         })
     },
-    getContributionLinks() {
-      this.$apollo
-        .query({
-          query: listContributionLinks,
-          fetchPolicy: 'network-only',
-        })
-        .then((result) => {
-          this.count = result.data.listContributionLinks.count
-          this.items = result.data.listContributionLinks.links
-        })
-        .catch(() => {
-          this.toastError('listContributionLinks has no result, use default data')
-        })
-    },
     getCommunityStatistics() {
       this.$apollo
         .query({
@@ -113,7 +89,6 @@ export default {
   created() {
     this.getPendingCreations()
     this.getCommunityStatistics()
-    this.getContributionLinks()
   },
 }
 </script>
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index eb9b646cb..bf2e724d2 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -45,7 +45,7 @@ describe('router', () => {
 
     describe('routes', () => {
       it('has seven routes defined', () => {
-        expect(routes).toHaveLength(7)
+        expect(routes).toHaveLength(8)
       })
 
       it('has "/overview" as default', async () => {
@@ -81,6 +81,13 @@ describe('router', () => {
         })
       })
 
+      describe('contribution-link', () => {
+        it('loads the "ContributionLink" component', async () => {
+          const component = await routes.find((r) => r.path === '/contribution-link').component()
+          expect(component.default.name).toBe('ContributionLinks')
+        })
+      })
+
       describe('not found page', () => {
         it('renders the "NotFound" component', async () => {
           const component = await routes.find((r) => r.path === '*').component()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index 72e7b1ac5..caf1030a1 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -23,6 +23,10 @@ const routes = [
     path: '/creation-confirm',
     component: () => import('@/pages/CreationConfirm.vue'),
   },
+  {
+    path: '/contribution-link',
+    component: () => import('@/pages/ContributionLink.vue'),
+  },
   {
     path: '*',
     component: () => import('@/components/NotFoundPage.vue'),

From 214378f683f5416ebd513950c37fd0ecb05d1679 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:14:28 +0100
Subject: [PATCH 56/72] fix lint

---
 admin/src/locales/de.json | 2 +-
 admin/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 2016f81a1..85f33660c 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -101,7 +101,7 @@
     "open_creation": "Offene Schöpfungen",
     "overview": "Übersicht",
     "user_search": "Nutzersuche",
-    "automaticContributions":"automatische Beiträge"
+    "automaticContributions": "automatische Beiträge"
   },
   "not_open_creations": "Keine offenen Schöpfungen",
   "open": "offen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e79050b69..8146455d2 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -101,7 +101,7 @@
     "open_creation": "Open creations",
     "overview": "Overview",
     "user_search": "User search",
-    "automaticContributions":"Automatic Contributions"
+    "automaticContributions": "Automatic Contributions"
   },
   "not_open_creations": "No open creations",
   "open": "open",

From f0e67930748df49a257f6d14082c2d508edf17e2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:14:49 +0100
Subject: [PATCH 57/72] fix locales

---
 admin/src/locales/de.json | 4 ++--
 admin/src/locales/en.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 85f33660c..ecd33045c 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -95,13 +95,13 @@
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
   "name": "Name",
   "navbar": {
+    "automaticContributions": "automatische Beiträge",
     "logout": "Abmelden",
     "multi_creation": "Mehrfachschöpfung",
     "my-account": "Mein Konto",
     "open_creation": "Offene Schöpfungen",
     "overview": "Übersicht",
-    "user_search": "Nutzersuche",
-    "automaticContributions": "automatische Beiträge"
+    "user_search": "Nutzersuche"
   },
   "not_open_creations": "Keine offenen Schöpfungen",
   "open": "offen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8146455d2..91d7d406e 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -95,13 +95,13 @@
   "multiple_creation_text": "Please select one or more members for which you would like to perform creations.",
   "name": "Name",
   "navbar": {
+    "automaticContributions": "Automatic Contributions",
     "logout": "Logout",
     "multi_creation": "Multiple creation",
     "my-account": "My Account",
     "open_creation": "Open creations",
     "overview": "Overview",
-    "user_search": "User search",
-    "automaticContributions": "Automatic Contributions"
+    "user_search": "User search"
   },
   "not_open_creations": "No open creations",
   "open": "open",

From df8b1623ac8efada494eacfd29e50d5ae5bdf8c9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:50:37 +0100
Subject: [PATCH 58/72] Contact email under own heading

---
 frontend/src/locales/de.json         | 1 +
 frontend/src/locales/en.json         | 1 +
 frontend/src/pages/InfoStatistic.vue | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a9aee274d..b5736d3e0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,6 +31,7 @@
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
+  "contact":"Kontakt",
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d9f69581d..e947965d7 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,6 +31,7 @@
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
+  "contact":"Contact",
   "contribution": {
     "activity": "Activity",
     "alert": {
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index de4b9e224..9b3b4dff5 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -44,6 +44,9 @@
           {{ item.firstName }} {{ item.lastName }}
         </li>
       </ul>
+    </b-container>
+    <b-container>
+      <div class="h3">{{ $t('contact') }}</div>
       <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
     </b-container>
     <!-- 

From cc538b609fbb38ed1887a384e2b7bf3906d37507 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 12:51:21 +0100
Subject: [PATCH 59/72] fix locales && lint

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index b5736d3e0..5304881c4 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,7 +31,7 @@
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
-  "contact":"Kontakt",
+  "contact": "Kontakt",
   "contribution": {
     "activity": "Tätigkeit",
     "alert": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index e947965d7..9fa2a1634 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,7 +31,7 @@
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
-  "contact":"Contact",
+  "contact": "Contact",
   "contribution": {
     "activity": "Activity",
     "alert": {

From 095e51fdbd2f1fb1edcaf554dd6a54aacb36f990 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 14:07:49 +0100
Subject: [PATCH 60/72] add button for close contribution messages box

---
 .../ContributionMessagesList.vue              | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 5f1c03b22..4b7045a40 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -5,15 +5,23 @@
         <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
-    <contribution-messages-formular
-      v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
-      :contributionId="contributionId"
-      @get-list-contribution-messages="getListContributionMessages"
-      @update-state="updateState"
-    />
-    <div v-b-toggle="'collapse' + String(contributionId)" class="text-center pointer h2">
-      <b-icon icon="arrow-up-short"></b-icon>
-      {{ $t('form.close') }}
+    <b-container>
+      <contribution-messages-formular
+        v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
+        :contributionId="contributionId"
+        @get-list-contribution-messages="getListContributionMessages"
+        @update-state="updateState"
+      />
+    </b-container>
+
+    <div
+      v-b-toggle="'collapse' + String(contributionId)"
+      class="text-center pointer h2 clearboth pt-1"
+    >
+      <b-button variant="outline-primary" block class="mt-4">
+        <b-icon icon="arrow-up-short"></b-icon>
+        {{ $t('form.close') }}
+      </b-button>
     </div>
   </div>
 </template>
@@ -55,4 +63,7 @@ export default {
 .temp-message {
   margin-top: 50px;
 }
+.clearboth {
+  clear: both;
+}
 </style>

From 208cb30274f6403ffd70d68cc360c0d959311111 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 31 Oct 2022 15:03:19 +0100
Subject: [PATCH 61/72] the last and current month is displayed cleanly again.

---
 .../Contributions/ContributionForm.spec.js       | 16 ++++++++--------
 .../Contributions/ContributionForm.vue           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 8f35948f9..e85a94884 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -109,8 +109,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
+            it('has "2020-05-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-05-01T00:00:00.000Z')
             })
           })
 
@@ -136,8 +136,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
+            it('has "2020-05-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-05-01T00:00:00.000Z')
             })
           })
 
@@ -159,8 +159,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
+            it('has "2019-11-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-11-01T00:00:00.000Z')
             })
           })
 
@@ -186,8 +186,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
+            it('has "2019-11-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-11-01T00:00:00.000Z')
             })
           })
 
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 71593f2b1..bb8a1902f 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -134,7 +134,7 @@ export default {
       // sets the date to the 1st of the previous month
       let date = new Date(this.maximalDate) // has to be a new object, because of 'setMonth' changes the objects date
       date = new Date(date.setMonth(date.getMonth() - 1))
-      return new Date(date.getFullYear(), date.getMonth(), 1)
+      return new Date(date.getFullYear(), date.getMonth() - 1)
     },
     disabled() {
       return (

From 9d01155d919b109540a55c97862dc2dc9d7ed74e Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 10:16:30 +0100
Subject: [PATCH 62/72] github test workflow: add e2e testing job

---
 .github/workflows/test.yml | 67 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 34ebeff11..d89de5d7f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,9 @@
 name: gradido test CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - 2283-feature-implement-fullstack-tests-as-github-workflow
 
 jobs:
   ##############################################################################
@@ -553,3 +556,65 @@ jobs:
         run: docker-compose -f docker-compose.yml run -T database yarn up
       - name: database | reset
         run: docker-compose -f docker-compose.yml run -T database yarn reset
+
+  ##############################################################################
+  # JOB: END-TO-END TESTS  #####################################################
+  ##############################################################################
+  end-to-end-tests:
+    name: End-to-End Tests
+    runs-on: ubuntu-latest
+    # needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v3
+      ##########################################################################
+      # BOOT UP THE TEST SYSTEM ################################################
+      ##########################################################################
+      - name: Boot up test system | docker-compose mariadb
+        run: docker-compose up --detach mariadb
+
+      - name: Sleep for 30 seconds
+        run: sleep 30s
+
+      - name: Boot up test system | docker-compose database
+        run: docker-compose up --detach --no-deps database
+
+      - name: Boot up test system | docker-compose backend
+        run: docker-compose up --detach --no-deps backend
+
+      - name: Sleep for 90 seconds
+        run: sleep 90s
+
+      - name: Boot up test system | seed backend
+        run: |
+          sudo chown runner:docker -R *
+          cd database
+          yarn && yarn dev_reset
+          cd ../backend
+          yarn && yarn seed
+          cd ..
+
+      - name: Boot up test system | docker-compose frontends
+        run: docker-compose up --detach --no-deps frontend admin nginx
+
+      - name: Sleep for 2.5 minutes
+        run: sleep 150s
+
+      ##########################################################################
+      # END-TO-END TESTS #######################################################
+      ##########################################################################
+      - name: End-to-end tests | run tests
+        id: e2e-tests
+        run: |
+          cd e2e-tests/cypress/tests/
+          yarn
+          yarn run cypress run --spec cypress/e2e/User.Authentication.feature
+      - name: End-to-end tests | if tests failed, upload screenshots
+        if: steps.e2e-tests.outcome == 'failure'
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-screenshots
+          path: /home/runner/work/gradido/gradido/e2e-tests/cypress/tests/cypress/screenshots/

From 1be1339992456377b9afc0ea4c0d0e78a3d83eb8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 10:32:28 +0100
Subject: [PATCH 63/72] github test workflow: rename branch for triggering

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d89de5d7f..9afee6075 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: gradido test CI
 on:
   push:
     branches:
-      - 2283-feature-implement-fullstack-tests-as-github-workflow
+      - 2283-feature-fullstack-tests-as-github-workflow
 
 jobs:
   ##############################################################################

From 720c064c4d78efd55ef3106d43cebbbc658b5f10 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 10:56:15 +0100
Subject: [PATCH 64/72] github test workflow: add job dependencies to e2e tests
 job

---
 .github/workflows/test.yml | 47 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9afee6075..a971eee4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -563,7 +563,7 @@ jobs:
   end-to-end-tests:
     name: End-to-End Tests
     runs-on: ubuntu-latest
-    # needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
+    needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -571,6 +571,51 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       ##########################################################################
+      # DOWNLOAD DOCKER IMAGES #################################################
+      ##########################################################################
+      - name: Download Docker Image (Mariadb)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-mariadb-test
+          path: /tmp
+      - name: Load Docker Image (Mariadb)
+        run: docker load < /tmp/mariadb.tar
+      - name: Download Docker Image (Database Up)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-database-test_up
+          path: /tmp
+      - name: Load Docker Image (Database Up)
+        run: docker load < /tmp/database_up.tar
+      - name: Download Docker Image (Backend)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-backend-test
+          path: /tmp
+      - name: Load Docker Image (Backend)
+        run: docker load < /tmp/backend.tar
+      - name: Download Docker Image (Frontend)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-frontend-test
+          path: /tmp
+      - name: Load Docker Image (Frontend)
+        run: docker load < /tmp/frontend.tar
+      - name: Download Docker Image (Admin Interface)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-admin-test
+          path: /tmp
+      - name: Load Docker Image (Admin Interface)
+        run: docker load < /tmp/nginx.tar
+      - name: Download Docker Image (Nginx)
+        uses: actions/download-artifact@v3
+        with:
+          name: docker-nginx-test
+          path: /tmp
+      - name: Load Docker Image (Nginx)
+        run: docker load < /tmp/nginx.tar
+      ##########################################################################
       # BOOT UP THE TEST SYSTEM ################################################
       ##########################################################################
       - name: Boot up test system | docker-compose mariadb

From 9cd0f450594acce14cf7939fd1e357b1cd162626 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 11:08:06 +0100
Subject: [PATCH 65/72] github test workflow: fix typos

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a971eee4e..96d0ce9a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -311,7 +311,7 @@ jobs:
   # JOB: LOCALES ADMIN #########################################################
   ##############################################################################
   locales_admin:
-    name: Locales - Admin
+    name: Locales - Admin Interface
     runs-on: ubuntu-latest
     needs: [build_test_admin]
     steps:
@@ -607,7 +607,7 @@ jobs:
           name: docker-admin-test
           path: /tmp
       - name: Load Docker Image (Admin Interface)
-        run: docker load < /tmp/nginx.tar
+        run: docker load < /tmp/admin.tar
       - name: Download Docker Image (Nginx)
         uses: actions/download-artifact@v3
         with:

From 6c8d9966491bef65cd65c497ff7dd1b3fe7402df Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 1 Nov 2022 11:24:50 +0100
Subject: [PATCH 66/72] more tests, 31st, 28st, 29.02.2024

---
 .../Contributions/ContributionForm.spec.js    | 85 +++++++++++++++++--
 .../Contributions/ContributionForm.vue        |  6 +-
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index e85a94884..3af716d36 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -109,8 +109,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2020-05-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-05-01T00:00:00.000Z')
+            it('has "2020-06-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
             })
           })
 
@@ -136,8 +136,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2020-05-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-05-01T00:00:00.000Z')
+            it('has "2020-06-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
             })
           })
 
@@ -159,8 +159,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2019-11-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-11-01T00:00:00.000Z')
+            it('has "2019-12-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
             })
           })
 
@@ -186,8 +186,8 @@ describe('ContributionForm', () => {
           })
 
           describe('minimalDate', () => {
-            it('has "2019-11-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-11-01T00:00:00.000Z')
+            it('has "2019-12-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
             })
           })
 
@@ -198,6 +198,75 @@ describe('ContributionForm', () => {
           })
         })
       })
+
+      describe('date with the 31st day of the month', () => {
+        describe('same month', () => {
+          beforeEach(async () => {
+            await wrapper.setData({
+              maximalDate: new Date('2022-10-31T00:00:00.000Z'),
+              form: { date: new Date('2022-10-31T00:00:00.000Z') },
+            })
+          })
+
+          describe('minimalDate', () => {
+            it('has "2022-09-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2022-09-01T00:00:00.000Z')
+            })
+          })
+
+          describe('isThisMonth', () => {
+            it('has true', () => {
+              expect(wrapper.vm.isThisMonth).toBe(true)
+            })
+          })
+        })
+      })
+
+      describe('date with the 28th day of the month', () => {
+        describe('same month', () => {
+          beforeEach(async () => {
+            await wrapper.setData({
+              maximalDate: new Date('2023-02-28T00:00:00.000Z'),
+              form: { date: new Date('2023-02-28T00:00:00.000Z') },
+            })
+          })
+
+          describe('minimalDate', () => {
+            it('has "2023-01-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2023-01-01T00:00:00.000Z')
+            })
+          })
+
+          describe('isThisMonth', () => {
+            it('has true', () => {
+              expect(wrapper.vm.isThisMonth).toBe(true)
+            })
+          })
+        })
+      })
+
+      describe('date with 29.02.2024 leap year', () => {
+        describe('same month', () => {
+          beforeEach(async () => {
+            await wrapper.setData({
+              maximalDate: new Date('2024-02-29T00:00:00.000Z'),
+              form: { date: new Date('2024-02-29T00:00:00.000Z') },
+            })
+          })
+
+          describe('minimalDate', () => {
+            it('has "2024-01-01T00:00:00.000Z"', () => {
+              expect(wrapper.vm.minimalDate.toISOString()).toBe('2024-01-01T00:00:00.000Z')
+            })
+          })
+
+          describe('isThisMonth', () => {
+            it('has true', () => {
+              expect(wrapper.vm.isThisMonth).toBe(true)
+            })
+          })
+        })
+      })
     })
 
     describe('set contrubtion', () => {
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index bb8a1902f..3884fd5b4 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -131,10 +131,8 @@ export default {
   },
   computed: {
     minimalDate() {
-      // sets the date to the 1st of the previous month
-      let date = new Date(this.maximalDate) // has to be a new object, because of 'setMonth' changes the objects date
-      date = new Date(date.setMonth(date.getMonth() - 1))
-      return new Date(date.getFullYear(), date.getMonth() - 1)
+      const date = new Date(this.maximalDate)
+      return new Date(date.setMonth(date.getMonth() - 1, 1))
     },
     disabled() {
       return (

From 7f565078bd7cbce43ace7e05797a6a50eb12605c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 11:28:19 +0100
Subject: [PATCH 67/72] github test workflow: ountcomment container
 dependencies

---
 .github/workflows/test.yml | 86 +++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 96d0ce9a1..15bdc8c50 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -563,7 +563,7 @@ jobs:
   end-to-end-tests:
     name: End-to-End Tests
     runs-on: ubuntu-latest
-    needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
+    # needs: [build_test_mariadb, build_test_database_up, build_test_backend, build_test_admin, build_test_frontend, build_test_nginx]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -573,48 +573,48 @@ jobs:
       ##########################################################################
       # DOWNLOAD DOCKER IMAGES #################################################
       ##########################################################################
-      - name: Download Docker Image (Mariadb)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-mariadb-test
-          path: /tmp
-      - name: Load Docker Image (Mariadb)
-        run: docker load < /tmp/mariadb.tar
-      - name: Download Docker Image (Database Up)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-database-test_up
-          path: /tmp
-      - name: Load Docker Image (Database Up)
-        run: docker load < /tmp/database_up.tar
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
-      - name: Load Docker Image (Backend)
-        run: docker load < /tmp/backend.tar
-      - name: Download Docker Image (Frontend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-frontend-test
-          path: /tmp
-      - name: Load Docker Image (Frontend)
-        run: docker load < /tmp/frontend.tar
-      - name: Download Docker Image (Admin Interface)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-admin-test
-          path: /tmp
-      - name: Load Docker Image (Admin Interface)
-        run: docker load < /tmp/admin.tar
-      - name: Download Docker Image (Nginx)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-nginx-test
-          path: /tmp
-      - name: Load Docker Image (Nginx)
-        run: docker load < /tmp/nginx.tar
+      # - name: Download Docker Image (Mariadb)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-mariadb-test
+      #     path: /tmp
+      # - name: Load Docker Image (Mariadb)
+      #   run: docker load < /tmp/mariadb.tar
+      # - name: Download Docker Image (Database Up)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-database-test_up
+      #     path: /tmp
+      # - name: Load Docker Image (Database Up)
+      #   run: docker load < /tmp/database_up.tar
+      # - name: Download Docker Image (Backend)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-backend-test
+      #     path: /tmp
+      # - name: Load Docker Image (Backend)
+      #   run: docker load < /tmp/backend.tar
+      # - name: Download Docker Image (Frontend)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-frontend-test
+      #     path: /tmp
+      # - name: Load Docker Image (Frontend)
+      #   run: docker load < /tmp/frontend.tar
+      # - name: Download Docker Image (Admin Interface)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-admin-test
+      #     path: /tmp
+      # - name: Load Docker Image (Admin Interface)
+      #   run: docker load < /tmp/admin.tar
+      # - name: Download Docker Image (Nginx)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-nginx-test
+      #     path: /tmp
+      # - name: Load Docker Image (Nginx)
+      #   run: docker load < /tmp/nginx.tar
       ##########################################################################
       # BOOT UP THE TEST SYSTEM ################################################
       ##########################################################################

From 63c0bf8e520bd0376859d27737c7c03fbfaf1fb5 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 1 Nov 2022 11:30:00 +0100
Subject: [PATCH 68/72] github test workflow: remove branch from trigger info

---
 .github/workflows/test.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15bdc8c50..dc9e1d513 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,6 @@
 name: gradido test CI
 
-on:
-  push:
-    branches:
-      - 2283-feature-fullstack-tests-as-github-workflow
+on: push
 
 jobs:
   ##############################################################################

From c7c25f2077ebafb576b4ef2cd1301dc3f61fa833 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 1 Nov 2022 13:44:09 +0100
Subject: [PATCH 69/72] more tests for all nav-items

---
 admin/src/components/NavBar.spec.js | 34 +++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index 0d9d22905..56e02fbac 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -7,6 +7,10 @@ const apolloMutateMock = jest.fn()
 const storeDispatchMock = jest.fn()
 const routerPushMock = jest.fn()
 
+const stubs = {
+  RouterLink: true,
+}
+
 const mocks = {
   $t: jest.fn((t) => t),
   $apollo: {
@@ -28,7 +32,7 @@ describe('NavBar', () => {
   let wrapper
 
   const Wrapper = () => {
-    return mount(NavBar, { mocks, localVue })
+    return mount(NavBar, { mocks, localVue, stubs })
   }
 
   describe('mount', () => {
@@ -41,13 +45,35 @@ describe('NavBar', () => {
     })
   })
 
+  describe('Navbar Menu', () => {
+    it('has a link to overview', () => {
+      expect(wrapper.findAll('.nav-item').at(0).find('a').attributes('href')).toBe('/')
+    })
+    it('has a link to /user', () => {
+      expect(wrapper.findAll('.nav-item').at(1).find('a').attributes('href')).toBe('/user')
+    })
+    it('has a link to /creation', () => {
+      expect(wrapper.findAll('.nav-item').at(2).find('a').attributes('href')).toBe('/creation')
+    })
+    it('has a link to /creation-confirm', () => {
+      expect(wrapper.findAll('.nav-item').at(3).find('a').attributes('href')).toBe(
+        '/creation-confirm',
+      )
+    })
+    it('has a link to /contribution-link', () => {
+      expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe(
+        '/contribution-link',
+      )
+    })
+  })
+
   describe('wallet', () => {
     const assignLocationSpy = jest.fn()
     beforeEach(async () => {
-      await wrapper.findAll('a').at(6).trigger('click')
+      await wrapper.findAll('.nav-item').at(5).find('a').trigger('click')
     })
 
-    it.skip('changes widnow location to wallet', () => {
+    it.skip('changes window location to wallet', () => {
       expect(assignLocationSpy).toBeCalledWith('valid-token')
     })
 
@@ -63,7 +89,7 @@ describe('NavBar', () => {
       window.location = {
         assign: windowLocationMock,
       }
-      await wrapper.findAll('a').at(7).trigger('click')
+      await wrapper.findAll('.nav-item').at(6).find('a').trigger('click')
     })
 
     it('redirects to /logout', () => {

From fdd3b0f4fdc5fe7a00aa3958ad5b3cb705c659d4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 1 Nov 2022 14:30:43 +0100
Subject: [PATCH 70/72] fix: Release Statistic Query Runner

---
 backend/src/graphql/resolver/StatisticsResolver.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index b0c061d91..7bfae319e 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -63,6 +63,8 @@ export class StatisticsResolver {
       .where('transaction.decay IS NOT NULL')
       .getRawOne()
 
+    await queryRunner.release()
+
     return {
       totalUsers,
       activeUsers,

From de1a305880f7f326cd94ef21b9344ee4d1596b10 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 1 Nov 2022 14:51:56 +0100
Subject: [PATCH 71/72] rename ContributionLink to ContributionLinks

---
 admin/src/components/NavBar.spec.js                         | 4 ++--
 admin/src/components/NavBar.vue                             | 4 +++-
 .../{ContributionLink.spec.js => ContributionLinks.spec.js} | 6 +++---
 .../pages/{ContributionLink.vue => ContributionLinks.vue}   | 0
 admin/src/router/router.test.js                             | 6 +++---
 admin/src/router/routes.js                                  | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)
 rename admin/src/pages/{ContributionLink.spec.js => ContributionLinks.spec.js} (89%)
 rename admin/src/pages/{ContributionLink.vue => ContributionLinks.vue} (100%)

diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index 56e02fbac..8956564bd 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -60,9 +60,9 @@ describe('NavBar', () => {
         '/creation-confirm',
       )
     })
-    it('has a link to /contribution-link', () => {
+    it('has a link to /contribution-links', () => {
       expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe(
-        '/contribution-link',
+        '/contribution-links',
       )
     })
   })
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 48833d15d..f8dd008d1 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -19,7 +19,9 @@
           >
             {{ $store.state.openCreations }} {{ $t('navbar.open_creation') }}
           </b-nav-item>
-          <b-nav-item to="/contribution-link">{{ $t('navbar.automaticContributions') }}</b-nav-item>
+          <b-nav-item to="/contribution-links">
+            {{ $t('navbar.automaticContributions') }}
+          </b-nav-item>
           <b-nav-item @click="wallet">{{ $t('navbar.my-account') }}</b-nav-item>
           <b-nav-item @click="logout">{{ $t('navbar.logout') }}</b-nav-item>
         </b-navbar-nav>
diff --git a/admin/src/pages/ContributionLink.spec.js b/admin/src/pages/ContributionLinks.spec.js
similarity index 89%
rename from admin/src/pages/ContributionLink.spec.js
rename to admin/src/pages/ContributionLinks.spec.js
index 944c1d052..fb60a99cf 100644
--- a/admin/src/pages/ContributionLink.spec.js
+++ b/admin/src/pages/ContributionLinks.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import ContributionLink from './ContributionLink.vue'
+import ContributionLinks from './ContributionLinks.vue'
 import { listContributionLinks } from '@/graphql/listContributionLinks.js'
 
 const localVue = global.localVue
@@ -34,12 +34,12 @@ const mocks = {
   },
 }
 
-describe('ContributionLink', () => {
+describe('ContributionLinks', () => {
   // eslint-disable-next-line no-unused-vars
   let wrapper
 
   const Wrapper = () => {
-    return mount(ContributionLink, { localVue, mocks })
+    return mount(ContributionLinks, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/admin/src/pages/ContributionLink.vue b/admin/src/pages/ContributionLinks.vue
similarity index 100%
rename from admin/src/pages/ContributionLink.vue
rename to admin/src/pages/ContributionLinks.vue
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index bf2e724d2..22273c15b 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -81,9 +81,9 @@ describe('router', () => {
         })
       })
 
-      describe('contribution-link', () => {
-        it('loads the "ContributionLink" component', async () => {
-          const component = await routes.find((r) => r.path === '/contribution-link').component()
+      describe('contribution-links', () => {
+        it('loads the "ContributionLinks" component', async () => {
+          const component = await routes.find((r) => r.path === '/contribution-links').component()
           expect(component.default.name).toBe('ContributionLinks')
         })
       })
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index caf1030a1..ee82f128e 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -24,8 +24,8 @@ const routes = [
     component: () => import('@/pages/CreationConfirm.vue'),
   },
   {
-    path: '/contribution-link',
-    component: () => import('@/pages/ContributionLink.vue'),
+    path: '/contribution-links',
+    component: () => import('@/pages/ContributionLinks.vue'),
   },
   {
     path: '*',

From 7f56eb2f75c40f6f90791a49741d24e75937c470 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 1 Nov 2022 15:48:31 +0100
Subject: [PATCH 72/72] release: Version 1.13.3

---
 CHANGELOG.md          | 13 +++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa516f827..754566658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,21 @@ 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.13.3](https://github.com/gradido/gradido/compare/1.13.2...1.13.3)
+
+- 2294 contribution links on its own page [`#2312`](https://github.com/gradido/gradido/pull/2312)
+- fix: Change Orange Color [`#2302`](https://github.com/gradido/gradido/pull/2302)
+- fix: Release Statistic Query Runner [`#2320`](https://github.com/gradido/gradido/pull/2320)
+- bug: 2295 remove horizontal scrollbar in admin overview [`#2311`](https://github.com/gradido/gradido/pull/2311)
+- 2292 community information contact [`#2313`](https://github.com/gradido/gradido/pull/2313)
+- bug: 2315 Contribution Month and TEST FAIL in MASTER [`#2316`](https://github.com/gradido/gradido/pull/2316)
+- 2291 add button for close contribution messages box [`#2314`](https://github.com/gradido/gradido/pull/2314)
+
 #### [1.13.2](https://github.com/gradido/gradido/compare/1.13.1...1.13.2)
 
+> 28 October 2022
+
+- release: Version 1.13.2 [`#2307`](https://github.com/gradido/gradido/pull/2307)
 - fix: 🍰 Links In Contribution Messages Target Blank [`#2306`](https://github.com/gradido/gradido/pull/2306)
 - fix: Link in Contribution Messages [`#2305`](https://github.com/gradido/gradido/pull/2305)
 - Refactor: 🍰 Change the query so that we only look on the ``contributions`` table. [`#2217`](https://github.com/gradido/gradido/pull/2217)
diff --git a/admin/package.json b/admin/package.json
index 05972bb33..370f504b8 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.13.2",
+  "version": "1.13.3",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 45ae2897f..77d3b8064 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "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 f24bb4150..096c7a9bd 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "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 ff3237b35..4e983d716 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index 95fdb714e..8e5fcfc70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",