merge with master

.github/workflows/test.yml

@@ -328,7 +328,7 @@ jobs:
           docker run -v ~/coverage:/app/coverage --rm gradido/frontend:test yarn run test
           cp -r ~/coverage ./coverage
       ##########################################################################
-      # COVERAGE REPORT FRONTEND ################################################
+      # COVERAGE REPORT FRONTEND ###############################################
       ##########################################################################
       #- name: frontend | Coverage report
       #  uses: romeovs/lcov-reporter-action@v0.2.21
@@ -344,9 +344,51 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 67
+          min_coverage: 69
           token: ${{ github.token }}
   
+  ##############################################################################
+  # JOB: UNIT TEST BACKEND  ####################################################
+  ##############################################################################
+  unit_test_backend:
+    name: Unit tests - Backend
+    runs-on: ubuntu-latest
+    needs: [build_test_backend]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ##########################################################################
+      # DOWNLOAD DOCKER IMAGES #################################################
+      ##########################################################################
+      - name: Download Docker Image (Backend)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-backend-test
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/backend.tar
+      ##########################################################################
+      # UNIT TESTS BACKEND #####################################################
+      ##########################################################################
+      - name: backend | Unit tests
+        run: |
+          docker run -v ~/coverage:/app/coverage --rm gradido/backend:test yarn run test
+          cp -r ~/coverage ./coverage
+      ##########################################################################
+      # COVERAGE CHECK BACKEND #################################################
+      ##########################################################################
+      - name: backend | Coverage check
+        uses: webcraftmedia/coverage-check-action@master
+        with:
+          report_name: Coverage Backend
+          type: lcov
+          result_path: ./coverage/lcov.info
+          min_coverage: 4
+          token: ${{ github.token }}
+
   ##############################################################################
   # JOB: UNIT TEST LOGIN-SERVER  ###############################################
   ##############################################################################

backend/.gitignore

@@ -2,5 +2,6 @@
 /.env
 /build/
 
+coverage
 # emacs
 *~

backend/jest.config.js

@@ -0,0 +1,7 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+module.exports = {
+  verbose: true,
+  preset: 'ts-jest',
+  collectCoverage: true,
+  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
+}

backend/package.json

@@ -12,9 +12,11 @@
     "clean": "tsc --build --clean",
     "start": "node build/index.js",
     "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts",
-    "lint": "eslint . --ext .js,.ts"
+    "lint": "eslint . --ext .js,.ts",
+    "test": "jest --coverage"
   },
   "dependencies": {
+    "@types/jest": "^27.0.2",
     "apollo-server-express": "^2.25.2",
     "axios": "^0.21.1",
     "class-validator": "^0.13.1",
@@ -22,9 +24,11 @@
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "graphql": "^15.5.1",
+    "jest": "^27.2.4",
     "jsonwebtoken": "^8.5.1",
     "mysql2": "^2.3.0",
     "reflect-metadata": "^0.1.13",
+    "ts-jest": "^27.0.5",
     "type-graphql": "^1.1.1",
     "typeorm": "^0.2.37"
   },

backend/src/auth/auth.ts

@@ -15,9 +15,10 @@ export const isAuthorized: AuthChecker<any> = async ({ root, args, context, info
         `${CONFIG.LOGIN_API_URL}checkSessionState?session_id=${decoded.sessionId}`,
       )
       context.sessionId = decoded.sessionId
-      context.setHeaders.push({ key: 'token', value: encode(decoded.sessionId) })
+      context.pubKey = decoded.pubKey
+      context.setHeaders.push({ key: 'token', value: encode(decoded.sessionId, decoded.pubKey) })
       return result.success
     }
   }
-  return false
+  throw new Error('401 Unauthorized')
 }

backend/src/graphql/args/ChangePasswordArgs.ts

@@ -0,0 +1,13 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class ChangePasswordArgs {
+  @Field(() => Number)
+  sessionId: number
+
+  @Field(() => String)
+  email: string
+
+  @Field(() => String)
+  password: string
+}

backend/src/graphql/args/CheckUsernameArgs.ts

@@ -0,0 +1,10 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class CheckUsernameArgs {
+  @Field(() => String)
+  username: string
+
+  @Field(() => Number, { nullable: true })
+  groupId?: number
+}

backend/src/graphql/args/CreateUserArgs.ts

@@ -0,0 +1,19 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class CreateUserArgs {
+  @Field(() => String)
+  email: string
+
+  @Field(() => String)
+  firstName: string
+
+  @Field(() => String)
+  lastName: string
+
+  @Field(() => String)
+  password: string
+
+  @Field(() => String)
+  language: string
+}

backend/src/graphql/args/Paginated.ts

@@ -0,0 +1,14 @@
+import { ArgsType, Field, Int } from 'type-graphql'
+import { Order } from '../enum/Order'
+
+@ArgsType()
+export default class Paginated {
+  @Field(() => Int, { nullable: true })
+  currentPage?: number
+
+  @Field(() => Int, { nullable: true })
+  pageSize?: number
+
+  @Field(() => Order, { nullable: true })
+  order?: Order
+}

backend/src/graphql/args/SubscribeNewsletterArgs.ts

@@ -1,7 +1,7 @@
 import { ArgsType, Field } from 'type-graphql'
 
 @ArgsType()
