Merge branch 'master' into 2332-mark-contribution-as-rejected

.github/workflows/test.yml

@@ -437,7 +437,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 91
+          min_coverage: 92
           token: ${{ github.token }}
   
   ##############################################################################

CHANGELOG.md

@@ -4,8 +4,60 @@ 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.17.0](https://github.com/gradido/gradido/compare/1.16.0...1.17.0)
+
+- fix(frontend): submit contribution text [`#2573`](https://github.com/gradido/gradido/pull/2573)
+- fix(backend): admin cannot delete confirmed contribution [`#2571`](https://github.com/gradido/gradido/pull/2571)
+- fix(frontend): english locales - horas -> hours [`#2572`](https://github.com/gradido/gradido/pull/2572)
+- fix(frontend): mobil divices datepicker add props dropleft  [`#2570`](https://github.com/gradido/gradido/pull/2570)
+- fix(frontend): pagination [`#2569`](https://github.com/gradido/gradido/pull/2569)
+- fix(frontend): add a watch on gdt prop to assure propper loading when mounted [`#2568`](https://github.com/gradido/gradido/pull/2568)
+- refactor(frontend): creation step in quarter hour set [`#2566`](https://github.com/gradido/gradido/pull/2566)
+- fix(frontend): tunneled email on right side last transactions [`#2561`](https://github.com/gradido/gradido/pull/2561)
+- feat(frontend): test transaction page [`#2555`](https://github.com/gradido/gradido/pull/2555)
+- refactor(backend): statistics with field resolvers [`#2553`](https://github.com/gradido/gradido/pull/2553)
+- fix(frontend): normalized amount transaction if processed again [`#2550`](https://github.com/gradido/gradido/pull/2550)
+- fix(backend): semaphore deadlock [`#2551`](https://github.com/gradido/gradido/pull/2551)
+- fix(frontend): mobile design [`#2552`](https://github.com/gradido/gradido/pull/2552)
+- refactor(frontend): slots for right sidebar and header [`#2548`](https://github.com/gradido/gradido/pull/2548)
+- fix(frontend): creation menu highlighted on all submenus [`#2527`](https://github.com/gradido/gradido/pull/2527)
+- refactor(frontend): computed hours for open creations [`#2545`](https://github.com/gradido/gradido/pull/2545)
+- feat(other): add description for daily backup cronjob [`#2532`](https://github.com/gradido/gradido/pull/2532)
+- fix(frontend): editing transaction does not work [`#2543`](https://github.com/gradido/gradido/pull/2543)
+- refactor(frontend): remove open creations from store [`#2541`](https://github.com/gradido/gradido/pull/2541)
+- feat(other): vscode extensions [`#2524`](https://github.com/gradido/gradido/pull/2524)
+- fix(backend): remove jest from dependecies [`#2533`](https://github.com/gradido/gradido/pull/2533)
+- fix(frontend): initials without space [`#2546`](https://github.com/gradido/gradido/pull/2546)
+- fix(backend): fix backend not confirmable [`#2539`](https://github.com/gradido/gradido/pull/2539)
+- fix(frontend):  send gdd and send link gdd is running [`#2534`](https://github.com/gradido/gradido/pull/2534)
+- fix(other): update browser list [`#2540`](https://github.com/gradido/gradido/pull/2540)
+- test(backend): increase backend coverage to 78% [`#2542`](https://github.com/gradido/gradido/pull/2542)
+- fix(frontend): pagination gdt  [`#2525`](https://github.com/gradido/gradido/pull/2525)
+- fix(frontend): leaves are over the user symbol [`#2526`](https://github.com/gradido/gradido/pull/2526)
+- fix(frontend): input-email label and placeholder are displayed correctly per language [`#2528`](https://github.com/gradido/gradido/pull/2528)
+- feat(backend): add hideAmountGDD & hideAmountGDT to users table. [`#2506`](https://github.com/gradido/gradido/pull/2506)
+- fix(frontend): avatar initials always has 2 letters [`#2530`](https://github.com/gradido/gradido/pull/2530)
+- refactor(backend): seed contributions as user [`#2460`](https://github.com/gradido/gradido/pull/2460)
+- fix(backend): fix logger middleware [`#2503`](https://github.com/gradido/gradido/pull/2503)
+- fix(backend): fix email text [`#2523`](https://github.com/gradido/gradido/pull/2523)
+- feat(other): new scopes for lint pr [`#2489`](https://github.com/gradido/gradido/pull/2489)
+- fix(backend): fix config - some typos [`#2477`](https://github.com/gradido/gradido/pull/2477)
+- style(frontend): new Design [`#2297`](https://github.com/gradido/gradido/pull/2297)
+- refactor(other): adjust some texts and translations [`#2504`](https://github.com/gradido/gradido/pull/2504)
+- test(other): fix tests breaking with the new year [`#2505`](https://github.com/gradido/gradido/pull/2505)
+- feat(backend): federation implement exchange of api versions persist in table [`#2427`](https://github.com/gradido/gradido/pull/2427)
+- feat(backend): semaphore to lock transaction table [`#2458`](https://github.com/gradido/gradido/pull/2458)
+- feat(backend): design html emails and adjust texts [`#2472`](https://github.com/gradido/gradido/pull/2472)
+- feat(backend): test semaphore [`#2468`](https://github.com/gradido/gradido/pull/2468)
+- fix(admin): reduce triggers of success toast on deleted user form to exactly one [`#2471`](https://github.com/gradido/gradido/pull/2471)
+- refactor(other):  build nginx docker image in workflow independent of other builds [`#2470`](https://github.com/gradido/gradido/pull/2470)
+- feat(backend): setup unit tests for federation [`#2465`](https://github.com/gradido/gradido/pull/2465)
+
 #### [1.16.0](https://github.com/gradido/gradido/compare/1.15.0...1.16.0)
 
+> 15 December 2022
+
+- feat(release): version 1.16.0 [`#2467`](https://github.com/gradido/gradido/pull/2467)
 - refactor(backend): cleaning user related old password junk [`#2426`](https://github.com/gradido/gradido/pull/2426)
 - fix(database): consistent transaction table [`#2453`](https://github.com/gradido/gradido/pull/2453)
 - refactor(backend): dissolve admin resolver [`#2416`](https://github.com/gradido/gradido/pull/2416)

admin/package.json

@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {

admin/src/graphql/communityStatistics.js

@@ -4,12 +4,14 @@ export const communityStatistics = gql`
   query {
     communityStatistics {
       totalUsers
-      activeUsers
       deletedUsers
       totalGradidoCreated
       totalGradidoDecayed
-      totalGradidoAvailable
+      dynamicStatisticsFields {
-      totalGradidoUnbookedDecayed
+        activeUsers
+        totalGradidoAvailable
+        totalGradidoUnbookedDecayed
+      }
     }
   }
 `

admin/src/pages/CommunityStatistic.spec.js

@@ -17,12 +17,14 @@ const defaultData = () => {
   return {
     communityStatistics: {
       totalUsers: 3113,
-      activeUsers: 1057,
       deletedUsers: 35,
       totalGradidoCreated: '4083774.05000000000000000000',
       totalGradidoDecayed: '-1062639.13634129622923372197',
-      totalGradidoAvailable: '2513565.869444365732411569',
+      dynamicStatisticsFields: {
-      totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+        activeUsers: 1057,
+        totalGradidoAvailable: '2513565.869444365732411569',
+        totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+      },
     },
   }
 }

admin/src/pages/CommunityStatistic.vue

@@ -31,7 +31,9 @@ export default {
         return communityStatistics
       },
       update({ communityStatistics }) {
-        this.statistics = communityStatistics
+        const totals = { ...communityStatistics.dynamicStatisticsFields }
+        this.statistics = { ...communityStatistics, ...totals }
+        delete this.statistics.dynamicStatisticsFields
       },
       error({ message }) {
         this.toastError(message)

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",

backend/src/graphql/model/CommunityStatistics.ts

@@ -2,13 +2,25 @@ import { ObjectType, Field } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 
 @ObjectType()
-export class CommunityStatistics {
+export class DynamicStatisticsFields {
-  @Field(() => Number)
-  totalUsers: number
-
   @Field(() => Number)
   activeUsers: number
 
+  @Field(() => Decimal)
+  totalGradidoAvailable: Decimal
+
+  @Field(() => Decimal)
+  totalGradidoUnbookedDecayed: Decimal
+}
+
+@ObjectType()
+export class CommunityStatistics {
+  @Field(() => Number)
+  allUsers: number
+
+  @Field(() => Number)
+  totalUsers: number
+
   @Field(() => Number)
   deletedUsers: number
 
@@ -18,9 +30,7 @@ export class CommunityStatistics {
   @Field(() => Decimal)
   totalGradidoDecayed: Decimal
 
-  @Field(() => Decimal)
+  // be carefull querying this, takes longer than 2 secs.
-  totalGradidoAvailable: Decimal
+  @Field(() => DynamicStatisticsFields)
-
+  dynamicStatisticsFields: DynamicStatisticsFields
-  @Field(() => Decimal)
-  totalGradidoUnbookedDecayed: Decimal
 }

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

@@ -3,6 +3,7 @@
 
 import Decimal from 'decimal.js-light'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
+import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import {
@@ -26,7 +27,13 @@ import {
   sendContributionConfirmedEmail,
   // sendContributionRejectedEmail,
 } from '@/emails/sendEmailVariants'
-import { cleanDB, resetToken, testEnvironment, contributionDateFormatter } from '@test/helpers'
+import {
+  cleanDB,
+  resetToken,
+  testEnvironment,
+  contributionDateFormatter,
+  resetEntity,
+} from '@test/helpers'
 import { GraphQLError } from 'graphql'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
@@ -1818,6 +1825,49 @@ describe('ContributionResolver', () => {
               )
             })
           })
+
+          describe('creation already confirmed', () => {
+            it('throws an error', async () => {
+              await userFactory(testEnv, bobBaumeister)
+              await query({
+                query: login,
+                variables: { email: 'bob@baumeister.de', password: 'Aa12345_' },
+              })
+              const {
+                data: { createContribution: confirmedContribution },
+              } = await mutate({
+                mutation: createContribution,
+                variables: {
+                  amount: 100.0,
+                  memo: 'Confirmed Contribution',
+                  creationDate: contributionDateFormatter(new Date()),
+                },
+              })
+              await query({
+                query: login,
+                variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+              })
+              await mutate({
+                mutation: confirmContribution,
+                variables: {
+                  id: confirmedContribution.id ? confirmedContribution.id : -1,
+                },
+              })
+              await expect(
+                mutate({
+                  mutation: adminDeleteContribution,
+                  variables: {
+                    id: confirmedContribution.id ? confirmedContribution.id : -1,
+                  },
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  errors: [new GraphQLError('A confirmed contribution can not be deleted')],
+                }),
+              )
+              await resetEntity(DbTransaction)
+            })
+          })
         })
 
         describe('confirmContribution', () => {

backend/src/graphql/resolver/ContributionResolver.ts

@@ -513,6 +513,10 @@ export class ContributionResolver {
       logger.error(`Contribution not found for given id: ${id}`)
       throw new Error('Contribution not found for given id.')
     }
+    if (contribution.confirmedAt) {
+      logger.error('A confirmed contribution can not be deleted')
+      throw new Error('A confirmed contribution can not be deleted')
+    }
     const moderator = getUser(context)
     if (
       contribution.contributionType === ContributionType.USER &&
@@ -558,7 +562,6 @@ export class ContributionResolver {
   ): Promise<boolean> {
     // acquire lock
     const releaseLock = await TRANSACTIONS_LOCK.acquire()
-
     try {
       const clientTimezoneOffset = getClientTimezoneOffset(context)
       const contribution = await DbContribution.findOne(id)
@@ -669,7 +672,6 @@ export class ContributionResolver {
     } finally {
       releaseLock()
     }
-
     return true
   }
 

backend/src/graphql/resolver/StatisticsResolver.ts

@@ -1,81 +1,113 @@
 import Decimal from 'decimal.js-light'
-import { Resolver, Query, Authorized } from 'type-graphql'
+import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
 
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'
 
-import { CommunityStatistics } from '@model/CommunityStatistics'
+import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics'
 
 import { RIGHTS } from '@/auth/RIGHTS'
 import { calculateDecay } from '@/util/decay'
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+@Resolver((of) => CommunityStatistics)
-
-@Resolver()
 export class StatisticsResolver {
   @Authorized([RIGHTS.COMMUNITY_STATISTICS])
   @Query(() => CommunityStatistics)
   async communityStatistics(): Promise<CommunityStatistics> {
-    const allUsers = await DbUser.count({ withDeleted: true })
+    return new CommunityStatistics()
-    const totalUsers = await DbUser.count()
+  }
-    const deletedUsers = allUsers - totalUsers
 
+  @FieldResolver(() => Decimal)
+  async allUsers(): Promise<number> {
+    return await DbUser.count({ withDeleted: true })
+  }
+
+  @FieldResolver()
+  async totalUsers(): Promise<number> {
+    return await DbUser.count()
+  }
+
+  @FieldResolver()
+  async deletedUsers(): Promise<number> {
+    return (await this.allUsers()) - (await this.totalUsers())
+  }
+
+  @FieldResolver()
+  async totalGradidoCreated(): Promise<Decimal> {
+    const queryRunner = getConnection().createQueryRunner()
+    try {
+      await queryRunner.connect()
+      const { totalGradidoCreated } = await queryRunner.manager
+        .createQueryBuilder()
+        .select('SUM(transaction.amount) AS totalGradidoCreated')
+        .from(DbTransaction, 'transaction')
+        .where('transaction.typeId = 1')
+        .getRawOne()
+      return totalGradidoCreated
+    } finally {
+      await queryRunner.release()
+    }
+  }
+
+  @FieldResolver()
+  async totalGradidoDecayed(): Promise<Decimal> {
+    const queryRunner = getConnection().createQueryRunner()
+    try {
+      await queryRunner.connect()
+      const { totalGradidoDecayed } = await queryRunner.manager
+        .createQueryBuilder()
+        .select('SUM(transaction.decay) AS totalGradidoDecayed')
+        .from(DbTransaction, 'transaction')
+        .where('transaction.decay IS NOT NULL')
+        .getRawOne()
+      return totalGradidoDecayed
+    } finally {
+      await queryRunner.release()
+    }
+  }
+
+  @FieldResolver()
+  async dynamicStatisticsFields(): Promise<DynamicStatisticsFields> {
     let totalGradidoAvailable: Decimal = new Decimal(0)
     let totalGradidoUnbookedDecayed: Decimal = new Decimal(0)
 
     const receivedCallDate = new Date()
 
     const queryRunner = getConnection().createQueryRunner()
-    await queryRunner.connect()
+    try {
+      await queryRunner.connect()
 
-    const lastUserTransactions = await queryRunner.manager
+      const lastUserTransactions = await queryRunner.manager
-      .createQueryBuilder(DbUser, 'user')
+        .createQueryBuilder(DbUser, 'user')
-      .select('transaction.balance', 'balance')
+        .select('transaction.balance', 'balance')
-      .addSelect('transaction.balance_date', 'balanceDate')
+        .addSelect('transaction.balance_date', 'balanceDate')
-      .innerJoin(DbTransaction, 'transaction', 'user.id = transaction.user_id')
+        .innerJoin(DbTransaction, 'transaction', 'user.id = transaction.user_id')
-      .where(
+        .where(
-        `transaction.balance_date = (SELECT MAX(t.balance_date) FROM transactions AS t WHERE t.user_id = user.id)`,
+          `transaction.balance_date = (SELECT MAX(t.balance_date) FROM transactions AS t WHERE t.user_id = user.id)`,
-      )
+        )
-      .orderBy('transaction.balance_date', 'DESC')
+        .orderBy('transaction.balance_date', 'DESC')
-      .addOrderBy('transaction.id', 'DESC')
+        .addOrderBy('transaction.id', 'DESC')
-      .getRawMany()
+        .getRawMany()
 
-    const activeUsers = lastUserTransactions.length
+      const activeUsers = lastUserTransactions.length
 
-    lastUserTransactions.forEach(({ balance, balanceDate }) => {
+      lastUserTransactions.forEach(({ balance, balanceDate }) => {
-      const decay = calculateDecay(new Decimal(balance), new Date(balanceDate), receivedCallDate)
+        const decay = calculateDecay(new Decimal(balance), new Date(balanceDate), receivedCallDate)
-      if (decay) {
+        if (decay) {
-        totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
+          totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
-        totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
+          totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
+        }
+      })
+
+      return {
+        activeUsers,
+        totalGradidoAvailable,
+        totalGradidoUnbookedDecayed,
       }
-    })
+    } finally {
-
+      await queryRunner.release()
-    const { totalGradidoCreated } = await queryRunner.manager
-      .createQueryBuilder()
-      .select('SUM(transaction.amount) AS totalGradidoCreated')
-      .from(DbTransaction, 'transaction')
-      .where('transaction.typeId = 1')
-      .getRawOne()
-
-    const { totalGradidoDecayed } = await queryRunner.manager
-      .createQueryBuilder()
-      .select('SUM(transaction.decay) AS totalGradidoDecayed')
-      .from(DbTransaction, 'transaction')
-      .where('transaction.decay IS NOT NULL')
-      .getRawOne()
-
-    await queryRunner.release()
-
-    return {
-      totalUsers,
-      activeUsers,
-      deletedUsers,
-      totalGradidoCreated,
-      totalGradidoDecayed,
-      totalGradidoAvailable,
-      totalGradidoUnbookedDecayed,
     }
   }
 }

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

@@ -4,7 +4,7 @@
 import { transactionLinkCode } from './TransactionLinkResolver'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
+import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { userFactory } from '@/seeds/factory/user'
@@ -50,238 +50,340 @@ afterAll(async () => {
 })
 
 describe('TransactionLinkResolver', () => {
-  // TODO: have this test separated into a transactionLink and a contributionLink part (if possible)
+  describe('redeemTransactionLink', () => {
-  describe('redeem daily Contribution Link', () => {
+    describe('contributionLink', () => {
-    const now = new Date()
+      describe('input not valid', () => {
-    let contributionLink: DbContributionLink | undefined
-    let contribution: UnconfirmedContribution | undefined
-
-    beforeAll(async () => {
-      await mutate({
-        mutation: login,
-        variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
-      })
-      await mutate({
-        mutation: createContributionLink,
-        variables: {
-          amount: new Decimal(5),
-          name: 'Daily Contribution  Link',
-          memo: 'Thank you for contribute daily to the community',
-          cycle: 'DAILY',
-          validFrom: new Date(now.getFullYear(), 0, 1).toISOString(),
-          validTo: new Date(now.getFullYear(), 11, 31, 23, 59, 59, 999).toISOString(),
-          maxAmountPerMonth: new Decimal(200),
-          maxPerCycle: 1,
-        },
-      })
-    })
-
-    it('has a daily contribution link in the database', async () => {
-      const cls = await DbContributionLink.find()
-      expect(cls).toHaveLength(1)
-      contributionLink = cls[0]
-      expect(contributionLink).toEqual(
-        expect.objectContaining({
-          id: expect.any(Number),
-          name: 'Daily Contribution  Link',
-          memo: 'Thank you for contribute daily to the community',
-          validFrom: new Date(now.getFullYear(), 0, 1),
-          validTo: new Date(now.getFullYear(), 11, 31, 23, 59, 59, 0),
-          cycle: 'DAILY',
-          maxPerCycle: 1,
-          totalMaxCountOfContribution: null,
-          maxAccountBalance: null,
-          minGapHours: null,
-          createdAt: expect.any(Date),
-          deletedAt: null,
-          code: expect.stringMatching(/^[0-9a-f]{24,24}$/),
-          linkEnabled: true,
-          amount: expect.decimalEqual(5),
-          maxAmountPerMonth: expect.decimalEqual(200),
-        }),
-      )
-    })
-
-    describe('user has pending contribution of 1000 GDD', () => {
-      beforeAll(async () => {
-        await mutate({
-          mutation: login,
-          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(),
-          },
-        })
-      })
-
-      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', () => {
         beforeAll(async () => {
-          jest.useFakeTimers()
-          setTimeout(jest.fn(), 1000 * 60 * 60 * 24)
-          jest.runAllTimers()
           await mutate({
             mutation: login,
-            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
         })
 
-        afterAll(() => {
+        it('throws error when link does not exists', async () => {
-          jest.useRealTimers()
-        })
-
-        it('allows the user to redeem the contribution link again', async () => {
           await expect(
             mutate({
               mutation: redeemTransactionLink,
               variables: {
-                code: 'CL-' + (contributionLink ? contributionLink.code : ''),
+                code: 'CL-123456',
-              },
-            }),
-          ).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',
+                'Creation from contribution link was not successful. Error: No contribution link found to given code: CL-123456',
               ),
             ],
           })
         })
+
+        it('throws error when link is not valid yet', async () => {
+          const now = new Date()
+          const {
+            data: { createContributionLink: contributionLink },
+          } = await mutate({
+            mutation: createContributionLink,
+            variables: {
+              amount: new Decimal(5),
+              name: 'Daily Contribution  Link',
+              memo: 'Thank you for contribute daily to the community',
+              cycle: 'DAILY',
+              validFrom: new Date(now.getFullYear() + 1, 0, 1).toISOString(),
+              validTo: new Date(now.getFullYear() + 1, 11, 31, 23, 59, 59, 999).toISOString(),
+              maxAmountPerMonth: new Decimal(200),
+              maxPerCycle: 1,
+            },
+          })
+          await expect(
+            mutate({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'CL-' + contributionLink.code,
+              },
+            }),
+          ).resolves.toMatchObject({
+            errors: [
+              new GraphQLError(
+                'Creation from contribution link was not successful. Error: Contribution link not valid yet',
+              ),
+            ],
+          })
+          await resetEntity(DbContributionLink)
+        })
+
+        it('throws error when contributionLink cycle is invalid', async () => {
+          const now = new Date()
+          const {
+            data: { createContributionLink: contributionLink },
+          } = await mutate({
+            mutation: createContributionLink,
+            variables: {
+              amount: new Decimal(5),
+              name: 'Daily Contribution  Link',
+              memo: 'Thank you for contribute daily to the community',
+              cycle: 'INVALID',
+              validFrom: new Date(now.getFullYear(), 0, 1).toISOString(),
+              validTo: new Date(now.getFullYear(), 11, 31, 23, 59, 59, 999).toISOString(),
+              maxAmountPerMonth: new Decimal(200),
+              maxPerCycle: 1,
+            },
+          })
+          await expect(
+            mutate({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'CL-' + contributionLink.code,
+              },
+            }),
+          ).resolves.toMatchObject({
+            errors: [
+              new GraphQLError(
+                'Creation from contribution link was not successful. Error: Contribution link has unknown cycle',
+              ),
+            ],
+          })
+          await resetEntity(DbContributionLink)
+        })
+
+        it('throws error when link is no longer valid', async () => {
+          const now = new Date()
+          const {
+            data: { createContributionLink: contributionLink },
+          } = await mutate({
+            mutation: createContributionLink,
+            variables: {
+              amount: new Decimal(5),
+              name: 'Daily Contribution  Link',
+              memo: 'Thank you for contribute daily to the community',
+              cycle: 'DAILY',
+              validFrom: new Date(now.getFullYear() - 1, 0, 1).toISOString(),
+              validTo: new Date(now.getFullYear() - 1, 11, 31, 23, 59, 59, 999).toISOString(),
+              maxAmountPerMonth: new Decimal(200),
+              maxPerCycle: 1,
+            },
+          })
+          await expect(
+            mutate({
+              mutation: redeemTransactionLink,
+              variables: {
+                code: 'CL-' + contributionLink.code,
+              },
+            }),
+          ).resolves.toMatchObject({
+            errors: [
+              new GraphQLError(
+                'Creation from contribution link was not successful. Error: Contribution link is no longer valid',
+              ),
+            ],
+          })
+          await resetEntity(DbContributionLink)
+        })
       })
-    })
-  })
 
-  describe('transaction links list', () => {
+      // TODO: have this test separated into a transactionLink and a contributionLink part
-    const variables = {
+      describe('redeem daily Contribution Link', () => {
-      userId: 1, // dummy, may be replaced
+        const now = new Date()
-      filters: null,
+        let contributionLink: DbContributionLink | undefined
-      currentPage: 1,
+        let contribution: UnconfirmedContribution | undefined
-      pageSize: 5,
-    }
 
-    // TODO: there is a test not cleaning up after itself! Fix it!
-    beforeAll(async () => {
-      await cleanDB()
-      resetToken()
-    })
-
-    describe('unauthenticated', () => {
-      it('returns an error', async () => {
-        await expect(
-          query({
-            query: listTransactionLinksAdmin,
-            variables,
-          }),
-        ).resolves.toEqual(
-          expect.objectContaining({
-            errors: [new GraphQLError('401 Unauthorized')],
-          }),
-        )
-      })
-    })
-
-    describe('authenticated', () => {
-      describe('without admin rights', () => {
         beforeAll(async () => {
-          user = await userFactory(testEnv, bibiBloxberg)
           await mutate({
             mutation: login,
-            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          })
+          await mutate({
+            mutation: createContributionLink,
+            variables: {
+              amount: new Decimal(5),
+              name: 'Daily Contribution  Link',
+              memo: 'Thank you for contribute daily to the community',
+              cycle: 'DAILY',
+              validFrom: new Date(now.getFullYear(), 0, 1).toISOString(),
+              validTo: new Date(now.getFullYear(), 11, 31, 23, 59, 59, 999).toISOString(),
+              maxAmountPerMonth: new Decimal(200),
+              maxPerCycle: 1,
+            },
           })
         })
 
-        afterAll(async () => {
+        it('has a daily contribution link in the database', async () => {
-          await cleanDB()
+          const cls = await DbContributionLink.find()
-          resetToken()
+          expect(cls).toHaveLength(1)
+          contributionLink = cls[0]
+          expect(contributionLink).toEqual(
+            expect.objectContaining({
+              id: expect.any(Number),
+              name: 'Daily Contribution  Link',
+              memo: 'Thank you for contribute daily to the community',
+              validFrom: new Date(now.getFullYear(), 0, 1),
+              validTo: new Date(now.getFullYear(), 11, 31, 23, 59, 59, 0),
+              cycle: 'DAILY',
+              maxPerCycle: 1,
+              totalMaxCountOfContribution: null,
+              maxAccountBalance: null,
+              minGapHours: null,
+              createdAt: expect.any(Date),
+              deletedAt: null,
+              code: expect.stringMatching(/^[0-9a-f]{24,24}$/),
+              linkEnabled: true,
+              amount: expect.decimalEqual(5),
+              maxAmountPerMonth: expect.decimalEqual(200),
+            }),
+          )
         })
 
+        describe('user has pending contribution of 1000 GDD', () => {
+          beforeAll(async () => {
+            await mutate({
+              mutation: login,
+              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(),
+              },
+            })
+          })
+
+          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', () => {
+            beforeAll(async () => {
+              jest.useFakeTimers()
+              setTimeout(jest.fn(), 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',
+                  ),
+                ],
+              })
+            })
+          })
+        })
+      })
+    })
+
+    describe('transaction links list', () => {
+      const variables = {
+        userId: 1, // dummy, may be replaced
+        filters: null,
+        currentPage: 1,
+        pageSize: 5,
+      }
+
+      // TODO: there is a test not cleaning up after itself! Fix it!
+      beforeAll(async () => {
+        await cleanDB()
+        resetToken()
+      })
+
+      describe('unauthenticated', () => {
         it('returns an error', async () => {
           await expect(
             query({
@@ -296,40 +398,22 @@ describe('TransactionLinkResolver', () => {
         })
       })
 
-      describe('with admin rights', () => {
+      describe('authenticated', () => {
-        beforeAll(async () => {
+        describe('without admin rights', () => {
-          // admin 'peter@lustig.de' has to exists for 'creationFactory'
+          beforeAll(async () => {
-          await userFactory(testEnv, peterLustig)
+            user = await userFactory(testEnv, bibiBloxberg)
-
+            await mutate({
-          user = await userFactory(testEnv, bibiBloxberg)
+              mutation: login,
-          variables.userId = user.id
+              variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-          variables.pageSize = 25
+            })
-          // 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!)
-          // bibis transaktion links
-          const bibisTransaktionLinks = transactionLinks.filter(
-            (transactionLink) => transactionLink.email === 'bibi@bloxberg.de',
-          )
-          for (let i = 0; i < bibisTransaktionLinks.length; i++) {
-            await transactionLinkFactory(testEnv, bibisTransaktionLinks[i])
-          }
-
-          // admin: only now log in
-          await mutate({
-            mutation: login,
-            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
           })
-        })
 
-        afterAll(async () => {
+          afterAll(async () => {
-          await cleanDB()
+            await cleanDB()
-          resetToken()
+            resetToken()
-        })
+          })
 
-        describe('without any filters', () => {
+          it('returns an error', async () => {
-          it('finds 6 open transaction links and no deleted or redeemed', async () => {
             await expect(
               query({
                 query: listTransactionLinksAdmin,
@@ -337,185 +421,235 @@ describe('TransactionLinkResolver', () => {
               }),
             ).resolves.toEqual(
               expect.objectContaining({
-                data: {
+                errors: [new GraphQLError('401 Unauthorized')],
-                  listTransactionLinksAdmin: {
-                    linkCount: 6,
-                    linkList: expect.not.arrayContaining([
-                      expect.objectContaining({
-                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
-                        createdAt: expect.any(String),
-                      }),
-                      expect.objectContaining({
-                        memo: 'Da habe ich mich wohl etwas übernommen.',
-                        deletedAt: expect.any(String),
-                      }),
-                    ]),
-                  },
-                },
               }),
             )
           })
         })
 
-        describe('all filters are null', () => {
+        describe('with admin rights', () => {
-          it('finds 6 open transaction links and no deleted or redeemed', async () => {
+          beforeAll(async () => {
-            await expect(
+            // admin 'peter@lustig.de' has to exists for 'creationFactory'
-              query({
+            await userFactory(testEnv, peterLustig)
-                query: listTransactionLinksAdmin,
-                variables: {
-                  ...variables,
-                  filters: {
-                    withDeleted: null,
-                    withExpired: null,
-                    withRedeemed: null,
-                  },
-                },
-              }),
-            ).resolves.toEqual(
-              expect.objectContaining({
-                data: {
-                  listTransactionLinksAdmin: {
-                    linkCount: 6,
-                    linkList: expect.not.arrayContaining([
-                      expect.objectContaining({
-                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
-                        createdAt: expect.any(String),
-                      }),
-                      expect.objectContaining({
-                        memo: 'Da habe ich mich wohl etwas übernommen.',
-                        deletedAt: expect.any(String),
-                      }),
-                    ]),
-                  },
-                },
-              }),
-            )
-          })
-        })
 
-        describe('filter with deleted', () => {
+            user = await userFactory(testEnv, bibiBloxberg)
-          it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+            variables.userId = user.id
-            await expect(
+            variables.pageSize = 25
-              query({
+            // bibi needs GDDs
-                query: listTransactionLinksAdmin,
+            const bibisCreation = creations.find(
-                variables: {
+              (creation) => creation.email === 'bibi@bloxberg.de',
-                  ...variables,
-                  filters: {
-                    withDeleted: true,
-                  },
-                },
-              }),
-            ).resolves.toEqual(
-              expect.objectContaining({
-                data: {
-                  listTransactionLinksAdmin: {
-                    linkCount: 7,
-                    linkList: expect.arrayContaining([
-                      expect.not.objectContaining({
-                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
-                        createdAt: expect.any(String),
-                      }),
-                      expect.objectContaining({
-                        memo: 'Da habe ich mich wohl etwas übernommen.',
-                        deletedAt: expect.any(String),
-                      }),
-                    ]),
-                  },
-                },
-              }),
             )
-          })
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        })
+            await creationFactory(testEnv, bibisCreation!)
+            // bibis transaktion links
+            const bibisTransaktionLinks = transactionLinks.filter(
+              (transactionLink) => transactionLink.email === 'bibi@bloxberg.de',
+            )
+            for (let i = 0; i < bibisTransaktionLinks.length; i++) {
+              await transactionLinkFactory(testEnv, bibisTransaktionLinks[i])
+            }
 
-        describe('filter by expired', () => {
+            // admin: only now log in
-          it('finds 5 open transaction links, 1 expired, and no redeemed', async () => {
+            await mutate({
-            await expect(
+              mutation: login,
-              query({
+              variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
-                query: listTransactionLinksAdmin,
+            })
-                variables: {
-                  ...variables,
-                  filters: {
-                    withExpired: true,
-                  },
-                },
-              }),
-            ).resolves.toEqual(
-              expect.objectContaining({
-                data: {
-                  listTransactionLinksAdmin: {
-                    linkCount: 7,
-                    linkList: expect.arrayContaining([
-                      expect.objectContaining({
-                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
-                        createdAt: expect.any(String),
-                      }),
-                      expect.not.objectContaining({
-                        memo: 'Da habe ich mich wohl etwas übernommen.',
-                        deletedAt: expect.any(String),
-                      }),
-                    ]),
-                  },
-                },
-              }),
-            )
           })
-        })
 
-        // TODO: works not as expected, because 'redeemedAt' and 'redeemedBy' have to be added to the transaktion link factory
+          afterAll(async () => {
-        describe.skip('filter by redeemed', () => {
+            await cleanDB()
-          it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+            resetToken()
-            await expect(
+          })
-              query({
+
-                query: listTransactionLinksAdmin,
+          describe('without any filters', () => {
-                variables: {
+            it('finds 6 open transaction links and no deleted or redeemed', async () => {
-                  ...variables,
+              await expect(
-                  filters: {
+                query({
-                    withDeleted: null,
+                  query: listTransactionLinksAdmin,
-                    withExpired: null,
+                  variables,
-                    withRedeemed: true,
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  data: {
+                    listTransactionLinksAdmin: {
+                      linkCount: 6,
+                      linkList: expect.not.arrayContaining([
+                        expect.objectContaining({
+                          memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                          createdAt: expect.any(String),
+                        }),
+                        expect.objectContaining({
+                          memo: 'Da habe ich mich wohl etwas übernommen.',
+                          deletedAt: expect.any(String),
+                        }),
+                      ]),
+                    },
                   },
-                },
+                }),
-              }),
+              )
-            ).resolves.toEqual(
+            })
-              expect.objectContaining({
+          })
-                data: {
+
-                  listTransactionLinksAdmin: {
+          describe('all filters are null', () => {
-                    linkCount: 6,
+            it('finds 6 open transaction links and no deleted or redeemed', async () => {
-                    linkList: expect.arrayContaining([
+              await expect(
-                      expect.not.objectContaining({
+                query({
-                        memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                  query: listTransactionLinksAdmin,
-                        createdAt: expect.any(String),
+                  variables: {
-                      }),
+                    ...variables,
-                      expect.objectContaining({
+                    filters: {
-                        memo: 'Yeah, eingelöst!',
+                      withDeleted: null,
-                        redeemedAt: expect.any(String),
+                      withExpired: null,
-                        redeemedBy: expect.any(Number),
+                      withRedeemed: null,
-                      }),
+                    },
-                      expect.not.objectContaining({
-                        memo: 'Da habe ich mich wohl etwas übernommen.',
-                        deletedAt: expect.any(String),
-                      }),
-                    ]),
                   },
-                },
+                }),
-              }),
+              ).resolves.toEqual(
-            )
+                expect.objectContaining({
+                  data: {
+                    listTransactionLinksAdmin: {
+                      linkCount: 6,
+                      linkList: expect.not.arrayContaining([
+                        expect.objectContaining({
+                          memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                          createdAt: expect.any(String),
+                        }),
+                        expect.objectContaining({
+                          memo: 'Da habe ich mich wohl etwas übernommen.',
+                          deletedAt: expect.any(String),
+                        }),
+                      ]),
+                    },
+                  },
+                }),
+              )
+            })
+          })
+
+          describe('filter with deleted', () => {
+            it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+              await expect(
+                query({
+                  query: listTransactionLinksAdmin,
+                  variables: {
+                    ...variables,
+                    filters: {
+                      withDeleted: true,
+                    },
+                  },
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  data: {
+                    listTransactionLinksAdmin: {
+                      linkCount: 7,
+                      linkList: expect.arrayContaining([
+                        expect.not.objectContaining({
+                          memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                          createdAt: expect.any(String),
+                        }),
+                        expect.objectContaining({
+                          memo: 'Da habe ich mich wohl etwas übernommen.',
+                          deletedAt: expect.any(String),
+                        }),
+                      ]),
+                    },
+                  },
+                }),
+              )
+            })
+          })
+
+          describe('filter by expired', () => {
+            it('finds 5 open transaction links, 1 expired, and no redeemed', async () => {
+              await expect(
+                query({
+                  query: listTransactionLinksAdmin,
+                  variables: {
+                    ...variables,
+                    filters: {
+                      withExpired: true,
+                    },
+                  },
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  data: {
+                    listTransactionLinksAdmin: {
+                      linkCount: 7,
+                      linkList: expect.arrayContaining([
+                        expect.objectContaining({
+                          memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                          createdAt: expect.any(String),
+                        }),
+                        expect.not.objectContaining({
+                          memo: 'Da habe ich mich wohl etwas übernommen.',
+                          deletedAt: expect.any(String),
+                        }),
+                      ]),
+                    },
+                  },
+                }),
+              )
+            })
+          })
+
+          // TODO: works not as expected, because 'redeemedAt' and 'redeemedBy' have to be added to the transaktion link factory
+          describe.skip('filter by redeemed', () => {
+            it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
+              await expect(
+                query({
+                  query: listTransactionLinksAdmin,
+                  variables: {
+                    ...variables,
+                    filters: {
+                      withDeleted: null,
+                      withExpired: null,
+                      withRedeemed: true,
+                    },
+                  },
+                }),
+              ).resolves.toEqual(
+                expect.objectContaining({
+                  data: {
+                    listTransactionLinksAdmin: {
+                      linkCount: 6,
+                      linkList: expect.arrayContaining([
+                        expect.not.objectContaining({
+                          memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+                          createdAt: expect.any(String),
+                        }),
+                        expect.objectContaining({
+                          memo: 'Yeah, eingelöst!',
+                          redeemedAt: expect.any(String),
+                          redeemedBy: expect.any(Number),
+                        }),
+                        expect.not.objectContaining({
+                          memo: 'Da habe ich mich wohl etwas übernommen.',
+                          deletedAt: expect.any(String),
+                        }),
+                      ]),
+                    },
+                  },
+                }),
+              )
+            })
           })
         })
       })
     })
   })
-})
 
-describe('transactionLinkCode', () => {
+  describe('transactionLinkCode', () => {
-  const date = new Date()
+    const date = new Date()
 
-  it('returns a string of length 24', () => {
+    it('returns a string of length 24', () => {
-    expect(transactionLinkCode(date)).toHaveLength(24)
+      expect(transactionLinkCode(date)).toHaveLength(24)
-  })
+    })
 
-  it('returns a string that ends with the hex value of date', () => {
+    it('returns a string that ends with the hex value of date', () => {
-    const regexp = new RegExp(date.getTime().toString(16) + '$')
+      const regexp = new RegExp(date.getTime().toString(16) + '$')
-    expect(transactionLinkCode(date)).toEqual(expect.stringMatching(regexp))
+      expect(transactionLinkCode(date)).toEqual(expect.stringMatching(regexp))
+    })
   })
 })

backend/src/graphql/resolver/TransactionLinkResolver.ts

@@ -170,148 +170,154 @@ export class TransactionLinkResolver {
     if (code.match(/^CL-/)) {
       // acquire lock
       const releaseLock = await TRANSACTIONS_LOCK.acquire()
-      logger.info('redeem contribution link...')
-      const now = new Date()
-      const queryRunner = getConnection().createQueryRunner()
-      await queryRunner.connect()
-      await queryRunner.startTransaction('REPEATABLE READ')
       try {
-        const contributionLink = await queryRunner.manager
+        logger.info('redeem contribution link...')
-          .createQueryBuilder()
+        const now = new Date()
-          .select('contributionLink')
+        const queryRunner = getConnection().createQueryRunner()
-          .from(DbContributionLink, 'contributionLink')
+        await queryRunner.connect()
-          .where('contributionLink.code = :code', { code: code.replace('CL-', '') })
+        await queryRunner.startTransaction('REPEATABLE READ')
-          .getOne()
+        try {
-        if (!contributionLink) {
+          const contributionLink = await queryRunner.manager
-          logger.error('no contribution link found to given code:', code)
+            .createQueryBuilder()
-          throw new Error('No contribution link found')
+            .select('contributionLink')
-        }
+            .from(DbContributionLink, 'contributionLink')
-        logger.info('...contribution link found with id', contributionLink.id)
+            .where('contributionLink.code = :code', { code: code.replace('CL-', '') })
-        if (new Date(contributionLink.validFrom).getTime() > now.getTime()) {
+            .getOne()
-          logger.error(
+          if (!contributionLink) {
-            'contribution link is not valid yet. Valid from: ',
+            logger.error('no contribution link found to given code:', code)
-            contributionLink.validFrom,
+            throw new Error(`No contribution link found to given code: ${code}`)
-          )
-          throw new Error('Contribution link not valid yet')
-        }
-        if (contributionLink.validTo) {
-          if (new Date(contributionLink.validTo).setHours(23, 59, 59) < now.getTime()) {
-            logger.error('contribution link is depricated. Valid to: ', contributionLink.validTo)
-            throw new Error('Contribution link is depricated')
           }
-        }
+          logger.info('...contribution link found with id', contributionLink.id)
-        let alreadyRedeemed: DbContribution | undefined
+          if (new Date(contributionLink.validFrom).getTime() > now.getTime()) {
-        switch (contributionLink.cycle) {
+            logger.error(
-          case ContributionCycleType.ONCE: {
+              'contribution link is not valid yet. Valid from: ',
-            alreadyRedeemed = await queryRunner.manager
+              contributionLink.validFrom,
-              .createQueryBuilder()
+            )
-              .select('contribution')
+            throw new Error('Contribution link not valid yet')
-              .from(DbContribution, 'contribution')
+          }
-              .where('contribution.contributionLinkId = :linkId AND contribution.userId = :id', {
+          if (contributionLink.validTo) {
-                linkId: contributionLink.id,
+            if (new Date(contributionLink.validTo).setHours(23, 59, 59) < now.getTime()) {
-                id: user.id,
-              })
-              .getOne()
-            if (alreadyRedeemed) {
               logger.error(
-                'contribution link with rule ONCE already redeemed by user with id',
+                'contribution link is no longer valid. Valid to: ',
-                user.id,
+                contributionLink.validTo,
               )
-              throw new Error('Contribution link already redeemed')
+              throw new Error('Contribution link is no longer valid')
             }
-            break
           }
-          case ContributionCycleType.DAILY: {
+          let alreadyRedeemed: DbContribution | undefined
-            const start = new Date()
+          switch (contributionLink.cycle) {
-            start.setHours(0, 0, 0, 0)
+            case ContributionCycleType.ONCE: {
-            const end = new Date()
+              alreadyRedeemed = await queryRunner.manager
-            end.setHours(23, 59, 59, 999)
+                .createQueryBuilder()
-            alreadyRedeemed = await queryRunner.manager
+                .select('contribution')
-              .createQueryBuilder()
+                .from(DbContribution, 'contribution')
-              .select('contribution')
+                .where('contribution.contributionLinkId = :linkId AND contribution.userId = :id', {
-              .from(DbContribution, 'contribution')
-              .where(
-                `contribution.contributionLinkId = :linkId AND contribution.userId = :id
-                      AND Date(contribution.confirmedAt) BETWEEN :start AND :end`,
-                {
                   linkId: contributionLink.id,
                   id: user.id,
-                  start,
+                })
-                  end,
+                .getOne()
-                },
+              if (alreadyRedeemed) {
-              )
+                logger.error(
-              .getOne()
+                  'contribution link with rule ONCE already redeemed by user with id',
-            if (alreadyRedeemed) {
+                  user.id,
-              logger.error(
+                )
-                'contribution link with rule DAILY already redeemed by user with id',
+                throw new Error('Contribution link already redeemed')
-                user.id,
+              }
-              )
+              break
-              throw new Error('Contribution link already redeemed today')
+            }
+            case ContributionCycleType.DAILY: {
+              const start = new Date()
+              start.setHours(0, 0, 0, 0)
+              const end = new Date()
+              end.setHours(23, 59, 59, 999)
+              alreadyRedeemed = await queryRunner.manager
+                .createQueryBuilder()
+                .select('contribution')
+                .from(DbContribution, 'contribution')
+                .where(
+                  `contribution.contributionLinkId = :linkId AND contribution.userId = :id
+                        AND Date(contribution.confirmedAt) BETWEEN :start AND :end`,
+                  {
+                    linkId: contributionLink.id,
+                    id: user.id,
+                    start,
+                    end,
+                  },
+                )
+                .getOne()
+              if (alreadyRedeemed) {
+                logger.error(
+                  'contribution link with rule DAILY already redeemed by user with id',
+                  user.id,
+                )
+                throw new Error('Contribution link already redeemed today')
+              }
+              break
+            }
+            default: {
+              logger.error('contribution link has unknown cycle', contributionLink.cycle)
+              throw new Error('Contribution link has unknown cycle')
             }
-            break
           }
-          default: {
+
-            logger.error('contribution link has unknown cycle', contributionLink.cycle)
+          const creations = await getUserCreation(user.id, clientTimezoneOffset)
-            throw new Error('Contribution link has unknown cycle')
+          logger.info('open creations', creations)
+          validateContribution(creations, contributionLink.amount, now, clientTimezoneOffset)
+          const contribution = new DbContribution()
+          contribution.userId = user.id
+          contribution.createdAt = now
+          contribution.contributionDate = now
+          contribution.memo = contributionLink.memo
+          contribution.amount = contributionLink.amount
+          contribution.contributionLinkId = contributionLink.id
+          contribution.contributionType = ContributionType.LINK
+          contribution.contributionStatus = ContributionStatus.CONFIRMED
+
+          await queryRunner.manager.insert(DbContribution, contribution)
+
+          const lastTransaction = await queryRunner.manager
+            .createQueryBuilder()
+            .select('transaction')
+            .from(DbTransaction, 'transaction')
+            .where('transaction.userId = :id', { id: user.id })
+            .orderBy('transaction.id', 'DESC')
+            .getOne()
+          let newBalance = new Decimal(0)
+
+          let decay: Decay | null = null
+          if (lastTransaction) {
+            decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, now)
+            newBalance = decay.balance
           }
+          newBalance = newBalance.add(contributionLink.amount.toString())
+
+          const transaction = new DbTransaction()
+          transaction.typeId = TransactionTypeId.CREATION
+          transaction.memo = contribution.memo
+          transaction.userId = contribution.userId
+          transaction.previous = lastTransaction ? lastTransaction.id : null
+          transaction.amount = contribution.amount
+          transaction.creationDate = contribution.contributionDate
+          transaction.balance = newBalance
+          transaction.balanceDate = now
+          transaction.decay = decay ? decay.decay : new Decimal(0)
+          transaction.decayStart = decay ? decay.start : null
+          await queryRunner.manager.insert(DbTransaction, transaction)
+
+          contribution.confirmedAt = now
+          contribution.transactionId = transaction.id
+          await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
+
+          await queryRunner.commitTransaction()
+          logger.info('creation from contribution link commited successfuly.')
+        } catch (e) {
+          await queryRunner.rollbackTransaction()
+          logger.error(`Creation from contribution link was not successful: ${e}`)
+          throw new Error(`Creation from contribution link was not successful. ${e}`)
+        } finally {
+          await queryRunner.release()
         }
-
-        const creations = await getUserCreation(user.id, clientTimezoneOffset)
-        logger.info('open creations', creations)
-        validateContribution(creations, contributionLink.amount, now, clientTimezoneOffset)
-        const contribution = new DbContribution()
-        contribution.userId = user.id
-        contribution.createdAt = now
-        contribution.contributionDate = now
-        contribution.memo = contributionLink.memo
-        contribution.amount = contributionLink.amount
-        contribution.contributionLinkId = contributionLink.id
-        contribution.contributionType = ContributionType.LINK
-        contribution.contributionStatus = ContributionStatus.CONFIRMED
-
-        await queryRunner.manager.insert(DbContribution, contribution)
-
-        const lastTransaction = await queryRunner.manager
-          .createQueryBuilder()
-          .select('transaction')
-          .from(DbTransaction, 'transaction')
-          .where('transaction.userId = :id', { id: user.id })
-          .orderBy('transaction.id', 'DESC')
-          .getOne()
-        let newBalance = new Decimal(0)
-
-        let decay: Decay | null = null
-        if (lastTransaction) {
-          decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, now)
-          newBalance = decay.balance
-        }
-        newBalance = newBalance.add(contributionLink.amount.toString())
-
-        const transaction = new DbTransaction()
-        transaction.typeId = TransactionTypeId.CREATION
-        transaction.memo = contribution.memo
-        transaction.userId = contribution.userId
-        transaction.previous = lastTransaction ? lastTransaction.id : null
-        transaction.amount = contribution.amount
-        transaction.creationDate = contribution.contributionDate
-        transaction.balance = newBalance
-        transaction.balanceDate = now
-        transaction.decay = decay ? decay.decay : new Decimal(0)
-        transaction.decayStart = decay ? decay.start : null
-        await queryRunner.manager.insert(DbTransaction, transaction)
-
-        contribution.confirmedAt = now
-        contribution.transactionId = transaction.id
-        await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
-
-        await queryRunner.commitTransaction()
-        logger.info('creation from contribution link commited successfuly.')
-      } catch (e) {
-        await queryRunner.rollbackTransaction()
-        logger.error(`Creation from contribution link was not successful: ${e}`)
-        throw new Error(`Creation from contribution link was not successful. ${e}`)
       } finally {
-        await queryRunner.release()
         releaseLock()
       }
       return true

backend/src/graphql/resolver/TransactionResolver.ts

@@ -45,29 +45,28 @@ export const executeTransaction = async (
   recipient: dbUser,
   transactionLink?: dbTransactionLink | null,
 ): Promise<boolean> => {
-  logger.info(
-    `executeTransaction(amount=${amount}, memo=${memo}, sender=${sender}, recipient=${recipient})...`,
-  )
-
-  if (sender.id === recipient.id) {
-    logger.error(`Sender and Recipient are the same.`)
-    throw new Error('Sender and Recipient are the same.')
-  }
-
-  if (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}`)
-    throw new Error(`memo text is too short (${MEMO_MIN_CHARS} characters minimum)`)
-  }
-
   // acquire lock
   const releaseLock = await TRANSACTIONS_LOCK.acquire()
-
   try {
+    logger.info(
+      `executeTransaction(amount=${amount}, memo=${memo}, sender=${sender}, recipient=${recipient})...`,
+    )
+
+    if (sender.id === recipient.id) {
+      logger.error(`Sender and Recipient are the same.`)
+      throw new Error('Sender and Recipient are the same.')
+    }
+
+    if (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}`)
+      throw new Error(`memo text is too short (${MEMO_MIN_CHARS} characters minimum)`)
+    }
+
     // validate amount
     const receivedCallDate = new Date()
     const sendBalance = await calculateBalance(
@@ -187,10 +186,10 @@ export const executeTransaction = async (
       })
     }
     logger.info(`finished executeTransaction successfully`)
-    return true
   } finally {
     releaseLock()
   }
+  return true
 }
 
 @Resolver()

database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

frontend/src/components/Contributions/ContributionForm.spec.js

@@ -23,6 +23,7 @@ describe('ContributionForm', () => {
   const mocks = {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
+    $n: jest.fn((n) => n),
     $store: {
       state: {
         creation: ['1000', '1000', '1000'],

frontend/src/components/Contributions/ContributionForm.vue

@@ -17,6 +17,7 @@
         :label-no-date-selected="$t('contribution.noDateSelected')"
         required
         :disabled="this.form.id !== null"
+        :dropleft="true"
       >
         <template #nav-prev-year><span></span></template>
         <template #nav-next-year><span></span></template>

frontend/src/components/Inputs/InputAmount.spec.js

@@ -9,10 +9,10 @@ describe('InputAmount', () => {
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $n: jest.fn((n) => n),
     $i18n: {
       locale: jest.fn(() => 'en'),
     },
-    $n: jest.fn((n) => String(n)),
     $route: {
       params: {},
     },
@@ -46,13 +46,14 @@ describe('InputAmount', () => {
 
     describe('amount normalization', () => {
       describe('if invalid', () => {
-        beforeEach(() => {
+        beforeEach(async () => {
+          await wrapper.setProps({ value: '12m34' })
           valid = false
         })
 
         it('is not normalized', () => {
-          wrapper.vm.normalizeAmount(valid)
+          wrapper.vm.normalizeAmount(false)
-          expect(wrapper.vm.amountValue).toBe(0.0)
+          expect(wrapper.vm.currentValue).toBe('12m34')
         })
       })
 
@@ -97,13 +98,14 @@ describe('InputAmount', () => {
 
     describe('amount normalization', () => {
       describe('if invalid', () => {
-        beforeEach(() => {
+        beforeEach(async () => {
+          await wrapper.setProps({ value: '12m34' })
           valid = false
         })
 
         it('is not normalized', () => {
           wrapper.vm.normalizeAmount(valid)
-          expect(wrapper.vm.amountValue).toBe(0.0)
+          expect(wrapper.vm.currentValue).toBe('12m34')
         })
       })
 

frontend/src/components/Inputs/InputAmount.vue

@@ -20,7 +20,7 @@
           trim
           v-focus="amountFocused"
           @focus="amountFocused = true"
-          @blur="normalizeAmount(true)"
+          @blur="normalizeAmount(valid)"
           :disabled="disabled"
           autocomplete="off"
         ></b-form-input>
@@ -90,5 +90,8 @@ export default {
       this.currentValue = this.$n(this.amountValue, 'ungroupedDecimal')
     },
   },
+  mounted() {
+    if (this.value !== '') this.normalizeAmount(true)
+  },
 }
 </script>

frontend/src/components/Inputs/InputHour.vue

@@ -15,7 +15,7 @@
           :placeholder="placeholder"
           type="number"
           :state="validated ? valid : false"
-          step="0.5"
+          step="0.25"
           min="0"
           :max="validMaxTime"
           class="bg-248"

frontend/src/layouts/DashboardLayout.vue

@@ -125,14 +125,13 @@
                 :transactions="transactions"
                 :transactionCount="transactionCount"
                 :transactionLinkCount="transactionLinkCount"
-                @set-tunneled-email="setTunneledEmail"
               >
                 <template #transactions>
                   <last-transactions
                     :transactions="transactions"
                     :transactionCount="transactionCount"
                     :transactionLinkCount="transactionLinkCount"
-                    v-on="$listeners"
+                    @set-tunneled-email="setTunneledEmail"
                   />
                 </template>
                 <template #community>
@@ -167,14 +166,13 @@
             :transactions="transactions"
             :transactionCount="transactionCount"
             :transactionLinkCount="transactionLinkCount"
-            @set-tunneled-email="setTunneledEmail"
           >
             <template #transactions>
               <last-transactions
                 :transactions="transactions"
                 :transactionCount="transactionCount"
                 :transactionLinkCount="transactionLinkCount"
-                v-on="$listeners"
+                @set-tunneled-email="setTunneledEmail"
               />
             </template>
             <template #community>

frontend/src/locales/de.json

@@ -30,7 +30,7 @@
     "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.",
     "openContributionLinks": "Öffentliche Beitrags-Linkliste",
     "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
-    "submitContribution": "schreiben"
+    "submitContribution": "Schreiben"
   },
   "communityInfo": "Gemeinschaft Information",
   "contact": "Kontakt",

frontend/src/locales/en.json

@@ -30,7 +30,7 @@
     "noOpenContributionLinkText": "Currently there are no automatic creations.",
     "openContributionLinks": "Open contribution-link list",
     "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
-    "submitContribution": "writing"
+    "submitContribution": "Contribute"
   },
   "communityInfo": "Community Information",
   "contact": "Contact",
@@ -126,7 +126,7 @@
     "firstname": "Firstname",
     "from": "from",
     "generate_now": "Generate now",
-    "hours": "Horas",
+    "hours": "Hours",
     "lastname": "Lastname",
     "memo": "Message",
     "message": "Message",

frontend/src/pages/Transactions.spec.js

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils'
 import Transactions from './Transactions'
 import { GdtEntryType } from '@/graphql/enums'
+import { listGDTEntriesQuery } from '@/graphql/queries'
 
 import { toastErrorSpy } from '@test/testSetup'
 
@@ -45,8 +46,8 @@ describe('Transactions', () => {
     },
   }
 
-  const Wrapper = () => {
+  const Wrapper = (propsData = {}) => {
-    return mount(Transactions, { localVue, mocks })
+    return mount(Transactions, { localVue, mocks, propsData })
   }
 
   describe('mount', () => {
@@ -77,147 +78,111 @@ describe('Transactions', () => {
       )
     })
 
-    it.skip('renders the transaction gradido transform table', () => {
+    it('renders the transaction gradido transform table when gdt is true', async () => {
-      beforeEach(() => {
+      await wrapper.setProps({
-        wrapper.setData({
+        gdt: true,
-          gdt: true,
-        })
       })
       expect(wrapper.findComponent({ name: 'GdtTransactionList' }).exists()).toBeTruthy()
     })
 
-    describe.skip('tabs', () => {
+    describe('update gdt with success', () => {
-      it('shows the GDD transactions by default', () => {
-        expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeTruthy()
-      })
-
-      it('does not show the GDT transactions by default', () => {
-        expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeFalsy()
-      })
-
-      describe('click on GDT tab', () => {
-        describe('server returns valid data', () => {
-          beforeEach(() => {
-            apolloMock.mockResolvedValue({
-              data: {
-                listGDTEntries: {
-                  count: 4,
-                  gdtEntries: [
-                    {
-                      id: 1,
-                      amount: 100,
-                      gdt: 1700,
-                      factor: 17,
-                      comment: '',
-                      date: '2021-05-02T17:20:11+00:00',
-                      gdtEntryType: GdtEntryType.FORM,
-                    },
-                    {
-                      id: 2,
-                      amount: 1810,
-                      gdt: 362,
-                      factor: 0.2,
-                      comment: 'Dezember 20',
-                      date: '2020-12-31T12:00:00+00:00',
-                      gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
-                    },
-                    {
-                      id: 3,
-                      amount: 100,
-                      gdt: 1700,
-                      factor: 17,
-                      comment: '',
-                      date: '2020-05-07T17:00:00+00:00',
-                      gdtEntryType: GdtEntryType.FORM,
-                    },
-                    {
-                      id: 4,
-                      amount: 100,
-                      gdt: 110,
-                      factor: 22,
-                      comment: '',
-                      date: '2020-04-10T13:28:00+00:00',
-                      gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
-                    },
-                  ],
-                },
-              },
-            })
-            wrapper.findAll('li[ role="presentation"]').at(1).find('a').trigger('click')
-          })
-
-          it('does not show the GDD transactions', () => {
-            expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeFalsy()
-          })
-
-          it('shows the GDT transactions', () => {
-            expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeTruthy()
-          })
-
-          it('calls the API', () => {
-            expect(apolloMock).toBeCalledWith(
-              expect.objectContaining({
-                variables: {
-                  currentPage: 1,
-                  pageSize: 25,
-                },
-              }),
-            )
-          })
-
-          it('scrolls to (0, 0) after API call', () => {
-            expect(windowScrollToMock).toBeCalledWith(0, 0)
-          })
-
-          describe('click on GDD tab', () => {
-            beforeEach(() => {
-              wrapper.findAll('li[ role="presentation"]').at(0).find('a').trigger('click')
-            })
-
-            it('shows the GDD transactions', () => {
-              expect(wrapper.findAll('div[role="tabpanel"]').at(0).isVisible()).toBeTruthy()
-            })
-
-            it('does not show the GDT', () => {
-              expect(wrapper.findAll('div[role="tabpanel"]').at(1).isVisible()).toBeFalsy()
-            })
-          })
-        })
-
-        describe('server returns error', () => {
-          beforeEach(() => {
-            apolloMock.mockRejectedValue({ message: 'Ouch!' })
-            wrapper.findAll('li[ role="presentation"]').at(1).find('a').trigger('click')
-          })
-
-          it('toasts an error message', () => {
-            expect(toastErrorSpy).toBeCalledWith('Ouch!')
-          })
-
-          it('sets transactionGdtCount to -1', () => {
-            expect(wrapper.vm.transactionGdtCount).toBe(-1)
-          })
-        })
-      })
-    })
-
-    describe.skip('update currentPage', () => {
       beforeEach(() => {
-        jest.clearAllMocks()
+        apolloMock.mockResolvedValue({
-        wrapper.setData({
+          data: {
-          currentPage: 2,
+            listGDTEntries: {
+              count: 4,
+              gdtEntries: [
+                {
+                  id: 1,
+                  amount: 100,
+                  gdt: 1700,
+                  factor: 17,
+                  comment: '',
+                  date: '2021-05-02T17:20:11+00:00',
+                  gdtEntryType: GdtEntryType.FORM,
+                },
+                {
+                  id: 2,
+                  amount: 1810,
+                  gdt: 362,
+                  factor: 0.2,
+                  comment: 'Dezember 20',
+                  date: '2020-12-31T12:00:00+00:00',
+                  gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR,
+                },
+                {
+                  id: 3,
+                  amount: 100,
+                  gdt: 1700,
+                  factor: 17,
+                  comment: '',
+                  date: '2020-05-07T17:00:00+00:00',
+                  gdtEntryType: GdtEntryType.FORM,
+                },
+                {
+                  id: 4,
+                  amount: 100,
+                  gdt: 110,
+                  factor: 22,
+                  comment: '',
+                  date: '2020-04-10T13:28:00+00:00',
+                  gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER,
+                },
+              ],
+            },
+          },
         })
+        wrapper = Wrapper({ gdt: true })
       })
 
       it('calls the API', () => {
-        expect(apolloMock).toBeCalledWith(
+        expect(apolloMock).toBeCalledWith({
-          expect.objectContaining({
+          query: listGDTEntriesQuery,
+          variables: {
+            currentPage: 1,
+            pageSize: 25,
+          },
+        })
+      })
+
+      it('does not show the GDD transactions', () => {
+        expect(wrapper.findAll('div.gdd-transaction-list').exists()).toBeFalsy()
+      })
+
+      it('shows the GDT transactions', () => {
+        expect(wrapper.findAll('div.gdt-transaction-list').exists()).toBeTruthy()
+      })
+
+      it('scrolls to (0, 0) after API call', () => {
+        expect(windowScrollToMock).toBeCalledWith(0, 0)
+      })
+
+      describe('update current page', () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
+          wrapper.vm.currentPage = 2
+        })
+
+        it('calls the API again', () => {
+          expect(apolloMock).toBeCalledWith({
+            query: listGDTEntriesQuery,
             variables: {
               currentPage: 2,
               pageSize: 25,
             },
-          }),
+          })
-        )
+        })
+      })
+    })
+
+    describe('update gdt with error', () => {
+      beforeEach(() => {
+        apolloMock.mockRejectedValue({ message: 'Oh no!' })
+        wrapper = Wrapper({ gdt: true })
+      })
+
+      it('toasts the error', () => {
+        expect(toastErrorSpy).toBeCalledWith('Oh no!')
       })
     })
   })

frontend/src/pages/Transactions.vue

@@ -15,6 +15,7 @@
         :transactionLinkCount="transactionLinkCount"
         :transactions="transactions"
         :showPagination="true"
+        :pageSize="pageSize"
         @update-transactions="updateTransactions"
         v-on="$listeners"
       />
@@ -90,6 +91,11 @@ export default {
         this.updateGdt()
       }
     },
+    gdt() {
+      if (this.gdt) {
+        this.updateGdt()
+      }
+    },
   },
 }
 </script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",