From 6e63bacba748c41ad91d7199b467483193b08ff4 Mon Sep 17 00:00:00 2001
From: Einhornimmond <git@einhornimmond.de>
Date: Fri, 11 Feb 2022 10:15:09 +0100
Subject: [PATCH 01/59] let handle mysql the paging

---
 backend/src/graphql/resolver/AdminResolver.ts | 16 ++++++----
 backend/src/typeorm/repository/User.ts        | 31 +++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 54fe9335e..2b6138dee 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -32,7 +32,13 @@ export class AdminResolver {
     @Args() { searchText, currentPage = 1, pageSize = 25, notActivated = false }: SearchUsersArgs,
   ): Promise<SearchUsersResult> {
     const userRepository = getCustomRepository(UserRepository)
-    const users = await userRepository.findBySearchCriteria(searchText)
+    let users: dbUser[]
+    let count: number
+    if(notActivated) {
+        [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated(searchText, currentPage, pageSize)
+    } else {
+        [users, count] = await userRepository.findBySearchCriteriaPaged(searchText, currentPage, pageSize)
+    }
     let adminUsers = await Promise.all(
       users.map(async (user) => {
         const adminUser = new UserAdmin()
@@ -41,16 +47,14 @@ export class AdminResolver {
         adminUser.lastName = user.lastName
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
-        adminUser.emailChecked = await hasActivatedEmail(user.email)
+        adminUser.emailChecked = user.emailChecked
         adminUser.hasElopage = await hasElopageBuys(user.email)
         return adminUser
       }),
     )
-    if (notActivated) adminUsers = adminUsers.filter((u) => !u.emailChecked)
-    const first = (currentPage - 1) * pageSize
     return {
-      userCount: adminUsers.length,
-      userList: adminUsers.slice(first, first + pageSize),
+      userCount: count,
+      userList: adminUsers,
     }
   }
 
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 59d6ff465..bf9d55587 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,5 +1,6 @@
 import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { User } from '@entity/User'
+import internal from 'stream'
 
 @EntityRepository(User)
 export class UserRepository extends Repository<User> {
@@ -43,4 +44,34 @@ export class UserRepository extends Repository<User> {
       )
       .getMany()
   }
+  async findBySearchCriteriaPaged(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> {
+    return await this.createQueryBuilder('user')
+      .where(
+        'user.firstName like :name or user.lastName like :lastName or user.email like :email',
+        {
+          name: `%${searchCriteria}%`,
+          lastName: `%${searchCriteria}%`,
+          email: `%${searchCriteria}%`,
+        },
+      )
+      .take(pageSize)
+      .skip((currentPage - 1 ) * pageSize)
+      .getManyAndCount()
+  }
+
+  async findBySearchCriteriaPagedNotActivated(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> {
+    return await this.createQueryBuilder('user')
+      .where(
+        'user.firstName like :name or user.lastName like :lastName or user.email like :email',
+        {
+          name: `%${searchCriteria}%`,
+          lastName: `%${searchCriteria}%`,
+          email: `%${searchCriteria}%`,
+          emailChecked: false
+        },
+      )
+      .take(pageSize)
+      .skip((currentPage - 1 ) * pageSize)
+      .getManyAndCount()
+  }
 }

From cdd31ccba9e0ea41cc1aee82c6abbd6ca17a8dd2 Mon Sep 17 00:00:00 2001
From: Einhornimmond <git@einhornimmond.de>
Date: Sat, 12 Feb 2022 12:41:13 +0100
Subject: [PATCH 02/59] fix nested where conditions

---
 backend/src/typeorm/repository/User.ts | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index bf9d55587..e4efedaf7 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,4 +1,4 @@
-import { EntityRepository, Repository } from '@dbTools/typeorm'
+import { Brackets, EntityRepository, Repository } from '@dbTools/typeorm'
 import { User } from '@entity/User'
 import internal from 'stream'
 
@@ -60,15 +60,22 @@ export class UserRepository extends Repository<User> {
   }
 
   async findBySearchCriteriaPagedNotActivated(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> {
+    
     return await this.createQueryBuilder('user')
       .where(
-        'user.firstName like :name or user.lastName like :lastName or user.email like :email',
-        {
-          name: `%${searchCriteria}%`,
-          lastName: `%${searchCriteria}%`,
-          email: `%${searchCriteria}%`,
-          emailChecked: false
-        },
+        new Brackets(qb => {
+          qb.where(
+            'user.firstName like :name or user.lastName like :lastName or user.email like :email',
+            {
+              name: `%${searchCriteria}%`,
+              lastName: `%${searchCriteria}%`,
+              email: `%${searchCriteria}%`,
+            },
+          )
+        })
+      )
+      .andWhere(
+        {emailChecked: false}
       )
       .take(pageSize)
       .skip((currentPage - 1 ) * pageSize)

From 692433ce51a47b90506a82d05bda1c48f971559c Mon Sep 17 00:00:00 2001
From: Einhornimmond <git@einhornimmond.de>
Date: Sun, 13 Feb 2022 09:22:05 +0100
Subject: [PATCH 03/59] try fix linting

---
 backend/src/graphql/resolver/AdminResolver.ts | 16 +++++++++---
 backend/src/typeorm/repository/User.ts        | 26 ++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 2b6138dee..fbd3b04fa 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -34,12 +34,20 @@ export class AdminResolver {
     const userRepository = getCustomRepository(UserRepository)
     let users: dbUser[]
     let count: number
-    if(notActivated) {
-        [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated(searchText, currentPage, pageSize)
+    if (notActivated) {
+      [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated(
+        searchText,
+        currentPage,
+        pageSize,
+      )
     } else {
-        [users, count] = await userRepository.findBySearchCriteriaPaged(searchText, currentPage, pageSize)
+      [users, count] = await userRepository.findBySearchCriteriaPaged(
+        searchText,
+        currentPage,
+        pageSize,
+      )
     }
-    let adminUsers = await Promise.all(
+    const adminUsers = await Promise.all(
       users.map(async (user) => {
         const adminUser = new UserAdmin()
         adminUser.userId = user.id
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index e4efedaf7..e43c29e22 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -44,7 +44,12 @@ export class UserRepository extends Repository<User> {
       )
       .getMany()
   }
-  async findBySearchCriteriaPaged(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> {
+
+  async findBySearchCriteriaPaged(
+    searchCriteria: string,
+    currentPage: number,
+    pageSize: number,
+  ): Promise<[User[], number]> {
     return await this.createQueryBuilder('user')
       .where(
         'user.firstName like :name or user.lastName like :lastName or user.email like :email',
@@ -55,15 +60,18 @@ export class UserRepository extends Repository<User> {
         },
       )
       .take(pageSize)
-      .skip((currentPage - 1 ) * pageSize)
+      .skip((currentPage - 1) * pageSize)
       .getManyAndCount()
   }
 
-  async findBySearchCriteriaPagedNotActivated(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> {
-    
+  async findBySearchCriteriaPagedNotActivated(
+    searchCriteria: string,
+    currentPage: number,
+    pageSize: number,
+  ): Promise<[User[], number]> {
     return await this.createQueryBuilder('user')
       .where(
-        new Brackets(qb => {
+        new Brackets((qb) => {
           qb.where(
             'user.firstName like :name or user.lastName like :lastName or user.email like :email',
             {
@@ -72,13 +80,11 @@ export class UserRepository extends Repository<User> {
               email: `%${searchCriteria}%`,
             },
           )
-        })
-      )
-      .andWhere(
-        {emailChecked: false}
+        }),
       )
+      .andWhere({ emailChecked: false })
       .take(pageSize)
-      .skip((currentPage - 1 ) * pageSize)
+      .skip((currentPage - 1) * pageSize)
       .getManyAndCount()
   }
 }

From 84d7f17d8502af189882e312a050bc0c30df1ea3 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Sun, 13 Feb 2022 13:33:44 +0100
Subject: [PATCH 04/59] Update backend/src/typeorm/repository/User.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/typeorm/repository/User.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index e43c29e22..6045c402a 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,6 +1,5 @@
 import { Brackets, EntityRepository, Repository } from '@dbTools/typeorm'
 import { User } from '@entity/User'
-import internal from 'stream'
 
 @EntityRepository(User)
 export class UserRepository extends Repository<User> {

From a3d697182dc88f7973f3148aa84c3db24ba04e0b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 12:26:27 +0100
Subject: [PATCH 05/59] fix: Backend Unit Tests Running Again

---
 backend/jest.config.js    | 36 +++++++++++++++++-------------------
 backend/test/testSetup.ts |  6 ++++++
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 backend/test/testSetup.ts

diff --git a/backend/jest.config.js b/backend/jest.config.js
index 75b674cb1..d9e7065d4 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -1,21 +1,19 @@
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
-module.exports = async () => {
-  process.env.TZ = 'UTC'
-  return {
-    verbose: true,
-    preset: 'ts-jest',
-    collectCoverage: true,
-    collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
-    moduleNameMapper: {
-      '@entity/(.*)': '<rootDir>/../database/build/entity/$1',
-      // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state
-      '@dbTools/(.*)': '<rootDir>/../database/src/$1',
-      /*
-      '@dbTools/(.*)':
-        process.env.NODE_ENV === 'development'
-          ? '<rootDir>/../database/src/$1'
-          : '<rootDir>/../database/build/src/$1',
-      */
-    },
-  }
+module.exports = {
+  verbose: true,
+  preset: 'ts-jest',
+  collectCoverage: true,
+  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
+  setupFiles: ['<rootDir>/test/testSetup.ts'],
+  moduleNameMapper: {
+    '@entity/(.*)':
+      process.env.NODE_ENV === 'development'
+        ? '<rootDir>/../database/entity/$1'
+        : '<rootDir>/../database/build/entity/$1',
+    // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state
+    '@dbTools/(.*)':
+      process.env.NODE_ENV === 'development'
+        ? '<rootDir>/../database/src/$1'
+        : '<rootDir>/../database/build/src/$1',
+  },
 }
diff --git a/backend/test/testSetup.ts b/backend/test/testSetup.ts
new file mode 100644
index 000000000..ed2c5cf49
--- /dev/null
+++ b/backend/test/testSetup.ts
@@ -0,0 +1,6 @@
+/* eslint-disable no-console */
+
+// disable console.info for apollo log
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+console.info = () => {}

From fccf64ec3623ba155a850bc0811b4007bca6559c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 12:29:24 +0100
Subject: [PATCH 06/59] set time zone in package json

---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index 7f4cfc239..b72386a68 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,7 @@
     "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts",
     "lint": "eslint . --ext .js,.ts",
     "CI_workflow_test": "jest --runInBand --coverage ",
-    "test": "NODE_ENV=development jest --runInBand --coverage "
+    "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage "
   },
   "dependencies": {
     "@types/jest": "^27.0.2",

From 1335bb8e26cd9f30ba65f8edeb9e4ac0461c2c92 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 13:18:59 +0100
Subject: [PATCH 07/59] activate UserResolver test again

---
 .../{UserResolver.test.ts.disabled => UserResolver.test.ts}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/src/graphql/resolver/{UserResolver.test.ts.disabled => UserResolver.test.ts} (100%)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts.disabled b/backend/src/graphql/resolver/UserResolver.test.ts
similarity index 100%
rename from backend/src/graphql/resolver/UserResolver.test.ts.disabled
rename to backend/src/graphql/resolver/UserResolver.test.ts

From 631346b63cab4b0f620fc4366e042aa71b645811 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 13:19:27 +0100
Subject: [PATCH 08/59] remove deleted entities

---
 .../src/graphql/resolver/UserResolver.test.ts | 54 +++-------------
 backend/src/server/plugins.ts                 | 64 ++++++++++---------
 2 files changed, 43 insertions(+), 75 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 02e490edd..2ba9374f0 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -7,8 +7,6 @@ import { GraphQLError } from 'graphql'
 import createServer from '../../server/createServer'
 import { resetDB, initialize } from '@dbTools/helpers'
 import { getRepository } from 'typeorm'
-import { LoginUser } from '@entity/LoginUser'
-import { LoginUserBackup } from '@entity/LoginUserBackup'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import CONFIG from '../../config'
@@ -84,16 +82,10 @@ describe('UserResolver', () => {
     })
 
     describe('valid input data', () => {
-      let loginUser: LoginUser[]
       let user: User[]
-      let loginUserBackup: LoginUserBackup[]
       let loginEmailOptIn: LoginEmailOptIn[]
       beforeAll(async () => {
-        loginUser = await getRepository(LoginUser).createQueryBuilder('login_user').getMany()
         user = await getRepository(User).createQueryBuilder('state_user').getMany()
-        loginUserBackup = await getRepository(LoginUserBackup)
-          .createQueryBuilder('login_user_backup')
-          .getMany()
         loginEmailOptIn = await getRepository(LoginEmailOptIn)
           .createQueryBuilder('login_email_optin')
           .getMany()
@@ -102,7 +94,7 @@ describe('UserResolver', () => {
 
       describe('filling all tables', () => {
         it('saves the user in login_user table', () => {
-          expect(loginUser).toEqual([
+          expect(user).toEqual([
             {
               id: expect.any(Number),
               email: 'peter@lustig.de',
@@ -141,22 +133,11 @@ describe('UserResolver', () => {
           ])
         })
 
-        it('saves the user in login_user_backup table', () => {
-          expect(loginUserBackup).toEqual([
-            {
-              id: expect.any(Number),
-              passphrase: expect.any(String),
-              userId: loginUser[0].id,
-              mnemonicType: 2,
-            },
-          ])
-        })
-
         it('creates an email optin', () => {
           expect(loginEmailOptIn).toEqual([
             {
               id: expect.any(Number),
-              userId: loginUser[0].id,
+              userId: user[0].id,
               verificationCode: expect.any(String),
               emailOptInTypeId: 1,
               createdAt: expect.any(Date),
@@ -196,9 +177,7 @@ describe('UserResolver', () => {
           mutation,
           variables: { ...variables, email: 'bibi@bloxberg.de', language: 'es' },
         })
-        await expect(
-          getRepository(LoginUser).createQueryBuilder('login_user').getMany(),
-        ).resolves.toEqual(
+        await expect(getRepository(User).createQueryBuilder('user').getMany()).resolves.toEqual(
           expect.arrayContaining([
             expect.objectContaining({
               email: 'bibi@bloxberg.de',
@@ -215,9 +194,7 @@ describe('UserResolver', () => {
           mutation,
           variables: { ...variables, email: 'raeuber@hotzenplotz.de', publisherId: undefined },
         })
-        await expect(
-          getRepository(LoginUser).createQueryBuilder('login_user').getMany(),
-        ).resolves.toEqual(
+        await expect(getRepository(User).createQueryBuilder('user').getMany()).resolves.toEqual(
           expect.arrayContaining([
             expect.objectContaining({
               email: 'raeuber@hotzenplotz.de',
@@ -274,13 +251,11 @@ describe('UserResolver', () => {
         const loginEmailOptIn = await getRepository(LoginEmailOptIn)
           .createQueryBuilder('login_email_optin')
           .getMany()
-        loginUser = await getRepository(LoginUser).createQueryBuilder('login_user').getMany()
         emailOptIn = loginEmailOptIn[0].verificationCode.toString()
         result = await mutate({
           mutation: setPasswordMutation,
           variables: { code: emailOptIn, password: 'Aa12345_' },
         })
-        newLoginUser = await getRepository(LoginUser).createQueryBuilder('login_user').getMany()
         newUser = await getRepository(User).createQueryBuilder('state_user').getMany()
       })
 
@@ -296,31 +271,22 @@ describe('UserResolver', () => {
         expect(newLoginUser[0].password).toEqual('3917921995996627700')
       })
 
-      it('updates the public Key on both user tables', () => {
-        expect(newLoginUser[0].pubKey).toEqual(expect.any(Buffer))
-        expect(newLoginUser[0].pubKey).not.toEqual(loginUser[0].pubKey)
-        expect(newLoginUser[0].pubKey).toEqual(newUser[0].pubkey)
-      })
-
-      it('updates the private Key', () => {
-        expect(newLoginUser[0].privKey).toEqual(expect.any(Buffer))
-        expect(newLoginUser[0].privKey).not.toEqual(loginUser[0].privKey)
-      })
-
       it('removes the optin', async () => {
         await expect(
           getRepository(LoginEmailOptIn).createQueryBuilder('login_email_optin').getMany(),
         ).resolves.toHaveLength(0)
       })
 
+      /*
       it('calls the klicktipp API', () => {
         expect(klicktippSignIn).toBeCalledWith(
-          loginUser[0].email,
-          loginUser[0].language,
-          loginUser[0].firstName,
-          loginUser[0].lastName,
+          user[0].email,
+          user[0].language,
+          user[0].firstName,
+          user[0].lastName,
         )
       })
+      */
 
       it('returns true', () => {
         expect(result).toBeTruthy()
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 049f63a08..a407135ea 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -4,40 +4,42 @@
 import { ApolloLogPlugin, LogMutateData } from 'apollo-log'
 import cloneDeep from 'lodash.clonedeep'
 
-const plugins = [
-  {
-    requestDidStart() {
-      return {
-        willSendResponse(requestContext: any) {
-          const { setHeaders = [] } = requestContext.context
-          setHeaders.forEach(({ key, value }: { [key: string]: string }) => {
-            if (requestContext.response.http.headers.get(key)) {
-              requestContext.response.http.headers.set(key, value)
-            } else {
-              requestContext.response.http.headers.append(key, value)
-            }
-          })
-          return requestContext
-        },
-      }
-    },
+const setHeadersPlugin = {
+  requestDidStart() {
+    return {
+      willSendResponse(requestContext: any) {
+        const { setHeaders = [] } = requestContext.context
+        setHeaders.forEach(({ key, value }: { [key: string]: string }) => {
+          if (requestContext.response.http.headers.get(key)) {
+            requestContext.response.http.headers.set(key, value)
+          } else {
+            requestContext.response.http.headers.append(key, value)
+          }
+        })
+        return requestContext
+      },
+    }
   },
-  ApolloLogPlugin({
-    mutate: (data: LogMutateData) => {
-      // We need to deep clone the object in order to not modify the actual request
-      const dataCopy = cloneDeep(data)
+}
 
-      // mask password if part of the query
-      if (dataCopy.context.request.variables && dataCopy.context.request.variables.password) {
-        dataCopy.context.request.variables.password = '***'
-      }
+const apolloLogPlugin = ApolloLogPlugin({
+  mutate: (data: LogMutateData) => {
+    // We need to deep clone the object in order to not modify the actual request
+    const dataCopy = cloneDeep(data)
 
-      // mask token at all times
-      dataCopy.context.context.token = '***'
+    // mask password if part of the query
+    if (dataCopy.context.request.variables && dataCopy.context.request.variables.password) {
+      dataCopy.context.request.variables.password = '***'
+    }
 
-      return dataCopy
-    },
-  }),
-]
+    // mask token at all times
+    dataCopy.context.context.token = '***'
+
+    return dataCopy
+  },
+})
+
+const plugins =
+  process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin, apolloLogPlugin]
 
 export default plugins

From fe8546da08d7dee97b1f6c581290f5c70aea0aa5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 13:19:46 +0100
Subject: [PATCH 09/59] add typeorm package

---
 backend/package.json |   3 +-
 backend/yarn.lock    | 186 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index b72386a68..c9b2fea30 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -39,7 +39,8 @@
     "reflect-metadata": "^0.1.13",
     "sodium-native": "^3.3.0",
     "ts-jest": "^27.0.5",
-    "type-graphql": "^1.1.1"
+    "type-graphql": "^1.1.1",
+    "typeorm": "^0.2.41"
   },
   "devDependencies": {
     "@types/express": "^4.17.12",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6ef0d5701..bee9cce71 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -677,6 +677,11 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sqltools/formatter@^1.2.2":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.3.tgz#1185726610acc37317ddab11c3c7f9066966bd20"
+  integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -1019,6 +1024,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/zen-observable@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
+  integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
+
 "@typescript-eslint/eslint-plugin@^4.28.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
@@ -1217,6 +1227,11 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -1423,6 +1438,11 @@ apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
     ts-invariant "^0.4.0"
     tslib "^1.10.0"
 
+app-root-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
+  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -1435,6 +1455,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1560,6 +1585,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -1650,6 +1680,14 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 busboy@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
@@ -1769,6 +1807,18 @@ cli-boxes@^2.2.1:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
+cli-highlight@^2.1.11:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf"
+  integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==
+  dependencies:
+    chalk "^4.0.0"
+    highlight.js "^10.7.1"
+    mz "^2.4.0"
+    parse5 "^5.1.1"
+    parse5-htmlparser2-tree-adapter "^6.0.0"
+    yargs "^16.0.0"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -2092,6 +2142,11 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dotenv@^8.2.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
+  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -2881,6 +2936,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+highlight.js@^10.7.1:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
+  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -2972,6 +3032,11 @@ iconv-lite@^0.6.2:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
@@ -3711,6 +3776,13 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsdom@^16.6.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
@@ -4087,6 +4159,11 @@ minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 module-alias@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
@@ -4131,6 +4208,15 @@ mysql2@^2.3.0:
     seq-queue "^0.0.5"
     sqlstring "^2.3.2"
 
+mz@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
 named-placeholders@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"
@@ -4240,7 +4326,7 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-object-assign@^4:
+object-assign@^4, object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -4401,11 +4487,23 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5@6.0.1:
+parse5-htmlparser2-tree-adapter@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
+parse5@6.0.1, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
 parseurl@^1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -4763,6 +4861,11 @@ safe-buffer@^5.0.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
@@ -5123,6 +5226,20 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
 throat@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
@@ -5307,6 +5424,28 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeorm@^0.2.41:
+  version "0.2.41"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.41.tgz#88758101ac158dc0a0a903d70eaacea2974281cc"
+  integrity sha512-/d8CLJJxKPgsnrZWiMyPI0rz2MFZnBQrnQ5XP3Vu3mswv2WPexb58QM6BEtmRmlTMYN5KFWUz8SKluze+wS9xw==
+  dependencies:
+    "@sqltools/formatter" "^1.2.2"
+    app-root-path "^3.0.0"
+    buffer "^6.0.3"
+    chalk "^4.1.0"
+    cli-highlight "^2.1.11"
+    debug "^4.3.1"
+    dotenv "^8.2.0"
+    glob "^7.1.6"
+    js-yaml "^4.0.0"
+    mkdirp "^1.0.4"
+    reflect-metadata "^0.1.13"
+    sha.js "^2.4.11"
+    tslib "^2.1.0"
+    xml2js "^0.4.23"
+    yargs "^17.0.1"
+    zen-observable-ts "^1.0.0"
+
 typescript@^4.3.4:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
@@ -5572,6 +5711,19 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml2js@^0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -5605,7 +5757,12 @@ yargs-parser@20.x, yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@^16.2.0:
+yargs-parser@^21.0.0:
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
+  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+
+yargs@^16.0.0, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
@@ -5618,6 +5775,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.0.1:
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
+  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -5631,7 +5801,15 @@ zen-observable-ts@^0.8.21:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable@^0.8.0:
+zen-observable-ts@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83"
+  integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==
+  dependencies:
+    "@types/zen-observable" "0.8.3"
+    zen-observable "0.8.15"
+
+zen-observable@0.8.15, zen-observable@^0.8.0:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==

From 4a5d1980a53a1261cac185b44209c48050a7140d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 12:32:51 +0100
Subject: [PATCH 10/59] afterAll at top

---
 backend/src/graphql/resolver/UserResolver.test.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 2ba9374f0..b62117a28 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -38,6 +38,11 @@ beforeAll(async () => {
   await resetDB()
 })
 
+afterAll(async () => {
+  await resetDB(true)
+  await con.close()
+})
+
 describe('UserResolver', () => {
   describe('createUser', () => {
     const variables = {
@@ -346,8 +351,3 @@ describe('UserResolver', () => {
     })
   })
 })
-
-afterAll(async () => {
-  await resetDB(true)
-  await con.close()
-})

From 10090756a13bafdf594dbc16b6af732acf52b1be Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 13:55:45 +0100
Subject: [PATCH 11/59] avoid moment, use minus signs

---
 frontend/src/components/DecayInformation.vue  |  66 +++++-----
 frontend/src/components/Transaction.vue       |   2 +-
 frontend/src/i18n.js                          |   8 +-
 frontend/src/plugins/dashboard-plugin.js      |   3 -
 .../AccountOverview/GddTransactionList.vue    | 118 +++++++++---------
 frontend/test/testSetup.js                    |   3 -
 6 files changed, 93 insertions(+), 107 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 28af9b2b4..901b8f52b 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="decayinformation">
     <span v-if="decaytyp === 'short'">
-      {{ decay ? ' - ' + $n(decay.balance, 'decimal') + ' ' + decayStartBlockTextShort : '' }}
+      {{ decay ? ' − ' + $n(decay.balance, 'decimal') : '' }}
     </span>
 
     <div v-if="decaytyp === 'new'">
@@ -21,12 +21,11 @@
             <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
             <div>
               {{ $t('decay.decay_introduced') }} :
-              {{ $d($moment.unix(decay.decayStart), 'long') }}
             </div>
           </div>
           <div>
             <span v-if="decay.decayStart">
-              {{ $d($moment.unix(decay.decayStart), 'long') }}
+              {{ $d(new Date(decay.decayStart * 1000), 'long') }}
               {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
             </span>
           </div>
@@ -59,7 +58,7 @@
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
         <b-col cols="6">
-          <div>- {{ $n(decay.balance, 'decimal') }}</div>
+          <div>− {{ $n(decay.balance, 'decimal') }}</div>
         </b-col>
       </b-row>
       <hr class="mt-2 mb-2" />
@@ -75,7 +74,7 @@
           <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
         </b-col>
         <b-col cols="6">
-          <div v-if="type === 'send'">- {{ $n(balance, 'decimal') }}</div>
+          <div v-if="type === 'send'">− {{ $n(balance, 'decimal') }}</div>
           <div v-if="type === 'receive'">+ {{ $n(balance, 'decimal') }}</div>
         </b-col>
       </b-row>
@@ -85,7 +84,7 @@
           <div>{{ $t('decay.decay') }}</div>
         </b-col>
         <b-col cols="6">
-          <div>- {{ $n(decay.balance, 'decimal') }}</div>
+          <div>− {{ $n(decay.balance, 'decimal') }}</div>
         </b-col>
       </b-row>
       <!-- Total-->
@@ -95,13 +94,13 @@
         </b-col>
         <b-col cols="6">
           <div v-if="type === 'send'">
-            <b>- {{ $n(balance + decay.balance, 'decimal') }}</b>
+            <b>− {{ $n(balance + decay.balance, 'decimal') }}</b>
           </div>
           <div v-if="type === 'receive'">
             <b>{{ $n(balance - decay.balance, 'decimal') }}</b>
           </div>
           <div v-if="type === 'creation'">
-            <b>- {{ $n(balance - decay.balance, 'decimal') }}</b>
+            <b>− {{ $n(balance - decay.balance, 'decimal') }}</b>
           </div>
         </b-col>
       </b-row>
@@ -109,33 +108,26 @@
   </div>
 </template>
 <script>
-export default {
-  name: 'DecayInformation',
-  props: {
-    balance: { type: Number },
-    type: { type: String, default: '' },
-    decay: {
-      balance: '',
-      decayDuration: '',
-      decayStart: 0,
-      decayEnd: 0,
-      decayStartBlock: 0,
-    },
-    decaytyp: { type: String, default: '' },
-  },
-  computed: {
-    decayStartBlockTextShort() {
-      return this.decay.decayStartBlock
-        ? this.$t('decay.decayStart') + this.$d(this.$moment.unix(this.decay.decayStartBlock))
-        : ''
-    },
-    duration() {
-      return this.$moment.duration(
-        this.$moment
-          .unix(new Date(this.decay.decayEnd))
-          .diff(this.$moment.unix(new Date(this.decay.decayStart))),
-      )._data
-    },
-  },
-}
+ import { duration } from 'moment'
+ 
+ export default {
+   name: 'DecayInformation',
+   props: {
+     balance: { type: Number },
+     type: { type: String, default: '' },
+     decay: {
+       balance: '',
+       decayDuration: '',
+       decayStart: 0,
+       decayEnd: 0,
+       decayStartBlock: 0,
+     },
+     decaytyp: { type: String, default: '' },
+   },
+   computed: {
+     duration() {
+       return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+     },
+   },
+ }
 </script>
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index f1deca565..1dcfee13a 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -50,7 +50,7 @@
             {{ $t('form.date') }}
           </b-col>
           <b-col cols="6">
-            {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+            {{ $d(new Date(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </b-col>
         </b-row>
 
diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 98e4ec971..0ce43310b 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -69,8 +69,8 @@ const dateTimeFormats = {
     },
     long: {
       year: 'numeric',
-      month: 'short',
-      day: 'numeric',
+      month: 'long',
+      day: 'long',
       weekday: 'short',
       hour: 'numeric',
       minute: 'numeric',
@@ -84,9 +84,9 @@ const dateTimeFormats = {
     },
     long: {
       day: 'numeric',
-      month: 'short',
+      month: 'long',
       year: 'numeric',
-      weekday: 'short',
+      weekday: 'long',
       hour: 'numeric',
       minute: 'numeric',
     },
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 4825377c7..983210027 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -11,8 +11,6 @@ import '@/assets/scss/gradido.scss'
 import FlatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
 
-import VueMoment from 'vue-moment'
-
 import Loading from 'vue-loading-overlay'
 import 'vue-loading-overlay/dist/vue-loading.css'
 
@@ -24,7 +22,6 @@ export default {
     Vue.use(GlobalDirectives)
     Vue.use(BootstrapVue)
     Vue.use(IconsPlugin)
-    Vue.use(VueMoment)
     Vue.use(PortalVue)
     Vue.use(FlatPickr)
     Vue.use(Loading)
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index f6c046fe6..d39d5ea88 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -77,7 +77,7 @@
                   </b-col>
                   <b-col cols="7">
                     <div class="gdd-transaction-list-item-date">
-                      {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+                      {{ $d(new Date(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
                     </div>
                   </b-col>
                 </b-row>
@@ -142,66 +142,66 @@
 </template>
 
 <script>
-import PaginationButtons from '../../../components/PaginationButtons'
-import DecayInformation from '../../../components/DecayInformation'
+ import PaginationButtons from '../../../components/PaginationButtons'
+ import DecayInformation from '../../../components/DecayInformation'
 
-const iconsByType = {
-  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '-' },
-  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
-  creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
-  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '-' },
-}
+ const iconsByType = {
+   send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
+   receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
+   creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
+   decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
+ }
 
-export default {
-  name: 'gdd-transaction-list',
-  components: {
-    PaginationButtons,
-    DecayInformation,
-  },
-  data() {
-    return {
-      currentPage: 1,
-    }
-  },
-  props: {
-    transactions: { default: () => [] },
-    pageSize: { type: Number, default: 25 },
-    timestamp: { type: Number, default: 0 },
-    transactionCount: { type: Number, default: 0 },
-    showPagination: { type: Boolean, default: false },
-  },
-  methods: {
-    updateTransactions() {
-      this.$emit('update-transactions', {
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-      })
-      window.scrollTo(0, 0)
-    },
-    getProperties(givenType) {
-      const type = iconsByType[givenType]
-      if (type)
-        return {
-          icon: type.icon,
-          class: type.classes + ' m-mb-1 font2em',
-          operator: type.operator,
-        }
-      this.throwError('no icon to given type')
-    },
-    throwError(msg) {
-      throw new Error(msg)
-    },
-  },
-  watch: {
-    currentPage() {
-      this.updateTransactions()
-    },
-    timestamp: {
-      immediate: true,
-      handler: 'updateTransactions',
-    },
-  },
-}
+ export default {
+   name: 'gdd-transaction-list',
+   components: {
+     PaginationButtons,
+     DecayInformation,
+   },
+   data() {
+     return {
+       currentPage: 1,
+     }
+   },
+   props: {
+     transactions: { default: () => [] },
+     pageSize: { type: Number, default: 25 },
+     timestamp: { type: Number, default: 0 },
+     transactionCount: { type: Number, default: 0 },
+     showPagination: { type: Boolean, default: false },
+   },
+   methods: {
+     updateTransactions() {
+       this.$emit('update-transactions', {
+         currentPage: this.currentPage,
+         pageSize: this.pageSize,
+       })
+       window.scrollTo(0, 0)
+     },
+     getProperties(givenType) {
+       const type = iconsByType[givenType]
+       if (type)
+         return {
+           icon: type.icon,
+           class: type.classes + ' m-mb-1 font2em',
+           operator: type.operator,
+         }
+       this.throwError('no icon to given type')
+     },
+     throwError(msg) {
+       throw new Error(msg)
+     },
+   },
+   watch: {
+     currentPage() {
+       this.updateTransactions()
+     },
+     timestamp: {
+       immediate: true,
+       handler: 'updateTransactions',
+     },
+   },
+ }
 </script>
 <style>
 .el-table .cell {
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 2e26db998..76066e776 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -10,8 +10,6 @@ import { messages } from 'vee-validate/dist/locale/en.json'
 import RegeneratorRuntime from 'regenerator-runtime'
 import VueQrcode from 'vue-qrcode'
 
-import VueMoment from 'vue-moment'
-
 // import clickOutside from '@/directives/click-ouside.js'
 import { focus } from 'vue-focus'
 
@@ -45,7 +43,6 @@ global.localVue.use(Vuex)
 global.localVue.use(IconsPlugin)
 global.localVue.use(RegeneratorRuntime)
 global.localVue.use(VueQrcode)
-global.localVue.use(VueMoment)
 global.localVue.component('validation-provider', ValidationProvider)
 global.localVue.component('validation-observer', ValidationObserver)
 // global.localVue.directive('click-outside', clickOutside)

From 804f9837f43010d040d06be5b9099990c545b8f1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 14:07:10 +0100
Subject: [PATCH 12/59] linting

---
 frontend/src/components/DecayInformation.vue  |  48 ++++----
 .../AccountOverview/GddTransactionList.vue    | 116 +++++++++---------
 2 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 901b8f52b..24b9b8381 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -19,9 +19,7 @@
         <b-col cols="6">
           <div v-if="decay.decayStartBlock > 0">
             <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
-            <div>
-              {{ $t('decay.decay_introduced') }} :
-            </div>
+            <div>{{ $t('decay.decay_introduced') }} :</div>
           </div>
           <div>
             <span v-if="decay.decayStart">
@@ -108,26 +106,26 @@
   </div>
 </template>
 <script>
- import { duration } from 'moment'
- 
- export default {
-   name: 'DecayInformation',
-   props: {
-     balance: { type: Number },
-     type: { type: String, default: '' },
-     decay: {
-       balance: '',
-       decayDuration: '',
-       decayStart: 0,
-       decayEnd: 0,
-       decayStartBlock: 0,
-     },
-     decaytyp: { type: String, default: '' },
-   },
-   computed: {
-     duration() {
-       return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
-     },
-   },
- }
+import { duration } from 'moment'
+
+export default {
+  name: 'DecayInformation',
+  props: {
+    balance: { type: Number },
+    type: { type: String, default: '' },
+    decay: {
+      balance: '',
+      decayDuration: '',
+      decayStart: 0,
+      decayEnd: 0,
+      decayStartBlock: 0,
+    },
+    decaytyp: { type: String, default: '' },
+  },
+  computed: {
+    duration() {
+      return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+    },
+  },
+}
 </script>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index d39d5ea88..4e2df58d1 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -142,66 +142,66 @@
 </template>
 
 <script>
- import PaginationButtons from '../../../components/PaginationButtons'
- import DecayInformation from '../../../components/DecayInformation'
+import PaginationButtons from '../../../components/PaginationButtons'
+import DecayInformation from '../../../components/DecayInformation'
 
- const iconsByType = {
-   send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
-   receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
-   creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
-   decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
- }
+const iconsByType = {
+  send: { icon: 'arrow-left-circle', classes: 'text-danger', operator: '−' },
+  receive: { icon: 'arrow-right-circle', classes: 'gradido-global-color-accent', operator: '+' },
+  creation: { icon: 'gift', classes: 'gradido-global-color-accent', operator: '+' },
+  decay: { icon: 'droplet-half', classes: 'gradido-global-color-gray', operator: '−' },
+}
 
- export default {
-   name: 'gdd-transaction-list',
-   components: {
-     PaginationButtons,
-     DecayInformation,
-   },
-   data() {
-     return {
-       currentPage: 1,
-     }
-   },
-   props: {
-     transactions: { default: () => [] },
-     pageSize: { type: Number, default: 25 },
-     timestamp: { type: Number, default: 0 },
-     transactionCount: { type: Number, default: 0 },
-     showPagination: { type: Boolean, default: false },
-   },
-   methods: {
-     updateTransactions() {
-       this.$emit('update-transactions', {
-         currentPage: this.currentPage,
-         pageSize: this.pageSize,
-       })
-       window.scrollTo(0, 0)
-     },
-     getProperties(givenType) {
-       const type = iconsByType[givenType]
-       if (type)
-         return {
-           icon: type.icon,
-           class: type.classes + ' m-mb-1 font2em',
-           operator: type.operator,
-         }
-       this.throwError('no icon to given type')
-     },
-     throwError(msg) {
-       throw new Error(msg)
-     },
-   },
-   watch: {
-     currentPage() {
-       this.updateTransactions()
-     },
-     timestamp: {
-       immediate: true,
-       handler: 'updateTransactions',
-     },
-   },
- }
+export default {
+  name: 'gdd-transaction-list',
+  components: {
+    PaginationButtons,
+    DecayInformation,
+  },
+  data() {
+    return {
+      currentPage: 1,
+    }
+  },
+  props: {
+    transactions: { default: () => [] },
+    pageSize: { type: Number, default: 25 },
+    timestamp: { type: Number, default: 0 },
+    transactionCount: { type: Number, default: 0 },
+    showPagination: { type: Boolean, default: false },
+  },
+  methods: {
+    updateTransactions() {
+      this.$emit('update-transactions', {
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+      })
+      window.scrollTo(0, 0)
+    },
+    getProperties(givenType) {
+      const type = iconsByType[givenType]
+      if (type)
+        return {
+          icon: type.icon,
+          class: type.classes + ' m-mb-1 font2em',
+          operator: type.operator,
+        }
+      this.throwError('no icon to given type')
+    },
+    throwError(msg) {
+      throw new Error(msg)
+    },
+  },
+  watch: {
+    currentPage() {
+      this.updateTransactions()
+    },
+    timestamp: {
+      immediate: true,
+      handler: 'updateTransactions',
+    },
+  },
+}
 </script>
 <style>
 .el-table .cell {

From ab33b953fb7eb68bac20ba2ad9f00ecbb50c5f2c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 15:08:43 +0100
Subject: [PATCH 13/59] use vue-moment again

---
 frontend/src/components/DecayInformation.vue | 4 +---
 frontend/src/plugins/dashboard-plugin.js     | 3 +++
 frontend/test/testSetup.js                   | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 24b9b8381..0daa45a18 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -106,8 +106,6 @@
   </div>
 </template>
 <script>
-import { duration } from 'moment'
-
 export default {
   name: 'DecayInformation',
   props: {
@@ -124,7 +122,7 @@ export default {
   },
   computed: {
     duration() {
-      return duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
+      return this.$moment.duration((this.decay.decayEnd - this.decay.decayStart) * 1000)._data
     },
   },
 }
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 983210027..4825377c7 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -11,6 +11,8 @@ import '@/assets/scss/gradido.scss'
 import FlatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
 
+import VueMoment from 'vue-moment'
+
 import Loading from 'vue-loading-overlay'
 import 'vue-loading-overlay/dist/vue-loading.css'
 
@@ -22,6 +24,7 @@ export default {
     Vue.use(GlobalDirectives)
     Vue.use(BootstrapVue)
     Vue.use(IconsPlugin)
+    Vue.use(VueMoment)
     Vue.use(PortalVue)
     Vue.use(FlatPickr)
     Vue.use(Loading)
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 76066e776..2e26db998 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -10,6 +10,8 @@ import { messages } from 'vee-validate/dist/locale/en.json'
 import RegeneratorRuntime from 'regenerator-runtime'
 import VueQrcode from 'vue-qrcode'
 
+import VueMoment from 'vue-moment'
+
 // import clickOutside from '@/directives/click-ouside.js'
 import { focus } from 'vue-focus'
 
@@ -43,6 +45,7 @@ global.localVue.use(Vuex)
 global.localVue.use(IconsPlugin)
 global.localVue.use(RegeneratorRuntime)
 global.localVue.use(VueQrcode)
+global.localVue.use(VueMoment)
 global.localVue.component('validation-provider', ValidationProvider)
 global.localVue.component('validation-observer', ValidationObserver)
 // global.localVue.directive('click-outside', clickOutside)

From 8f8c9ab534d587c3a12eb1f0d2679d5b7f270bc2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 17 Feb 2022 15:58:20 +0100
Subject: [PATCH 14/59] fix tests (check for minus signs)

---
 .../Pages/AccountOverview/GddTransactionList.spec.js      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index b116de9e8..772a42f5f 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -145,7 +145,7 @@ describe('GddTransactionList', () => {
 
         it('has a minus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-            '-',
+            '−',
           )
         })
 
@@ -175,7 +175,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '- 0.5',
+            '− 0.5',
           )
         })
       })
@@ -265,7 +265,7 @@ describe('GddTransactionList', () => {
 
         it('shows the decay calculation', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-decay').at(0).text()).toContain(
-            '- 1.5',
+            '− 1.5',
           )
         })
       })
@@ -286,7 +286,7 @@ describe('GddTransactionList', () => {
 
         it('has a minus operator', () => {
           expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
-            '-',
+            '−',
           )
         })
 

From 4a51231bf9bd0782b2e165d209314caf321310a4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 12:44:35 +0100
Subject: [PATCH 15/59] admin resolver - use entity instead of repository -
 include deleted users in our query for pending transactions - throw an error
 when trying to add or confirm a pending transaction for a deleted user

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index c314b5bb7..eed395926 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -23,6 +23,7 @@ import { calculateDecay } from '../../util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
+import { User } from '@entity/User'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -82,8 +83,10 @@ export class AdminResolver {
   async createPendingCreation(
     @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
   ): Promise<number[]> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByEmail(email)
+    const user = await User.findOne({ email })
+    if (!user) {
+      throw new Error(`Could not find user with email: ${email}`)
+    }
     if (!user.emailChecked) {
       throw new Error('Creation could not be saved, Email is not activated')
     }
@@ -134,8 +137,13 @@ export class AdminResolver {
   async updatePendingCreation(
     @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs,
   ): Promise<UpdatePendingCreation> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByEmail(email)
+    const user = await User.findOne({ email }, { withDeleted: true })
+    if (!user) {
+      throw new Error(`Could not find user with email: ${email}`)
+    }
+    if (user.deletedAt) {
+      throw new Error(`User was deleted (${email})`)
+    }
 
     const pendingCreationToUpdate = await AdminPendingCreation.findOneOrFail({ id })
 

From 8eaed23af40f9e94fe5e3970198a1477105ccd11 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 12:47:33 +0100
Subject: [PATCH 16/59] transactionResolver - remove unnecessary function - use
 of the enity model directly - corrected spelling - show specific error when
 sending to a deleted user

---
 .../graphql/resolver/TransactionResolver.ts   | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 622bf37fe..8d9e0c6c3 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -272,16 +272,6 @@ async function addUserTransaction(
   })
 }
 
-async function getPublicKey(email: string): Promise<string | null> {
-  const user = await dbUser.findOne({ email: email })
-  // User not found
-  if (!user) {
-    return null
-  }
-
-  return user.pubKey.toString('hex')
-}
-
 @Resolver()
 export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
@@ -301,7 +291,7 @@ export class TransactionResolver {
     const userRepository = getCustomRepository(UserRepository)
     let userEntity: dbUser | undefined
     if (userId) {
-      userEntity = await userRepository.findOneOrFail({ id: userId })
+      userEntity = await userRepository.findOneOrFail({ id: userId }, { withDeleted: true })
     } else {
       userEntity = await userRepository.findByPubkeyHex(context.pubKey)
     }
@@ -357,18 +347,15 @@ export class TransactionResolver {
 
     // validate recipient user
     // TODO: the detour over the public key is unnecessary
-    const recipiantPublicKey = await getPublicKey(email)
-    if (!recipiantPublicKey) {
+    const recipientUser = await dbUser.findOne({ email: email }, { withDeleted: true })
+    if (!recipientUser) {
       throw new Error('recipient not known')
     }
-    if (!isHexPublicKey(recipiantPublicKey)) {
-      throw new Error('invalid recipiant public key')
+    if (recipientUser.deletedAt) {
+      throw new Error('The recipient account was deleted')
     }
-    const recipiantUser = await userRepository.findByPubkeyHex(recipiantPublicKey)
-    if (!recipiantUser) {
-      throw new Error('Cannot find recipiant user by local send coins transaction')
-    } else if (recipiantUser.deletedAt) {
-      throw new Error('recipiant user account is disabled')
+    if (!isHexPublicKey(recipientUser.pubKey.toString('hex'))) {
+      throw new Error('invalid recipient public key')
     }
 
     // validate amount
@@ -405,7 +392,7 @@ export class TransactionResolver {
 
       // Insert Transaction: recipient + amount
       const recipiantUserTransactionBalance = await addUserTransaction(
-        recipiantUser,
+        recipientUser,
         transaction,
         centAmount,
         queryRunner,
@@ -421,7 +408,7 @@ export class TransactionResolver {
 
       // Update Balance: recipiant + amount
       const recipiantStateBalance = await updateStateBalance(
-        recipiantUser,
+        recipientUser,
         centAmount,
         transaction.received,
         queryRunner,
@@ -439,8 +426,8 @@ export class TransactionResolver {
       transactionSendCoin.transactionId = transaction.id
       transactionSendCoin.userId = senderUser.id
       transactionSendCoin.senderPublic = senderUser.pubKey
-      transactionSendCoin.recipiantUserId = recipiantUser.id
-      transactionSendCoin.recipiantPublic = Buffer.from(recipiantPublicKey, 'hex')
+      transactionSendCoin.recipiantUserId = recipientUser.id
+      transactionSendCoin.recipiantPublic = recipientUser.pubKey
       transactionSendCoin.amount = centAmount
       transactionSendCoin.senderFinalBalance = senderStateBalance.amount
       await queryRunner.manager.save(transactionSendCoin).catch((error) => {
@@ -474,9 +461,9 @@ export class TransactionResolver {
     await sendTransactionReceivedEmail({
       senderFirstName: senderUser.firstName,
       senderLastName: senderUser.lastName,
-      recipientFirstName: recipiantUser.firstName,
-      recipientLastName: recipiantUser.lastName,
-      email: recipiantUser.email,
+      recipientFirstName: recipientUser.firstName,
+      recipientLastName: recipientUser.lastName,
+      email: recipientUser.email,
       amount,
       memo,
     })

From 90bdca04a669b60ff99da066441032df9669ea54 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 12:49:05 +0100
Subject: [PATCH 17/59] UserResolver - on login have a specific message for
 deleted users - when trying to register also check for deleted users and
 prevent registration

---
 backend/src/graphql/resolver/UserResolver.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 5bc30f6b4..fdae2a14e 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -250,9 +250,12 @@ export class UserResolver {
     @Ctx() context: any,
   ): Promise<User> {
     email = email.trim().toLowerCase()
-    const dbUser = await DbUser.findOneOrFail({ email }).catch(() => {
+    const dbUser = await DbUser.findOneOrFail({ email }, { withDeleted: true }).catch(() => {
       throw new Error('No user with this credentials')
     })
+    if (dbUser.deletedAt) {
+      throw new Error('This user was permanently disabled. Contact support for questions.')
+    }
     if (!dbUser.emailChecked) {
       throw new Error('User email not validated')
     }
@@ -335,9 +338,9 @@ export class UserResolver {
 
     // Validate email unique
     // TODO: i can register an email in upper/lower case twice
-    const userRepository = getCustomRepository(UserRepository)
-    const usersFound = await userRepository.count({ email })
-    if (usersFound !== 0) {
+    // TODO we cannot use repository.count(), since it does not allow to specify if you want to include the soft deletes
+    const userFound = await DbUser.findOne({ email }, { withDeleted: true })
+    if (userFound) {
       // TODO: this is unsecure, but the current implementation of the login server. This way it can be queried if the user with given EMail is existent.
       throw new Error(`User already exists.`)
     }

From 18b7fd73d0d32ac30fb6791a89b77c0646c65204 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 12:49:56 +0100
Subject: [PATCH 18/59] Admin: search for users include deleted remove
 unnecessary function

---
 backend/src/typeorm/repository/User.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 59d6ff465..3ac2fbe93 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -3,6 +3,7 @@ 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 })
@@ -14,10 +15,6 @@ export class UserRepository extends Repository<User> {
     return await this.findByPubkeyHex(pubKeyString)
   }
 
-  async findByEmail(email: string): Promise<User> {
-    return this.createQueryBuilder('user').where('user.email = :email', { email }).getOneOrFail()
-  }
-
   async getUsersIndiced(userIds: number[]): Promise<User[]> {
     if (!userIds.length) return []
     const users = await this.createQueryBuilder('user')
@@ -33,6 +30,7 @@ export class UserRepository extends Repository<User> {
 
   async findBySearchCriteria(searchCriteria: string): Promise<User[]> {
     return await this.createQueryBuilder('user')
+      .withDeleted()
       .where(
         'user.firstName like :name or user.lastName like :lastName or user.email like :email',
         {

From ed09e998b915178cbc818ea26e603130869d818f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 12:59:55 +0100
Subject: [PATCH 19/59] admin: have a specific error message when trying to add
 a pending creation on a deleted user

---
 backend/src/graphql/resolver/AdminResolver.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index eed395926..7430868b1 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -83,10 +83,13 @@ export class AdminResolver {
   async createPendingCreation(
     @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
   ): Promise<number[]> {
-    const user = await User.findOne({ email })
+    const user = await User.findOne({ email }, { withDeleted: true })
     if (!user) {
       throw new Error(`Could not find user with email: ${email}`)
     }
+    if (user.deletedAt) {
+      throw new Error('This user was deleted. Cannot make a creation.')
+    }
     if (!user.emailChecked) {
       throw new Error('Creation could not be saved, Email is not activated')
     }

From fc9829bc8489ea28587427ddda638349a7491d1f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 13:06:28 +0100
Subject: [PATCH 20/59] lint fixes

---
 backend/src/typeorm/repository/User.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 3ac2fbe93..88467fc95 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -3,7 +3,6 @@ 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 })

From 264270524b2b3361b3dca4c44a805d98ffc96476 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Feb 2022 13:26:57 +0100
Subject: [PATCH 21/59] some small refactors for the user resolver: - stop
 using repositories where its not needed - removed unused function

---
 backend/src/graphql/resolver/UserResolver.ts | 17 ++++++-----------
 backend/src/typeorm/repository/User.ts       |  5 -----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 5bc30f6b4..32b5d4ab5 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -152,8 +152,7 @@ const createEmailOptIn = async (
   loginUserId: number,
   queryRunner: QueryRunner,
 ): Promise<LoginEmailOptIn> => {
-  const loginEmailOptInRepository = await getRepository(LoginEmailOptIn)
-  let emailOptIn = await loginEmailOptInRepository.findOne({
+  let emailOptIn = await LoginEmailOptIn.findOne({
     userId: loginUserId,
     emailOptInTypeId: EMAIL_OPT_IN_REGISTER,
   })
@@ -182,8 +181,7 @@ const createEmailOptIn = async (
 }
 
 const getOptInCode = async (loginUserId: number): Promise<LoginEmailOptIn> => {
-  const loginEmailOptInRepository = await getRepository(LoginEmailOptIn)
-  let optInCode = await loginEmailOptInRepository.findOne({
+  let optInCode = await LoginEmailOptIn.findOne({
     userId: loginUserId,
     emailOptInTypeId: EMAIL_OPT_IN_RESET_PASSWORD,
   })
@@ -205,7 +203,7 @@ const getOptInCode = async (loginUserId: number): Promise<LoginEmailOptIn> => {
     optInCode.userId = loginUserId
     optInCode.emailOptInTypeId = EMAIL_OPT_IN_RESET_PASSWORD
   }
-  await loginEmailOptInRepository.save(optInCode)
+  await LoginEmailOptIn.save(optInCode)
   return optInCode
 }
 
@@ -487,12 +485,9 @@ export class UserResolver {
     }
 
     // Load code
-    const loginEmailOptInRepository = await getRepository(LoginEmailOptIn)
-    const optInCode = await loginEmailOptInRepository
-      .findOneOrFail({ verificationCode: code })
-      .catch(() => {
-        throw new Error('Could not login with emailVerificationCode')
-      })
+    const optInCode = await LoginEmailOptIn.findOneOrFail({ verificationCode: code }).catch(() => {
+      throw new Error('Could not login with emailVerificationCode')
+    })
 
     // Code is only valid for 10minutes
     const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime()
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 59d6ff465..bd9291eae 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -9,11 +9,6 @@ export class UserRepository extends Repository<User> {
       .getOneOrFail()
   }
 
-  async findByPubkeyHexBuffer(pubkeyHexBuffer: Buffer): Promise<User> {
-    const pubKeyString = pubkeyHexBuffer.toString('hex')
-    return await this.findByPubkeyHex(pubKeyString)
-  }
-
   async findByEmail(email: string): Promise<User> {
     return this.createQueryBuilder('user').where('user.email = :email', { email }).getOneOrFail()
   }

From 9d362a6c03192d132349e711f2d8bde447e9b5ae Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 02:21:55 +0100
Subject: [PATCH 22/59] combine transaction tables

---
 .../0024-combine_transaction_tables.ts        | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 database/migrations/0024-combine_transaction_tables.ts

diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts
new file mode 100644
index 000000000..d8dde9f11
--- /dev/null
+++ b/database/migrations/0024-combine_transaction_tables.ts
@@ -0,0 +1,113 @@
+/* MIGRATION TO COMBINE ALL TRANSACTION TABLES
+ *
+ * Combine all transaction tables into one table with all data
+ */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  // Create new `user_id` column (former `state_user_id`), with a temporary default of null
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `user_id` int(10) unsigned DEFAULT NULL AFTER `transaction_type_id`;',
+  )
+  // Create new `amount` column, with a temporary default of null
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `amount` bigint(20) DEFAULT NULL AFTER `user_id`;',
+  )
+  // Create new `creation_ident_hash` column (former `ident_hash`)
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `creation_ident_hash` binary(32) DEFAULT NULL AFTER `pubkey`;',
+  )
+  // Create new `creation_date` column (former `target_date`)
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `creation_date` timestamp NULL DEFAULT NULL AFTER `creation_ident_hash`;',
+  )
+  // Create new `send_receiver_public_key` column (former `receiver_public_key`)
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `send_receiver_public_key` binary(32) DEFAULT NULL AFTER `creation_date`;',
+  )
+  // Create new `send_receiver_user_id` column (former `receiver_user_id`)
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `send_receiver_user_id` int(10) unsigned DEFAULT NULL AFTER `send_receiver_public_key`;',
+  )
+  // Create new `send_sender_final_balance` column (former `sender_final_balance`)
+  await queryFn(
+    'ALTER TABLE `transactions` ADD COLUMN `send_sender_final_balance` bigint(20) DEFAULT NULL AFTER `send_receiver_user_id`;',
+  )
+
+  // Insert Data from `transaction_creations`
+  await queryFn(`
+    UPDATE transactions
+    INNER JOIN transaction_creations ON transaction_creations.transaction_id = transactions.id
+    SET transactions.user_id = transaction_creations.state_user_id,
+      transactions.amount = transaction_creations.amount,
+      transactions.creation_ident_hash = transaction_creations.ident_hash,
+      transactions.creation_date = transaction_creations.target_date;
+  `)
+
+  // Insert Data from `transaction_send_coins`
+  // Note: we drop `sender_public_key` in favor of `pubkey` from the original `transactions` table
+  //       the data from `transaction_send_coins` seems incomplete for half the dataset (zeroed pubkey)
+  //       with one key being different.
+  await queryFn(`
+    UPDATE transactions
+    INNER JOIN transaction_send_coins ON transaction_send_coins.transaction_id = transactions.id
+    SET transactions.user_id = transaction_send_coins.state_user_id,
+      transactions.amount = transaction_send_coins.amount,
+      transactions.send_receiver_public_key = transaction_send_coins.receiver_public_key,
+      transactions.send_receiver_user_id = transaction_send_coins.receiver_user_id,
+      transactions.send_sender_final_balance = transaction_send_coins.sender_final_balance;
+  `)
+
+  // Modify defaults after our inserts
+  await queryFn('ALTER TABLE `transactions` MODIFY COLUMN `user_id` int(10) unsigned NOT NULL;')
+  await queryFn('ALTER TABLE `transactions` MODIFY COLUMN `amount` bigint(20) NOT NULL;')
+
+  // Drop table `transaction_creations`
+  await queryFn('DROP TABLE `transaction_creations`;')
+  // Drop table `transaction_send_coins`
+  await queryFn('DROP TABLE `transaction_send_coins`;')
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_sender_final_balance`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_receiver_user_id`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_receiver_public_key`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `creation_date`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `creation_ident_hash`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `amount`;')
+  await queryFn('ALTER TABLE `transactions` DROP COLUMN `user_id`;')
+}
+
+/*
+CREATE TABLE `transactions` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `transaction_type_id` int(10) unsigned NOT NULL,
+  `tx_hash` binary(48) DEFAULT NULL,
+  `memo` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `received` timestamp NOT NULL DEFAULT current_timestamp(),
+  `signature` binary(64) DEFAULT NULL,
+  `pubkey` binary(32) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3421 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+*/
+
+// CREATE TABLE `transaction_creations` (
+//   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+//   `transaction_id` int(10) unsigned NOT NULL,
+//   `state_user_id` int(10) unsigned NOT NULL,
+//   `amount` bigint(20) NOT NULL,
+//   `ident_hash` binary(32) DEFAULT NULL,
+//   `target_date` timestamp NULL DEFAULT NULL,
+//   PRIMARY KEY (`id`)
+// ) ENGINE=InnoDB AUTO_INCREMENT=2769 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+
+// CREATE TABLE `transaction_send_coins` (
+//   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+//   `transaction_id` int(10) unsigned NOT NULL,
+//   `sender_public_key` binary(32) NOT NULL,
+//   `state_user_id` int(10) unsigned DEFAULT 0,
+//   `receiver_public_key` binary(32) NOT NULL,
+//   `receiver_user_id` int(10) unsigned DEFAULT 0,
+//   `amount` bigint(20) NOT NULL,
+//   `sender_final_balance` bigint(20) NOT NULL,
+//   PRIMARY KEY (`id`)
+// ) ENGINE=InnoDB AUTO_INCREMENT=659 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci

From 0bdd52989a08a5ff3cd4d78dd683849c598bad35 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 02:51:04 +0100
Subject: [PATCH 23/59] down migration

---
 .../0024-combine_transaction_tables.ts        | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts
index d8dde9f11..ce0f1cb44 100644
--- a/database/migrations/0024-combine_transaction_tables.ts
+++ b/database/migrations/0024-combine_transaction_tables.ts
@@ -68,6 +68,53 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 }
 
 export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(`
+    CREATE TABLE \`transaction_send_coins\` (
+      \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+      \`transaction_id\` int(10) unsigned NOT NULL,
+      \`sender_public_key\` binary(32) NOT NULL,
+      \`state_user_id\` int(10) unsigned DEFAULT 0,
+      \`receiver_public_key\` binary(32) NOT NULL,
+      \`receiver_user_id\` int(10) unsigned DEFAULT 0,
+      \`amount\` bigint(20) NOT NULL,
+      \`sender_final_balance\` bigint(20) NOT NULL,
+      PRIMARY KEY (\`id\`)
+    ) ENGINE=InnoDB AUTO_INCREMENT=659 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  `)
+  await queryFn(`
+    CREATE TABLE \`transaction_creations\` (
+      \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+      \`transaction_id\` int(10) unsigned NOT NULL,
+      \`state_user_id\` int(10) unsigned NOT NULL,
+      \`amount\` bigint(20) NOT NULL,
+      \`ident_hash\` binary(32) DEFAULT NULL,
+      \`target_date\` timestamp NULL DEFAULT NULL,
+      PRIMARY KEY (\`id\`)
+    ) ENGINE=InnoDB AUTO_INCREMENT=2769 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  `)
+
+  await queryFn(`
+    INSERT INTO transaction_send_coins
+      ( transaction_id, sender_public_key, state_user_id,
+        receiver_public_key, receiver_user_id,
+        amount, sender_final_balance )
+      ( SELECT  id AS transaction_id, IF(pubkey, pubkey, 0x00000000000000000000000000000000) AS sender_public_key, user_id AS state_user_id,
+                send_receiver_public_key AS receiver_public_key, send_receiver_user_id AS receiver_user_id,
+                amount, send_sender_final_balance AS sender_final_balance
+        FROM transactions
+        WHERE transaction_type_id = 2 );
+  `)
+
+  await queryFn(`
+    INSERT INTO transaction_creations
+      ( transaction_id, state_user_id,
+        amount, ident_hash, target_date )
+      ( SELECT  id AS transaction_id, user_id AS state_user_id,
+                amount, creation_ident_hash AS ident_hash, creation_date AS target_date
+        FROM transactions
+        WHERE transaction_type_id = 1 );
+  `)
+
   await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_sender_final_balance`;')
   await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_receiver_user_id`;')
   await queryFn('ALTER TABLE `transactions` DROP COLUMN `send_receiver_public_key`;')

From bfde22b261e707533778bbf0a4e36b320842ac87 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 03:10:54 +0100
Subject: [PATCH 24/59] updated entities

---
 database/entity/0001-init_db/Transaction.ts   |  4 +-
 .../Transaction.ts                            |  4 +-
 .../Transaction.ts                            | 65 +++++++++++++++++++
 database/entity/Transaction.ts                |  2 +-
 database/entity/TransactionCreation.ts        |  1 -
 database/entity/TransactionSendCoin.ts        |  1 -
 database/entity/index.ts                      |  4 --
 7 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 database/entity/0024-combine_transaction_tables/Transaction.ts
 delete mode 100644 database/entity/TransactionCreation.ts
 delete mode 100644 database/entity/TransactionSendCoin.ts

diff --git a/database/entity/0001-init_db/Transaction.ts b/database/entity/0001-init_db/Transaction.ts
index 3c2397108..a33fbd0be 100644
--- a/database/entity/0001-init_db/Transaction.ts
+++ b/database/entity/0001-init_db/Transaction.ts
@@ -1,6 +1,6 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
-import { TransactionCreation } from '../TransactionCreation'
-import { TransactionSendCoin } from '../TransactionSendCoin'
+import { TransactionCreation } from './TransactionCreation'
+import { TransactionSendCoin } from './TransactionSendCoin'
 
 @Entity('transactions')
 export class Transaction extends BaseEntity {
diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts
index 8c8251baf..5410d010b 100644
--- a/database/entity/0016-transaction_signatures/Transaction.ts
+++ b/database/entity/0016-transaction_signatures/Transaction.ts
@@ -1,6 +1,6 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
-import { TransactionCreation } from '../TransactionCreation'
-import { TransactionSendCoin } from '../TransactionSendCoin'
+import { TransactionCreation } from '../0001-init_db/TransactionCreation'
+import { TransactionSendCoin } from '../0001-init_db/TransactionSendCoin'
 
 @Entity('transactions')
 export class Transaction extends BaseEntity {
diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts
new file mode 100644
index 000000000..fde1f3057
--- /dev/null
+++ b/database/entity/0024-combine_transaction_tables/Transaction.ts
@@ -0,0 +1,65 @@
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
+
+@Entity('transactions')
+export class Transaction extends BaseEntity {
+  // TODO the id is defined as bigint(20) - there might be problems with that: https://github.com/typeorm/typeorm/issues/2400
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ name: 'transaction_type_id', unsigned: true, length: 10, nullable: false })
+  transactionTypeId: number
+
+  @Column({ name: 'user_id', unsigned: true, length: 10, nullable: false })
+  userId: number
+
+  @Column({ type: 'bigint', length: 20, nullable: false })
+  amount: BigInt
+
+  @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null, nullable: true })
+  txHash: Buffer
+
+  @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  memo: string
+
+  @Column({ type: 'timestamp', nullable: false, default: () => 'CURRENT_TIMESTAMP' })
+  received: Date
+
+  @Column({ type: 'binary', length: 64, nullable: true, default: null })
+  signature: Buffer
+
+  @Column({ type: 'binary', length: 32, nullable: true, default: null })
+  pubkey: Buffer
+
+  @Column({
+    name: 'creation_ident_hash',
+    type: 'binary',
+    length: 32,
+    nullable: true,
+    default: null,
+  })
+  creationIdentHash: Buffer
+
+  @Column({ name: 'creation_date', type: 'timestamp', nullable: true, default: null })
+  creationDate: Date
+
+  @Column({
+    name: 'send_receiver_public_key',
+    type: 'binary',
+    length: 32,
+    nullable: true,
+    default: null,
+  })
+  sendReceiverPublicKey: Buffer
+
+  @Column({
+    name: 'send_receiver_user_id',
+    unsigned: true,
+    length: 10,
+    nullable: true,
+    default: null,
+  })
+  sendReceiverUserId: number
+
+  @Column({ name: 'send_sender_final_balance', length: 20, nullable: true, default: null })
+  sendSenderFinalBalance: BigInt
+}
diff --git a/database/entity/Transaction.ts b/database/entity/Transaction.ts
index f17479f9f..5c9d2df88 100644
--- a/database/entity/Transaction.ts
+++ b/database/entity/Transaction.ts
@@ -1 +1 @@
-export { Transaction } from './0016-transaction_signatures/Transaction'
+export { Transaction } from './0024-combine_transaction_tables/Transaction'
diff --git a/database/entity/TransactionCreation.ts b/database/entity/TransactionCreation.ts
deleted file mode 100644
index 100e948a1..000000000
--- a/database/entity/TransactionCreation.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TransactionCreation } from './0001-init_db/TransactionCreation'
diff --git a/database/entity/TransactionSendCoin.ts b/database/entity/TransactionSendCoin.ts
deleted file mode 100644
index 5c47d3961..000000000
--- a/database/entity/TransactionSendCoin.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TransactionSendCoin } from './0001-init_db/TransactionSendCoin'
diff --git a/database/entity/index.ts b/database/entity/index.ts
index 37fe6eb55..9371b5420 100644
--- a/database/entity/index.ts
+++ b/database/entity/index.ts
@@ -4,8 +4,6 @@ import { LoginEmailOptIn } from './LoginEmailOptIn'
 import { Migration } from './Migration'
 import { ServerUser } from './ServerUser'
 import { Transaction } from './Transaction'
-import { TransactionCreation } from './TransactionCreation'
-import { TransactionSendCoin } from './TransactionSendCoin'
 import { User } from './User'
 import { UserSetting } from './UserSetting'
 import { UserTransaction } from './UserTransaction'
@@ -19,8 +17,6 @@ export const entities = [
   Migration,
   ServerUser,
   Transaction,
-  TransactionCreation,
-  TransactionSendCoin,
   User,
   UserSetting,
   UserTransaction,

From 6b78161182ad510cd537ba99fde0b4504a1b0b30 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:02:05 +0100
Subject: [PATCH 25/59] fixed seeds

---
 .../Transaction.ts                            |  6 ++---
 .../factories/transaction-creation.factory.ts | 18 -------------
 database/src/factories/transaction.factory.ts | 25 +++++++++++-------
 database/src/interface/TransactionContext.ts  | 25 +++++++-----------
 database/src/interface/UserInterface.ts       |  4 +--
 database/src/seeds/helpers/user-helpers.ts    | 26 +++++--------------
 database/src/seeds/users/bibi-bloxberg.ts     | 14 +++-------
 database/src/seeds/users/bob-baumeister.ts    | 14 +++-------
 .../src/seeds/users/garrick-ollivander.ts     |  8 +++---
 database/src/seeds/users/peter-lustig.ts      |  8 +++---
 .../src/seeds/users/raeuber-hotzenplotz.ts    | 14 +++-------
 11 files changed, 54 insertions(+), 108 deletions(-)
 delete mode 100644 database/src/factories/transaction-creation.factory.ts

diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts
index fde1f3057..130f1a9da 100644
--- a/database/entity/0024-combine_transaction_tables/Transaction.ts
+++ b/database/entity/0024-combine_transaction_tables/Transaction.ts
@@ -49,7 +49,7 @@ export class Transaction extends BaseEntity {
     nullable: true,
     default: null,
   })
-  sendReceiverPublicKey: Buffer
+  sendReceiverPublicKey: Buffer | null
 
   @Column({
     name: 'send_receiver_user_id',
@@ -58,8 +58,8 @@ export class Transaction extends BaseEntity {
     nullable: true,
     default: null,
   })
-  sendReceiverUserId: number
+  sendReceiverUserId: number | null
 
   @Column({ name: 'send_sender_final_balance', length: 20, nullable: true, default: null })
-  sendSenderFinalBalance: BigInt
+  sendSenderFinalBalance: BigInt | null
 }
diff --git a/database/src/factories/transaction-creation.factory.ts b/database/src/factories/transaction-creation.factory.ts
deleted file mode 100644
index ec0b9e8a6..000000000
--- a/database/src/factories/transaction-creation.factory.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Faker from 'faker'
-import { define } from 'typeorm-seeding'
-import { TransactionCreation } from '../../entity/TransactionCreation'
-import { TransactionCreationContext } from '../interface/TransactionContext'
-
-define(TransactionCreation, (faker: typeof Faker, context?: TransactionCreationContext) => {
-  if (!context || !context.userId || !context.transaction) {
-    throw new Error('TransactionCreation: No userId and/or transaction present!')
-  }
-
-  const transactionCreation = new TransactionCreation()
-  transactionCreation.userId = context.userId
-  transactionCreation.amount = context.amount ? context.amount : 100000
-  transactionCreation.targetDate = context.targetDate ? context.targetDate : new Date()
-  transactionCreation.transaction = context.transaction
-
-  return transactionCreation
-})
diff --git a/database/src/factories/transaction.factory.ts b/database/src/factories/transaction.factory.ts
index 10d242265..2637ae298 100644
--- a/database/src/factories/transaction.factory.ts
+++ b/database/src/factories/transaction.factory.ts
@@ -5,17 +5,24 @@ import { TransactionContext } from '../interface/TransactionContext'
 import { randomBytes } from 'crypto'
 
 define(Transaction, (faker: typeof Faker, context?: TransactionContext) => {
-  if (!context) context = {}
+  if (!context) {
+    throw new Error('TransactionContext not well defined.')
+  }
 
   const transaction = new Transaction()
-  transaction.transactionTypeId = context.transactionTypeId ? context.transactionTypeId : 2
-  transaction.txHash = context.txHash ? context.txHash : randomBytes(48)
-  transaction.memo = context.memo || context.memo === '' ? context.memo : faker.lorem.sentence()
-  transaction.received = context.received ? context.received : new Date()
-  transaction.signature = context.signature ? context.signature : randomBytes(64)
-  transaction.pubkey = context.signaturePubkey ? context.signaturePubkey : randomBytes(32)
-  if (context.transactionSendCoin) transaction.transactionSendCoin = context.transactionSendCoin
-  if (context.transactionCreation) transaction.transactionCreation = context.transactionCreation
+  transaction.transactionTypeId = context.transactionTypeId // || 2
+  transaction.userId = context.userId
+  transaction.amount = context.amount
+  transaction.txHash = context.txHash || randomBytes(48)
+  transaction.memo = context.memo
+  transaction.received = context.received || new Date()
+  transaction.signature = context.signature || randomBytes(64)
+  transaction.pubkey = context.pubkey || randomBytes(32)
+  transaction.creationIdentHash = context.creationIdentHash || randomBytes(32)
+  transaction.creationDate = context.creationDate || new Date()
+  transaction.sendReceiverPublicKey = context.sendReceiverPublicKey || null
+  transaction.sendReceiverUserId = context.sendReceiverUserId || null
+  transaction.sendSenderFinalBalance = context.sendSenderFinalBalance || null
 
   return transaction
 })
diff --git a/database/src/interface/TransactionContext.ts b/database/src/interface/TransactionContext.ts
index 15b66bad6..add9fc71c 100644
--- a/database/src/interface/TransactionContext.ts
+++ b/database/src/interface/TransactionContext.ts
@@ -1,18 +1,20 @@
 import { Transaction } from '../../entity/Transaction'
-import { TransactionSendCoin } from '../../entity/TransactionSendCoin'
-import { TransactionCreation } from '../../entity/TransactionCreation'
 import { User } from '../../entity/User'
 
 export interface TransactionContext {
-  transactionTypeId?: number
+  transactionTypeId: number
+  userId: number
+  amount: BigInt
   txHash?: Buffer
-  memo?: string
+  memo: string
   received?: Date
-  blockchainTypeId?: number
   signature?: Buffer
-  signaturePubkey?: Buffer
-  transactionSendCoin?: TransactionSendCoin
-  transactionCreation?: TransactionCreation
+  pubkey?: Buffer
+  creationIdentHash?: Buffer
+  creationDate?: Date
+  sendReceiverPublicKey?: Buffer
+  sendReceiverUserId?: number
+  sendSenderFinalBalance?: BigInt
 }
 
 export interface BalanceContext {
@@ -32,13 +34,6 @@ export interface TransactionSendCoinContext {
   transaction?: Transaction
 }
 
-export interface TransactionCreationContext {
-  userId?: number
-  amount?: number
-  targetDate?: Date
-  transaction?: Transaction
-}
-
 export interface UserTransactionContext {
   userId?: number
   transactionId?: number
diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts
index 30b05db38..1f258f808 100644
--- a/database/src/interface/UserInterface.ts
+++ b/database/src/interface/UserInterface.ts
@@ -11,7 +11,6 @@ export interface UserInterface {
   emailChecked?: boolean
   language?: string
   deletedAt?: Date
-  groupId?: number
   publisherId?: number
   passphrase?: string
   // from server user
@@ -27,9 +26,8 @@ export interface UserInterface {
   // balance
   balanceModified?: Date
   recordDate?: Date
-  targetDate?: Date
+  creationDate?: Date
   amount?: number
   creationTxHash?: Buffer
   signature?: Buffer
-  signaturePubkey?: Buffer
 }
diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts
index 74bdd4326..a195fc181 100644
--- a/database/src/seeds/helpers/user-helpers.ts
+++ b/database/src/seeds/helpers/user-helpers.ts
@@ -2,7 +2,6 @@ import { UserContext, ServerUserContext } from '../../interface/UserContext'
 import {
   BalanceContext,
   TransactionContext,
-  TransactionCreationContext,
   UserTransactionContext,
 } from '../../interface/TransactionContext'
 import { UserInterface } from '../../interface/UserInterface'
@@ -11,7 +10,6 @@ import { ServerUser } from '../../../entity/ServerUser'
 import { Balance } from '../../../entity/Balance'
 import { Transaction } from '../../../entity/Transaction'
 import { UserTransaction } from '../../../entity/UserTransaction'
-import { TransactionCreation } from '../../../entity/TransactionCreation'
 import { Factory } from 'typeorm-seeding'
 
 export const userSeeder = async (factory: Factory, userData: UserInterface): Promise<void> => {
@@ -25,10 +23,7 @@ export const userSeeder = async (factory: Factory, userData: UserInterface): Pro
     // create some GDD for the user
     await factory(Balance)(createBalanceContext(userData, user)).create()
     const transaction = await factory(Transaction)(
-      createTransactionContext(userData, 1, 'Herzlich Willkommen bei Gradido!'),
-    ).create()
-    await factory(TransactionCreation)(
-      createTransactionCreationContext(userData, user, transaction),
+      createTransactionContext(userData, user, 1, 'Herzlich Willkommen bei Gradido!'),
     ).create()
     await factory(UserTransaction)(
       createUserTransactionContext(userData, user, transaction),
@@ -76,27 +71,18 @@ const createBalanceContext = (context: UserInterface, user: User): BalanceContex
 
 const createTransactionContext = (
   context: UserInterface,
+  user: User,
   type: number,
   memo: string,
 ): TransactionContext => {
   return {
     transactionTypeId: type,
+    userId: user.id,
+    amount: BigInt(context.amount || 100000),
     txHash: context.creationTxHash,
     memo,
     received: context.recordDate,
-  }
-}
-
-const createTransactionCreationContext = (
-  context: UserInterface,
-  user: User,
-  transaction: Transaction,
-): TransactionCreationContext => {
-  return {
-    userId: user.id,
-    amount: context.amount,
-    targetDate: context.targetDate,
-    transaction,
+    creationDate: context.creationDate,
   }
 }
 
@@ -112,6 +98,6 @@ const createUserTransactionContext = (
     balance: context.amount,
     balanceDate: context.recordDate,
     signature: context.signature,
-    pubkey: context.signaturePubkey,
+    pubkey: context.pubKey,
   }
 }
diff --git a/database/src/seeds/users/bibi-bloxberg.ts b/database/src/seeds/users/bibi-bloxberg.ts
index e8291b213..f940c3447 100644
--- a/database/src/seeds/users/bibi-bloxberg.ts
+++ b/database/src/seeds/users/bibi-bloxberg.ts
@@ -1,8 +1,9 @@
-export const bibiBloxberg = {
+import { UserInterface } from '../../interface/UserInterface'
+
+export const bibiBloxberg: UserInterface = {
   email: 'bibi@bloxberg.de',
   firstName: 'Bibi',
   lastName: 'Bloxberg',
-  username: 'bibi',
   // description: 'Hex Hex',
   password: BigInt('12825419584724616625'),
   pubKey: Buffer.from('42de7e4754625b730018c3b4ea745a4d043d9d867af352d0f08871793dfa6743', 'hex'),
@@ -14,16 +15,13 @@ export const bibiBloxberg = {
   createdAt: new Date('2021-11-26T11:32:16'),
   emailChecked: true,
   language: 'de',
-  disabled: false,
-  groupId: 1,
   passphrase:
     'knife normal level all hurdle crucial color avoid warrior stadium road bachelor affair topple hawk pottery right afford immune two ceiling budget glance hour ',
-  mnemonicType: 2,
   isAdmin: false,
   addBalance: true,
   balanceModified: new Date('2021-11-30T10:37:11'),
   recordDate: new Date('2021-11-30T10:37:11'),
-  targetDate: new Date('2021-08-01 00:00:00'),
+  creationDate: new Date('2021-08-01 00:00:00'),
   amount: 10000000,
   creationTxHash: Buffer.from(
     '51103dc0fc2ca5d5d75a9557a1e899304e5406cfdb1328d8df6414d527b0118100000000000000000000000000000000',
@@ -33,8 +31,4 @@ export const bibiBloxberg = {
     '2a2c71f3e41adc060bbc3086577e2d57d24eeeb0a7727339c3f85aad813808f601d7e1df56a26e0929d2e67fc054fca429ccfa283ed2782185c7f009fe008f0c',
     'hex',
   ),
-  signaturePubkey: Buffer.from(
-    '7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770',
-    'hex',
-  ),
 }
diff --git a/database/src/seeds/users/bob-baumeister.ts b/database/src/seeds/users/bob-baumeister.ts
index 1c9f992e6..34597fa3f 100644
--- a/database/src/seeds/users/bob-baumeister.ts
+++ b/database/src/seeds/users/bob-baumeister.ts
@@ -1,8 +1,9 @@
-export const bobBaumeister = {
+import { UserInterface } from '../../interface/UserInterface'
+
+export const bobBaumeister: UserInterface = {
   email: 'bob@baumeister.de',
   firstName: 'Bob',
   lastName: 'der Baumeister',
-  username: 'bob',
   // description: 'Können wir das schaffen? Ja, wir schaffen das!',
   password: BigInt('3296644341468822636'),
   pubKey: Buffer.from('a509d9a146374fc975e3677db801ae8a4a83bff9dea96da64053ff6de6b2dd7e', 'hex'),
@@ -14,16 +15,13 @@ export const bobBaumeister = {
   createdAt: new Date('2021-11-26T11:36:31'),
   emailChecked: true,
   language: 'de',
-  disabled: false,
-  groupId: 1,
   passphrase:
     'detail master source effort unable waste tilt flush domain orchard art truck hint barrel response gate impose peanut secret merry three uncle wink resource ',
-  mnemonicType: 2,
   isAdmin: false,
   addBalance: true,
   balanceModified: new Date('2021-11-30T10:37:14'),
   recordDate: new Date('2021-11-30T10:37:14'),
-  targetDate: new Date('2021-08-01 00:00:00'),
+  creationDate: new Date('2021-08-01 00:00:00'),
   amount: 10000000,
   creationTxHash: Buffer.from(
     'be095dc87acb94987e71168fee8ecbf50ecb43a180b1006e75d573b35725c69c00000000000000000000000000000000',
@@ -33,8 +31,4 @@ export const bobBaumeister = {
     '1fbd6b9a3d359923b2501557f3bc79fa7e428127c8090fb16bc490b4d87870ab142b3817ddd902d22f0b26472a483233784a0e460c0622661752a13978903905',
     'hex',
   ),
-  signaturePubkey: Buffer.from(
-    '7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770',
-    'hex',
-  ),
 }
diff --git a/database/src/seeds/users/garrick-ollivander.ts b/database/src/seeds/users/garrick-ollivander.ts
index bddd5aa0f..3f18a875c 100644
--- a/database/src/seeds/users/garrick-ollivander.ts
+++ b/database/src/seeds/users/garrick-ollivander.ts
@@ -1,8 +1,9 @@
-export const garrickOllivander = {
+import { UserInterface } from '../../interface/UserInterface'
+
+export const garrickOllivander: UserInterface = {
   email: 'garrick@ollivander.com',
   firstName: 'Garrick',
   lastName: 'Ollivander',
-  username: 'garrick',
   // description: `Curious ... curious ...
   // Renowned wandmaker Mr Ollivander owns the wand shop Ollivanders: Makers of Fine Wands Since 382 BC in Diagon Alley. His shop is widely considered the best place to purchase a wand.`,
   password: BigInt('0'),
@@ -10,11 +11,8 @@ export const garrickOllivander = {
   createdAt: new Date('2022-01-10T10:23:17'),
   emailChecked: false,
   language: 'en',
-  disabled: false,
-  groupId: 1,
   passphrase:
     'human glide theory clump wish history other duty door fringe neck industry ostrich equal plate diesel tornado neck people antenna door category moon hen ',
-  mnemonicType: 2,
   isAdmin: false,
   addBalance: false,
 }
diff --git a/database/src/seeds/users/peter-lustig.ts b/database/src/seeds/users/peter-lustig.ts
index da6c31777..5b4b98488 100644
--- a/database/src/seeds/users/peter-lustig.ts
+++ b/database/src/seeds/users/peter-lustig.ts
@@ -1,8 +1,9 @@
-export const peterLustig = {
+import { UserInterface } from '../../interface/UserInterface'
+
+export const peterLustig: UserInterface = {
   email: 'peter@lustig.de',
   firstName: 'Peter',
   lastName: 'Lustig',
-  username: 'peter',
   // description: 'Latzhose und Nickelbrille',
   password: BigInt('3917921995996627700'),
   pubKey: Buffer.from('7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770', 'hex'),
@@ -14,11 +15,8 @@ export const peterLustig = {
   createdAt: new Date('2020-11-25T10:48:43'),
   emailChecked: true,
   language: 'de',
-  disabled: false,
-  groupId: 1,
   passphrase:
     'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ',
-  mnemonicType: 2,
   role: 'admin',
   serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.',
   activated: 1,
diff --git a/database/src/seeds/users/raeuber-hotzenplotz.ts b/database/src/seeds/users/raeuber-hotzenplotz.ts
index aaf862d14..bcd5f995b 100644
--- a/database/src/seeds/users/raeuber-hotzenplotz.ts
+++ b/database/src/seeds/users/raeuber-hotzenplotz.ts
@@ -1,8 +1,9 @@
-export const raeuberHotzenplotz = {
+import { UserInterface } from '../../interface/UserInterface'
+
+export const raeuberHotzenplotz: UserInterface = {
   email: 'raeuber@hotzenplotz.de',
   firstName: 'Räuber',
   lastName: 'Hotzenplotz',
-  username: 'räuber',
   // description: 'Pfefferpistole',
   password: BigInt('12123692783243004812'),
   pubKey: Buffer.from('d7c70f94234dff071d982aa8f41583876c356599773b5911b39080da2b8c2d2b', 'hex'),
@@ -14,16 +15,13 @@ export const raeuberHotzenplotz = {
   createdAt: new Date('2021-11-26T11:32:16'),
   emailChecked: true,
   language: 'de',
-  disabled: false,
-  groupId: 1,
   passphrase:
     'gospel trip tenant mouse spider skill auto curious man video chief response same little over expire drum display fancy clinic keen throw urge basket ',
-  mnemonicType: 2,
   isAdmin: false,
   addBalance: true,
   balanceModified: new Date('2021-11-30T10:37:13'),
   recordDate: new Date('2021-11-30T10:37:13'),
-  targetDate: new Date('2021-08-01 00:00:00'),
+  creationDate: new Date('2021-08-01 00:00:00'),
   amount: 10000000,
   creationTxHash: Buffer.from(
     '23ba44fd84deb59b9f32969ad0cb18bfa4588be1bdb99c396888506474c16c1900000000000000000000000000000000',
@@ -33,8 +31,4 @@ export const raeuberHotzenplotz = {
     '756d3da061687c575d1dbc5073908f646aa5f498b0927b217c83b48af471450e571dfe8421fb8e1f1ebd1104526b7e7c6fa78684e2da59c8f7f5a8dc3d9e5b0b',
     'hex',
   ),
-  signaturePubkey: Buffer.from(
-    '7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770',
-    'hex',
-  ),
 }

From 9ba7d6341ab746ec3d9731c7ca1d204011f5230d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:06:08 +0100
Subject: [PATCH 26/59] fixed lint warning

---
 database/entity/0024-combine_transaction_tables/Transaction.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts
index 130f1a9da..cd7e6833e 100644
--- a/database/entity/0024-combine_transaction_tables/Transaction.ts
+++ b/database/entity/0024-combine_transaction_tables/Transaction.ts
@@ -1,4 +1,4 @@
-import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 
 @Entity('transactions')
 export class Transaction extends BaseEntity {

From 281a4fbc9b51b88cd6ef8a1d705f603a37ad019e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:06:18 +0100
Subject: [PATCH 27/59] fixed lint warning

---
 database/src/factories/user.factory.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts
index cb2ccb105..d04dcea4c 100644
--- a/database/src/factories/user.factory.ts
+++ b/database/src/factories/user.factory.ts
@@ -1,7 +1,7 @@
 import Faker from 'faker'
 import { define } from 'typeorm-seeding'
 import { User } from '../../entity/User'
-import { randomBytes, randomInt } from 'crypto'
+import { randomBytes } from 'crypto'
 import { UserContext } from '../interface/UserContext'
 
 define(User, (faker: typeof Faker, context?: UserContext) => {

From c88b67faa4b66dc09d0a87fb60f454c075af53e2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:15:14 +0100
Subject: [PATCH 28/59] removed length properties and define nullable userId as
 int

---
 .../Transaction.ts                              | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/database/entity/0024-combine_transaction_tables/Transaction.ts b/database/entity/0024-combine_transaction_tables/Transaction.ts
index cd7e6833e..5834c007a 100644
--- a/database/entity/0024-combine_transaction_tables/Transaction.ts
+++ b/database/entity/0024-combine_transaction_tables/Transaction.ts
@@ -6,13 +6,13 @@ export class Transaction extends BaseEntity {
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
 
-  @Column({ name: 'transaction_type_id', unsigned: true, length: 10, nullable: false })
+  @Column({ name: 'transaction_type_id', unsigned: true, nullable: false })
   transactionTypeId: number
 
-  @Column({ name: 'user_id', unsigned: true, length: 10, nullable: false })
+  @Column({ name: 'user_id', unsigned: true, nullable: false })
   userId: number
 
-  @Column({ type: 'bigint', length: 20, nullable: false })
+  @Column({ type: 'bigint', nullable: false })
   amount: BigInt
 
   @Column({ name: 'tx_hash', type: 'binary', length: 48, default: null, nullable: true })
@@ -53,13 +53,18 @@ export class Transaction extends BaseEntity {
 
   @Column({
     name: 'send_receiver_user_id',
+    type: 'int',
     unsigned: true,
-    length: 10,
     nullable: true,
     default: null,
   })
-  sendReceiverUserId: number | null
+  sendReceiverUserId?: number | null
 
-  @Column({ name: 'send_sender_final_balance', length: 20, nullable: true, default: null })
+  @Column({
+    name: 'send_sender_final_balance',
+    type: 'bigint',
+    nullable: true,
+    default: null,
+  })
   sendSenderFinalBalance: BigInt | null
 }

From 93ec25f72f11807802ad635ac70bb2698e230643 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:27:31 +0100
Subject: [PATCH 29/59] remove comment

---
 .../0024-combine_transaction_tables.ts        | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/database/migrations/0024-combine_transaction_tables.ts b/database/migrations/0024-combine_transaction_tables.ts
index ce0f1cb44..af564ce2d 100644
--- a/database/migrations/0024-combine_transaction_tables.ts
+++ b/database/migrations/0024-combine_transaction_tables.ts
@@ -123,38 +123,3 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
   await queryFn('ALTER TABLE `transactions` DROP COLUMN `amount`;')
   await queryFn('ALTER TABLE `transactions` DROP COLUMN `user_id`;')
 }
-
-/*
-CREATE TABLE `transactions` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `transaction_type_id` int(10) unsigned NOT NULL,
-  `tx_hash` binary(48) DEFAULT NULL,
-  `memo` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `received` timestamp NOT NULL DEFAULT current_timestamp(),
-  `signature` binary(64) DEFAULT NULL,
-  `pubkey` binary(32) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3421 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-*/
-
-// CREATE TABLE `transaction_creations` (
-//   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-//   `transaction_id` int(10) unsigned NOT NULL,
-//   `state_user_id` int(10) unsigned NOT NULL,
-//   `amount` bigint(20) NOT NULL,
-//   `ident_hash` binary(32) DEFAULT NULL,
-//   `target_date` timestamp NULL DEFAULT NULL,
-//   PRIMARY KEY (`id`)
-// ) ENGINE=InnoDB AUTO_INCREMENT=2769 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-
-// CREATE TABLE `transaction_send_coins` (
-//   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-//   `transaction_id` int(10) unsigned NOT NULL,
-//   `sender_public_key` binary(32) NOT NULL,
-//   `state_user_id` int(10) unsigned DEFAULT 0,
-//   `receiver_public_key` binary(32) NOT NULL,
-//   `receiver_user_id` int(10) unsigned DEFAULT 0,
-//   `amount` bigint(20) NOT NULL,
-//   `sender_final_balance` bigint(20) NOT NULL,
-//   PRIMARY KEY (`id`)
-// ) ENGINE=InnoDB AUTO_INCREMENT=659 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci

From 0c15bed74eaf32c569342057afa3b5a07d2c822b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 04:46:36 +0100
Subject: [PATCH 30/59] backend is buildable

---
 backend/src/graphql/resolver/AdminResolver.ts | 22 +++++------
 .../graphql/resolver/TransactionResolver.ts   | 38 +++++++------------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 7430868b1..11d7f201c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -15,7 +15,6 @@ import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
 import SearchUsersArgs from '../arg/SearchUsersArgs'
 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'
 import { BalanceRepository } from '../../typeorm/repository/Balance'
@@ -24,6 +23,7 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
+import { TransactionTypeId } from '../enum/TransactionTypeId'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -229,17 +229,12 @@ export class AdminResolver {
     transaction.transactionTypeId = 1
     transaction.memo = pendingCreation.memo
     transaction.received = receivedCallDate
+    transaction.userId = pendingCreation.userId
+    transaction.amount = BigInt(parseInt(pendingCreation.amount.toString()))
+    transaction.creationDate = pendingCreation.date
     transaction = await transactionRepository.save(transaction)
     if (!transaction) throw new Error('Could not create transaction')
 
-    let transactionCreation = new TransactionCreation()
-    transactionCreation.transactionId = transaction.id
-    transactionCreation.userId = pendingCreation.userId
-    transactionCreation.amount = parseInt(pendingCreation.amount.toString())
-    transactionCreation.targetDate = pendingCreation.date
-    transactionCreation = await TransactionCreation.save(transactionCreation)
-    if (!transactionCreation) throw new Error('Could not create transactionCreation')
-
     const userTransactionRepository = getCustomRepository(UserTransactionRepository)
     const lastUserTransaction = await userTransactionRepository.findLastForUser(
       pendingCreation.userId,
@@ -289,10 +284,11 @@ async function getUserCreations(id: number): Promise<number[]> {
   const lastMonthNumber = moment().subtract(1, 'month').format('M')
   const currentMonthNumber = moment().format('M')
 
-  const createdAmountsQuery = await TransactionCreation.createQueryBuilder('transaction_creations')
-    .select('MONTH(transaction_creations.target_date)', 'target_month')
-    .addSelect('SUM(transaction_creations.amount)', 'sum')
-    .where('transaction_creations.state_user_id = :id', { id })
+  const createdAmountsQuery = await Transaction.createQueryBuilder('transactions')
+    .select('MONTH(transactions.creation_date)', 'target_month')
+    .addSelect('SUM(transactions.amount)', 'sum')
+    .where('transactions.user_id = :id', { id })
+    .andWhere('transactions.transaction_type_id = :type', { type: TransactionTypeId.CREATION })
     .andWhere({
       targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :endDate`, {
         date: dateBeforeLastMonth,
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 8d9e0c6c3..9c7c8b93f 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -24,7 +24,6 @@ import { TransactionRepository } from '../../typeorm/repository/Transaction'
 import { User as dbUser } from '@entity/User'
 import { UserTransaction as dbUserTransaction } from '@entity/UserTransaction'
 import { Transaction as dbTransaction } from '@entity/Transaction'
-import { TransactionSendCoin as dbTransactionSendCoin } from '@entity/TransactionSendCoin'
 import { Balance as dbBalance } from '@entity/Balance'
 
 import { apiPost } from '../../apis/HttpRequest'
@@ -57,8 +56,8 @@ async function calculateAndAddDecayTransactions(
   transactions.forEach((transaction: dbTransaction) => {
     transactionIndiced[transaction.id] = transaction
     if (transaction.transactionTypeId === TransactionTypeId.SEND) {
-      involvedUserIds.push(transaction.transactionSendCoin.userId)
-      involvedUserIds.push(transaction.transactionSendCoin.recipiantUserId)
+      involvedUserIds.push(transaction.userId)
+      involvedUserIds.push(transaction.sendReceiverUserId!) // TODO ensure not null properly
     }
   })
   // remove duplicates
@@ -108,24 +107,21 @@ async function calculateAndAddDecayTransactions(
     // 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)
+      finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
     } 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.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
+      if (transaction.userId === user.id) {
         finalTransaction.type = TransactionType.SEND
-        otherUser = userIndiced[sendCoin.recipiantUserId]
+        otherUser = userIndiced[transaction.sendReceiverUserId!] // TODO properly enforce null
         // finalTransaction.pubkey = sendCoin.recipiantPublic
-      } else if (sendCoin.recipiantUserId === user.id) {
+      } else if (transaction.sendReceiverUserId === user.id) {
         finalTransaction.type = TransactionType.RECIEVE
-        otherUser = userIndiced[sendCoin.userId]
+        otherUser = userIndiced[transaction.userId]
         // finalTransaction.pubkey = sendCoin.senderPublic
       } else {
         throw new Error('invalid transaction')
@@ -373,6 +369,11 @@ export class TransactionResolver {
       let transaction = new dbTransaction()
       transaction.transactionTypeId = TransactionTypeId.SEND
       transaction.memo = memo
+      transaction.userId = senderUser.id
+      transaction.pubkey = senderUser.pubKey
+      transaction.sendReceiverUserId = recipientUser.id
+      transaction.sendReceiverPublicKey = recipientUser.pubKey
+      transaction.amount = BigInt(centAmount)
 
       // TODO: NO! this is problematic in its construction
       const insertResult = await queryRunner.manager.insert(dbTransaction, transaction)
@@ -421,18 +422,7 @@ export class TransactionResolver {
         throw new Error('db data corrupted, recipiant')
       }
 
-      // transactionSendCoin
-      const transactionSendCoin = new dbTransactionSendCoin()
-      transactionSendCoin.transactionId = transaction.id
-      transactionSendCoin.userId = senderUser.id
-      transactionSendCoin.senderPublic = senderUser.pubKey
-      transactionSendCoin.recipiantUserId = recipientUser.id
-      transactionSendCoin.recipiantPublic = recipientUser.pubKey
-      transactionSendCoin.amount = centAmount
-      transactionSendCoin.senderFinalBalance = senderStateBalance.amount
-      await queryRunner.manager.save(transactionSendCoin).catch((error) => {
-        throw new Error('error saving transaction send coin: ' + error)
-      })
+      transaction.sendSenderFinalBalance = BigInt(senderStateBalance.amount)
 
       await queryRunner.manager.save(transaction).catch((error) => {
         throw new Error('error saving transaction with tx hash: ' + error)

From fc0675c461596291088b80c628c39f8f192cfb8c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 12:01:52 +0100
Subject: [PATCH 31/59] updated database version in backend

---
 backend/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 990cde078..8961fc358 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -4,7 +4,7 @@ import dotenv from 'dotenv'
 dotenv.config()
 
 const constants = {
-  DB_VERSION: '0023-users_disabled_soft_delete',
+  DB_VERSION: '0024-combine_transaction_tables',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
 }
 

From babe2b4930403b04d7f4c5710fe1a7a704ef779e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 12:54:20 +0100
Subject: [PATCH 32/59] wtf, this stopped working for me? Why?

---
 frontend/src/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 0ce43310b..73125dd07 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -70,7 +70,7 @@ const dateTimeFormats = {
     long: {
       year: 'numeric',
       month: 'long',
-      day: 'long',
+      day: 'numeric',
       weekday: 'short',
       hour: 'numeric',
       minute: 'numeric',

From ecfcde8dd4168da8651c4a4fad4ec16f72a1bd56 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 12:56:10 +0100
Subject: [PATCH 33/59] simplified query

---
 backend/src/typeorm/repository/Transaction.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
index 0a97067a2..dcf312753 100644
--- a/backend/src/typeorm/repository/Transaction.ts
+++ b/backend/src/typeorm/repository/Transaction.ts
@@ -6,16 +6,6 @@ export class TransactionRepository extends Repository<Transaction> {
   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()
   }
 }

From c9424361a6bf0bc5dbe6a5c517d95279ea97c789 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 13:20:13 +0100
Subject: [PATCH 34/59] simplified query and also include `withDeleted` to show
 the name of an user  marked as deleted

---
 backend/src/typeorm/repository/User.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index f9faf6c5b..3155053d9 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -10,20 +10,15 @@ export class UserRepository extends Repository<User> {
   }
 
   async getUsersIndiced(userIds: number[]): Promise<User[]> {
-    if (!userIds.length) return []
-    const users = await this.createQueryBuilder('user')
+    return this.createQueryBuilder('user')
+      .withDeleted() // We need to show the name for deleted users for old transactions
       .select(['user.id', 'user.firstName', 'user.lastName', 'user.email'])
-      .where('user.id IN (:...users)', { users: userIds })
+      .where('user.id IN (:...userIds)', { userIds })
       .getMany()
-    const usersIndiced: User[] = []
-    users.forEach((value) => {
-      usersIndiced[value.id] = value
-    })
-    return usersIndiced
   }
 
   async findBySearchCriteria(searchCriteria: string): Promise<User[]> {
-    return await this.createQueryBuilder('user')
+    return this.createQueryBuilder('user')
       .withDeleted()
       .where(
         'user.firstName like :name or user.lastName like :lastName or user.email like :email',

From 70a0a2664b3df07b115daabecc0dbcc37919ec33 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 20 Feb 2022 13:21:12 +0100
Subject: [PATCH 35/59] properly use js array operators (find)

---
 backend/src/graphql/resolver/TransactionResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 9c7c8b93f..edbe6373e 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -117,11 +117,11 @@ async function calculateAndAddDecayTransactions(
       finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
       if (transaction.userId === user.id) {
         finalTransaction.type = TransactionType.SEND
-        otherUser = userIndiced[transaction.sendReceiverUserId!] // TODO properly enforce null
+        otherUser = userIndiced.find((u) => u.id === transaction.sendReceiverUserId) // TODO properly enforce null
         // finalTransaction.pubkey = sendCoin.recipiantPublic
       } else if (transaction.sendReceiverUserId === user.id) {
         finalTransaction.type = TransactionType.RECIEVE
-        otherUser = userIndiced[transaction.userId]
+        otherUser = userIndiced.find((u) => u.id === transaction.userId)
         // finalTransaction.pubkey = sendCoin.senderPublic
       } else {
         throw new Error('invalid transaction')

From e1034cb1fdabd32b73b44e7f1a7eedcf055de395 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 00:18:08 +0100
Subject: [PATCH 36/59] fixed data conversion error on sendCoins

---
 backend/src/graphql/resolver/TransactionResolver.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index edbe6373e..417760982 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -114,6 +114,7 @@ async function calculateAndAddDecayTransactions(
     } else if (userTransaction.transactionTypeId === TransactionTypeId.SEND) {
       // send coin
       let otherUser: dbUser | undefined
+      console.log('converting', transaction.amount)
       finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
       if (transaction.userId === user.id) {
         finalTransaction.type = TransactionType.SEND
@@ -422,7 +423,10 @@ export class TransactionResolver {
         throw new Error('db data corrupted, recipiant')
       }
 
-      transaction.sendSenderFinalBalance = BigInt(senderStateBalance.amount)
+      // TODO: WTF?
+      // I just assume that due to implicit type conversion the decimal places were cut.
+      // Using `Math.trunc` to simulate this behaviour
+      transaction.sendSenderFinalBalance = BigInt(Math.trunc(senderStateBalance.amount))
 
       await queryRunner.manager.save(transaction).catch((error) => {
         throw new Error('error saving transaction with tx hash: ' + error)

From 9574af9278d912f3f325d0cc6a324cc7f8e0eabe Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 00:38:39 +0100
Subject: [PATCH 37/59] removed balance & transaction repository since its no
 longer needed

---
 backend/src/graphql/resolver/AdminResolver.ts       | 13 +++++--------
 backend/src/graphql/resolver/BalanceResolver.ts     |  5 ++---
 backend/src/graphql/resolver/TransactionResolver.ts | 12 +++---------
 backend/src/typeorm/repository/Balance.ts           |  9 ---------
 backend/src/typeorm/repository/Transaction.ts       | 11 -----------
 5 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 backend/src/typeorm/repository/Balance.ts
 delete mode 100644 backend/src/typeorm/repository/Transaction.ts

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 11d7f201c..54898f770 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -8,7 +8,6 @@ import { PendingCreation } from '../model/PendingCreation'
 import { CreatePendingCreations } from '../model/CreatePendingCreations'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
-import { TransactionRepository } from '../../typeorm/repository/Transaction'
 import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
@@ -17,13 +16,13 @@ import moment from 'moment'
 import { Transaction } from '@entity/Transaction'
 import { UserTransaction } from '@entity/UserTransaction'
 import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
-import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import { TransactionTypeId } from '../enum/TransactionTypeId'
+import { Balance } from '@entity/Balance'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -223,7 +222,6 @@ export class AdminResolver {
     if (moderatorUser.id === pendingCreation.userId)
       throw new Error('Moderator can not confirm own pending creation')
 
-    const transactionRepository = getCustomRepository(TransactionRepository)
     const receivedCallDate = new Date()
     let transaction = new Transaction()
     transaction.transactionTypeId = 1
@@ -232,7 +230,7 @@ export class AdminResolver {
     transaction.userId = pendingCreation.userId
     transaction.amount = BigInt(parseInt(pendingCreation.amount.toString()))
     transaction.creationDate = pendingCreation.date
-    transaction = await transactionRepository.save(transaction)
+    transaction = await transaction.save()
     if (!transaction) throw new Error('Could not create transaction')
 
     const userTransactionRepository = getCustomRepository(UserTransactionRepository)
@@ -262,15 +260,14 @@ export class AdminResolver {
       throw new Error('Error saving user transaction: ' + error)
     })
 
-    const balanceRepository = getCustomRepository(BalanceRepository)
-    let userBalance = await balanceRepository.findByUser(pendingCreation.userId)
+    let userBalance = await Balance.findOne({ userId: pendingCreation.userId })
 
-    if (!userBalance) userBalance = balanceRepository.create()
+    if (!userBalance) userBalance = new Balance()
     userBalance.userId = pendingCreation.userId
     userBalance.amount = Number(newBalance)
     userBalance.modified = receivedCallDate
     userBalance.recordDate = receivedCallDate
-    await balanceRepository.save(userBalance)
+    await userBalance.save()
     await AdminPendingCreation.delete(pendingCreation)
 
     return true
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 0ecfbb7cd..fff073b99 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -4,11 +4,11 @@
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { Balance } from '../model/Balance'
-import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { UserRepository } from '../../typeorm/repository/User'
 import { calculateDecay } from '../../util/decay'
 import { roundFloorFrom4 } from '../../util/round'
 import { RIGHTS } from '../../auth/RIGHTS'
+import { Balance as dbBalance } from '@entity/Balance'
 
 @Resolver()
 export class BalanceResolver {
@@ -16,11 +16,10 @@ export class BalanceResolver {
   @Query(() => Balance)
   async balance(@Ctx() context: any): Promise<Balance> {
     // load user and balance
-    const balanceRepository = getCustomRepository(BalanceRepository)
     const userRepository = getCustomRepository(UserRepository)
 
     const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
-    const balanceEntity = await balanceRepository.findByUser(userEntity.id)
+    const balanceEntity = await dbBalance.findOne({ userId: userEntity.id })
     const now = new Date()
 
     // No balance found
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 417760982..41879f550 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -16,10 +16,8 @@ import Paginated from '../arg/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 '@entity/User'
 import { UserTransaction as dbUserTransaction } from '@entity/UserTransaction'
@@ -49,8 +47,7 @@ async function calculateAndAddDecayTransactions(
     transactionIds.push(userTransaction.transactionId)
   })
 
-  const transactionRepository = getCustomRepository(TransactionRepository)
-  const transactions = await transactionRepository.joinFullTransactionsByIds(transactionIds)
+  const transactions = await dbTransaction.find({ where: { id: transactionIds } })
 
   const transactionIndiced: dbTransaction[] = []
   transactions.forEach((transaction: dbTransaction) => {
@@ -114,7 +111,6 @@ async function calculateAndAddDecayTransactions(
     } else if (userTransaction.transactionTypeId === TransactionTypeId.SEND) {
       // send coin
       let otherUser: dbUser | undefined
-      console.log('converting', transaction.amount)
       finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
       if (transaction.userId === user.id) {
         finalTransaction.type = TransactionType.SEND
@@ -212,8 +208,7 @@ async function updateStateBalance(
   received: Date,
   queryRunner: QueryRunner,
 ): Promise<dbBalance> {
-  const balanceRepository = getCustomRepository(BalanceRepository)
-  let balance = await balanceRepository.findByUser(user.id)
+  let balance = await dbBalance.findOne({ userId: user.id })
   if (!balance) {
     balance = new dbBalance()
     balance.userId = user.id
@@ -311,8 +306,7 @@ export class TransactionResolver {
     } catch (err: any) {}
 
     // get balance
-    const balanceRepository = getCustomRepository(BalanceRepository)
-    const balanceEntity = await balanceRepository.findByUser(userEntity.id)
+    const balanceEntity = await dbBalance.findOne({ userId: userEntity.id })
     if (balanceEntity) {
       const now = new Date()
       transactions.balance = roundFloorFrom4(balanceEntity.amount)
diff --git a/backend/src/typeorm/repository/Balance.ts b/backend/src/typeorm/repository/Balance.ts
deleted file mode 100644
index 856329443..000000000
--- a/backend/src/typeorm/repository/Balance.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { EntityRepository, Repository } from '@dbTools/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()
-  }
-}
diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts
deleted file mode 100644
index dcf312753..000000000
--- a/backend/src/typeorm/repository/Transaction.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { EntityRepository, Repository } from '@dbTools/typeorm'
-import { Transaction } from '@entity/Transaction'
-
-@EntityRepository(Transaction)
-export class TransactionRepository extends Repository<Transaction> {
-  async joinFullTransactionsByIds(transactionIds: number[]): Promise<Transaction[]> {
-    return this.createQueryBuilder('transaction')
-      .where('transaction.id IN (:...transactions)', { transactions: transactionIds })
-      .getMany()
-  }
-}

From 2d0d02c7f6c100d25712bf64a764bf14eb23da96 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 01:01:57 +0100
Subject: [PATCH 38/59] lots of refacoting in TransactionResolver

---
 .../graphql/resolver/TransactionResolver.ts   | 128 +++++++-----------
 1 file changed, 51 insertions(+), 77 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 41879f550..35f960f48 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -150,57 +150,6 @@ async function calculateAndAddDecayTransactions(
   return finalTransactions
 }
 
-// Helper function
-async function listTransactions(
-  currentPage: number,
-  pageSize: number,
-  order: Order,
-  user: dbUser,
-  onlyCreations: boolean,
-): 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,
-    onlyCreations,
-  )
-  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
-}
-
 // helper helper function
 async function updateStateBalance(
   user: dbUser,
@@ -281,42 +230,71 @@ export class TransactionResolver {
   ): Promise<TransactionList> {
     // load user
     const userRepository = getCustomRepository(UserRepository)
-    let userEntity: dbUser | undefined
-    if (userId) {
-      userEntity = await userRepository.findOneOrFail({ id: userId }, { withDeleted: true })
-    } else {
-      userEntity = await userRepository.findByPubkeyHex(context.pubKey)
-    }
+    const user = userId
+      ? await userRepository.findOneOrFail({ id: userId }, { withDeleted: true })
+      : await userRepository.findByPubkeyHex(context.pubKey)
 
-    const transactions = await listTransactions(
-      currentPage,
-      pageSize,
+    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,
-      userEntity,
       onlyCreations,
     )
+    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
 
     // get gdt sum
-    transactions.gdtSum = null
+    transactionList.gdtSum = null
     try {
       const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
-        email: userEntity.email,
+        email: user.email,
       })
-      if (resultGDTSum.success) transactions.gdtSum = Number(resultGDTSum.data.sum) || 0
+      if (resultGDTSum.success) transactionList.gdtSum = Number(resultGDTSum.data.sum) || 0
     } catch (err: any) {}
 
     // get balance
-    const balanceEntity = await dbBalance.findOne({ userId: userEntity.id })
+    const balanceEntity = await dbBalance.findOne({ userId: user.id })
     if (balanceEntity) {
       const now = new Date()
-      transactions.balance = roundFloorFrom4(balanceEntity.amount)
-      transactions.decay = roundFloorFrom4(
+      transactionList.balance = roundFloorFrom4(balanceEntity.amount)
+      transactionList.decay = roundFloorFrom4(
         calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now).balance,
       )
-      transactions.decayDate = now.toString()
+      transactionList.decayDate = now.toString()
     }
 
-    return transactions
+    return transactionList
   }
 
   @Authorized([RIGHTS.SEND_COINS])
@@ -324,7 +302,7 @@ export class TransactionResolver {
   async sendCoins(
     @Args() { email, amount, memo }: TransactionSendArgs,
     @Ctx() context: any,
-  ): Promise<string> {
+  ): Promise<boolean> {
     // TODO this is subject to replay attacks
     // validate sender user (logged in)
     const userRepository = getCustomRepository(UserRepository)
@@ -332,8 +310,9 @@ export class TransactionResolver {
     if (senderUser.pubKey.length !== 32) {
       throw new Error('invalid sender public key')
     }
+    // validate amount
     if (!hasUserAmount(senderUser, amount)) {
-      throw new Error("user hasn't enough GDD")
+      throw new Error("user hasn't enough GDD or amount is < 0")
     }
 
     // validate recipient user
@@ -349,11 +328,6 @@ export class TransactionResolver {
       throw new Error('invalid recipient public key')
     }
 
-    // validate amount
-    if (amount <= 0) {
-      throw new Error('invalid amount')
-    }
-
     const centAmount = Math.trunc(amount * 10000)
 
     const queryRunner = getConnection().createQueryRunner()
@@ -456,6 +430,6 @@ export class TransactionResolver {
       memo,
     })
 
-    return 'success'
+    return true
   }
 }

From acc49581cbf90bbfc7c68fb7616307478bdaae2d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 01:16:15 +0100
Subject: [PATCH 39/59] more refactors, fixed some todos and simplified things

---
 .../graphql/resolver/TransactionResolver.ts    | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 35f960f48..a490cec8a 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
-import { getCustomRepository, getConnection, QueryRunner } from '@dbTools/typeorm'
+import { getCustomRepository, getConnection, QueryRunner, In } from '@dbTools/typeorm'
 
 import CONFIG from '../../config'
 import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail'
@@ -47,7 +47,7 @@ async function calculateAndAddDecayTransactions(
     transactionIds.push(userTransaction.transactionId)
   })
 
-  const transactions = await dbTransaction.find({ where: { id: transactionIds } })
+  const transactions = await dbTransaction.find({ where: { id: In(transactionIds) } })
 
   const transactionIndiced: dbTransaction[] = []
   transactions.forEach((transaction: dbTransaction) => {
@@ -114,7 +114,7 @@ async function calculateAndAddDecayTransactions(
       finalTransaction.balance = roundFloorFrom4(Number(transaction.amount)) // Todo unsafe conversion
       if (transaction.userId === user.id) {
         finalTransaction.type = TransactionType.SEND
-        otherUser = userIndiced.find((u) => u.id === transaction.sendReceiverUserId) // TODO properly enforce null
+        otherUser = userIndiced.find((u) => u.id === transaction.sendReceiverUserId)
         // finalTransaction.pubkey = sendCoin.recipiantPublic
       } else if (transaction.sendReceiverUserId === user.id) {
         finalTransaction.type = TransactionType.RECIEVE
@@ -304,7 +304,6 @@ export class TransactionResolver {
     @Ctx() context: any,
   ): Promise<boolean> {
     // TODO this is subject to replay attacks
-    // validate sender user (logged in)
     const userRepository = getCustomRepository(UserRepository)
     const senderUser = await userRepository.findByPubkeyHex(context.pubKey)
     if (senderUser.pubKey.length !== 32) {
@@ -316,7 +315,6 @@ export class TransactionResolver {
     }
 
     // validate recipient user
-    // TODO: the detour over the public key is unnecessary
     const recipientUser = await dbUser.findOne({ email: email }, { withDeleted: true })
     if (!recipientUser) {
       throw new Error('recipient not known')
@@ -335,7 +333,7 @@ export class TransactionResolver {
     await queryRunner.startTransaction('READ UNCOMMITTED')
     try {
       // transaction
-      let transaction = new dbTransaction()
+      const transaction = new dbTransaction()
       transaction.transactionTypeId = TransactionTypeId.SEND
       transaction.memo = memo
       transaction.userId = senderUser.id
@@ -344,13 +342,7 @@ export class TransactionResolver {
       transaction.sendReceiverPublicKey = recipientUser.pubKey
       transaction.amount = BigInt(centAmount)
 
-      // TODO: NO! this is problematic in its construction
-      const insertResult = await queryRunner.manager.insert(dbTransaction, transaction)
-      transaction = await queryRunner.manager
-        .findOneOrFail(dbTransaction, insertResult.generatedMaps[0].id)
-        .catch((error) => {
-          throw new Error('error loading saved transaction: ' + error)
-        })
+      await queryRunner.manager.insert(dbTransaction, transaction)
 
       // Insert Transaction: sender - amount
       const senderUserTransactionBalance = await addUserTransaction(

From 270ccbf1cf90f3ec37be0a6a1331b094aa91df14 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 01:23:58 +0100
Subject: [PATCH 40/59] removed unused symbol

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

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 3e387a611..81bd9b1a8 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -3,7 +3,7 @@
 
 import fs from 'fs'
 import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
-import { getConnection, getCustomRepository, getRepository, QueryRunner } from '@dbTools/typeorm'
+import { getConnection, getCustomRepository, QueryRunner } from '@dbTools/typeorm'
 import CONFIG from '../../config'
 import { User } from '../model/User'
 import { User as DbUser } from '@entity/User'

From 3040992c51cbccc10d1b9e956d2c874f10bdbcdc Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 01:46:01 +0100
Subject: [PATCH 41/59] fix query to use proper field

---
 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 54898f770..6112e1d50 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -287,7 +287,7 @@ async function getUserCreations(id: number): Promise<number[]> {
     .where('transactions.user_id = :id', { id })
     .andWhere('transactions.transaction_type_id = :type', { type: TransactionTypeId.CREATION })
     .andWhere({
-      targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :endDate`, {
+      creationDate: Raw((alias) => `${alias} >= :date and ${alias} < :endDate`, {
         date: dateBeforeLastMonth,
         endDate: dateNextMonth,
       }),

From d715fd9c2fca31b44c362eae7ea48ae859486172 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 01:49:53 +0100
Subject: [PATCH 42/59] also set user.id as involved User on a creation

---
 backend/src/graphql/resolver/TransactionResolver.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index a490cec8a..b705694fe 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -48,12 +48,11 @@ async function calculateAndAddDecayTransactions(
   })
 
   const transactions = await dbTransaction.find({ where: { id: In(transactionIds) } })
-
   const transactionIndiced: dbTransaction[] = []
   transactions.forEach((transaction: dbTransaction) => {
     transactionIndiced[transaction.id] = transaction
+    involvedUserIds.push(transaction.userId)
     if (transaction.transactionTypeId === TransactionTypeId.SEND) {
-      involvedUserIds.push(transaction.userId)
       involvedUserIds.push(transaction.sendReceiverUserId!) // TODO ensure not null properly
     }
   })
@@ -146,7 +145,6 @@ async function calculateAndAddDecayTransactions(
       finalTransactions.push(decayTransaction)
     }
   }
-
   return finalTransactions
 }
 
@@ -233,7 +231,6 @@ export class TransactionResolver {
     const user = userId
       ? await userRepository.findOneOrFail({ id: userId }, { withDeleted: true })
       : await userRepository.findByPubkeyHex(context.pubKey)
-
     let limit = pageSize
     let offset = 0
     let skipFirstTransaction = false

From 2f9cb424285d66d431a1b96e6ffc956797f2a987 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 11:52:59 +0100
Subject: [PATCH 43/59] Update frontend/src/i18n.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 73125dd07..f4f969008 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -71,7 +71,7 @@ const dateTimeFormats = {
       year: 'numeric',
       month: 'long',
       day: 'numeric',
-      weekday: 'short',
+      weekday: 'long',
       hour: 'numeric',
       minute: 'numeric',
     },

From ea3ecbc6799f45059697826a6dfe5912aa0e691a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 12:00:02 +0100
Subject: [PATCH 44/59] admin resolver: make sure to write userId only when we
 create a new balance

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 6112e1d50..0bb4822b3 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -261,9 +261,10 @@ export class AdminResolver {
     })
 
     let userBalance = await Balance.findOne({ userId: pendingCreation.userId })
-
-    if (!userBalance) userBalance = new Balance()
-    userBalance.userId = pendingCreation.userId
+    if (!userBalance) {
+      userBalance = new Balance()
+      userBalance.userId = pendingCreation.userId
+    }
     userBalance.amount = Number(newBalance)
     userBalance.modified = receivedCallDate
     userBalance.recordDate = receivedCallDate

From b3523b4c631c4f507ec612715062e40f0bc14a3f Mon Sep 17 00:00:00 2001
From: Einhornimmond <git@einhornimmond.de>
Date: Mon, 21 Feb 2022 12:03:19 +0100
Subject: [PATCH 45/59] generic filtering, prevent overfetching from db

---
 backend/src/graphql/resolver/AdminResolver.ts | 40 +++++++++++-------
 backend/src/typeorm/repository/User.ts        | 41 +++----------------
 2 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 937ed8567..4a2e59644 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx } from 'type-graphql'
-import { getCustomRepository, Raw } from '@dbTools/typeorm'
+import { getCustomRepository, ObjectLiteral, Raw } from '@dbTools/typeorm'
 import { UserAdmin, SearchUsersResult } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { CreatePendingCreations } from '../model/CreatePendingCreations'
@@ -27,6 +27,13 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
 
+/*
+parent:any,
+args:any,
+context:any,
+info:any
+*/
+
 @Resolver()
 export class AdminResolver {
   @Authorized([RIGHTS.SEARCH_USERS])
@@ -35,21 +42,25 @@ export class AdminResolver {
     @Args() { searchText, currentPage = 1, pageSize = 25, notActivated = false }: SearchUsersArgs,
   ): Promise<SearchUsersResult> {
     const userRepository = getCustomRepository(UserRepository)
-    let users: dbUser[]
-    let count: number
+
+    const filterCriteria: ObjectLiteral[] = []
     if (notActivated) {
-      [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated(
-        searchText,
-        currentPage,
-        pageSize,
-      )
-    } else {
-      [users, count] = await userRepository.findBySearchCriteriaPaged(
-        searchText,
-        currentPage,
-        pageSize,
-      )
+      filterCriteria.push({ emailChecked: false })
     }
+    // prevent overfetching data from db, select only needed columns
+    // prevent reading and transmitting data from db at least 300 Bytes
+    // one of my example dataset shrink down from 342 Bytes to 42 Bytes, that's ~88% saved db bandwith
+    const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked']
+    const [users, count] = await userRepository.findBySearchCriteriaPagedFiltered(
+      userFields.map((fieldName) => {
+        return 'user.' + fieldName
+      }),
+      searchText,
+      filterCriteria,
+      currentPage,
+      pageSize,
+    )
+
     const adminUsers = await Promise.all(
       users.map(async (user) => {
         const adminUser = new UserAdmin()
@@ -70,6 +81,7 @@ export class AdminResolver {
                 updatedAt: 'DESC',
                 createdAt: 'DESC',
               },
+              select: ['updatedAt', 'createdAt'],
             },
           )
           if (emailOptIn) {
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 6045c402a..e7ef7f0bc 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,4 +1,4 @@
-import { Brackets, EntityRepository, Repository } from '@dbTools/typeorm'
+import { Brackets, EntityRepository, ObjectLiteral, Repository } from '@dbTools/typeorm'
 import { User } from '@entity/User'
 
 @EntityRepository(User)
@@ -31,44 +31,15 @@ export class UserRepository extends Repository<User> {
     return usersIndiced
   }
 
-  async findBySearchCriteria(searchCriteria: string): Promise<User[]> {
-    return await this.createQueryBuilder('user')
-      .where(
-        'user.firstName like :name or user.lastName like :lastName or user.email like :email',
-        {
-          name: `%${searchCriteria}%`,
-          lastName: `%${searchCriteria}%`,
-          email: `%${searchCriteria}%`,
-        },
-      )
-      .getMany()
-  }
-
-  async findBySearchCriteriaPaged(
-    searchCriteria: string,
-    currentPage: number,
-    pageSize: number,
-  ): Promise<[User[], number]> {
-    return await this.createQueryBuilder('user')
-      .where(
-        'user.firstName like :name or user.lastName like :lastName or user.email like :email',
-        {
-          name: `%${searchCriteria}%`,
-          lastName: `%${searchCriteria}%`,
-          email: `%${searchCriteria}%`,
-        },
-      )
-      .take(pageSize)
-      .skip((currentPage - 1) * pageSize)
-      .getManyAndCount()
-  }
-
-  async findBySearchCriteriaPagedNotActivated(
+  async findBySearchCriteriaPagedFiltered(
+    select: string[],
     searchCriteria: string,
+    filterCriteria: ObjectLiteral[],
     currentPage: number,
     pageSize: number,
   ): Promise<[User[], number]> {
     return await this.createQueryBuilder('user')
+      .select(select)
       .where(
         new Brackets((qb) => {
           qb.where(
@@ -81,7 +52,7 @@ export class UserRepository extends Repository<User> {
           )
         }),
       )
-      .andWhere({ emailChecked: false })
+      .andWhere(filterCriteria)
       .take(pageSize)
       .skip((currentPage - 1) * pageSize)
       .getManyAndCount()

From 314a1b1ed45c9a63159b473efc00854b358c9fbf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 12:08:37 +0100
Subject: [PATCH 46/59] add todo

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

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b705694fe..d2d19a6a2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -285,6 +285,7 @@ export class TransactionResolver {
     if (balanceEntity) {
       const now = new Date()
       transactionList.balance = roundFloorFrom4(balanceEntity.amount)
+      // TODO: Add a decay object here instead of static data representing the decay.
       transactionList.decay = roundFloorFrom4(
         calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now).balance,
       )

From 21587287527983b6b2ecc16f54aa6a3b923415bf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 12:41:11 +0100
Subject: [PATCH 47/59] enum instead of value definition

---
 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 0bb4822b3..f7f13ec55 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -224,7 +224,7 @@ export class AdminResolver {
 
     const receivedCallDate = new Date()
     let transaction = new Transaction()
-    transaction.transactionTypeId = 1
+    transaction.transactionTypeId = TransactionTypeId.CREATION
     transaction.memo = pendingCreation.memo
     transaction.received = receivedCallDate
     transaction.userId = pendingCreation.userId

From bf64de06b11f741bf79dfe1d0a6aabdb450ac6c5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 13:00:20 +0100
Subject: [PATCH 48/59] reverse is destructing

---
 backend/src/graphql/resolver/TransactionResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d2d19a6a2..f0653da92 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -254,7 +254,7 @@ export class TransactionResolver {
     let transactions: Transaction[] = []
     if (userTransactions.length) {
       if (order === Order.DESC) {
-        userTransactions = userTransactions.reverse()
+        userTransactions.reverse()
       }
       transactions = await calculateAndAddDecayTransactions(
         userTransactions,
@@ -263,7 +263,7 @@ export class TransactionResolver {
         skipFirstTransaction,
       )
       if (order === Order.DESC) {
-        transactions = transactions.reverse()
+        transactions.reverse()
       }
     }
 

From a344011403db6e46ead41ed8a0020ead0623e589 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 21 Feb 2022 13:02:15 +0100
Subject: [PATCH 49/59] lint fix

---
 backend/src/graphql/resolver/TransactionResolver.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f0653da92..7227f9621 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -242,13 +242,8 @@ export class TransactionResolver {
       offset--
     }
     const userTransactionRepository = getCustomRepository(UserTransactionRepository)
-    let [userTransactions, userTransactionsCount] = await userTransactionRepository.findByUserPaged(
-      user.id,
-      limit,
-      offset,
-      order,
-      onlyCreations,
-    )
+    const [userTransactions, userTransactionsCount] =
+      await userTransactionRepository.findByUserPaged(user.id, limit, offset, order, onlyCreations)
     skipFirstTransaction = userTransactionsCount > offset + limit
     const decay = !(currentPage > 1)
     let transactions: Transaction[] = []

From c3d3929ac644561167c9b8460a0aa823b6378b4b Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Mon, 21 Feb 2022 13:23:04 +0100
Subject: [PATCH 50/59] Update backend/src/graphql/resolver/AdminResolver.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/graphql/resolver/AdminResolver.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 8a333a233..f2fb00666 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -28,13 +28,6 @@ import { User } from '@entity/User'
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
 
-/*
-parent:any,
-args:any,
-context:any,
-info:any
-*/
-
 @Resolver()
 export class AdminResolver {
   @Authorized([RIGHTS.SEARCH_USERS])

From 8d9228aab86deb8d3ab42e2430f90741cc42a291 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 14:30:06 +0100
Subject: [PATCH 51/59] ensure mnemomic type files are copied to build

---
 backend/jest.config.js                                     | 1 -
 .../migrations/0012-login_user_backups_unify_wordlist.ts   | 7 ++++---
 database/package.json                                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/jest.config.js b/backend/jest.config.js
index d9e7065d4..0e4643c63 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -10,7 +10,6 @@ module.exports = {
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/entity/$1'
         : '<rootDir>/../database/build/entity/$1',
-    // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state
     '@dbTools/(.*)':
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/src/$1'
diff --git a/database/migrations/0012-login_user_backups_unify_wordlist.ts b/database/migrations/0012-login_user_backups_unify_wordlist.ts
index a59a8da7f..0c04693ec 100644
--- a/database/migrations/0012-login_user_backups_unify_wordlist.ts
+++ b/database/migrations/0012-login_user_backups_unify_wordlist.ts
@@ -5,19 +5,20 @@
  * This also removes the trailing space
  */
 import fs from 'fs'
+import path from 'path'
 
 const TARGET_MNEMONIC_TYPE = 2
 const PHRASE_WORD_COUNT = 24
 const WORDS_MNEMONIC_0 = fs
-  .readFileSync('src/config/mnemonic.uncompressed_buffer18112.txt')
+  .readFileSync(path.resolve(__dirname, '../src/config/mnemonic.uncompressed_buffer18112.txt'))
   .toString()
   .split(',')
 const WORDS_MNEMONIC_1 = fs
-  .readFileSync('src/config/mnemonic.uncompressed_buffer18113.txt')
+  .readFileSync(path.resolve(__dirname, '../src/config/mnemonic.uncompressed_buffer18113.txt'))
   .toString()
   .split(',')
 const WORDS_MNEMONIC_2 = fs
-  .readFileSync('src/config/mnemonic.uncompressed_buffer13116.txt')
+  .readFileSync(path.resolve(__dirname, '../src/config/mnemonic.uncompressed_buffer13116.txt'))
   .toString()
   .split(',')
 const WORDS_MNEMONIC = [WORDS_MNEMONIC_0, WORDS_MNEMONIC_1, WORDS_MNEMONIC_2]
diff --git a/database/package.json b/database/package.json
index 964bb07c7..d3bda1bc4 100644
--- a/database/package.json
+++ b/database/package.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "build": "tsc --build",
+    "build": "mkdir -p build/src/config/ && cp src/config/*.txt build/src/config/ && tsc --build",
     "clean": "tsc --build --clean",
     "up": "node build/src/index.js up",
     "down": "node build/src/index.js down",

From 1f3c9d39081ebfa4fc5e01d4d755c33372174ba7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 14:57:16 +0100
Subject: [PATCH 52/59] get user resolver test running again

---
 backend/package.json                          |   3 +-
 .../src/graphql/resolver/UserResolver.test.ts |  56 ++----
 backend/yarn.lock                             | 186 +-----------------
 3 files changed, 18 insertions(+), 227 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index c9b2fea30..b72386a68 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -39,8 +39,7 @@
     "reflect-metadata": "^0.1.13",
     "sodium-native": "^3.3.0",
     "ts-jest": "^27.0.5",
-    "type-graphql": "^1.1.1",
-    "typeorm": "^0.2.41"
+    "type-graphql": "^1.1.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.12",
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index b62117a28..aa44ca13d 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -6,12 +6,11 @@ import gql from 'graphql-tag'
 import { GraphQLError } from 'graphql'
 import createServer from '../../server/createServer'
 import { resetDB, initialize } from '@dbTools/helpers'
-import { getRepository } from 'typeorm'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import CONFIG from '../../config'
 import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
-import { klicktippSignIn } from '../../apis/KlicktippController'
+// import { klicktippSignIn } from '../../apis/KlicktippController'
 
 jest.mock('../../mailer/sendAccountActivationEmail', () => {
   return {
@@ -90,10 +89,8 @@ describe('UserResolver', () => {
       let user: User[]
       let loginEmailOptIn: LoginEmailOptIn[]
       beforeAll(async () => {
-        user = await getRepository(User).createQueryBuilder('state_user').getMany()
-        loginEmailOptIn = await getRepository(LoginEmailOptIn)
-          .createQueryBuilder('login_email_optin')
-          .getMany()
+        user = await User.find()
+        loginEmailOptIn = await LoginEmailOptIn.find()
         emailOptIn = loginEmailOptIn[0].verificationCode.toString()
       })
 
@@ -105,39 +102,20 @@ describe('UserResolver', () => {
               email: 'peter@lustig.de',
               firstName: 'Peter',
               lastName: 'Lustig',
-              username: '',
-              description: '',
               password: '0',
               pubKey: null,
               privKey: null,
               emailHash: expect.any(Buffer),
               createdAt: expect.any(Date),
               emailChecked: false,
-              passphraseShown: false,
+              passphrase: expect.any(String),
               language: 'de',
-              disabled: false,
-              groupId: 1,
+              deletedAt: null,
               publisherId: 1234,
             },
           ])
         })
 
-        it('saves the user in state_user table', () => {
-          expect(user).toEqual([
-            {
-              id: expect.any(Number),
-              indexId: 0,
-              groupId: 0,
-              pubkey: expect.any(Buffer),
-              email: 'peter@lustig.de',
-              firstName: 'Peter',
-              lastName: 'Lustig',
-              username: '',
-              disabled: false,
-            },
-          ])
-        })
-
         it('creates an email optin', () => {
           expect(loginEmailOptIn).toEqual([
             {
@@ -182,7 +160,7 @@ describe('UserResolver', () => {
           mutation,
           variables: { ...variables, email: 'bibi@bloxberg.de', language: 'es' },
         })
-        await expect(getRepository(User).createQueryBuilder('user').getMany()).resolves.toEqual(
+        await expect(User.find()).resolves.toEqual(
           expect.arrayContaining([
             expect.objectContaining({
               email: 'bibi@bloxberg.de',
@@ -199,7 +177,7 @@ describe('UserResolver', () => {
           mutation,
           variables: { ...variables, email: 'raeuber@hotzenplotz.de', publisherId: undefined },
         })
-        await expect(getRepository(User).createQueryBuilder('user').getMany()).resolves.toEqual(
+        await expect(User.find()).resolves.toEqual(
           expect.arrayContaining([
             expect.objectContaining({
               email: 'raeuber@hotzenplotz.de',
@@ -247,21 +225,17 @@ describe('UserResolver', () => {
     let emailOptIn: string
 
     describe('valid optin code and valid password', () => {
-      let loginUser: any
-      let newLoginUser: any
       let newUser: any
 
       beforeAll(async () => {
         await mutate({ mutation: createUserMutation, variables: createUserVariables })
-        const loginEmailOptIn = await getRepository(LoginEmailOptIn)
-          .createQueryBuilder('login_email_optin')
-          .getMany()
+        const loginEmailOptIn = await LoginEmailOptIn.find()
         emailOptIn = loginEmailOptIn[0].verificationCode.toString()
         result = await mutate({
           mutation: setPasswordMutation,
           variables: { code: emailOptIn, password: 'Aa12345_' },
         })
-        newUser = await getRepository(User).createQueryBuilder('state_user').getMany()
+        newUser = await User.find()
       })
 
       afterAll(async () => {
@@ -269,17 +243,15 @@ describe('UserResolver', () => {
       })
 
       it('sets email checked to true', () => {
-        expect(newLoginUser[0].emailChecked).toBeTruthy()
+        expect(newUser[0].emailChecked).toBeTruthy()
       })
 
       it('updates the password', () => {
-        expect(newLoginUser[0].password).toEqual('3917921995996627700')
+        expect(newUser[0].password).toEqual('3917921995996627700')
       })
 
       it('removes the optin', async () => {
-        await expect(
-          getRepository(LoginEmailOptIn).createQueryBuilder('login_email_optin').getMany(),
-        ).resolves.toHaveLength(0)
+        await expect(LoginEmailOptIn.find()).resolves.toHaveLength(0)
       })
 
       /*
@@ -301,9 +273,7 @@ describe('UserResolver', () => {
     describe('no valid password', () => {
       beforeAll(async () => {
         await mutate({ mutation: createUserMutation, variables: createUserVariables })
-        const loginEmailOptIn = await getRepository(LoginEmailOptIn)
-          .createQueryBuilder('login_email_optin')
-          .getMany()
+        const loginEmailOptIn = await LoginEmailOptIn.find()
         emailOptIn = loginEmailOptIn[0].verificationCode.toString()
         result = await mutate({
           mutation: setPasswordMutation,
diff --git a/backend/yarn.lock b/backend/yarn.lock
index bee9cce71..6ef0d5701 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -677,11 +677,6 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@sqltools/formatter@^1.2.2":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.3.tgz#1185726610acc37317ddab11c3c7f9066966bd20"
-  integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==
-
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -1024,11 +1019,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/zen-observable@0.8.3":
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
-  integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
-
 "@typescript-eslint/eslint-plugin@^4.28.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
@@ -1227,11 +1217,6 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
 anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -1438,11 +1423,6 @@ apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
     ts-invariant "^0.4.0"
     tslib "^1.10.0"
 
-app-root-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
-  integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
-
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -1455,11 +1435,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1585,11 +1560,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -1680,14 +1650,6 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 busboy@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
@@ -1807,18 +1769,6 @@ cli-boxes@^2.2.1:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-highlight@^2.1.11:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf"
-  integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==
-  dependencies:
-    chalk "^4.0.0"
-    highlight.js "^10.7.1"
-    mz "^2.4.0"
-    parse5 "^5.1.1"
-    parse5-htmlparser2-tree-adapter "^6.0.0"
-    yargs "^16.0.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -2142,11 +2092,6 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
-dotenv@^8.2.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
-  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -2936,11 +2881,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-highlight.js@^10.7.1:
-  version "10.7.3"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
-  integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -3032,11 +2972,6 @@ iconv-lite@^0.6.2:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
 ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
@@ -3776,13 +3711,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsdom@^16.6.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
@@ -4159,11 +4087,6 @@ minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 module-alias@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
@@ -4208,15 +4131,6 @@ mysql2@^2.3.0:
     seq-queue "^0.0.5"
     sqlstring "^2.3.2"
 
-mz@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 named-placeholders@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"
@@ -4326,7 +4240,7 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-object-assign@^4, object-assign@^4.0.1:
+object-assign@^4:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -4487,23 +4401,11 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5-htmlparser2-tree-adapter@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
-  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
-  dependencies:
-    parse5 "^6.0.1"
-
-parse5@6.0.1, parse5@^6.0.1:
+parse5@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
 parseurl@^1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -4861,11 +4763,6 @@ safe-buffer@^5.0.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
 saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
@@ -5226,20 +5123,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
 throat@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
@@ -5424,28 +5307,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typeorm@^0.2.41:
-  version "0.2.41"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.41.tgz#88758101ac158dc0a0a903d70eaacea2974281cc"
-  integrity sha512-/d8CLJJxKPgsnrZWiMyPI0rz2MFZnBQrnQ5XP3Vu3mswv2WPexb58QM6BEtmRmlTMYN5KFWUz8SKluze+wS9xw==
-  dependencies:
-    "@sqltools/formatter" "^1.2.2"
-    app-root-path "^3.0.0"
-    buffer "^6.0.3"
-    chalk "^4.1.0"
-    cli-highlight "^2.1.11"
-    debug "^4.3.1"
-    dotenv "^8.2.0"
-    glob "^7.1.6"
-    js-yaml "^4.0.0"
-    mkdirp "^1.0.4"
-    reflect-metadata "^0.1.13"
-    sha.js "^2.4.11"
-    tslib "^2.1.0"
-    xml2js "^0.4.23"
-    yargs "^17.0.1"
-    zen-observable-ts "^1.0.0"
-
 typescript@^4.3.4:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
@@ -5711,19 +5572,6 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml2js@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -5757,12 +5605,7 @@ yargs-parser@20.x, yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
-
-yargs@^16.0.0, yargs@^16.2.0:
+yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
@@ -5775,19 +5618,6 @@ yargs@^16.0.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.1:
-  version "17.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
-  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
-
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -5801,15 +5631,7 @@ zen-observable-ts@^0.8.21:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable-ts@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz#2d1aa9d79b87058e9b75698b92791c1838551f83"
-  integrity sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==
-  dependencies:
-    "@types/zen-observable" "0.8.3"
-    zen-observable "0.8.15"
-
-zen-observable@0.8.15, zen-observable@^0.8.0:
+zen-observable@^0.8.0:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==

From 09a0f8abfd5df672dc3beaaf3149d0b02c4946e4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 14:58:06 +0100
Subject: [PATCH 53/59] coverage backend to 47%

---
 .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 9c7f9b7c2..07c855018 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -480,7 +480,7 @@ jobs:
           report_name: Coverage Backend
           type: lcov
           result_path: ./backend/coverage/lcov.info
-          min_coverage: 38
+          min_coverage: 47
           token: ${{ github.token }}
 
   ##########################################################################

From fb78a71f0661cda8e253bbceb2eb5a302ea5865c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:13:44 +0100
Subject: [PATCH 54/59] remove CI deelopment test target

---
 .github/workflows/test.yml | 2 +-
 backend/package.json       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 07c855018..f87914de6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -469,7 +469,7 @@ jobs:
         run: sleep 30s
         shell: bash
       - name: backend Unit tests | test
-        run: cd database && yarn && yarn build && cd ../backend && yarn && yarn CI_workflow_test
+        run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test
         # run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test
       ##########################################################################
       # COVERAGE CHECK BACKEND #################################################
diff --git a/backend/package.json b/backend/package.json
index b72386a68..93ab27fe4 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -13,7 +13,6 @@
     "start": "node build/index.js",
     "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts",
     "lint": "eslint . --ext .js,.ts",
-    "CI_workflow_test": "jest --runInBand --coverage ",
     "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage "
   },
   "dependencies": {

From 08b9abdfab8fc275cb41c7263b6a29a76d1903c9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:16:25 +0100
Subject: [PATCH 55/59] CI test backend without backend.tar dependency

---
 .github/workflows/test.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f87914de6..8ebefe394 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -431,7 +431,7 @@ jobs:
   unit_test_backend:
     name: Unit tests - Backend
     runs-on: ubuntu-latest
-    needs: [build_test_backend,build_test_mariadb]
+    needs: [build_test_mariadb]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -448,13 +448,6 @@ jobs:
           path: /tmp
       - name: Load Docker Image
         run: docker load < /tmp/mariadb.tar
-      - 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 #####################################################
       ##########################################################################

From 38d5eda9d220f5c53dd1baecfa7413a120ce8cb3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:24:36 +0100
Subject: [PATCH 56/59] set timeoute to 10000

---
 backend/src/graphql/resolver/UserResolver.test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index aa44ca13d..b01c99552 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -12,6 +12,8 @@ import CONFIG from '../../config'
 import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
 // import { klicktippSignIn } from '../../apis/KlicktippController'
 
+jest.setTimeout(10000)
+
 jest.mock('../../mailer/sendAccountActivationEmail', () => {
   return {
     __esModule: true,
@@ -19,12 +21,14 @@ jest.mock('../../mailer/sendAccountActivationEmail', () => {
   }
 })
 
+/*
 jest.mock('../../apis/KlicktippController', () => {
   return {
     __esModule: true,
     klicktippSignIn: jest.fn(),
   }
 })
+*/
 
 let mutate: any
 let con: any

From 52d58afaf465018bba7a268def090435f78a6680 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:36:32 +0100
Subject: [PATCH 57/59] try frontend unot tests without build

---
 .github/workflows/test.yml | 20 +-------------------
 backend/package.json       |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ebefe394..c67a63f4d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -339,7 +339,7 @@ jobs:
   unit_test_frontend:
     name: Unit tests - Frontend
     runs-on: ubuntu-latest
-    needs: [build_test_frontend]
+    #needs: [nothing]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -347,16 +347,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       ##########################################################################
-      # DOWNLOAD DOCKER IMAGES #################################################
-      ##########################################################################
-      - name: Download Docker Image (Frontend)
-        uses: actions/download-artifact@v2
-        with:
-          name: docker-frontend-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/frontend.tar
-      ##########################################################################
       # UNIT TESTS FRONTEND ####################################################
       ##########################################################################
       - name: frontend | Unit tests
@@ -364,14 +354,6 @@ jobs:
           docker run --env NODE_ENV=test -v ~/coverage:/app/coverage --rm gradido/frontend:test yarn run test
           cp -r ~/coverage ./coverage
       ##########################################################################
-      # COVERAGE REPORT FRONTEND ###############################################
-      ##########################################################################
-      #- name: frontend | Coverage report
-      #  uses: romeovs/lcov-reporter-action@v0.2.21
-      #  with:
-      #    github-token: ${{ secrets.GITHUB_TOKEN }}
-      #    lcov-file: ./coverage/lcov.info
-      ##########################################################################
       # COVERAGE CHECK FRONTEND ################################################
       ##########################################################################
       - name: frontend | Coverage check
diff --git a/backend/package.json b/backend/package.json
index 93ab27fe4..93a954d3f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -13,7 +13,7 @@
     "start": "node build/index.js",
     "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts",
     "lint": "eslint . --ext .js,.ts",
-    "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage "
+    "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",

From 72643b434641bd4e2d896a97a3770b3dcbea5959 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:38:53 +0100
Subject: [PATCH 58/59] wait for frontend image in CI for unit tests

---
 .github/workflows/test.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c67a63f4d..8ebefe394 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -339,7 +339,7 @@ jobs:
   unit_test_frontend:
     name: Unit tests - Frontend
     runs-on: ubuntu-latest
-    #needs: [nothing]
+    needs: [build_test_frontend]
     steps:
       ##########################################################################
       # CHECKOUT CODE ##########################################################
@@ -347,6 +347,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       ##########################################################################
+      # DOWNLOAD DOCKER IMAGES #################################################
+      ##########################################################################
+      - name: Download Docker Image (Frontend)
+        uses: actions/download-artifact@v2
+        with:
+          name: docker-frontend-test
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/frontend.tar
+      ##########################################################################
       # UNIT TESTS FRONTEND ####################################################
       ##########################################################################
       - name: frontend | Unit tests
@@ -354,6 +364,14 @@ jobs:
           docker run --env NODE_ENV=test -v ~/coverage:/app/coverage --rm gradido/frontend:test yarn run test
           cp -r ~/coverage ./coverage
       ##########################################################################
+      # COVERAGE REPORT FRONTEND ###############################################
+      ##########################################################################
+      #- name: frontend | Coverage report
+      #  uses: romeovs/lcov-reporter-action@v0.2.21
+      #  with:
+      #    github-token: ${{ secrets.GITHUB_TOKEN }}
+      #    lcov-file: ./coverage/lcov.info
+      ##########################################################################
       # COVERAGE CHECK FRONTEND ################################################
       ##########################################################################
       - name: frontend | Coverage check

From b9c3e9c146b5adf758f774bfe30ad64661b29629 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 21 Feb 2022 15:48:36 +0100
Subject: [PATCH 59/59] coverage backend to 48%

---
 .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 8ebefe394..c1e363b52 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -473,7 +473,7 @@ jobs:
           report_name: Coverage Backend
           type: lcov
           result_path: ./backend/coverage/lcov.info
-          min_coverage: 47
+          min_coverage: 48
           token: ${{ github.token }}
 
   ##########################################################################