-export class SubscribeNewsletterArguments {
+export default class SubscribeNewsletterArgs {
   @Field(() => String)
   email: string
 

backend/src/graphql/args/TransactionSendArgs.ts

@@ -0,0 +1,13 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class TransactionSendArgs {
+  @Field(() => String)
+  email: string
+
+  @Field(() => Number)
+  amount: number
+
+  @Field(() => String)
+  memo: string
+}

backend/src/graphql/args/UnsecureLoginArgs.ts

@@ -0,0 +1,10 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class UnsecureLoginArgs {
+  @Field(() => String)
+  email: string
+
+  @Field(() => String)
+  password: string
+}

backend/src/graphql/args/UpdateUserInfosArgs.ts

@@ -0,0 +1,34 @@
+import { ArgsType, Field } from 'type-graphql'
+
+@ArgsType()
+export default class UpdateUserInfosArgs {
+  @Field(() => String)
+  email!: string
+
+  @Field({ nullable: true })
+  firstName?: string
+
+  @Field({ nullable: true })
+  lastName?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  username?: string
+
+  @Field({ nullable: true })
+  language?: string
+
+  @Field({ nullable: true })
+  publisherId?: number
+
+  @Field({ nullable: true })
+  password?: string
+
+  @Field({ nullable: true })
+  passwordNew?: string
+
+  @Field({ nullable: true })
+  coinanimation?: boolean
+}

backend/src/graphql/enum/GdtEntryType.ts

@@ -0,0 +1,16 @@
+import { registerEnumType } from 'type-graphql'
+
+export enum GdtEntryType {
+  FORM = 1,
+  CVS = 2,
+  ELOPAGE = 3,
+  ELOPAGE_PUBLISHER = 4,
+  DIGISTORE = 5,
+  CVS2 = 6,
+  GLOBAL_MODIFICATOR = 7,
+}
+
+registerEnumType(GdtEntryType, {
+  name: 'GdtEntryType', // this one is mandatory
+  description: 'Gdt Entry Source Type', // this one is optional
+})

backend/src/graphql/enum/Order.ts

@@ -0,0 +1,11 @@
+import { registerEnumType } from 'type-graphql'
+
+export enum Order {
+  ASC = 'ASC',
+  DESC = 'DESC',
+}
+
+registerEnumType(Order, {
+  name: 'Order', // this one is mandatory
+  description: 'Order direction - ascending or descending', // this one is optional
+})

backend/src/graphql/enum/TransactionType.ts

@@ -0,0 +1,12 @@
+import { registerEnumType } from 'type-graphql'
+
+export enum TransactionType {
+  CREATION = 'creation',
+  SEND = 'send',
+  RECIEVE = 'receive',
+}
+
+registerEnumType(TransactionType, {
+  name: 'TransactionType', // this one is mandatory
+  description: 'Name of the Type of the transaction', // this one is optional
+})

backend/src/graphql/enum/TransactionTypeId.ts

@@ -0,0 +1,11 @@
+import { registerEnumType } from 'type-graphql'
+
+export enum TransactionTypeId {
+  CREATION = 1,
+  SEND = 2,
+}
+
+registerEnumType(TransactionTypeId, {
+  name: 'TransactionTypeId', // this one is mandatory
+  description: 'Type of the transaction', // this one is optional
+})

backend/src/graphql/inputs/GdtInputs.ts

@@ -1,28 +0,0 @@
-import { ArgsType, Field, Int } from 'type-graphql'
-
-@ArgsType()
-export class GdtTransactionInput {
-  @Field(() => String)
-  email: string
-
-  @Field(() => Int, { nullable: true })
-  currentPage?: number
-
-  @Field(() => Int, { nullable: true })
-  pageSize?: number
-
-  @Field(() => String, { nullable: true })
-  order?: string
-}
-
-@ArgsType()
-export class GdtTransactionSessionIdInput {
-  @Field(() => Int, { nullable: true })
-  currentPage?: number
-
-  @Field(() => Int, { nullable: true })
-  pageSize?: number
-
-  @Field(() => String, { nullable: true })
-  order?: string
-}

backend/src/graphql/inputs/LoginUserInput.ts

@@ -1,82 +0,0 @@
-import { ArgsType, Field } from 'type-graphql'
-
-@ArgsType()
-export class UnsecureLoginArgs {
-  @Field(() => String)
-  email: string
-
-  @Field(() => String)
-  password: string
-}
-
-@ArgsType()
-export class CreateUserArgs {
-  @Field(() => String)
-  email: string
-
-  @Field(() => String)
-  firstName: string
-
-  @Field(() => String)
-  lastName: string
-
-  @Field(() => String)
-  password: string
-
-  @Field(() => String)
-  language: string
-}
-
-@ArgsType()
-export class ChangePasswordArgs {
-  @Field(() => Number)
-  sessionId: number
-
-  @Field(() => String)
-  email: string
-
-  @Field(() => String)
-  password: string
-}
-
-@ArgsType()
-export class UpdateUserInfosArgs {
-  @Field(() => String)
-  email!: string
-
-  @Field({ nullable: true })
-  firstName?: string
-
-  @Field({ nullable: true })
-  lastName?: string
-
-  @Field({ nullable: true })
-  description?: string
-
-  @Field({ nullable: true })
-  username?: string
-
-  @Field({ nullable: true })
-  language?: string
-
-  @Field({ nullable: true })
-  publisherId?: number
-
-  @Field({ nullable: true })
-  password?: string
-
-  @Field({ nullable: true })
-  passwordNew?: string
-
-  @Field({ nullable: true })
-  coinanimation?: boolean
-}
-
-@ArgsType()
-export class CheckUsernameArgs {
-  @Field(() => String)
-  username: string
-
-  @Field(() => Number, { nullable: true })
-  groupId?: number
-}

backend/src/graphql/inputs/TransactionInput.ts

@@ -1,25 +0,0 @@
-import { ArgsType, Field, Int } from 'type-graphql'
-
-@ArgsType()
-export class TransactionListInput {
-  @Field(() => Int)
-  firstPage: number
-
-  @Field(() => Int)
-  items: number
-
-  @Field(() => String)
-  order: 'ASC' | 'DESC'
-}
-
-@ArgsType()
-export class TransactionSendArgs {
-  @Field(() => String)
-  email: string
-
-  @Field(() => Number)
-  amount: number
-
-  @Field(() => String)
-  memo: string
-}

backend/src/graphql/models/Decay.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field, Int } from 'type-graphql'
-import { Transaction } from '../../typeorm/entity/Transaction'
 
 @ObjectType()
 export class Decay {
@@ -15,13 +14,6 @@ export class Decay {
     }
   }
 
-  static async getDecayStartBlock(): Promise<Transaction | undefined> {
-    if (!this.decayStartBlockTransaction) {
-      this.decayStartBlockTransaction = await Transaction.getDecayStartBlock()
-    }
-    return this.decayStartBlockTransaction
-  }
-
   @Field(() => Number)
   balance: number
 
@@ -38,6 +30,4 @@ export class Decay {
 
   @Field(() => Int, { nullable: true })
   decayStartBlock?: string
-
-  static decayStartBlockTransaction: Transaction | undefined
 }

backend/src/graphql/models/GdtEntry.ts

@@ -1,16 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field } from 'type-graphql'
-
-export enum GdtEntryType {
-  FORM = 1,
-  CVS = 2,
-  ELOPAGE = 3,
-  ELOPAGE_PUBLISHER = 4,
-  DIGISTORE = 5,
-  CVS2 = 6,
-  GLOBAL_MODIFICATOR = 7,
-}
+import { GdtEntryType } from '../enum/GdtEntryType'
 
 @ObjectType()
 export class GdtEntry {
@@ -46,7 +37,7 @@ export class GdtEntry {
   @Field(() => String)
   couponCode: string
 
-  @Field(() => Number)
+  @Field(() => GdtEntryType)
   gdtEntryType: GdtEntryType
 
   @Field(() => Number)

backend/src/graphql/models/GdtEntryList.ts

@@ -3,20 +3,6 @@
 import { GdtEntry } from './GdtEntry'
 import { ObjectType, Field } from 'type-graphql'
 
-@ObjectType()
-export class GdtSumPerEmail {
-  constructor(email: string, summe: number) {
-    this.email = email
-    this.summe = summe
-  }
-
-  @Field(() => String)
-  email: string
-
-  @Field(() => Number)
-  summe: number
-}
-
 @ObjectType()
 export class GdtEntryList {
   constructor(json: any) {

backend/src/graphql/models/GdtSumPerEmail.ts

@@ -0,0 +1,19 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/*
+import { ObjectType, Field } from 'type-graphql'
+
+@ObjectType()
+export class GdtSumPerEmail {
+  constructor(email: string, summe: number) {
+    this.email = email
+    this.summe = summe
+  }
+
+  @Field(() => String)
+  email: string
+
+  @Field(() => Number)
+  summe: number
+}
+*/

backend/src/graphql/models/Transaction.ts

@@ -53,32 +53,3 @@ export class Transaction {
   @Field({ nullable: true })
   decay?: Decay
 }
-
-@ObjectType()
-export class TransactionList {
-  constructor() {
-    this.gdtSum = 0
-    this.count = 0
-    this.balance = 0
-    this.decay = 0
-    this.decayDate = ''
-  }
-
-  @Field(() => Number)
-  gdtSum: number
-
-  @Field(() => Number)
-  count: number
-
-  @Field(() => Number)
-  balance: number
-
-  @Field(() => Number)
-  decay: number
-
-  @Field(() => String)
-  decayDate: string
-
-  @Field(() => [Transaction])
-  transactions: Transaction[]
-}

backend/src/graphql/models/TransactionList.ts

@@ -0,0 +1,33 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { ObjectType, Field } from 'type-graphql'
+import { Transaction } from './Transaction'
+
+@ObjectType()
+export class TransactionList {
+  constructor() {
+    this.gdtSum = 0
+    this.count = 0
+    this.balance = 0
+    this.decay = 0
+    this.decayDate = ''
+  }
+
+  @Field(() => Number)
+  gdtSum: number
+
+  @Field(() => Number)
+  count: number
+
+  @Field(() => Number)
+  balance: number
+
+  @Field(() => Number)
+  decay: number
+
+  @Field(() => String)
+  decayDate: string
+
+  @Field(() => [Transaction])
+  transactions: Transaction[]
+}

backend/src/graphql/resolvers/BalanceResolver.ts

@@ -2,11 +2,10 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
-import CONFIG from '../../config'
+import { getCustomRepository } from 'typeorm'
 import { Balance } from '../models/Balance'
-import { apiGet } from '../../apis/HttpRequest'
-import { User as dbUser } from '../../typeorm/entity/User'
-import { Balance as dbBalance } from '../../typeorm/entity/Balance'
+import { BalanceRepository } from '../../typeorm/repository/Balance'
+import { UserRepository } from '../../typeorm/repository/User'
 import { calculateDecay } from '../../util/decay'
 import { roundFloorFrom4 } from '../../util/round'
 
@@ -15,31 +14,29 @@ export class BalanceResolver {
   @Authorized()
   @Query(() => Balance)
   async balance(@Ctx() context: any): Promise<Balance> {
-    // get public key for current logged in user
-    const result = await apiGet(CONFIG.LOGIN_API_URL + 'login?session_id=' + context.sessionId)
-    if (!result.success) throw new Error(result.data)
-
     // load user and balance
-    const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
-    const balanceEntity = await dbBalance.findByUser(userEntity.id)
-    let balance: Balance
+    const balanceRepository = getCustomRepository(BalanceRepository)
+    const userRepository = getCustomRepository(UserRepository)
+
+    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    const balanceEntity = await balanceRepository.findByUser(userEntity.id)
     const now = new Date()
-    if (balanceEntity) {
-      balance = new Balance({
-        balance: roundFloorFrom4(balanceEntity.amount),
-        decay: roundFloorFrom4(
-          await calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now),
-        ),
-        decay_date: now.toString(),
-      })
-    } else {
-      balance = new Balance({
+
+    // No balance found
+    if (!balanceEntity) {
+      return new Balance({
         balance: 0,
         decay: 0,
         decay_date: now.toString(),
       })
     }
 
-    return balance
+    return new Balance({
+      balance: roundFloorFrom4(balanceEntity.amount),
+      decay: roundFloorFrom4(
+        await calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now),
+      ),
+      decay_date: now.toString(),
+    })
   }
 }

backend/src/graphql/resolvers/GdtResolver.ts

@@ -2,11 +2,13 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Args, Ctx, Authorized } from 'type-graphql'
+import { getCustomRepository } from 'typeorm'
 import CONFIG from '../../config'
 import { GdtEntryList } from '../models/GdtEntryList'
-import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs'
+import Paginated from '../args/Paginated'
 import { apiGet } from '../../apis/HttpRequest'
-import { User as dbUser } from '../../typeorm/entity/User'
+import { UserRepository } from '../../typeorm/repository/User'
+import { Order } from '../enum/Order'
 
 @Resolver()
 export class GdtResolver {
@@ -15,21 +17,18 @@ export class GdtResolver {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async listGDTEntries(
     @Args()
-    { currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput,
+    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
     @Ctx() context: any,
   ): Promise<GdtEntryList> {
-    // get public key for current logged in user
-    const result = await apiGet(CONFIG.LOGIN_API_URL + 'login?session_id=' + context.sessionId)
-    if (!result.success) throw new Error(result.data)
-
     // load user
-    const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
+    const userRepository = getCustomRepository(UserRepository)
+    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
 
     const resultGDT = await apiGet(
       `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`,
     )
     if (!resultGDT.success) {
-      throw new Error(result.data)
+      throw new Error(resultGDT.data)
     }
 
     return new GdtEntryList(resultGDT.data)

backend/src/graphql/resolvers/KlicktippResolver.ts

@@ -8,7 +8,7 @@ import {
   unsubscribe,
   signIn,
 } from '../../apis/KlicktippController'
-import { SubscribeNewsletterArguments } from '../inputs/KlickTippInputs'
+import SubscribeNewsletterArgs from '../args/SubscribeNewsletterArgs'
 
 @Resolver()
 export class KlicktippResolver {
@@ -33,7 +33,7 @@ export class KlicktippResolver {
   @Authorized()
   @Mutation(() => Boolean)
   async subscribeNewsletter(
-    @Args() { email, language }: SubscribeNewsletterArguments,
+    @Args() { email, language }: SubscribeNewsletterArgs,
   ): Promise<boolean> {
     return await signIn(email, language)
   }

backend/src/graphql/resolvers/TransactionResolver.ts

@@ -2,22 +2,218 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
+import { getCustomRepository } from 'typeorm'
+
 import CONFIG from '../../config'
-import { TransactionList } from '../models/Transaction'
-import { TransactionListInput, TransactionSendArgs } from '../inputs/TransactionInput'
-import { apiGet, apiPost } from '../../apis/HttpRequest'
+
+import { Transaction } from '../models/Transaction'
+import { TransactionList } from '../models/TransactionList'
+
+import TransactionSendArgs from '../args/TransactionSendArgs'
+import Paginated from '../args/Paginated'
+
+import { Order } from '../enum/Order'
+
+import { BalanceRepository } from '../../typeorm/repository/Balance'
+import { UserRepository } from '../../typeorm/repository/User'
+import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
+import { TransactionRepository } from '../../typeorm/repository/Transaction'
+
 import { User as dbUser } from '../../typeorm/entity/User'
-import { Balance as dbBalance } from '../../typeorm/entity/Balance'
-import listTransactions from './listTransactions'
+import { UserTransaction as dbUserTransaction } from '../../typeorm/entity/UserTransaction'
+import { Transaction as dbTransaction } from '../../typeorm/entity/Transaction'
+
+import { apiGet, apiPost } from '../../apis/HttpRequest'
 import { roundFloorFrom4 } from '../../util/round'
-import { calculateDecay } from '../../util/decay'
+import { calculateDecay, calculateDecayWithInterval } from '../../util/decay'
+import { TransactionTypeId } from '../enum/TransactionTypeId'
+import { TransactionType } from '../enum/TransactionType'
+
+// Helper function
+async function calculateAndAddDecayTransactions(
+  userTransactions: dbUserTransaction[],
+  user: dbUser,
+  decay: boolean,
+  skipFirstTransaction: boolean,
+): Promise<Transaction[]> {
+  const finalTransactions: Transaction[] = []
+  const transactionIds: number[] = []
+  const involvedUserIds: number[] = []
+
+  userTransactions.forEach((userTransaction: dbUserTransaction) => {
+    transactionIds.push(userTransaction.transactionId)
+  })
+
+  const transactionRepository = getCustomRepository(TransactionRepository)
+  const transactions = await transactionRepository.joinFullTransactionsByIds(transactionIds)
+
+  const transactionIndiced: dbTransaction[] = []
+  transactions.forEach((transaction: dbTransaction) => {
+    transactionIndiced[transaction.id] = transaction
+    if (transaction.transactionTypeId === TransactionTypeId.SEND) {
+      involvedUserIds.push(transaction.transactionSendCoin.userId)
+      involvedUserIds.push(transaction.transactionSendCoin.recipiantUserId)
+    }
+  })
+  // remove duplicates
+  // https://stackoverflow.com/questions/1960473/get-all-unique-values-in-a-javascript-array-remove-duplicates
+  const involvedUsersUnique = involvedUserIds.filter((v, i, a) => a.indexOf(v) === i)
+  const userRepository = getCustomRepository(UserRepository)
+  const userIndiced = await userRepository.getUsersIndiced(involvedUsersUnique)
+
+  const decayStartTransaction = await transactionRepository.findDecayStartBlock()
+
+  for (let i = 0; i < userTransactions.length; i++) {
+    const userTransaction = userTransactions[i]
+    const transaction = transactionIndiced[userTransaction.transactionId]
+    const finalTransaction = new Transaction()
+    finalTransaction.transactionId = transaction.id
+    finalTransaction.date = transaction.received.toISOString()
+    finalTransaction.memo = transaction.memo
+    finalTransaction.totalBalance = roundFloorFrom4(userTransaction.balance)
+    const prev = i > 0 ? userTransactions[i - 1] : null
+
+    if (prev && prev.balance > 0) {
+      const current = userTransaction
+      const decay = await calculateDecayWithInterval(
+        prev.balance,
+        prev.balanceDate,
+        current.balanceDate,
+      )
+      const balance = prev.balance - decay.balance
+
+      if (balance) {
+        finalTransaction.decay = decay
+        finalTransaction.decay.balance = roundFloorFrom4(balance)
+        if (
+          decayStartTransaction &&
+          prev.transactionId < decayStartTransaction.id &&
+          current.transactionId > decayStartTransaction.id
+        ) {
+          finalTransaction.decay.decayStartBlock = (
+            decayStartTransaction.received.getTime() / 1000
+          ).toString()
+        }
+      }
+    }
+
+    // sender or receiver when user has sent money
+    // group name if creation
+    // type: gesendet / empfangen / geschöpft
+    // transaktion nr / id
+    // date
+    // balance
+    if (userTransaction.transactionTypeId === TransactionTypeId.CREATION) {
+      // creation
+      const creation = transaction.transactionCreation
+
+      finalTransaction.name = 'Gradido Akademie'
+      finalTransaction.type = TransactionType.CREATION
+      // finalTransaction.targetDate = creation.targetDate
+      finalTransaction.balance = roundFloorFrom4(creation.amount)
+    } else if (userTransaction.transactionTypeId === TransactionTypeId.SEND) {
+      // send coin
+      const sendCoin = transaction.transactionSendCoin
+      let otherUser: dbUser | undefined
+      finalTransaction.balance = roundFloorFrom4(sendCoin.amount)
+      if (sendCoin.userId === user.id) {
+        finalTransaction.type = TransactionType.SEND
+        otherUser = userIndiced[sendCoin.recipiantUserId]
+        // finalTransaction.pubkey = sendCoin.recipiantPublic
+      } else if (sendCoin.recipiantUserId === user.id) {
+        finalTransaction.type = TransactionType.RECIEVE
+        otherUser = userIndiced[sendCoin.userId]
+        // finalTransaction.pubkey = sendCoin.senderPublic
+      } else {
+        throw new Error('invalid transaction')
+      }
+      if (otherUser) {
+        finalTransaction.name = otherUser.firstName + ' ' + otherUser.lastName
+        finalTransaction.email = otherUser.email
+      }
+    }
+    if (i > 0 || !skipFirstTransaction) {
+      finalTransactions.push(finalTransaction)
+    }
+
+    if (i === userTransactions.length - 1 && decay) {
+      const now = new Date()
+      const decay = await calculateDecayWithInterval(
+        userTransaction.balance,
+        userTransaction.balanceDate,
+        now.getTime(),
+      )
+      const balance = userTransaction.balance - decay.balance
+      if (balance) {
+        const decayTransaction = new Transaction()
+        decayTransaction.type = 'decay'
+        decayTransaction.balance = roundFloorFrom4(balance)
+        decayTransaction.decayDuration = decay.decayDuration
+        decayTransaction.decayStart = decay.decayStart
+        decayTransaction.decayEnd = decay.decayEnd
+        finalTransactions.push(decayTransaction)
+      }
+    }
+  }
+
+  return finalTransactions
+}
+
+// Helper function
+async function listTransactions(
+  currentPage: number,
+  pageSize: number,
+  order: Order,
+  user: dbUser,
+): Promise<TransactionList> {
+  let limit = pageSize
+  let offset = 0
+  let skipFirstTransaction = false
+  if (currentPage > 1) {
+    offset = (currentPage - 1) * pageSize - 1
+    limit++
+  }
+
+  if (offset && order === Order.ASC) {
+    offset--
+  }
+  const userTransactionRepository = getCustomRepository(UserTransactionRepository)
+  let [userTransactions, userTransactionsCount] = await userTransactionRepository.findByUserPaged(
+    user.id,
+    limit,
+    offset,
+    order,
+  )
+  skipFirstTransaction = userTransactionsCount > offset + limit
+  const decay = !(currentPage > 1)
+  let transactions: Transaction[] = []
+  if (userTransactions.length) {
+    if (order === Order.DESC) {
+      userTransactions = userTransactions.reverse()
+    }
+    transactions = await calculateAndAddDecayTransactions(
+      userTransactions,
+      user,
+      decay,
+      skipFirstTransaction,
+    )
+    if (order === Order.DESC) {
+      transactions = transactions.reverse()
+    }
+  }
+
+  const transactionList = new TransactionList()
+  transactionList.count = userTransactionsCount
+  transactionList.transactions = transactions
+  return transactionList
+}
 
 @Resolver()
 export class TransactionResolver {
   @Authorized()
   @Query(() => TransactionList)
   async transactionList(
-    @Args() { firstPage = 1, items = 25, order = 'DESC' }: TransactionListInput,
+    @Args() { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
     @Ctx() context: any,
   ): Promise<TransactionList> {
     // get public key for current logged in user
@@ -25,19 +221,21 @@ export class TransactionResolver {
     if (!result.success) throw new Error(result.data)
 
     // load user
-    const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
+    const userRepository = getCustomRepository(UserRepository)
+    const userEntity = await userRepository.findByPubkeyHex(result.data.user.public_hex)
 
-    const transactions = await listTransactions(firstPage, items, order, userEntity)
+    const transactions = await listTransactions(currentPage, pageSize, order, userEntity)
 
     // get gdt sum
     const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
       email: userEntity.email,
     })
     if (!resultGDTSum.success) throw new Error(resultGDTSum.data)
-    transactions.gdtSum = resultGDTSum.data.sum
+    transactions.gdtSum = resultGDTSum.data.sum || 0
 
     // get balance
-    const balanceEntity = await dbBalance.findByUser(userEntity.id)
+    const balanceRepository = getCustomRepository(BalanceRepository)
+    const balanceEntity = await balanceRepository.findByUser(userEntity.id)
     if (balanceEntity) {
       const now = new Date()
       transactions.balance = roundFloorFrom4(balanceEntity.amount)

backend/src/graphql/resolvers/UserResolver.ts

@@ -10,13 +10,11 @@ import { UpdateUserInfosResponse } from '../models/UpdateUserInfosResponse'
 import { User } from '../models/User'
 import { User as dbUser } from '../../typeorm/entity/User'
 import encode from '../../jwt/encode'
-import {
-  ChangePasswordArgs,
-  CheckUsernameArgs,
-  CreateUserArgs,
-  UnsecureLoginArgs,
-  UpdateUserInfosArgs,
-} from '../inputs/LoginUserInput'
+import ChangePasswordArgs from '../args/ChangePasswordArgs'
+import CheckUsernameArgs from '../args/CheckUsernameArgs'
+import CreateUserArgs from '../args/CreateUserArgs'
+import UnsecureLoginArgs from '../args/UnsecureLoginArgs'
+import UpdateUserInfosArgs from '../args/UpdateUserInfosArgs'
 import { apiPost, apiGet } from '../../apis/HttpRequest'
 import {
   klicktippRegistrationMiddleware,
@@ -25,7 +23,8 @@ import {
 import { CheckEmailResponse } from '../models/CheckEmailResponse'
 import { getCustomRepository } from 'typeorm'
 import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository'
-import { Setting } from '../../types'
+import { Setting } from '../../graphql/enum/Setting'
+import { UserRepository } from '../../typeorm/repository/User'
 
 @Resolver()
 export class UserResolver {
@@ -40,7 +39,10 @@ export class UserResolver {
       throw new Error(result.data)
     }
 
-    context.setHeaders.push({ key: 'token', value: encode(result.data.session_id) })
+    context.setHeaders.push({
+      key: 'token',
+      value: encode(result.data.session_id, result.data.user.public_hex),
+    })
 
     return new User(result.data.user)
   }
@@ -180,7 +182,8 @@ export class UserResolver {
       if (!result.success) throw new Error(result.data)
 
       // load user and balance
-      const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
+      const userRepository = getCustomRepository(UserRepository)
+      const userEntity = await userRepository.findByPubkeyHex(result.data.user.public_hex)
 
       const userSettingRepository = getCustomRepository(UserSettingRepository)
       userSettingRepository.setOrUpdate(

backend/src/graphql/resolvers/listTransactions.ts

@@ -1,194 +0,0 @@
-import { User as dbUser } from '../../typeorm/entity/User'
-import { TransactionList, Transaction } from '../models/Transaction'
-import { UserTransaction as dbUserTransaction } from '../../typeorm/entity/UserTransaction'
-import { Transaction as dbTransaction } from '../../typeorm/entity/Transaction'
-import { Decay } from '../models/Decay'
-import { calculateDecayWithInterval } from '../../util/decay'
-import { roundFloorFrom4 } from '../../util/round'
-
-async function calculateAndAddDecayTransactions(
-  userTransactions: dbUserTransaction[],
-  user: dbUser,
-  decay: boolean,
-  skipFirstTransaction: boolean,
-): Promise<Transaction[]> {
-  const finalTransactions: Transaction[] = []
-  const transactionIds: number[] = []
-  const involvedUserIds: number[] = []
-
-  userTransactions.forEach((userTransaction: dbUserTransaction) => {
-    transactionIds.push(userTransaction.transactionId)
-  })
-
-  const transactions = await dbTransaction
-    .createQueryBuilder('transaction')
-    .where('transaction.id IN (:...transactions)', { transactions: transactionIds })
-    .leftJoinAndSelect(
-      'transaction.transactionSendCoin',
-      'transactionSendCoin',
-      // 'transactionSendCoin.transaction_id = transaction.id',
-    )
-    .leftJoinAndSelect(
-      'transaction.transactionCreation',
-      'transactionCreation',
-      // 'transactionSendCoin.transaction_id = transaction.id',
-    )
-    .getMany()
-
-  const transactionIndiced: dbTransaction[] = []
-  transactions.forEach((transaction: dbTransaction) => {
-    transactionIndiced[transaction.id] = transaction
-    if (transaction.transactionTypeId === 2) {
-      involvedUserIds.push(transaction.transactionSendCoin.userId)
-      involvedUserIds.push(transaction.transactionSendCoin.recipiantUserId)
-    }
-  })
-  // remove duplicates
-  // https://stackoverflow.com/questions/1960473/get-all-unique-values-in-a-javascript-array-remove-duplicates
-  const involvedUsersUnique = involvedUserIds.filter((v, i, a) => a.indexOf(v) === i)
-  const userIndiced = await dbUser.getUsersIndiced(involvedUsersUnique)
-
-  const decayStartTransaction = await Decay.getDecayStartBlock()
-
-  for (let i = 0; i < userTransactions.length; i++) {
-    const userTransaction = userTransactions[i]
-    const transaction = transactionIndiced[userTransaction.transactionId]
-    const finalTransaction = new Transaction()
-    finalTransaction.transactionId = transaction.id
-    finalTransaction.date = transaction.received.toISOString()
-    finalTransaction.memo = transaction.memo
-    finalTransaction.totalBalance = roundFloorFrom4(userTransaction.balance)
-    const prev = i > 0 ? userTransactions[i - 1] : null
-
-    if (prev && prev.balance > 0) {
-      const current = userTransaction
-      const decay = await calculateDecayWithInterval(
-        prev.balance,
-        prev.balanceDate,
-        current.balanceDate,
-      )
-      const balance = prev.balance - decay.balance
-
-      if (balance) {
-        finalTransaction.decay = decay
-        finalTransaction.decay.balance = roundFloorFrom4(balance)
-        if (
-          decayStartTransaction &&
-          prev.transactionId < decayStartTransaction.id &&
-          current.transactionId > decayStartTransaction.id
-        ) {
-          finalTransaction.decay.decayStartBlock = (
-            decayStartTransaction.received.getTime() / 1000
-          ).toString()
-        }
-      }
-    }
-
-    // sender or receiver when user has sended money
-    // group name if creation
-    // type: gesendet / empfangen / geschöpft
-    // transaktion nr / id
-    // date
-    // balance
-    if (userTransaction.transactionTypeId === 1) {
-      // creation
-      const creation = transaction.transactionCreation
-
-      finalTransaction.name = 'Gradido Akademie'
-      finalTransaction.type = 'creation'
-      // finalTransaction.targetDate = creation.targetDate
-      finalTransaction.balance = roundFloorFrom4(creation.amount)
-    } else if (userTransaction.transactionTypeId === 2) {
-      // send coin
-      const sendCoin = transaction.transactionSendCoin
-      let otherUser: dbUser | undefined
-      finalTransaction.balance = roundFloorFrom4(sendCoin.amount)
-      if (sendCoin.userId === user.id) {
-        finalTransaction.type = 'send'
-        otherUser = userIndiced[sendCoin.recipiantUserId]
-        // finalTransaction.pubkey = sendCoin.recipiantPublic
-      } else if (sendCoin.recipiantUserId === user.id) {
-        finalTransaction.type = 'receive'
-        otherUser = userIndiced[sendCoin.userId]
-        // finalTransaction.pubkey = sendCoin.senderPublic
-      } else {
-        throw new Error('invalid transaction')
-      }
-      if (otherUser) {
-        finalTransaction.name = otherUser.firstName + ' ' + otherUser.lastName
-        finalTransaction.email = otherUser.email
-      }
-    }
-    if (i > 0 || !skipFirstTransaction) {
-      finalTransactions.push(finalTransaction)
-    }
-
-    if (i === userTransactions.length - 1 && decay) {
-      const now = new Date()
-      const decay = await calculateDecayWithInterval(
-        userTransaction.balance,
-        userTransaction.balanceDate,
-        now.getTime(),
-      )
-      const balance = userTransaction.balance - decay.balance
-      if (balance) {
-        const decayTransaction = new Transaction()
-        decayTransaction.type = 'decay'
-        decayTransaction.balance = roundFloorFrom4(balance)
-        decayTransaction.decayDuration = decay.decayDuration
-        decayTransaction.decayStart = decay.decayStart
-        decayTransaction.decayEnd = decay.decayEnd
-        finalTransactions.push(decayTransaction)
-      }
-    }
-  }
-
-  return finalTransactions
-}
-
-export default async function listTransactions(
-  firstPage: number,
-  items: number,
-  order: 'ASC' | 'DESC',
-  user: dbUser,
-): Promise<TransactionList> {
-  let limit = items
-  let offset = 0
-  let skipFirstTransaction = false
-  if (firstPage > 1) {
-    offset = (firstPage - 1) * items - 1
-    limit++
-  }
-
-  if (offset && order === 'ASC') {
-    offset--
-  }
-  let [userTransactions, userTransactionsCount] = await dbUserTransaction.findByUserPaged(
-    user.id,
-    limit,
-    offset,
-    order,
-  )
-  skipFirstTransaction = userTransactionsCount > offset + limit
-  const decay = !(firstPage > 1)
-  let transactions: Transaction[] = []
-  if (userTransactions.length) {
-    if (order === 'DESC') {
-      userTransactions = userTransactions.reverse()
-    }
-    transactions = await calculateAndAddDecayTransactions(
-      userTransactions,
-      user,
-      decay,
-      skipFirstTransaction,
-    )
-    if (order === 'DESC') {
-      transactions = transactions.reverse()
-    }
-  }
-
-  const transactionList = new TransactionList()
-  transactionList.count = userTransactionsCount
-  transactionList.transactions = transactions
-  return transactionList
-}

backend/src/jwt/decode.ts

@@ -1,18 +1,29 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
-import jwt from 'jsonwebtoken'
+import jwt, { JwtPayload } from 'jsonwebtoken'
 import CONFIG from '../config/'
 
-export default (token: string): any => {
-  if (!token) return new Error('401 Unauthorized')
+interface CustomJwtPayload extends JwtPayload {
+  sessionId: number
+  pubKey: Buffer
+}
+
+type DecodedJwt = {
+  token: string
+  sessionId: number
+  pubKey: Buffer
+}
+
+export default (token: string): DecodedJwt => {
+  if (!token) throw new Error('401 Unauthorized')
   let sessionId = null
+  let pubKey = null
   try {
-    const decoded = jwt.verify(token, CONFIG.JWT_SECRET)
-    sessionId = decoded.sub
+    const decoded = <CustomJwtPayload>jwt.verify(token, CONFIG.JWT_SECRET)
+    sessionId = decoded.sessionId
+    pubKey = decoded.pubKey
     return {
       token,
       sessionId,
+      pubKey,
     }
   } catch (err) {
     throw new Error('403.13 - Client certificate revoked')

backend/src/jwt/encode.ts

@@ -5,8 +5,8 @@ import jwt from 'jsonwebtoken'
 import CONFIG from '../config/'
 
 // Generate an Access Token
-export default function encode(sessionId: string): string {
-  const token = jwt.sign({ sessionId }, CONFIG.JWT_SECRET, {
+export default function encode(sessionId: number, pubKey: Buffer): string {
+  const token = jwt.sign({ sessionId, pubKey }, CONFIG.JWT_SECRET, {
     expiresIn: CONFIG.JWT_EXPIRES_IN,
     subject: sessionId.toString(),
   })

backend/src/server/context.ts

@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 const context = (args: any) => {
   const authorization = args.req.headers.authorization
   let token = null

backend/src/server/plugins.ts

@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 const plugins = [
   {
     requestDidStart() {

backend/src/typeorm/entity/Balance.ts

@@ -16,8 +16,4 @@ export class Balance extends BaseEntity {
 
   @Column({ type: 'bigint' })
   amount: number
-
-  static findByUser(userId: number): Promise<Balance | undefined> {
-    return this.createQueryBuilder('balance').where('balance.userId = :userId', { userId }).getOne()
-  }
 }

backend/src/typeorm/entity/Group.ts

@@ -1,25 +0,0 @@
-/* import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
-import { User } from "./User"
-
-@Entity()
-export class Group {
-
-    @PrimaryGeneratedColumn()
-    id: number;
-
-    @Column()
-    alias: string;
-
-    @Column()
-    name: string;
-
-    @Column()
-    url: string;
-
-    @Column()
-    description: string;
-
-    @OneToMany(type => User, user => user.group)
-    users: User[];
-
-} */

backend/src/typeorm/entity/Transaction.ts

@@ -27,19 +27,4 @@ export class Transaction extends BaseEntity {
 
   @OneToOne(() => TransactionCreation, (transactionCreation) => transactionCreation.transaction)
   transactionCreation: TransactionCreation
-
-  static async findByTransactionTypeId(transactionTypeId: number): Promise<Transaction[]> {
-    return this.createQueryBuilder('transaction')
-      .where('transaction.transactionTypeId = :transactionTypeId', {
-        transactionTypeId: transactionTypeId,
-      })
-      .getMany()
-  }
-
-  static async getDecayStartBlock(): Promise<Transaction | undefined> {
-    return this.createQueryBuilder('transaction')
-      .where('transaction.transactionTypeId = :transactionTypeId', { transactionTypeId: 9 })
-      .orderBy('received', 'ASC')
-      .getOne()
-  }
 }

backend/src/typeorm/entity/User.ts

@@ -1,7 +1,7 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'
 import { UserSetting } from './UserSetting'
 
-// import { Group } from "./Group"
+// Moriz: I do not like the idea of having two user tables
 @Entity('state_users')
 export class User extends BaseEntity {
   @PrimaryGeneratedColumn()
@@ -30,22 +30,4 @@ export class User extends BaseEntity {
 
   @OneToMany(() => UserSetting, (userSetting) => userSetting.user)
   settings: UserSetting[]
-
-  static findByPubkeyHex(pubkeyHex: string): Promise<User> {
-    return this.createQueryBuilder('user')
-      .where('hex(user.pubkey) = :pubkeyHex', { pubkeyHex })
-      .getOneOrFail()
-  }
-
-  static async getUsersIndiced(userIds: number[]): Promise<User[]> {
-    const users = await this.createQueryBuilder('user')
-      .select(['user.id', 'user.firstName', 'user.lastName', 'user.email'])
-      .where('user.id IN (:...users)', { users: userIds })
-      .getMany()
-    const usersIndiced: User[] = []
-    users.forEach((value) => {
-      usersIndiced[value.id] = value
-    })
-    return usersIndiced
-  }
 }

backend/src/typeorm/entity/UserTransaction.ts

@@ -19,18 +19,4 @@ export class UserTransaction extends BaseEntity {
 
   @Column({ name: 'balance_date', type: 'timestamp' })
   balanceDate: Date
-
-  static findByUserPaged(
-    userId: number,
-    limit: number,
-    offset: number,
-    order: 'ASC' | 'DESC',
-  ): Promise<[UserTransaction[], number]> {
-    return this.createQueryBuilder('userTransaction')
-      .where('userTransaction.userId = :userId', { userId })
-      .orderBy('userTransaction.balanceDate', order)
-      .limit(limit)
-      .offset(offset)
-      .getManyAndCount()
-  }
 }

backend/src/typeorm/getDBVersion.ts

@@ -1,11 +1,8 @@
-import { getConnection } from 'typeorm'
 import { Migration } from './entity/Migration'
 
 const getDBVersion = async (): Promise<string | null> => {
-  const connection = getConnection()
-  const migrations = connection.getRepository(Migration)
   try {
-    const dbVersion = await migrations.findOne({ order: { version: 'DESC' } })
+    const dbVersion = await Migration.findOne({ order: { version: 'DESC' } })
     return dbVersion ? dbVersion.fileName : null
   } catch (error) {
     return null

backend/src/typeorm/repository/Balance.ts

@@ -0,0 +1,9 @@
+import { EntityRepository, Repository } from 'typeorm'
+import { Balance } from '../entity/Balance'
+
+@EntityRepository(Balance)
+export class BalanceRepository extends Repository<Balance> {
+  findByUser(userId: number): Promise<Balance | undefined> {
+    return this.createQueryBuilder('balance').where('balance.userId = :userId', { userId }).getOne()
+  }
+}

backend/src/typeorm/repository/Transaction.ts

@@ -0,0 +1,28 @@
+import { EntityRepository, Repository } from 'typeorm'
+import { Transaction } from '../entity/Transaction'
+
+@EntityRepository(Transaction)
+export class TransactionRepository extends Repository<Transaction> {
+  async findDecayStartBlock(): Promise<Transaction | undefined> {
+    return this.createQueryBuilder('transaction')
+      .where('transaction.transactionTypeId = :transactionTypeId', { transactionTypeId: 9 })
+      .orderBy('received', 'ASC')
+      .getOne()
+  }
+
+  async joinFullTransactionsByIds(transactionIds: number[]): Promise<Transaction[]> {
+    return this.createQueryBuilder('transaction')
+      .where('transaction.id IN (:...transactions)', { transactions: transactionIds })
+      .leftJoinAndSelect(
+        'transaction.transactionSendCoin',
+        'transactionSendCoin',
+        // 'transactionSendCoin.transaction_id = transaction.id',
+      )
+      .leftJoinAndSelect(
+        'transaction.transactionCreation',
+        'transactionCreation',
+        // 'transactionSendCoin.transaction_id = transaction.id',
+      )
+      .getMany()
+  }
+}

backend/src/typeorm/repository/User.ts

@@ -0,0 +1,23 @@
+import { EntityRepository, Repository } from 'typeorm'
+import { User } from '../entity/User'
+
+@EntityRepository(User)
+export class UserRepository extends Repository<User> {
+  async findByPubkeyHex(pubkeyHex: string): Promise<User> {
+    return this.createQueryBuilder('user')
+      .where('hex(user.pubkey) = :pubkeyHex', { pubkeyHex })
+      .getOneOrFail()
+  }
+
+  async getUsersIndiced(userIds: number[]): Promise<User[]> {
+    const users = await this.createQueryBuilder('user')
+      .select(['user.id', 'user.firstName', 'user.lastName', 'user.email'])
+      .where('user.id IN (:...users)', { users: userIds })
+      .getMany()
+    const usersIndiced: User[] = []
+    users.forEach((value) => {
+      usersIndiced[value.id] = value
+    })
+    return usersIndiced
+  }
+}

backend/src/typeorm/repository/UserTransaction.ts

@@ -0,0 +1,20 @@
+import { EntityRepository, Repository } from 'typeorm'
+import { Order } from '../../graphql/enum/Order'
+import { UserTransaction } from '../entity/UserTransaction'
+
+@EntityRepository(UserTransaction)
+export class UserTransactionRepository extends Repository<UserTransaction> {
+  findByUserPaged(
+    userId: number,
+    limit: number,
+    offset: number,
+    order: Order,
+  ): Promise<[UserTransaction[], number]> {
+    return this.createQueryBuilder('userTransaction')
+      .where('userTransaction.userId = :userId', { userId })
+      .orderBy('userTransaction.balanceDate', order)
+      .limit(limit)
+      .offset(offset)
+      .getManyAndCount()
+  }
+}

backend/src/util/decay.test.ts

@@ -0,0 +1,16 @@
+import { calculateDecay } from './decay'
+
+describe('utils/decay', () => {
+  it.skip('has base 0.99999997802044727', async () => {
+    const now = new Date()
+    now.setSeconds(1)
+    const oneSecondAgo = new Date(now.getTime())
+    oneSecondAgo.setSeconds(0)
+    expect(await calculateDecay(1.0, oneSecondAgo, now)).toBe(0.99999997802044727)
+  })
+
+  it.skip('returns input amount when from and to is the same', async () => {
+    const now = new Date()
+    expect(await calculateDecay(100.0, now, now)).toBe(100.0)
+  })
+})

backend/src/util/decay.ts

@@ -1,4 +1,6 @@
+import { getCustomRepository } from 'typeorm'
 import { Decay } from '../graphql/models/Decay'
+import { TransactionRepository } from '../typeorm/repository/Transaction'
 
 function decayFormula(amount: number, durationInSeconds: number): number {
   return amount * Math.pow(0.99999997802044727, durationInSeconds)
@@ -6,7 +8,8 @@ function decayFormula(amount: number, durationInSeconds: number): number {
 
 async function calculateDecay(amount: number, from: Date, to: Date): Promise<number> {
   // load decay start block
-  const decayStartBlock = await Decay.getDecayStartBlock()
+  const transactionRepository = getCustomRepository(TransactionRepository)
+  const decayStartBlock = await transactionRepository.findDecayStartBlock()
 
   // if decay hasn't started yet we return input amount
   if (!decayStartBlock) return amount
@@ -20,7 +23,8 @@ async function calculateDecayWithInterval(
   from: number | Date,
   to: number | Date,
 ): Promise<Decay> {
-  const decayStartBlock = await Decay.getDecayStartBlock()
+  const transactionRepository = getCustomRepository(TransactionRepository)
+  const decayStartBlock = await transactionRepository.findDecayStartBlock()
 
   const result = new Decay(undefined)
   result.balance = amount

docker-compose.override.yml

@@ -43,11 +43,13 @@ services:
   # DATABASE ##############################################
   ########################################################
   database:
-    # we always run on prouction here since else the service lingers
+    # we always run on production here since else the service lingers
     # feel free to change this behaviour if it seems useful
-    #image: gradido/database:test_up
-    #build:
-    #  target: test_up
+    # Due to problems with the volume caching the built files
+    # we changed this to test build. This keeps the service running.
+    image: gradido/database:test_up
+    build:
+      target: test_up
     #networks:
     #  - external-net
     #  - internal-net

docu/graphics/gdt_server_api.drawio

@@ -0,0 +1,208 @@
+<mxfile host="65bd71144e">
+    <diagram id="1NBLOcaJ18vLSwe3OBlU" name="Page-1">
+        <mxGraphModel dx="1337" dy="381" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#F1FAEE" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="78" value="External Service" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="1400" width="240" height="160" as="geometry"/>
+                </mxCell>
+                <mxCell id="60" value="Community Gradido Akademie" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="279" y="840" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" value="Community B" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="840" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Community Gradido Akademie" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="280" y="40" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="3" value="Current Process" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=21;fontStyle=1;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry y="10" width="180" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="9" value="EMail" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="6" target="7" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="6" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="80" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="7" value="GDT-Server" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="240" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="10" value="Community B" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="40" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=none;startFill=0;endArrow=none;endFill=0;strokeWidth=3;labelBackgroundColor=#F1FAEE;strokeColor=#B20000;fontColor=#1D3557;fillColor=#e51400;" parent="1" source="12" target="7" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="12" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="640" y="80" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="16" value="" style="endArrow=none;html=1;strokeWidth=3;labelBackgroundColor=#F1FAEE;strokeColor=#B20000;fontColor=#1D3557;fillColor=#e51400;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="550" y="199" as="sourcePoint"/>
+                        <mxPoint x="570" y="184" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="17" value="" style="endArrow=none;html=1;strokeWidth=3;labelBackgroundColor=#F1FAEE;strokeColor=#B20000;fontColor=#1D3557;fillColor=#e51400;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="550" y="209.5" as="sourcePoint"/>
+                        <mxPoint x="570" y="194.5" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="18" value="The GDT-Server is only reachable internally.&lt;br&gt;&lt;br&gt;Another community cannot query it and therefore can not determin the GDT-Balance or the GDT-Transactions of a user. Since this data is queried via EMail identificator it is not possible to expose the GDT-Server to 3rd party communties for obvious privacy reasons.&lt;br&gt;&lt;br&gt;We need another process to expose the GDT data in a private manner, so the user data is protected and the GDT-Server can be exposed." style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="10" y="180" width="260" height="180" as="geometry"/>
+                </mxCell>
+                <mxCell id="22" value="Community Gradido Akademie" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="280" y="440" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="Suggested Process" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=21;fontStyle=1;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry y="410" width="200" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="26" value="IdentifierHash" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="27" target="28" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="27" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="480" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="28" value="GDT-Server" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="640" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="29" value="Community B" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="440" width="240" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="30" value="IdentifierHash" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=classic;endFill=1;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="31" target="28" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="31" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="640" y="480" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="34" value="We expose the GDT-Server to the public, but allow the query of the GDT data by an anonymous identifier hash only.&lt;br&gt;This way the data can not be linked with a user and crawling of known EMail adresses is no longer possible.&lt;br&gt;&lt;br&gt;This requires us to provide an user a way to get his identifier hash and our Gradido Akademie Community to automatically obtain it.&lt;br&gt;&lt;br&gt;The following shall describe thoses processes." style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="10" y="580" width="260" height="180" as="geometry"/>
+                </mxCell>
+                <mxCell id="37" value="" style="endArrow=none;html=1;fontSize=21;strokeWidth=3;fillColor=none;labelBackgroundColor=#F1FAEE;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint y="400" as="sourcePoint"/>
+                        <mxPoint x="1090" y="400" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="38" value="" style="endArrow=none;html=1;fontSize=21;strokeWidth=3;fillColor=none;labelBackgroundColor=#F1FAEE;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint y="800" as="sourcePoint"/>
+                        <mxPoint x="1090" y="800" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="39" value="User requests his identifier hash" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=21;fontStyle=1;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry y="810" width="330" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="59" value="&lt;font style=&quot;font-size: 12px ; line-height: 120%&quot;&gt;Requests identifier hash &lt;br&gt;in his community's frontend&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;strokeWidth=3;jumpSize=6;startSize=6;spacing=2;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="52" target="58" edge="1">
+                    <mxGeometry x="0.0041" y="-29" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="52" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="1049" y="889" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="62" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Forward&lt;br&gt;with EMail&lt;br&gt;from user&lt;br&gt;&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="58" target="61" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="58" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="640" y="879" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="64" value="&lt;font style=&quot;font-size: 12px&quot;&gt;GDT-Server sends EMail with identifier hash&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0.5;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="61" target="63" edge="1">
+                    <mxGeometry x="-0.0051" y="-11" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="61" value="GDT-Server" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="1040" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="63" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="1049" y="1070" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="69" value="The user can request an identifier hash via his community's frontend.&lt;br&gt;This will task the community's backend to send a request to the Gradido Akademie's GDT-Server with the EMail of the user.&lt;br&gt;The GDT-Server in turn will send the user his identifier hash via EMail.&lt;br&gt;The user can input this identifier hash into his community's frontend and therefore allows the foreign community to be able to query the GDT data.&lt;br&gt;&lt;br&gt;Attributes of the identifier hash:&lt;br&gt;1. Not guessable: long, random, not just a hash of the EMail&lt;br&gt;2. Unique: Each user can have only one globally unique identifier&lt;br&gt;3. Persistent: The user might want to use the identifier hash on more then one service&lt;br&gt;4. Regeneratable: The user might want to request to replace his existing hash with a new one in case the old got compromised" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="10" y="840" width="260" height="320" as="geometry"/>
+                </mxCell>
+                <mxCell id="70" value="" style="endArrow=none;html=1;fontSize=21;strokeWidth=3;fillColor=none;labelBackgroundColor=#F1FAEE;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint y="1200" as="sourcePoint"/>
+                        <mxPoint x="1090" y="1200" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="71" value="Special case: Gradido Akademie Community" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=21;fontStyle=1;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry y="1210" width="450" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="72" value="Community Gradido Akademie" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="280" y="1240" width="240" height="480" as="geometry"/>
+                </mxCell>
+                <mxCell id="73" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="1280" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="76" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Write identifier hash&lt;br&gt;directly into Database&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#B09500;fontColor=#1D3557;fillColor=#e3c800;" parent="1" source="74" target="73" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="74" value="GDT-Server" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="1440" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="75" value="Since the Gradido Akademie has access to all data it is not required to pester the user with an EMail confirmation process.&lt;br&gt;&lt;br&gt;Therefore we can define two processes to keep all data up to date:&lt;br&gt;&lt;br&gt;1. A donatation or other change to the GDT account of an EMail happens.&lt;br&gt;2. Continously write all existing data&lt;br&gt;&lt;br&gt;Process 1 is dynamic and esures that once a user donates his identifier hash is directly written into the database as soon as this information reaches us.&lt;br&gt;&lt;br&gt;Process 2 is in case a user registers with our service who already has donated in the past (legacy). This process is not syncronous, meaning it might take a moment till the newly registred user gets access to his old donation data. Furthermore we can use this to syncronize our data between the two services initially and periodically to prevent out-of-sync-data." style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="10" y="1240" width="260" height="480" as="geometry"/>
+                </mxCell>
+                <mxCell id="80" value="&lt;font style=&quot;font-size: 12px&quot;&gt;User donates&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="77" target="79" edge="1">
+                    <mxGeometry x="0.0323" y="-20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="77" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="1048" y="1450" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="81" value="&lt;font style=&quot;font-size: 12px&quot;&gt;webhook&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;entryX=1;entryY=0.5;entryDx=0;entryDy=0;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="79" target="74" edge="1">
+                    <mxGeometry y="-20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="79" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Donation Service&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fontSize=21;strokeWidth=1;align=center;verticalAlign=middle;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="640" y="1440" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="84" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Hook&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="83" target="74" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="83" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Cron&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fontSize=21;strokeWidth=1;align=center;verticalAlign=middle;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="320" y="1600" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="87" value="&lt;span style=&quot;font-size: 12px&quot;&gt;Request GDT-Data&lt;/span&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="85" target="6" edge="1">
+                    <mxGeometry x="0.0189" y="20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="85" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="90" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="89" value="&lt;span style=&quot;font-size: 12px;&quot;&gt;Request GDT-Data&lt;/span&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="88" target="27" edge="1">
+                    <mxGeometry x="0.0189" y="20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="88" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="490" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="91" value="&lt;font style=&quot;font-size: 12px&quot;&gt;Request GDT-Data&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="90" target="12" edge="1">
+                    <mxGeometry x="0.0189" y="-20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="90" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="1050" y="90" width="30" height="60" as="geometry"/>
+                </mxCell>
+                <mxCell id="93" value="&lt;span style=&quot;font-size: 12px&quot;&gt;Request GDT-Data&lt;/span&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=1;jumpSize=6;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=21;startArrow=none;startFill=0;endArrow=classic;endFill=1;startSize=6;strokeWidth=3;labelBackgroundColor=none;strokeColor=#2D7600;fontColor=#1D3557;fillColor=#60a917;" parent="1" source="92" target="31" edge="1">
+                    <mxGeometry x="0.0189" y="-20" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="92" value="User" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fontSize=21;strokeWidth=2;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" parent="1" vertex="1">
+                    <mxGeometry x="1050" y="490" width="30" height="60" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

frontend/src/graphql/queries.js

@@ -32,8 +32,8 @@ export const loginViaEmailVerificationCode = gql`
 `
 
 export const transactionsQuery = gql`
-  query($firstPage: Int = 1, $items: Int = 25, $order: String = "DESC") {
-    transactionList(firstPage: $firstPage, items: $items, order: $order) {
+  query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
+    transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
       gdtSum
       count
       balance

frontend/src/validation-rules.js

@@ -114,14 +114,14 @@ export const loadAllRules = (i18nCallback) => {
 
   extend('atLeastOneSpecialCharater', {
     validate(value) {
-      return !!value.match(/[^a-zA-Z0-9]/)
+      return !!value.match(/[^a-zA-Z0-9 \t\n\r]/)
     },
     message: (_, values) => i18nCallback.t('site.signup.special-char', values),
   })
 
   extend('noWhitespaceCharacters', {
     validate(value) {
-      return !!value.match(/[^ \t\n\r]/)
+      return !value.match(/[ \t\n\r]+/)
     },
     message: (_, values) => i18nCallback.t('site.signup.no-whitespace', values),
   })

frontend/src/views/Layout/DashboardLayout_gdd.spec.js

@@ -32,6 +32,9 @@ describe('DashboardLayoutGdd', () => {
     },
     $router: {
       push: routerPushMock,
+      currentRoute: {
+        path: '/overview',
+      },
     },
     $toasted: {
       error: toasterMock,
@@ -143,21 +146,23 @@ describe('DashboardLayoutGdd', () => {
         it('redirects to login page', () => {
           expect(routerPushMock).toBeCalledWith('/login')
         })
+      })
 
-        describe('logout fails', () => {
-          beforeEach(() => {
-            apolloMock.mockRejectedValue({
-              message: 'error',
-            })
+      describe('logout fails', () => {
+        beforeEach(async () => {
+          apolloMock.mockRejectedValue({
+            message: 'error',
           })
+          await wrapper.findComponent({ name: 'sidebar' }).vm.$emit('logout')
+          await flushPromises()
+        })
 
-          it('dispatches logout to store', () => {
-            expect(storeDispatchMock).toBeCalledWith('logout')
-          })
+        it('dispatches logout to store', () => {
+          expect(storeDispatchMock).toBeCalledWith('logout')
+        })
 
-          it('redirects to login page', () => {
-            expect(routerPushMock).toBeCalledWith('/login')
-          })
+        it('redirects to login page', () => {
+          expect(routerPushMock).toBeCalledWith('/login')
         })
       })
 
@@ -184,7 +189,7 @@ describe('DashboardLayoutGdd', () => {
           })
           await wrapper
             .findComponent({ ref: 'router-view' })
-            .vm.$emit('update-transactions', { firstPage: 2, items: 5 })
+            .vm.$emit('update-transactions', { currentPage: 2, pageSize: 5 })
           await flushPromises()
         })
 
@@ -192,8 +197,8 @@ describe('DashboardLayoutGdd', () => {
           expect(apolloMock).toBeCalledWith(
             expect.objectContaining({
               variables: {
-                firstPage: 2,
-                items: 5,
+                currentPage: 2,
+                pageSize: 5,
               },
             }),
           )
@@ -228,7 +233,7 @@ describe('DashboardLayoutGdd', () => {
           })
           await wrapper
             .findComponent({ ref: 'router-view' })
-            .vm.$emit('update-transactions', { firstPage: 2, items: 5 })
+            .vm.$emit('update-transactions', { currentPage: 2, pageSize: 5 })
           await flushPromises()
         })
 

frontend/src/views/Layout/DashboardLayout_gdd.vue

@@ -101,7 +101,7 @@ export default {
         .catch(() => {
           this.$sidebar.displaySidebar(false)
           this.$store.dispatch('logout')
-          this.$router.push('/login')
+          if (this.$router.currentRoute.path !== '/login') this.$router.push('/login')
         })
     },
     async updateTransactions(pagination) {
@@ -110,8 +110,8 @@ export default {
         .query({
           query: transactionsQuery,
           variables: {
-            firstPage: pagination.firstPage,
-            items: pagination.items,
+            currentPage: pagination.currentPage,
+            pageSize: pagination.pageSize,
           },
           fetchPolicy: 'network-only',
         })

frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js

@@ -327,7 +327,9 @@ describe('GddTransactionList', () => {
 
       it('emits update-transactions when next button is clicked', async () => {
         await paginationButtons.find('button.next-page').trigger('click')
-        expect(wrapper.emitted('update-transactions')[1]).toEqual([{ firstPage: 2, items: 25 }])
+        expect(wrapper.emitted('update-transactions')[1]).toEqual([
+          { currentPage: 2, pageSize: 25 },
+        ])
       })
 
       it('shows text "2 / 2" when next button is clicked', async () => {
@@ -348,7 +350,9 @@ describe('GddTransactionList', () => {
       it('emits update-transactions when preivous button is clicked after next buton', async () => {
         await paginationButtons.find('button.next-page').trigger('click')
         await paginationButtons.find('button.previous-page').trigger('click')
-        expect(wrapper.emitted('update-transactions')[2]).toEqual([{ firstPage: 1, items: 25 }])
+        expect(wrapper.emitted('update-transactions')[2]).toEqual([
+          { currentPage: 1, pageSize: 25 },
+        ])
         expect(scrollToMock).toBeCalled()
       })
     })

frontend/src/views/Pages/AccountOverview/GddTransactionList.vue

@@ -134,8 +134,8 @@ export default {
   methods: {
     updateTransactions() {
       this.$emit('update-transactions', {
-        firstPage: this.currentPage,
-        items: this.pageSize,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
       })
       window.scrollTo(0, 0)
     },

frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.spec.js

@@ -105,13 +105,20 @@ describe('UserCard_FormUserPasswort', () => {
       describe('validation', () => {
         it('displays all password requirements', () => {
           const feedbackArray = wrapper.findAll('div.invalid-feedback').at(1).findAll('span')
-          expect(feedbackArray).toHaveLength(7)
+          expect(feedbackArray).toHaveLength(6)
           expect(feedbackArray.at(0).text()).toBe('validations.messages.required')
           expect(feedbackArray.at(1).text()).toBe('site.signup.lowercase')
           expect(feedbackArray.at(2).text()).toBe('site.signup.uppercase')
           expect(feedbackArray.at(3).text()).toBe('site.signup.one_number')
           expect(feedbackArray.at(4).text()).toBe('site.signup.minimum')
           expect(feedbackArray.at(5).text()).toBe('site.signup.special-char')
+        })
+
+        it('displays no whitespace error when a space character is entered', async () => {
+          await wrapper.findAll('input').at(1).setValue(' ')
+          await flushPromises()
+          const feedbackArray = wrapper.findAll('div.invalid-feedback').at(1).findAll('span')
+          expect(feedbackArray).toHaveLength(7)
           expect(feedbackArray.at(6).text()).toBe('site.signup.no-whitespace')
         })
 

frontend/src/views/Pages/UserProfile/UserCard_Language.spec.js

@@ -3,7 +3,13 @@ import UserCardLanguage from './UserCard_Language'
 
 const localVue = global.localVue
 
-const mockAPIcall = jest.fn()
+const mockAPIcall = jest.fn().mockResolvedValue({
+  data: {
+    updateUserInfos: {
+      validValues: 1,
+    },
+  },
+})
 
 const toastErrorMock = jest.fn()
 const toastSuccessMock = jest.fn()
@@ -17,6 +23,7 @@ describe('UserCard_Language', () => {
     $store: {
       state: {
         language: 'de',
+        email: 'peter@lustig.de',
       },
       commit: storeCommitMock,
     },
@@ -27,6 +34,9 @@ describe('UserCard_Language', () => {
     $apollo: {
       mutate: mockAPIcall,
     },
+    $i18n: {
+      locale: 'de',
+    },
   }
 
   const Wrapper = () => {
@@ -45,5 +55,119 @@ describe('UserCard_Language', () => {
     it('has an edit icon', () => {
       expect(wrapper.find('svg.bi-pencil').exists()).toBeTruthy()
     })
+
+    it('has change language as text', () => {
+      expect(wrapper.find('a').text()).toBe('settings.language.changeLanguage')
+    })
+
+    it('has no select field by default', () => {
+      expect(wrapper.find('select').exists()).toBeFalsy()
+    })
+
+    describe('edit button', () => {
+      beforeEach(() => {
+        wrapper.find('a').trigger('click')
+      })
+
+      it('has no edit icon anymore', () => {
+        expect(wrapper.find('svg.bi-pencil').exists()).toBeFalsy()
+      })
+
+      it('has x-circle icon', () => {
+        expect(wrapper.find('svg.bi-x-circle').exists()).toBeTruthy()
+      })
+
+      it('has a submit button', () => {
+        expect(wrapper.find('button[type="submit"]').exists()).toBeTruthy()
+      })
+
+      it('has the submit button disbaled by default', () => {
+        expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
+      })
+
+      describe('change language', () => {
+        it('does not enable the submit button when same language is chosen', () => {
+          wrapper.findAll('option').at(0).setSelected()
+          expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
+        })
+
+        it('enables the submit button when other language is chosen', async () => {
+          await wrapper.findAll('option').at(1).setSelected()
+          expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined)
+        })
+
+        it('updates language data in component', async () => {
+          await wrapper.findAll('option').at(1).setSelected()
+          expect(wrapper.vm.language).toBe('en')
+        })
+
+        describe('cancel edit', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('option').at(1).setSelected()
+            wrapper.find('a').trigger('click')
+          })
+
+          it('sets the language to initial value', () => {
+            expect(wrapper.vm.language).toBe('de')
+          })
+
+          it('has no select field anymore', () => {
+            expect(wrapper.find('select').exists()).toBeFalsy()
+          })
+        })
+
+        describe('submit', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('option').at(1).setSelected()
+            wrapper.find('form').trigger('submit')
+          })
+
+          describe('with success', () => {
+            it('calls the API', () => {
+              expect(mockAPIcall).toBeCalledWith(
+                expect.objectContaining({
+                  variables: {
+                    email: 'peter@lustig.de',
+                    locale: 'en',
+                  },
+                }),
+              )
+            })
+
+            it('commits new language to store', () => {
+              expect(storeCommitMock).toBeCalledWith('language', 'en')
+            })
+
+            it('changes the i18n locale', () => {
+              expect(mocks.$i18n.locale).toBe('en')
+            })
+
+            it('has no select field anymore', () => {
+              expect(wrapper.find('select').exists()).toBeFalsy()
+            })
+
+            it('toasts a success message', () => {
+              expect(toastSuccessMock).toBeCalledWith('settings.language.success')
+            })
+          })
+
+          describe('with error', () => {
+            beforeEach(() => {
+              mockAPIcall.mockRejectedValue({
+                message: 'Ouch!',
+              })
+            })
+
+            it('sets the language back to initial value', () => {
+              expect(wrapper.vm.language).toBe('de')
+            })
+
+            it('toasts an error message', () => {
+              expect(toastErrorMock).toBeCalledWith('Ouch!')
+            })
+          })
+        })
+      })
+    })
   })
 })

frontend/src/views/Pages/UserProfile/UserCard_Language.vue

@@ -82,6 +82,7 @@ export default {
     },
     cancelEdit() {
       this.showLanguage = true
+      this.language = this.$store.state.language
     },
     async onSubmit() {
       this.$apollo
@@ -104,7 +105,6 @@ export default {
           this.$toasted.error(error.message)
         })
     },
-
     buildTagFromLanguageString() {
       return 'languages.' + this.$store.state.language
     },

frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js

@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import UserCardNewsletter from './UserCard_Newsletter'
-import { unsubscribeNewsletter } from '../../../graphql/mutations'
+import { unsubscribeNewsletter, subscribeNewsletter } from '../../../graphql/mutations'
 
 const localVue = global.localVue
 
@@ -9,7 +9,6 @@ const mockAPIcall = jest.fn()
 const toastErrorMock = jest.fn()
 const toastSuccessMock = jest.fn()
 const storeCommitMock = jest.fn()
-const newsletterStateMock = jest.fn().mockReturnValue(true)
 
 describe('UserCard_Newsletter', () => {
   let wrapper
@@ -20,7 +19,7 @@ describe('UserCard_Newsletter', () => {
       state: {
         language: 'de',
         email: 'peter@lustig.de',
-        newsletterState: newsletterStateMock,
+        newsletterState: true,
       },
       commit: storeCommitMock,
     },
@@ -50,14 +49,15 @@ describe('UserCard_Newsletter', () => {
       expect(wrapper.find('.Test-BFormCheckbox').exists()).toBeTruthy()
     })
 
-    describe('unsubscribe with sucess', () => {
-      beforeEach(() => {
+    describe('unsubscribe with success', () => {
+      beforeEach(async () => {
+        await wrapper.setData({ newsletterState: false })
         mockAPIcall.mockResolvedValue({
           data: {
             unsubscribeNewsletter: true,
           },
         })
-        wrapper.find('input').trigger('change')
+        await wrapper.find('input').trigger('change')
       })
 
       it('calls the unsubscribe mutation', () => {
@@ -78,6 +78,36 @@ describe('UserCard_Newsletter', () => {
       })
     })
 
+    describe('subscribe with success', () => {
+      beforeEach(async () => {
+        await wrapper.setData({ newsletterState: true })
+        mockAPIcall.mockResolvedValue({
+          data: {
+            subscribeNewsletter: true,
+          },
+        })
+        wrapper.find('input').trigger('change')
+      })
+
+      it('calls the subscribe mutation', () => {
+        expect(mockAPIcall).toBeCalledWith({
+          mutation: subscribeNewsletter,
+          variables: {
+            email: 'peter@lustig.de',
+            language: 'de',
+          },
+        })
+      })
+
+      it('updates the store', () => {
+        expect(storeCommitMock).toBeCalledWith('newsletterState', true)
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessMock).toBeCalledWith('settings.newsletter.newsletterFalse')
+      })
+    })
+
     describe('unsubscribe with server error', () => {
       beforeEach(() => {
         mockAPIcall.mockRejectedValue({

frontend/src/views/Pages/UserProfileTransactionList.spec.js

@@ -36,16 +36,16 @@ describe('UserProfileTransactionList', () => {
 
     it('emits update-transactions after creation', () => {
       expect(wrapper.emitted('update-transactions')).toEqual(
-        expect.arrayContaining([expect.arrayContaining([{ firstPage: 1, items: 25 }])]),
+        expect.arrayContaining([expect.arrayContaining([{ currentPage: 1, pageSize: 25 }])]),
       )
     })
 
     it('emist update-transactions when update-transactions is called', () => {
       wrapper
         .findComponent({ name: 'GddTransactionList' })
-        .vm.$emit('update-transactions', { firstPage: 2, items: 25 })
+        .vm.$emit('update-transactions', { currentPage: 2, pageSize: 25 })
       expect(wrapper.emitted('update-transactions')).toEqual(
-        expect.arrayContaining([expect.arrayContaining([{ firstPage: 2, items: 25 }])]),
+        expect.arrayContaining([expect.arrayContaining([{ currentPage: 2, pageSize: 25 }])]),
       )
     })