From d4ce46b271bc2e859b629f93feea9cddc2069dde Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 9 Mar 2022 16:34:54 +0100
Subject: [PATCH 1/4] update db version

---
 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 82fb9ff2b..4cd428153 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0029-clean_transaction_table',
+  DB_VERSION: '0030-transaction_link',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
 }
 

From 01648aaa0d5d84676bbede8cc9c8a7c4ac313ce9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 9 Mar 2022 16:51:17 +0100
Subject: [PATCH 2/4] add soft delete for transaction links

---
 database/entity/0030-transaction_link/TransactionLink.ts | 5 ++++-
 database/migrations/0030-transaction_link.ts             | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/database/entity/0030-transaction_link/TransactionLink.ts b/database/entity/0030-transaction_link/TransactionLink.ts
index bb12277d1..6ea708547 100644
--- a/database/entity/0030-transaction_link/TransactionLink.ts
+++ b/database/entity/0030-transaction_link/TransactionLink.ts
@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js-light'
-import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
 @Entity('transaction_links')
@@ -41,6 +41,9 @@ export class TransactionLink extends BaseEntity {
   })
   createdAt: Date
 
+  @DeleteDateColumn()
+  deletedAt?: Date | null
+
   @Column({
     type: 'datetime',
     nullable: false,
diff --git a/database/migrations/0030-transaction_link.ts b/database/migrations/0030-transaction_link.ts
index 4d72cf43b..ee76c980d 100644
--- a/database/migrations/0030-transaction_link.ts
+++ b/database/migrations/0030-transaction_link.ts
@@ -13,6 +13,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
       \`memo\` varchar(255) NOT NULL,
       \`code\` varchar(24) NOT NULL,
       \`createdAt\` datetime NOT NULL,
+      \`deletedAt\` datetime DEFAULT NULL,
       \`validUntil\` datetime NOT NULL,
       \`showEmail\` boolean NOT NULL DEFAULT false,
       \`redeemedAt\` datetime,

From f96177285471bac61f8533cdc203873ea1ee1f0d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 9 Mar 2022 16:51:56 +0100
Subject: [PATCH 3/4] add soft delete to transaction link model

---
 backend/src/graphql/model/TransactionLink.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index f449a6f9e..0f19df466 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -25,6 +25,9 @@ export class TransactionLink {
   @Field(() => Date)
   createdAt: Date
 
+  @Field(() => Date, { nullable: true })
+  deletedAt: Date | null
+
   @Field(() => Date)
   validUntil: Date
 

From dbb42c30ec988e82de161f1886a838af808a076c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 9 Mar 2022 17:07:32 +0100
Subject: [PATCH 4/4] increase timeout by factoe 100

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

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 9f3d7265f..05ff2b302 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -12,7 +12,7 @@ import CONFIG from '@/config'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 // import { klicktippSignIn } from '@/apis/KlicktippController'
 
-jest.setTimeout(10000)
+jest.setTimeout(1000000)
 
 jest.mock('@/mailer/sendAccountActivationEmail', () => {
   return {