From e09121d854e98245143cf2025601b158916003ea Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 2 Dec 2021 08:17:56 +0100
Subject: [PATCH 01/23] Admin sends confirmPendingCreation to apollo.

---
 admin/src/components/UserTable.vue          | 28 +++++++++++++--------
 admin/src/graphql/confirmPendingCreation.js |  7 ++++++
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 admin/src/graphql/confirmPendingCreation.js

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index e47963159..fd02a08db 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -132,6 +132,7 @@
 <script>
 import CreationFormular from '../components/CreationFormular.vue'
 import EditCreationFormular from '../components/EditCreationFormular.vue'
+import { confirmPendingCreation } from '../graphql/confirmPendingCreation'
 
 export default {
   name: 'UserTable',
@@ -228,9 +229,22 @@ export default {
       }
     },
     bookmarkConfirm(item) {
-      alert('die schöpfung bestätigen und abschließen')
-      alert(JSON.stringify(item))
-      this.$emit('remove-confirm-result', item, 'remove')
+      console.log('die schöpfung bestätigen und abschließen')
+      console.log(JSON.stringify(item))
+      this.$apollo
+        .mutate({
+          mutation: confirmPendingCreation,
+          variables: {
+            id: item.id,
+          },
+        })
+        .then((result) => {
+          console.log('result', result)
+          this.$emit('remove-confirm-result', item, 'remove')
+        })
+        .catch((error) => {
+          this.$toasted.error(error.message)
+        })
     },
     editCreationUserTable(row, rowItem) {
       if (!row.detailsShowing) {
@@ -241,14 +255,6 @@ export default {
       row.toggleDetails()
     },
     updateCreationData(data) {
-      // console.log('updateCreationData this.creationUserData11=> ', this.creationUserData)
-      // console.log('updateCreationData data=> ', data)
-      // this.creationUserData = {
-      //   ...this.creationUserData,
-      //   ...data,
-      // }
-      // console.log('updateCreationData this.creationUserData22=> ', this.creationUserData)
-
       this.creationUserData.amount = data.amount
       this.creationUserData.date = data.date
       this.creationUserData.memo = data.memo
diff --git a/admin/src/graphql/confirmPendingCreation.js b/admin/src/graphql/confirmPendingCreation.js
new file mode 100644
index 000000000..eee2a00ac
--- /dev/null
+++ b/admin/src/graphql/confirmPendingCreation.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const createPendingCreation = gql`
+  mutation ($id: Int!) {
+    confirmPendingCreation(id: $id)
+  }
+`

From 21928633779a1b0917ef443e59c998f6aa5a2d03 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 2 Dec 2021 09:06:54 +0100
Subject: [PATCH 02/23] --author=ogerly <fridolin@tutanota.com>

creation store prepared
---
 admin/src/graphql/confirmPendingCreation.js   |  2 +-
 backend/src/graphql/resolver/AdminResolver.ts | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/admin/src/graphql/confirmPendingCreation.js b/admin/src/graphql/confirmPendingCreation.js
index eee2a00ac..df72cc04d 100644
--- a/admin/src/graphql/confirmPendingCreation.js
+++ b/admin/src/graphql/confirmPendingCreation.js
@@ -1,6 +1,6 @@
 import gql from 'graphql-tag'
 
-export const createPendingCreation = gql`
+export const confirmPendingCreation = gql`
   mutation ($id: Int!) {
     confirmPendingCreation(id: $id)
   }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 7ae4194b7..9f8c4b9d7 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,9 +1,10 @@
 import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql'
-import { getCustomRepository, Raw } from 'typeorm'
+import { getCustomRepository, Raw, Timestamp } from 'typeorm'
 import { UserAdmin } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
+import { TransactionRepository } from '../../typeorm/repository/Transaction'
 import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation'
 import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation'
 import { UserRepository } from '../../typeorm/repository/User'
@@ -11,6 +12,8 @@ import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
 import moment from 'moment'
 import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin'
+import { Transaction } from '@entity/Transaction'
+import { TransactionCreation } from '@entity/TransactionCreation'
 
 @Resolver()
 export class AdminResolver {
@@ -135,6 +138,35 @@ export class AdminResolver {
     const res = await pendingCreationRepository.manager.remove(entity)
     return !!res
   }
+
+  @Mutation(() => Boolean)
+  async confirmPendingCreation(@Arg('id') id: number): Promise<boolean> {
+    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
+    const pendingCreation = await pendingCreationRepository.findOneOrFail({ id: id })
+    console.log('pendingCreation', pendingCreation)
+
+    const transactionRepository = getCustomRepository(TransactionRepository)
+    let transaction = new Transaction()
+    transaction.transactionTypeId = 1
+    transaction.memo = pendingCreation.memo
+    transaction.received = new Date()
+    transaction.blockchainTypeId = 1
+    transaction = await transactionRepository.save(transaction)
+    console.log('transactionCreation', transaction)
+    if (!transaction) throw new Error('Could not create transaction')
+
+    const transactionCreationRepository = getCustomRepository(TransactionCreationRepository)
+    let transactionCreation = new TransactionCreation()
+    transactionCreation.transactionId = transaction.id
+    transactionCreation.userId = pendingCreation.userId
+    transactionCreation.amount = parseInt(pendingCreation.amount.toString())
+    // transactionCreation.targetDate = new Timestamp(pendingCreation.date.getTime())
+    transactionCreation = await transactionCreationRepository.save(transactionCreation)
+    console.log('transactionCreation', transactionCreation)
+    if (!transactionCreation) throw new Error('Could not create transactionCreation')
+
+    return true
+  }
 }
 
 async function getUserCreations(id: number): Promise<number[]> {

From a93792cab86d78a9f79f1344afc5e7ff6425996b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 2 Dec 2021 10:55:39 +0100
Subject: [PATCH 03/23] Mutation for confirmPendingCreation.

---
 admin/src/components/UserTable.vue            | 1 +
 backend/src/graphql/resolver/AdminResolver.ts | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index fd02a08db..4d2cbe86f 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -231,6 +231,7 @@ export default {
     bookmarkConfirm(item) {
       console.log('die schöpfung bestätigen und abschließen')
       console.log(JSON.stringify(item))
+      console.log(typeof item.id)
       this.$apollo
         .mutate({
           mutation: confirmPendingCreation,
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 9f8c4b9d7..8d1048bfd 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,5 +1,5 @@
-import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql'
-import { getCustomRepository, Raw, Timestamp } from 'typeorm'
+import { Resolver, Query, Arg, Args, Authorized, Mutation, Int } from 'type-graphql'
+import { getCustomRepository, Raw } from 'typeorm'
 import { UserAdmin } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
@@ -11,7 +11,6 @@ import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
 import moment from 'moment'
-import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin'
 import { Transaction } from '@entity/Transaction'
 import { TransactionCreation } from '@entity/TransactionCreation'
 

From 7b3096a88b79a7aaba3e9ee45a35ffa6c1159422 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 3 Dec 2021 12:41:24 +0100
Subject: [PATCH 04/23] Change mutation id from int to float and changed the
 findOrFail parameter to simply id.

---
 admin/src/graphql/confirmPendingCreation.js   | 2 +-
 backend/src/graphql/resolver/AdminResolver.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/graphql/confirmPendingCreation.js b/admin/src/graphql/confirmPendingCreation.js
index df72cc04d..29ac5b4fc 100644
--- a/admin/src/graphql/confirmPendingCreation.js
+++ b/admin/src/graphql/confirmPendingCreation.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const confirmPendingCreation = gql`
-  mutation ($id: Int!) {
+  mutation ($id: Float!) {
     confirmPendingCreation(id: $id)
   }
 `
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 8d1048bfd..dab6eb7c6 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -141,7 +141,7 @@ export class AdminResolver {
   @Mutation(() => Boolean)
   async confirmPendingCreation(@Arg('id') id: number): Promise<boolean> {
     const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
-    const pendingCreation = await pendingCreationRepository.findOneOrFail({ id: id })
+    const pendingCreation = await pendingCreationRepository.findOneOrFail(id)
     console.log('pendingCreation', pendingCreation)
 
     const transactionRepository = getCustomRepository(TransactionRepository)

From a07d34d82715fa06aee4991d70f189e86d6b330b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 3 Dec 2021 14:25:00 +0100
Subject: [PATCH 05/23] Added a state_user_transaction row. withdrew / 10000
 from frontend.

---
 admin/src/components/CreationFormular.vue     |  2 +-
 admin/src/components/EditCreationFormular.vue |  4 +--
 backend/src/graphql/model/PendingCreation.ts  |  2 +-
 backend/src/graphql/resolver/AdminResolver.ts | 34 +++++++++++++++++--
 .../0001-init_db/TransactionCreation.ts       | 12 ++-----
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 2e811da81..de2d3ebc5 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -159,7 +159,7 @@ export default {
     return {
       radioSelected: '',
       text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
-      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
+      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount,
       rangeMin: 0,
       rangeMax: 1000,
       currentMonth: {
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index d3e362b5d..c22900a75 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -186,7 +186,7 @@ export default {
           throw new Error('Something went wrong')
       }
       this.selectedOpenCreationAmount[this.createdIndex] =
-        this.creation[this.createdIndex] + this.creationUserData.amount / 10000
+        this.creation[this.createdIndex] + this.creationUserData.amount
       this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex]
     }
   },
@@ -194,7 +194,7 @@ export default {
     return {
       radioSelected: '',
       text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
-      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
+      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount,
       rangeMin: 0,
       rangeMax: 1000,
       currentMonth: {
diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts
index f1087ea0b..594657a59 100644
--- a/backend/src/graphql/model/PendingCreation.ts
+++ b/backend/src/graphql/model/PendingCreation.ts
@@ -24,7 +24,7 @@ export class PendingCreation {
   memo: string
 
   @Field(() => Number)
-  amount: BigInt
+  amount: number
 
   @Field(() => Number)
   moderator: number
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index dab6eb7c6..581de3752 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,5 +1,5 @@
 import { Resolver, Query, Arg, Args, Authorized, Mutation, Int } from 'type-graphql'
-import { getCustomRepository, Raw } from 'typeorm'
+import { getCustomRepository, Raw, Timestamp } from 'typeorm'
 import { UserAdmin } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
@@ -13,6 +13,8 @@ import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
 import moment from 'moment'
 import { Transaction } from '@entity/Transaction'
 import { TransactionCreation } from '@entity/TransactionCreation'
+import { UserTransaction } from '@entity/UserTransaction'
+import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
 
 @Resolver()
 export class AdminResolver {
@@ -115,8 +117,11 @@ export class AdminResolver {
         const userRepository = getCustomRepository(UserRepository)
         const user = await userRepository.findOneOrFail({ id: pendingCreation.userId })
 
+        const parsedAmount = Number(parseInt(pendingCreation.amount.toString()) / 10000)
+        // pendingCreation.amount = parsedAmount
         const newPendingCreation = {
           ...pendingCreation,
+          amount: parsedAmount,
           firstName: user.firstName,
           lastName: user.lastName,
           email: user.email,
@@ -159,11 +164,36 @@ export class AdminResolver {
     transactionCreation.transactionId = transaction.id
     transactionCreation.userId = pendingCreation.userId
     transactionCreation.amount = parseInt(pendingCreation.amount.toString())
-    // transactionCreation.targetDate = new Timestamp(pendingCreation.date.getTime())
+    transactionCreation.targetDate = pendingCreation.date
     transactionCreation = await transactionCreationRepository.save(transactionCreation)
     console.log('transactionCreation', transactionCreation)
     if (!transactionCreation) throw new Error('Could not create transactionCreation')
 
+    const userTransactionRepository = getCustomRepository(UserTransactionRepository)
+    const lastUserTransaction = await userTransactionRepository.findLastForUser(
+      pendingCreation.userId,
+    )
+    let newBalance = 0
+    if (!lastUserTransaction) {
+      newBalance = 0
+    } else {
+      newBalance = lastUserTransaction.balance
+    }
+    const newUserTransaction = new UserTransaction()
+    newUserTransaction.userId = pendingCreation.userId
+    newUserTransaction.transactionId = transaction.id
+    newUserTransaction.transactionTypeId = transaction.transactionTypeId
+    newUserTransaction.balance = Number(
+      newBalance + parseInt(pendingCreation.amount.toString()) / 10000,
+    )
+    newUserTransaction.balanceDate = transaction.received
+
+    console.log(newUserTransaction)
+
+    await userTransactionRepository.save(newUserTransaction).catch((error) => {
+      throw new Error('Error saving user transaction: ' + error)
+    })
+
     return true
   }
 }
diff --git a/database/entity/0001-init_db/TransactionCreation.ts b/database/entity/0001-init_db/TransactionCreation.ts
index 4a8bdd571..8b9c02623 100644
--- a/database/entity/0001-init_db/TransactionCreation.ts
+++ b/database/entity/0001-init_db/TransactionCreation.ts
@@ -1,12 +1,4 @@
-import {
-  BaseEntity,
-  Entity,
-  PrimaryGeneratedColumn,
-  Column,
-  Timestamp,
-  OneToOne,
-  JoinColumn,
-} from 'typeorm'
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm'
 import { Transaction } from './Transaction'
 
 @Entity('transaction_creations')
@@ -24,7 +16,7 @@ export class TransactionCreation extends BaseEntity {
   amount: number
 
   @Column({ name: 'target_date', type: 'timestamp' })
-  targetDate: Timestamp
+  targetDate: Date
 
   @OneToOne(() => Transaction)
   @JoinColumn({ name: 'transaction_id' })

From 0da5c3d2c8cc9a526f93daf0f263a8fd1cb42f6f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 16:27:01 +0100
Subject: [PATCH 06/23] Store the right amount in the database.

---
 backend/src/graphql/resolver/AdminResolver.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 581de3752..81a87a948 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -15,6 +15,7 @@ import { Transaction } from '@entity/Transaction'
 import { TransactionCreation } from '@entity/TransactionCreation'
 import { UserTransaction } from '@entity/UserTransaction'
 import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
+import { BalanceRepository } from '../../typeorm/repository/Balance'
 
 @Resolver()
 export class AdminResolver {
@@ -179,13 +180,13 @@ export class AdminResolver {
     } else {
       newBalance = lastUserTransaction.balance
     }
+    newBalance += Number(parseInt(pendingCreation.amount.toString()) / 10000)
+
     const newUserTransaction = new UserTransaction()
     newUserTransaction.userId = pendingCreation.userId
     newUserTransaction.transactionId = transaction.id
     newUserTransaction.transactionTypeId = transaction.transactionTypeId
-    newUserTransaction.balance = Number(
-      newBalance + parseInt(pendingCreation.amount.toString()) / 10000,
-    )
+    newUserTransaction.balance = Number(newBalance)
     newUserTransaction.balanceDate = transaction.received
 
     console.log(newUserTransaction)
@@ -194,6 +195,18 @@ export class AdminResolver {
       throw new Error('Error saving user transaction: ' + error)
     })
 
+    const balanceRepository = getCustomRepository(BalanceRepository)
+    let userBalance = await balanceRepository.findByUser(pendingCreation.userId)
+
+    if (!userBalance) userBalance = balanceRepository.create()
+    userBalance.userId = pendingCreation.userId
+    userBalance.amount = Number(newBalance * 10000)
+    userBalance.modified = new Date()
+    userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
+    await balanceRepository.save(userBalance)
+    console.log('userBalance', userBalance)
+    await pendingCreationRepository.delete(pendingCreation)
+
     return true
   }
 }

From df393c4ea87633186caac77d9dd3ecea5d658d69 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 16:46:14 +0100
Subject: [PATCH 07/23] Fixe calculation of the new balance.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 81a87a948..a96ea31a1 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -180,7 +180,7 @@ export class AdminResolver {
     } else {
       newBalance = lastUserTransaction.balance
     }
-    newBalance += Number(parseInt(pendingCreation.amount.toString()) / 10000)
+    newBalance = Number(newBalance) + Number(parseInt(pendingCreation.amount.toString()) / 10000)
 
     const newUserTransaction = new UserTransaction()
     newUserTransaction.userId = pendingCreation.userId

From 6e250cb63b4b0838447d033a87da66063b7822c8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 16:49:03 +0100
Subject: [PATCH 08/23] Remove console.log.

---
 backend/src/graphql/resolver/AdminResolver.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index a96ea31a1..e02d65acd 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -148,7 +148,6 @@ export class AdminResolver {
   async confirmPendingCreation(@Arg('id') id: number): Promise<boolean> {
     const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
     const pendingCreation = await pendingCreationRepository.findOneOrFail(id)
-    console.log('pendingCreation', pendingCreation)
 
     const transactionRepository = getCustomRepository(TransactionRepository)
     let transaction = new Transaction()
@@ -157,7 +156,6 @@ export class AdminResolver {
     transaction.received = new Date()
     transaction.blockchainTypeId = 1
     transaction = await transactionRepository.save(transaction)
-    console.log('transactionCreation', transaction)
     if (!transaction) throw new Error('Could not create transaction')
 
     const transactionCreationRepository = getCustomRepository(TransactionCreationRepository)
@@ -189,8 +187,6 @@ export class AdminResolver {
     newUserTransaction.balance = Number(newBalance)
     newUserTransaction.balanceDate = transaction.received
 
-    console.log(newUserTransaction)
-
     await userTransactionRepository.save(newUserTransaction).catch((error) => {
       throw new Error('Error saving user transaction: ' + error)
     })
@@ -204,7 +200,6 @@ export class AdminResolver {
     userBalance.modified = new Date()
     userBalance.recordDate = userBalance.recordDate ? userBalance.recordDate : new Date()
     await balanceRepository.save(userBalance)
-    console.log('userBalance', userBalance)
     await pendingCreationRepository.delete(pendingCreation)
 
     return true

From 688ae36d8f5b6c86b32ef09a1835c2f828eb34d1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 17:00:40 +0100
Subject: [PATCH 09/23] Remove unused import and console log.

---
 backend/src/graphql/resolver/AdminResolver.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index e02d65acd..08a02049e 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,5 +1,5 @@
-import { Resolver, Query, Arg, Args, Authorized, Mutation, Int } from 'type-graphql'
-import { getCustomRepository, Raw, Timestamp } from 'typeorm'
+import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql'
+import { getCustomRepository, Raw } from 'typeorm'
 import { UserAdmin } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
@@ -165,7 +165,6 @@ export class AdminResolver {
     transactionCreation.amount = parseInt(pendingCreation.amount.toString())
     transactionCreation.targetDate = pendingCreation.date
     transactionCreation = await transactionCreationRepository.save(transactionCreation)
-    console.log('transactionCreation', transactionCreation)
     if (!transactionCreation) throw new Error('Could not create transactionCreation')
 
     const userTransactionRepository = getCustomRepository(UserTransactionRepository)

From 39a85d96d8fa8fdc16a4c9e621266cbb5cfe1a7e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 3 Dec 2021 17:03:09 +0100
Subject: [PATCH 10/23] Remove console log statements.

---
 admin/src/components/UserTable.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4d2cbe86f..4a8ca8e84 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -229,9 +229,6 @@ export default {
       }
     },
     bookmarkConfirm(item) {
-      console.log('die schöpfung bestätigen und abschließen')
-      console.log(JSON.stringify(item))
-      console.log(typeof item.id)
       this.$apollo
         .mutate({
           mutation: confirmPendingCreation,
@@ -239,8 +236,7 @@ export default {
             id: item.id,
           },
         })
-        .then((result) => {
-          console.log('result', result)
+        .then(() => {
           this.$emit('remove-confirm-result', item, 'remove')
         })
         .catch((error) => {

From b8854f9365ff6fdc4fc0f6300a983a2801e546cb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 4 Dec 2021 10:38:25 +0100
Subject: [PATCH 11/23] Change the lastUserTransaction.balance and multiplied
 it by 10000

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

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b2f4b4db5..58eb695ea 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -428,7 +428,7 @@ async function addUserTransaction(
   if (lastUserTransaction) {
     newBalance += Number(
       await calculateDecay(
-        Number(lastUserTransaction.balance),
+        Number(lastUserTransaction.balance * 10000),
         lastUserTransaction.balanceDate,
         transaction.received,
       ).catch(() => {

From 9e8e5e56abcd16ae555c255331ad68dce483f4b4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 11:04:15 +0100
Subject: [PATCH 12/23] Withdrew alert and replaced them with toasted error or
 console.log, withdrew non required props from the test files.

---
 admin/src/components/CreationFormular.spec.js |  1 -
 admin/src/components/CreationFormular.vue     | 14 ++++-----
 .../components/EditCreationFormular.spec.js   |  2 --
 admin/src/components/EditCreationFormular.vue | 30 +++++++++----------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index e1bbff1cc..01faaed39 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -34,7 +34,6 @@ const mocks = {
 
 const propsData = {
   type: '',
-  item: {},
   creation: [],
   itemsMassCreation: {},
 }
diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index de2d3ebc5..dd19ef7ca 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -197,26 +197,26 @@ export default {
     submitCreation() {
       // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
       if (this.radioSelected === '') {
-        return alert('Bitte wähle einen Zeitraum!')
+        return this.$toasted.error('Bitte wähle einen Zeitraum!')
       }
       // Formular Prüfen ob der GDD Betrag grösser 0 ist. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.value === 0) {
-        return alert('Bitte gib einen GDD Betrag an!')
+      if (this.value <= 0) {
+        return this.$toasted.error('Bitte gib einen GDD Betrag an!')
       }
       // Formular Prüfen ob der Text vorhanden ist. Ansonsten abbrechen und Hinweis anzeigen
       if (this.text === '') {
-        return alert('Bitte gib einen Text ein!')
+        return this.$toasted.error('Bitte gib einen Text ein!')
       }
       // Formular Prüfen ob der Text länger als 10 Zeichen hat. Ansonsten abbrechen und Hinweis anzeigen
       if (this.text.length < 10) {
-        return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
+        return this.$toasted.error('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
       }
 
       if (this.type === 'massCreation') {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
         const i = Object.keys(this.itemsMassCreation).length
         // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird)
-        alert('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
+        console.log('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
         this.submitObj = [
           {
             item: this.itemsMassCreation,
@@ -227,7 +227,7 @@ export default {
             moderator: this.$store.state.moderator.id,
           },
         ]
-        alert('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
+        console.log('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
 
         // $store - offene Schöpfungen hochzählen
         this.$store.commit('openCreationsPlus', i)
diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 2f29cb812..8f8103b06 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -45,8 +45,6 @@ const mocks = {
 
 const propsData = {
   type: '',
-  item: {},
-  row: [],
   creation: [],
   itemsMassCreation: {},
 }
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index c22900a75..9154a68fa 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -149,7 +149,7 @@ export default {
     },
     row: {
       type: Array,
-      required: Object,
+      required: false,
       default() {
         return []
       },
@@ -225,19 +225,19 @@ export default {
     submitCreation() {
       // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
       if (this.radioSelected === '') {
-        return alert('Bitte wähle einen Zeitraum!')
+        return this.$toasted.error('Bitte wähle einen Zeitraum!')
       }
       // Formular Prüfen ob der GDD Betrag grösser 0 ist. Ansonsten abbrechen und Hinweis anzeigen
       if (this.value <= 0) {
-        return alert('Bitte gib einen GDD Betrag an!')
+        return this.$toasted.error('Bitte gib einen GDD Betrag an!')
       }
       // Formular Prüfen ob der Text vorhanden ist. Ansonsten abbrechen und Hinweis anzeigen
       if (this.text === '') {
-        return alert('Bitte gib einen Text ein!')
+        return this.$toasted.error('Bitte gib einen Text ein!')
       }
       // Formular Prüfen ob der Text länger als 10 Zeichen hat. Ansonsten abbrechen und Hinweis anzeigen
       if (this.text.length < 10) {
-        return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
+        return this.$toasted.error('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
       }
       this.submitObj = {
         id: this.item.id,
@@ -282,16 +282,16 @@ export default {
           this.value = 0
         })
     },
-  },
-  searchModeratorData() {
-    this.$apollo
-      .query({ query: verifyLogin })
-      .then((result) => {
-        this.$store.commit('moderator', result.data.verifyLogin)
-      })
-      .catch(() => {
-        this.$store.commit('moderator', { id: 0, name: 'Test Moderator' })
-      })
+    searchModeratorData() {
+      this.$apollo
+        .query({ query: verifyLogin })
+        .then((result) => {
+          this.$store.commit('moderator', result.data.verifyLogin)
+        })
+        .catch(() => {
+          this.$store.commit('moderator', { id: 0, name: 'Test Moderator' })
+        })
+    },
   },
 }
 </script>

From 9c0bd490fab39aefe565d10d165badb9e21a0349 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 11:39:00 +0100
Subject: [PATCH 13/23] Moved created method to the end.

---
 admin/src/components/EditCreationFormular.vue | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 9154a68fa..c46698b9d 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -166,30 +166,6 @@ export default {
       required: true,
     },
   },
-  created() {
-    this.searchModeratorData()
-    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
-      switch (this.$moment(this.creationUserData.date).format('MMMM')) {
-        case this.currentMonth.short:
-          this.createdIndex = 2
-          this.radioSelected = this.currentMonth
-          break
-        case this.lastMonth.short:
-          this.createdIndex = 1
-          this.radioSelected = this.lastMonth
-          break
-        case this.beforeLastMonth.short:
-          this.createdIndex = 0
-          this.radioSelected = this.beforeLastMonth
-          break
-        default:
-          throw new Error('Something went wrong')
-      }
-      this.selectedOpenCreationAmount[this.createdIndex] =
-        this.creation[this.createdIndex] + this.creationUserData.amount
-      this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex]
-    }
-  },
   data() {
     return {
       radioSelected: '',
@@ -293,5 +269,29 @@ export default {
         })
     },
   },
+  created() {
+    this.searchModeratorData()
+    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
+      switch (this.$moment(this.creationUserData.date).format('MMMM')) {
+        case this.currentMonth.short:
+          this.createdIndex = 2
+          this.radioSelected = this.currentMonth
+          break
+        case this.lastMonth.short:
+          this.createdIndex = 1
+          this.radioSelected = this.lastMonth
+          break
+        case this.beforeLastMonth.short:
+          this.createdIndex = 0
+          this.radioSelected = this.beforeLastMonth
+          break
+        default:
+          throw new Error('Something went wrong')
+      }
+      this.selectedOpenCreationAmount[this.createdIndex] =
+        this.creation[this.createdIndex] + this.creationUserData.amount
+      this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex]
+    }
+  },
 }
 </script>

From a5406286fe6666e68c37b5455952e2b838ea8790 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 11:43:00 +0100
Subject: [PATCH 14/23] change logic need a if exists or if not exists to up
 and downgrade easily.

---
 database/migrations/0002-add_settings.ts      |  4 +-
 .../migrations/0003-login_server_tables.ts    | 40 +++++++++----------
 database/migrations/0004-login_server_data.ts | 14 +------
 database/migrations/0005-admin_tables.ts      |  4 +-
 4 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts
index 1b3b8a1a4..5c1b4fbe7 100644
--- a/database/migrations/0002-add_settings.ts
+++ b/database/migrations/0002-add_settings.ts
@@ -14,7 +14,7 @@
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   await queryFn(`
-      CREATE TABLE \`user_setting\` (
+      CREATE TABLE IF NOT EXISTS \`user_setting\` (
         \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
         \`userId\` int(11) NOT NULL,
         \`key\` varchar(255) NOT NULL,
@@ -25,5 +25,5 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
 export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   // write downgrade logic as parameter of queryFn
-  await queryFn(`DROP TABLE \`user_setting\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`user_setting\`;`)
 }
diff --git a/database/migrations/0003-login_server_tables.ts b/database/migrations/0003-login_server_tables.ts
index 54e7bca54..d3d720c97 100644
--- a/database/migrations/0003-login_server_tables.ts
+++ b/database/migrations/0003-login_server_tables.ts
@@ -14,7 +14,7 @@
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   await queryFn(`
-    CREATE TABLE \`login_app_access_tokens\` (
+    CREATE TABLE IF NOT EXISTS \`login_app_access_tokens\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`user_id\` int NOT NULL,
       \`access_code\` bigint unsigned NOT NULL,
@@ -25,7 +25,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_elopage_buys\` (
+    CREATE TABLE IF NOT EXISTS \`login_elopage_buys\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`elopage_user_id\` int DEFAULT NULL,
       \`affiliate_program_id\` int NOT NULL,
@@ -42,7 +42,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_email_opt_in_types\` (
+    CREATE TABLE IF NOT EXISTS \`login_email_opt_in_types\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`name\` varchar(255) NOT NULL,
       \`description\` varchar(255) NOT NULL,
@@ -50,7 +50,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_email_opt_in\` (
+    CREATE TABLE IF NOT EXISTS \`login_email_opt_in\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`user_id\` int NOT NULL,
       \`verification_code\` bigint unsigned NOT NULL,
@@ -63,7 +63,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_groups\` (
+    CREATE TABLE IF NOT EXISTS \`login_groups\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`alias\` varchar(190) NOT NULL,
       \`name\` varchar(255) NOT NULL,
@@ -76,7 +76,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; 
   `)
   await queryFn(`
-    CREATE TABLE \`login_pending_tasks\` (
+    CREATE TABLE IF NOT EXISTS \`login_pending_tasks\` (
       \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT,
       \`user_id\` int UNSIGNED DEFAULT 0,
       \`request\` varbinary(2048) NOT NULL,
@@ -91,7 +91,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_roles\` (
+    CREATE TABLE IF NOT EXISTS \`login_roles\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`name\` varchar(255) NOT NULL,
       \`description\` varchar(255) NOT NULL,
@@ -100,7 +100,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_user_backups\` (
+    CREATE TABLE IF NOT EXISTS \`login_user_backups\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`user_id\` int NOT NULL,
       \`passphrase\` text NOT NULL,
@@ -109,7 +109,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_user_roles\` (
+    CREATE TABLE IF NOT EXISTS \`login_user_roles\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`user_id\` int NOT NULL,
       \`role_id\` int NOT NULL,
@@ -117,7 +117,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
   `)
   await queryFn(`
-    CREATE TABLE \`login_users\` (
+    CREATE TABLE IF NOT EXISTS \`login_users\` (
       \`id\` int unsigned NOT NULL AUTO_INCREMENT,
       \`email\` varchar(191) NOT NULL,
       \`first_name\` varchar(150) NOT NULL,
@@ -143,14 +143,14 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
 export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   // write downgrade logic as parameter of queryFn
-  await queryFn(`DROP TABLE \`login_app_access_tokens\`;`)
-  await queryFn(`DROP TABLE \`login_elopage_buys\`;`)
-  await queryFn(`DROP TABLE \`login_email_opt_in_types\`;`)
-  await queryFn(`DROP TABLE \`login_email_opt_in\`;`)
-  await queryFn(`DROP TABLE \`login_groups\`;`)
-  await queryFn(`DROP TABLE \`login_pending_tasks\`;`)
-  await queryFn(`DROP TABLE \`login_roles\`;`)
-  await queryFn(`DROP TABLE \`login_user_backups\`;`)
-  await queryFn(`DROP TABLE \`login_user_roles\`;`)
-  await queryFn(`DROP TABLE \`login_users\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_app_access_tokens\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_elopage_buys\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_email_opt_in_types\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_email_opt_in\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_groups\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_pending_tasks\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_roles\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_user_backups\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_user_roles\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_users\`;`)
 }
diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts
index f319b16ab..b69283ad7 100644
--- a/database/migrations/0004-login_server_data.ts
+++ b/database/migrations/0004-login_server_data.ts
@@ -62,16 +62,4 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
   `)
 }
 
-export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
-  // write downgrade logic as parameter of queryFn
-  await queryFn(`DELETE FROM \`login_app_access_tokens\`;`)
-  await queryFn(`DELETE FROM \`login_elopage_buys\`;`)
-  await queryFn(`DELETE FROM \`login_email_opt_in_types\`;`)
-  await queryFn(`DELETE FROM \`login_email_opt_in\`;`)
-  await queryFn(`DELETE FROM \`login_groups\`;`)
-  await queryFn(`DELETE FROM \`login_pending_tasks\`;`)
-  await queryFn(`DELETE FROM \`login_roles\`;`)
-  await queryFn(`DELETE FROM \`login_user_backups\`;`)
-  await queryFn(`DELETE FROM \`login_user_roles\`;`)
-  await queryFn(`DELETE FROM \`login_users\`;`)
-}
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {}
diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts
index 6398b22fc..bd325678f 100644
--- a/database/migrations/0005-admin_tables.ts
+++ b/database/migrations/0005-admin_tables.ts
@@ -11,7 +11,7 @@
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   await queryFn(`
-  CREATE TABLE \`login_pending_tasks_admin\` (
+  CREATE TABLE IF NOT EXISTS \`login_pending_tasks_admin\` (
     \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT,
     \`userId\` int UNSIGNED DEFAULT 0,
     \`created\` datetime NOT NULL,
@@ -25,5 +25,5 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 }
 
 export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
-  await queryFn(`DROP TABLE \`login_pending_tasks_admin\`;`)
+  await queryFn(`DROP TABLE IF EXISTS \`login_pending_tasks_admin\`;`)
 }

From c7633bb1eb4047c3a572572f79506a54a787edf4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 12:22:48 +0100
Subject: [PATCH 15/23] Test submit of EditCreationFormular, remove
 getCountPendingCreations.

---
 .../components/EditCreationFormular.spec.js   | 38 +++++++++++++++++++
 admin/src/components/EditCreationFormular.vue |  1 +
 admin/src/graphql/getCountPendingCreations.js |  7 ----
 3 files changed, 39 insertions(+), 7 deletions(-)
 delete mode 100644 admin/src/graphql/getCountPendingCreations.js

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 8f8103b06..dd503411a 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -39,6 +39,12 @@ const mocks = {
     mutate: apolloMutateMock,
   },
   $store: {
+    state: {
+      moderator: {
+        id: 0,
+        name: 'test moderator',
+      },
+    },
     commit: stateCommitMock,
   },
 }
@@ -92,6 +98,8 @@ describe('EditCreationFormular', () => {
           jest.clearAllMocks()
           await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
           await wrapper.setData({ rangeMin: 180 })
+          await wrapper.setData({ text: 'Test create coins' })
+          await wrapper.setData({ value: 90 })
         })
 
         describe('first radio button', () => {
@@ -106,6 +114,16 @@ describe('EditCreationFormular', () => {
           it('sets rangeMax to 200', () => {
             expect(wrapper.vm.rangeMax).toBe(200)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+          })
         })
 
         describe('second radio button', () => {
@@ -120,6 +138,16 @@ describe('EditCreationFormular', () => {
           it('sets rangeMax to 400', () => {
             expect(wrapper.vm.rangeMax).toBe(400)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+          })
         })
 
         describe('third radio button', () => {
@@ -134,6 +162,16 @@ describe('EditCreationFormular', () => {
           it('sets rangeMax to 400', () => {
             expect(wrapper.vm.rangeMax).toBe(600)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+          })
         })
       })
     })
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index c46698b9d..5e1bf4be1 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -106,6 +106,7 @@
               <b-button
                 type="button"
                 variant="success"
+                class="test-submit"
                 @click="submitCreation"
                 :disabled="radioSelected === '' || value <= 0 || text.length < 10"
               >
diff --git a/admin/src/graphql/getCountPendingCreations.js b/admin/src/graphql/getCountPendingCreations.js
deleted file mode 100644
index f8593ee59..000000000
--- a/admin/src/graphql/getCountPendingCreations.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import gql from 'graphql-tag'
-
-export const countPendingCreations = gql`
-  query {
-    countPendingCreations
-  }
-`

From 16fa3de5736ad3c6157c8ec028a1f6b59dcf1fa7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 12:29:38 +0100
Subject: [PATCH 16/23] click on months in the creation form if index 0, and id
 set for the label

---
 admin/src/components/CreationFormular.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index dd19ef7ca..41eeef6a3 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -6,6 +6,7 @@
           <label>Monat Auswählen</label>
           <b-col class="text-left">
             <b-form-radio
+              id="beforeLastMonth"
               v-model="radioSelected"
               :value="beforeLastMonth"
               :disabled="creation[0] === 0"
@@ -19,6 +20,7 @@
           </b-col>
           <b-col>
             <b-form-radio
+              id="lastMonth"
               v-model="radioSelected"
               :value="lastMonth"
               :disabled="creation[1] === 0"
@@ -32,6 +34,7 @@
           </b-col>
           <b-col class="text-right">
             <b-form-radio
+              id="currentMonth"
               v-model="radioSelected"
               :value="currentMonth"
               :disabled="creation[2] === 0"
@@ -45,7 +48,7 @@
           </b-col>
         </b-row>
 
-        <b-row class="m-4" v-show="createdIndex">
+        <b-row class="m-4" v-show="createdIndex != null">
           <label>Betrag Auswählen</label>
           <div>
             <b-input-group prepend="GDD" append=".00">
@@ -92,6 +95,7 @@
                 v-if="pagetype === 'PageCreationConfirm'"
                 type="button"
                 variant="success"
+                class="test-submit"
                 @click="submitCreation"
                 :disabled="radioSelected === '' || value <= 0 || text.length < 10"
               >
@@ -183,7 +187,9 @@ export default {
   methods: {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
+      console.log('this.createdIndex befor', this.createdIndex)
       this.createdIndex = index
+       console.log('this.createdIndex last', this.createdIndex)
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren

From f5572febee74cffecfbd5a4b31581a5e55dc17c3 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 13:27:10 +0100
Subject: [PATCH 17/23] Testing Creation and EditCreation formulars.

---
 admin/src/components/CreationFormular.spec.js | 186 ++++++++++++++++++
 admin/src/components/CreationFormular.vue     |  20 +-
 admin/src/components/EditCreationFormular.vue |  23 +--
 3 files changed, 192 insertions(+), 37 deletions(-)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index 01faaed39..f167d48a1 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -11,7 +11,14 @@ const apolloMock = jest.fn().mockResolvedValue({
     },
   },
 })
+const apolloMutateMock = jest.fn().mockResolvedValue({
+  data: {
+    createPendingCreation: [0, 0, 0],
+  },
+})
 const stateCommitMock = jest.fn()
+const toastedErrorMock = jest.fn()
+const toastedSuccessMock = jest.fn()
 
 const mocks = {
   $moment: jest.fn(() => {
@@ -26,9 +33,20 @@ const mocks = {
   }),
   $apollo: {
     query: apolloMock,
+    mutate: apolloMutateMock,
   },
   $store: {
     commit: stateCommitMock,
+    state: {
+      moderator: {
+        id: 0,
+        name: 'test moderator',
+      },
+    },
+  },
+  $toasted: {
+    error: toastedErrorMock,
+    success: toastedSuccessMock,
   },
 }
 
@@ -124,6 +142,8 @@ describe('CreationFormular', () => {
           jest.clearAllMocks()
           await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
           await wrapper.setData({ rangeMin: 180 })
+          await wrapper.setData({ text: 'Test create coins' })
+          await wrapper.setData({ value: 90 })
         })
 
         describe('first radio button', () => {
@@ -138,6 +158,66 @@ describe('CreationFormular', () => {
           it('sets rangeMax to 200', () => {
             expect(wrapper.vm.rangeMax).toBe(200)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+          })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              apolloMutateMock.mockRejectedValueOnce({ message: 'Ouch!' })
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(toastedErrorMock).toBeCalled()
+            })
+          })
+
+          describe('Negativ value', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ value: -20 })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Empty text', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: '' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Text length less than 10', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: 'Try this' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
         })
 
         describe('second radio button', () => {
@@ -152,6 +232,55 @@ describe('CreationFormular', () => {
           it('sets rangeMax to 400', () => {
             expect(wrapper.vm.rangeMax).toBe(400)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends ... to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+          })
+
+          describe('Negativ value', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ value: -20 })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Empty text', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: '' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Text length less than 10', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: 'Try this' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
         })
 
         describe('third radio button', () => {
@@ -166,6 +295,63 @@ describe('CreationFormular', () => {
           it('sets rangeMax to 400', () => {
             expect(wrapper.vm.rangeMax).toBe(600)
           })
+
+          describe('sendForm', () => {
+            beforeEach(async () => {
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('sends mutation to apollo', () => {
+              expect(apolloMutateMock).toBeCalled()
+            })
+
+            it('toast success message', () => {
+              expect(toastedSuccessMock).toBeCalled()
+            })
+
+            it('store commit openCreationPlus', () => {
+              expect(stateCommitMock).toBeCalledWith('openCreationsPlus', 1)
+            })
+          })
+
+          describe('Negativ value', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ value: -20 })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Empty text', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: '' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
+
+          describe('Text length less than 10', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.setData({ text: 'Try this' })
+            })
+
+            it('has no submit button', async () => {
+              expect(await wrapper.find('.test-submit').attributes('disabled')).toBe('disabled')
+            })
+          })
         })
       })
     })
diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 41eeef6a3..5b131dca8 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -106,6 +106,7 @@
                 v-else
                 type="button"
                 variant="success"
+                class="test-submit"
                 @click="submitCreation"
                 :disabled="radioSelected === '' || value <= 0 || text.length < 10"
               >
@@ -187,9 +188,7 @@ export default {
   methods: {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
-      console.log('this.createdIndex befor', this.createdIndex)
       this.createdIndex = index
-       console.log('this.createdIndex last', this.createdIndex)
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren
@@ -201,23 +200,6 @@ export default {
       }
     },
     submitCreation() {
-      // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.radioSelected === '') {
-        return this.$toasted.error('Bitte wähle einen Zeitraum!')
-      }
-      // Formular Prüfen ob der GDD Betrag grösser 0 ist. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.value <= 0) {
-        return this.$toasted.error('Bitte gib einen GDD Betrag an!')
-      }
-      // Formular Prüfen ob der Text vorhanden ist. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.text === '') {
-        return this.$toasted.error('Bitte gib einen Text ein!')
-      }
-      // Formular Prüfen ob der Text länger als 10 Zeichen hat. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.text.length < 10) {
-        return this.$toasted.error('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
-      }
-
       if (this.type === 'massCreation') {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
         const i = Object.keys(this.itemsMassCreation).length
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 5e1bf4be1..bda48569a 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -6,6 +6,7 @@
           <label>Monat Auswählen</label>
           <b-col class="text-left">
             <b-form-radio
+              id="beforeLastMonth"
               v-model="radioSelected"
               :value="beforeLastMonth"
               :disabled="selectedOpenCreationAmount[0] === 0"
@@ -24,6 +25,7 @@
           </b-col>
           <b-col>
             <b-form-radio
+              id="lastMonth"
               v-model="radioSelected"
               :value="lastMonth"
               :disabled="selectedOpenCreationAmount[1] === 0"
@@ -42,6 +44,7 @@
           </b-col>
           <b-col class="text-right">
             <b-form-radio
+              id="currentMonth"
               v-model="radioSelected"
               :value="currentMonth"
               :disabled="selectedOpenCreationAmount[2] === 0"
@@ -149,10 +152,10 @@ export default {
       },
     },
     row: {
-      type: Array,
+      type: Object,
       required: false,
       default() {
-        return []
+        return {}
       },
     },
     creationUserData: {
@@ -200,22 +203,6 @@ export default {
       this.rangeMax = this.creation[index]
     },
     submitCreation() {
-      // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.radioSelected === '') {
-        return this.$toasted.error('Bitte wähle einen Zeitraum!')
-      }
-      // Formular Prüfen ob der GDD Betrag grösser 0 ist. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.value <= 0) {
-        return this.$toasted.error('Bitte gib einen GDD Betrag an!')
-      }
-      // Formular Prüfen ob der Text vorhanden ist. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.text === '') {
-        return this.$toasted.error('Bitte gib einen Text ein!')
-      }
-      // Formular Prüfen ob der Text länger als 10 Zeichen hat. Ansonsten abbrechen und Hinweis anzeigen
-      if (this.text.length < 10) {
-        return this.$toasted.error('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
-      }
       this.submitObj = {
         id: this.item.id,
         email: this.item.email,

From 060eb998f6d0cff5f1ac509079f212852a859f5a Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 13:38:53 +0100
Subject: [PATCH 18/23] test ok for Overview.spec.js

---
 admin/src/pages/Overview.spec.js | 52 ++++++++++++++++++++++++++++++++
 admin/src/pages/Overview.vue     |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 admin/src/pages/Overview.spec.js

diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
new file mode 100644
index 000000000..7f0a2b3cc
--- /dev/null
+++ b/admin/src/pages/Overview.spec.js
@@ -0,0 +1,52 @@
+import { mount } from '@vue/test-utils'
+import Overview from './Overview.vue'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValue({
+  data: {
+    searchUsers: [
+      {
+        firstName: 'Bibi',
+        lastName: 'Bloxberg',
+        email: 'bibi@bloxberg.de',
+        creation: [200, 400, 600],
+      },
+    ],
+  },
+})
+
+const toastErrorMock = jest.fn()
+
+const mocks = {
+  $store: {
+    state: {
+      openCreations: 0,
+    },
+    commit: jest.fn(),
+  },
+  $apollo: {
+    query: apolloQueryMock,
+  },
+  $toasted: {
+    error: toastErrorMock,
+  },
+}
+
+describe('Overview', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(Overview, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV element with the class.admin-overview', () => {
+      expect(wrapper.find('div.admin-overview').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 8d05e03e8..f45f588e5 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="admin-overview">
     <b-card
       v-show="$store.state.openCreations > 0"
       border-variant="primary"

From 236f30d16fc65e5c670b3cf701a45bff68901545 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 13:50:48 +0100
Subject: [PATCH 19/23] CreationFormular now tests everything exept from
 massCreation.

---
 admin/src/components/CreationFormular.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index f167d48a1..f6bd1a924 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -81,9 +81,10 @@ describe('CreationFormular', () => {
     describe('server throws error for moderator data call', () => {
       beforeEach(() => {
         jest.clearAllMocks()
-        apolloMock.mockRejectedValue({ message: 'Ouch!' })
+        apolloMock.mockRejectedValueOnce({ message: 'Ouch!' })
         wrapper = Wrapper()
       })
+
       it('has called store commit with fake data', () => {
         expect(stateCommitMock).toBeCalledWith('moderator', { id: 0, name: 'Test Moderator' })
       })

From 03111c7b4ec9e9319ca2ac400dc3c7a269806a3e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 13:55:23 +0100
Subject: [PATCH 20/23] Lint fixes.

---
 admin/src/components/CreationFormular.vue     | 2 ++
 database/migrations/0004-login_server_data.ts | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 5b131dca8..6e47812be 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -204,6 +204,7 @@ export default {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
         const i = Object.keys(this.itemsMassCreation).length
         // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird)
+        // eslint-disable-next-line no-console
         console.log('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
         this.submitObj = [
           {
@@ -215,6 +216,7 @@ export default {
             moderator: this.$store.state.moderator.id,
           },
         ]
+        // eslint-disable-next-line no-console
         console.log('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
 
         // $store - offene Schöpfungen hochzählen
diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts
index b69283ad7..554125eed 100644
--- a/database/migrations/0004-login_server_data.ts
+++ b/database/migrations/0004-login_server_data.ts
@@ -62,4 +62,6 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
   `)
 }
 
-export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {}
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  // TODO NO EMPTY FUNCTION
+}

From 5885e7424c3f92a7878518fd346fd24da87d59b6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 4 Dec 2021 14:05:03 +0100
Subject: [PATCH 21/23] Upgrade coverage to 60%.

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4967be67d..c854bdc30 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -441,7 +441,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 51
+          min_coverage: 60
           token: ${{ github.token }}
 
   ##############################################################################

From a76287c0b066912db51453fe9d80486c9e5759d4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 6 Dec 2021 16:10:07 +0100
Subject: [PATCH 22/23] add toasted error mock

---
 admin/src/components/EditCreationFormular.spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 968525613..22b9817f1 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -15,6 +15,7 @@ const apolloMutateMock = jest.fn().mockResolvedValue({
 })
 
 const stateCommitMock = jest.fn()
+const toastedErrorMock = jest.fn()
 
 const mocks = {
   $moment: jest.fn(() => {
@@ -39,6 +40,9 @@ const mocks = {
     },
     commit: stateCommitMock,
   },
+  $toasted: {
+    error: toastedErrorMock,
+  },
 }
 
 const propsData = {

From 8a2df2f8990b5aae1780f13e309637a5d3af23f9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 7 Dec 2021 07:28:20 +0100
Subject: [PATCH 23/23] Fixe tests of EditCreationFormular.

---
 .../components/EditCreationFormular.spec.js   | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 22b9817f1..50704ed76 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -100,7 +100,18 @@ describe('EditCreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(apolloMutateMock).toBeCalledWith(
+                expect.objectContaining({
+                  variables: {
+                    amount: 90,
+                    creationDate: 'YYYY-MM-01',
+                    email: undefined,
+                    id: undefined,
+                    memo: 'Test create coins',
+                    moderator: 0,
+                  },
+                }),
+              )
             })
           })
         })
@@ -124,7 +135,18 @@ describe('EditCreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(apolloMutateMock).toBeCalledWith(
+                expect.objectContaining({
+                  variables: {
+                    amount: 90,
+                    creationDate: 'YYYY-MM-01',
+                    email: undefined,
+                    id: undefined,
+                    memo: 'Test create coins',
+                    moderator: 0,
+                  },
+                }),
+              )
             })
           })
         })
@@ -148,7 +170,18 @@ describe('EditCreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(apolloMutateMock).toBeCalledWith(
+                expect.objectContaining({
+                  variables: {
+                    amount: 90,
+                    creationDate: 'YYYY-MM-DD',
+                    email: undefined,
+                    id: undefined,
+                    memo: 'Test create coins',
+                    moderator: 0,
+                  },
+                }),
+              )
             })
           })
         })