Change the test so that we can test if the contribution list finds only created but not confirmed contribution

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -13,6 +13,7 @@ import { peterLustig } from '@/seeds/users/peter-lustig'
 
 let mutate: any, query: any, con: any
 let testEnv: any
+let result: any
 
 beforeAll(async () => {
   testEnv = await testEnvironment()
@@ -114,6 +115,7 @@ describe('ContributionResolver', () => {
             expect.objectContaining({
               data: {
                 createContribution: {
+                  id: expect.any(Number),
                   amount: '100',
                   memo: 'Test env contribution',
                 },
@@ -148,25 +150,22 @@ describe('ContributionResolver', () => {
 
     describe('authenticated', () => {
       beforeAll(async () => {
-        await userFactory(testEnv, peterLustig)
         await userFactory(testEnv, bibiBloxberg)
-        // bibi needs GDDs
-        const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        await creationFactory(testEnv, bibisCreation!)
-        // await userFactory(testEnv, bibiBloxberg)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
         })
+        await mutate({
+          mutation: createContribution,
+          variables: {
+            amount: 100.0,
+            memo: 'Test env contribution',
+            creationDate: new Date().toString(),
+          },
+        })
       })
 
-      afterAll(async () => {
+      it('returns only unconfirmed creations', async () => {
-        await cleanDB()
-        resetToken()
-      })
-
-      it('returns an empty array for unconfirmed creation filter', async () => {
         await expect(
           query({
             query: listContributions,
@@ -177,39 +176,63 @@ describe('ContributionResolver', () => {
               filterConfirmed: true,
             },
           }),
-        ).resolves.toEqual(
-          expect.objectContaining({
-            data: {
-              listContributions: [],
-            },
-          }),
-        )
-      })
-
-      it('returns confirmed creation', async () => {
-        await expect(
-          query({
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-              order: 'DESC',
-              filterConfirmed: false,
-            },
-          }),
         ).resolves.toEqual(
           expect.objectContaining({
             data: {
               listContributions: expect.arrayContaining([
                 expect.objectContaining({
-                  memo: 'Herzlich Willkommen bei Gradido!',
+                  id: expect.any(Number),
-                  amount: '1000',
+                  memo: 'Test env contribution',
+                  amount: '100',
                 }),
               ]),
             },
           }),
         )
       })
+
+      describe('Adding confirmed creations', () => {
+        beforeAll(async () => {
+          await userFactory(testEnv, peterLustig)
+          const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
+          await creationFactory(testEnv, bibisCreation!)
+          await query({
+            query: login,
+            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+          })
+        })
+
+        it('returns confirmed and unconfirmed creation', async () => {
+          await expect(
+            query({
+              query: listContributions,
+              variables: {
+                currentPage: 1,
+                pageSize: 25,
+                order: 'DESC',
+                filterConfirmed: false,
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                listContributions: expect.arrayContaining([
+                  expect.objectContaining({
+                    id: expect.any(Number),
+                    memo: 'Herzlich Willkommen bei Gradido!',
+                    amount: '1000',
+                  }),
+                  expect.objectContaining({
+                    id: expect.any(Number),
+                    memo: 'Test env contribution',
+                    amount: '100',
+                  }),
+                ]),
+              },
+            }),
+          )
+        })
+      })
     })
   })
 })

backend/src/seeds/graphql/mutations.ts

@@ -234,6 +234,7 @@ export const deleteContributionLink = gql`
 export const createContribution = gql`
   mutation ($amount: Decimal!, $memo: String!, $creationDate: String!) {
     createContribution(amount: $amount, memo: $memo, creationDate: $creationDate) {
+      id
       amount
       memo
     }

backend/src/seeds/graphql/queries.ts

@@ -185,6 +185,7 @@ export const listContributions = gql`
       order: $order
       filterConfirmed: $filterConfirmed
     ) {
+      id
       amount
       memo
     }