From 2177c501c37b9f809ea14673b6aefb4ea8b20fe7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 1 Sep 2022 10:24:42 +0200
Subject: [PATCH 1/2] Remove cleanDB in most afterAll so we don't need to seed
 contribution and contribution messages again in later tests.

---
 .../ContributionMessageResolver.test.ts       | 60 ++-----------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index bf61da47f..6c617acb4 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -69,8 +69,7 @@ describe('ContributionMessageResolver', () => {
         })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 
@@ -142,24 +141,13 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await userFactory(testEnv, peterLustig)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
-        result = await mutate({
-          mutation: createContribution,
-          variables: {
-            amount: 100.0,
-            memo: 'Test env contribution',
-            creationDate: new Date().toString(),
-          },
-        })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 
@@ -217,18 +205,13 @@ describe('ContributionMessageResolver', () => {
           })
         })
 
-        afterAll(async () => {
-          await cleanDB()
-          resetToken()
-        })
-
         it('creates ContributionMessage', async () => {
           await expect(
             mutate({
               mutation: createContributionMessage,
               variables: {
                 contributionId: result.data.createContribution.id,
-                message: 'Test',
+                message: 'User Test',
               },
             }),
           ).resolves.toEqual(
@@ -236,7 +219,7 @@ describe('ContributionMessageResolver', () => {
               data: {
                 createContributionMessage: expect.objectContaining({
                   id: expect.any(Number),
-                  message: 'Test',
+                  message: 'User Test',
                   type: 'DIALOG',
                   userFirstName: 'Bibi',
                   userLastName: 'Bloxberg',
@@ -267,46 +250,13 @@ describe('ContributionMessageResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await userFactory(testEnv, bibiBloxberg)
-        await userFactory(testEnv, peterLustig)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
-        result = await mutate({
-          mutation: createContribution,
-          variables: {
-            amount: 100.0,
-            memo: 'Test env contribution',
-            creationDate: new Date().toString(),
-          },
-        })
-        await query({
-          query: login,
-          variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
-        })
-        await mutate({
-          mutation: adminCreateContributionMessage,
-          variables: {
-            contributionId: result.data.createContribution.id,
-            message: 'Admin Test',
-          },
-        })
-        await query({
-          query: login,
-          variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-        })
-        await mutate({
-          mutation: createContributionMessage,
-          variables: {
-            contributionId: result.data.createContribution.id,
-            message: 'User Test',
-          },
-        })
       })
 
-      afterAll(async () => {
-        await cleanDB()
+      afterAll(() => {
         resetToken()
       })
 

From fbd3d412101ac917a13c65d00022b00a6b8fcc04 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 1 Sep 2022 10:25:41 +0200
Subject: [PATCH 2/2] Remove messages and replace it with messagesCount in the
 query listContributions.

---
 frontend/src/graphql/queries.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index f701ad8cf..88c312a3f 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -207,15 +207,7 @@ export const listContributions = gql`
         confirmedBy
         deletedAt
         state
-        messages {
-          id
-          message
-          createdAt
-          updatedAt
-          type
-          userFirstName
-          userLastName
-        }
+        messagesCount
       }
     }
   }