From 641d2d4cc24f5276f3f1ccf3b8e6d2b79f67d625 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 09:58:41 +0200
Subject: [PATCH 01/18] creation date better represented

---
 .../components/CreationTransactionList.vue    | 23 ++++++++++++-------
 admin/src/locales/de.json                     | 15 +++++++++---
 admin/src/locales/en.json                     | 14 ++++++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ec5c12aa4..ba0c7be6a 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -2,6 +2,13 @@
   <div class="component-creation-transaction-list">
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
+    <div>
+      <b-button v-b-toggle.collapse-1 variant="light" size="sm">Hilfe</b-button>
+      <b-collapse id="collapse-1" class="mt-2">
+        <div>{{ $t('transactionlist.submitted') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.submitted') }}</div>
+        <div>{{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.confirmed') }}</div>
+      </b-collapse>
+    </div>
   </div>
 </template>
 <script>
@@ -16,7 +23,14 @@ export default {
       fields: [
         {
           key: 'creationDate',
-          label: this.$t('transactionlist.date'),
+          label: this.$t('transactionlist.submitted'),
+          formatter: (value, key, item) => {
+            return this.$d(new Date(value))
+          },
+        },
+        {
+          key: 'balanceDate',
+          label: this.$t('transactionlist.confirmed'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
@@ -36,13 +50,6 @@ export default {
           },
         },
         { key: 'memo', label: this.$t('transactionlist.memo') },
-        {
-          key: 'balanceDate',
-          label: this.$t('transactionlist.balanceDate'),
-          formatter: (value, key, item) => {
-            return this.$d(new Date(value))
-          },
-        },
       ],
       items: [],
     }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c977a613e..043a16e61 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -74,13 +74,21 @@
     "submit": "Senden"
   },
   "GDD": "GDD",
+  "help": {
+    "help":"Hilfe",
+    "transactionlist": {
+      "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
+      "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
+    }
+  },
   "hide_details": "Details verbergen",
   "lastname": "Nachname",
   "math": {
     "colon": ":",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+"
+    "plus": "+",
+    "equals":"="
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
@@ -133,9 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "balanceDate": "Schöpfungsdatum",
+    "confirmed": "Bestätigt",
+    "confirmed": "Bestätigt",
     "community": "Gemeinschaft",
-    "date": "Datum",
+    "submitted": "Eingereicht",
     "memo": "Nachricht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e99305e08..fd8ca69d3 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -74,13 +74,21 @@
     "submit": "Send"
   },
   "GDD": "GDD",
+  "help": {
+    "help":"Help",
+    "transactionlist": {
+      "confirmed": "When was it confirmed by a moderator / admin.",
+      "submitted": "For which period was submitted by the user."
+    }
+  },
   "hide_details": "Hide details",
   "lastname": "Lastname",
   "math": {
     "colon": ":",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+"
+    "plus": "+",
+    "equals":"="
   },
   "message": {
     "request": "Request has been sent."
@@ -133,9 +141,9 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "balanceDate": "Creation date",
+    "confirmed": "Confirmed",
     "community": "Community",
-    "date": "Date",
+    "submitted": "Submitted",
     "memo": "Message",
     "title": "All creation-transactions for the user"
   },

From 420296ca94339324df5192895578920810d38107 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 09:59:44 +0200
Subject: [PATCH 02/18] fix lint

---
 admin/src/components/CreationTransactionList.vue | 12 +++++++++---
 admin/src/locales/de.json                        |  4 ++--
 admin/src/locales/en.json                        |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ba0c7be6a..ed0b911a5 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -3,10 +3,16 @@
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
     <div>
-      <b-button v-b-toggle.collapse-1 variant="light" size="sm">Hilfe</b-button>
+      <b-button v-b-toggle.collapse-1 variant="light" size="sm">{{ $t('help.help') }}</b-button>
       <b-collapse id="collapse-1" class="mt-2">
-        <div>{{ $t('transactionlist.submitted') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.submitted') }}</div>
-        <div>{{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.confirmed') }}</div>
+        <div>
+          {{ $t('transactionlist.submitted') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.submitted') }}
+        </div>
+        <div>
+          {{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.confirmed') }}
+        </div>
       </b-collapse>
     </div>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 043a16e61..c68cf4e2d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -75,7 +75,7 @@
   },
   "GDD": "GDD",
   "help": {
-    "help":"Hilfe",
+    "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
       "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
@@ -88,7 +88,7 @@
     "exclaim": "!",
     "pipe": "|",
     "plus": "+",
-    "equals":"="
+    "equals": "="
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index fd8ca69d3..6d3a7e1f8 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -75,7 +75,7 @@
   },
   "GDD": "GDD",
   "help": {
-    "help":"Help",
+    "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "submitted": "For which period was submitted by the user."
@@ -88,7 +88,7 @@
     "exclaim": "!",
     "pipe": "|",
     "plus": "+",
-    "equals":"="
+    "equals": "="
   },
   "message": {
     "request": "Request has been sent."

From db2415e6171faf795c52176dcde66e09dd7aff12 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 10:22:19 +0200
Subject: [PATCH 03/18] fix locales

---
 admin/src/locales/de.json | 9 ++++-----
 admin/src/locales/en.json | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c68cf4e2d..b688e95fc 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -85,10 +85,10 @@
   "lastname": "Nachname",
   "math": {
     "colon": ":",
+    "equals": "=",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+",
-    "equals": "="
+    "plus": "+"
   },
   "message": {
     "request": "Die Anfrage wurde gesendet."
@@ -141,11 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "confirmed": "Bestätigt",
-    "confirmed": "Bestätigt",
     "community": "Gemeinschaft",
-    "submitted": "Eingereicht",
+    "confirmed": "Bestätigt",
     "memo": "Nachricht",
+    "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
   "undelete_user": "Nutzer wiederherstellen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 6d3a7e1f8..7267fbeec 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -85,10 +85,10 @@
   "lastname": "Lastname",
   "math": {
     "colon": ":",
+    "equals": "=",
     "exclaim": "!",
     "pipe": "|",
-    "plus": "+",
-    "equals": "="
+    "plus": "+"
   },
   "message": {
     "request": "Request has been sent."
@@ -141,10 +141,10 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "confirmed": "Confirmed",
     "community": "Community",
-    "submitted": "Submitted",
+    "confirmed": "Confirmed",
     "memo": "Message",
+    "submitted": "Submitted",
     "title": "All creation-transactions for the user"
   },
   "undelete_user": "Undelete User",

From 5aa499a07389fffa200f0cd2448e3e4fb7ad346d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:31:19 +0200
Subject: [PATCH 04/18] Change the result for the FE so that we get datas from
 the contribution table instead of the transaction table.

---
 backend/src/graphql/model/Contribution.ts     |  2 +-
 backend/src/graphql/resolver/AdminResolver.ts | 53 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 1f690a3d8..cf57e632f 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -5,7 +5,7 @@ import { User } from '@entity/User'
 
 @ObjectType()
 export class Contribution {
-  constructor(contribution: dbContribution, user: User) {
+  constructor(contribution: dbContribution, user?: User | null) {
     this.id = contribution.id
     this.firstName = user ? user.firstName : null
     this.lastName = user ? user.lastName : null
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index d71ffc72c..d5293dcce 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -17,6 +17,7 @@ import { AdminCreateContributions } from '@model/AdminCreateContributions'
 import { AdminUpdateContribution } from '@model/AdminUpdateContribution'
 import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkList } from '@model/ContributionLinkList'
+import { Contribution } from '@model/Contribution'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { UserRepository } from '@repository/User'
 import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
@@ -30,7 +31,7 @@ import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
-import { Contribution } from '@entity/Contribution'
+import { Contribution as DbContribution } from '@entity/Contribution'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User as dbUser } from '@entity/User'
@@ -68,6 +69,7 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionMessage } from '@model/ContributionMessage'
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail'
+import { ContributionListResult } from '../model/Contribution'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -261,7 +263,7 @@ export class AdminResolver {
     logger.trace('creations', creations)
     const creationDateObj = new Date(creationDate)
     validateContribution(creations, amount, creationDateObj)
-    const contribution = Contribution.create()
+    const contribution = DbContribution.create()
     contribution.userId = user.id
     contribution.amount = amount
     contribution.createdAt = new Date()
@@ -272,7 +274,7 @@ export class AdminResolver {
     contribution.contributionStatus = ContributionStatus.PENDING
 
     logger.trace('contribution to save', contribution)
-    await Contribution.save(contribution)
+    await DbContribution.save(contribution)
     return getUserCreation(user.id)
   }
 
@@ -319,7 +321,7 @@ export class AdminResolver {
 
     const moderator = getUser(context)
 
-    const contributionToUpdate = await Contribution.findOne({
+    const contributionToUpdate = await DbContribution.findOne({
       where: { id, confirmedAt: IsNull() },
     })
 
@@ -349,7 +351,7 @@ export class AdminResolver {
     contributionToUpdate.moderatorId = moderator.id
     contributionToUpdate.contributionStatus = ContributionStatus.PENDING
 
-    await Contribution.save(contributionToUpdate)
+    await DbContribution.save(contributionToUpdate)
     const result = new AdminUpdateContribution()
     result.amount = amount
     result.memo = contributionToUpdate.memo
@@ -366,7 +368,7 @@ export class AdminResolver {
     const contributions = await getConnection()
       .createQueryBuilder()
       .select('c')
-      .from(Contribution, 'c')
+      .from(DbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
       .where({ confirmedAt: IsNull() })
       .getMany()
@@ -394,7 +396,7 @@ export class AdminResolver {
   @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION])
   @Mutation(() => Boolean)
   async adminDeleteContribution(@Arg('id', () => Int) id: number): Promise<boolean> {
-    const contribution = await Contribution.findOne(id)
+    const contribution = await DbContribution.findOne(id)
     if (!contribution) {
       throw new Error('Contribution not found for given id.')
     }
@@ -410,7 +412,7 @@ export class AdminResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
-    const contribution = await Contribution.findOne(id)
+    const contribution = await DbContribution.findOne(id)
     if (!contribution) {
       throw new Error('Contribution not found to given id.')
     }
@@ -468,7 +470,7 @@ export class AdminResolver {
       contribution.confirmedBy = moderatorUser.id
       contribution.transactionId = transaction.id
       contribution.contributionStatus = ContributionStatus.CONFIRMED
-      await queryRunner.manager.update(Contribution, { id: contribution.id }, contribution)
+      await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
 
       await queryRunner.commitTransaction()
       logger.info('creation commited successfuly.')
@@ -493,24 +495,29 @@ export class AdminResolver {
   }
 
   @Authorized([RIGHTS.CREATION_TRANSACTION_LIST])
-  @Query(() => [Transaction])
+  @Query(() => ContributionListResult)
   async creationTransactionList(
     @Args()
     { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
     @Arg('userId', () => Int) userId: number,
-  ): Promise<Transaction[]> {
+  ): Promise<ContributionListResult> {
     const offset = (currentPage - 1) * pageSize
-    const transactionRepository = getCustomRepository(TransactionRepository)
-    const [userTransactions] = await transactionRepository.findByUserPaged(
-      userId,
-      pageSize,
-      offset,
-      order,
-      true,
-    )
+    const [contributionResult, count] = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(DbContribution, 'c')
+      .leftJoinAndSelect('c.user', 'u')
+      .where(`user_id = ${userId}`)
+      .limit(pageSize)
+      .offset(offset)
+      .orderBy('c.created_at', order)
+      .getManyAndCount()
 
-    const user = await dbUser.findOneOrFail({ id: userId })
-    return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
+    return new ContributionListResult(
+      count,
+      contributionResult.map((contribution) => new Contribution(contribution, contribution.user)),
+    )
+    // return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
   }
 
   @Authorized([RIGHTS.SEND_ACTIVATION_EMAIL])
@@ -725,7 +732,7 @@ export class AdminResolver {
     await queryRunner.startTransaction('READ UNCOMMITTED')
     const contributionMessage = DbContributionMessage.create()
     try {
-      const contribution = await Contribution.findOne({
+      const contribution = await DbContribution.findOne({
         where: { id: contributionId },
         relations: ['user'],
       })
@@ -749,7 +756,7 @@ export class AdminResolver {
         contribution.contributionStatus === ContributionStatus.PENDING
       ) {
         contribution.contributionStatus = ContributionStatus.IN_PROGRESS
-        await queryRunner.manager.update(Contribution, { id: contributionId }, contribution)
+        await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution)
       }
       await queryRunner.commitTransaction()
 

From 8989b6f50ed4314d5bb7b39c5e8494c696095b45 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:33:32 +0200
Subject: [PATCH 05/18] Change query of the creationTransactionList, add new
 parameters to CreationTransactionList and add translations.

---
 .../components/CreationTransactionList.vue    | 30 ++++++++++++-------
 admin/src/graphql/creationTransactionList.js  | 17 ++++++-----
 admin/src/locales/de.json                     |  2 ++
 admin/src/locales/en.json                     |  2 ++
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index ed0b911a5..8bf27c275 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -28,19 +28,34 @@ export default {
     return {
       fields: [
         {
-          key: 'creationDate',
+          key: 'createdAt',
           label: this.$t('transactionlist.submitted'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
         },
         {
-          key: 'balanceDate',
-          label: this.$t('transactionlist.confirmed'),
+          key: 'contributionDate',
+          label: this.$t('transactionlist.period'),
           formatter: (value, key, item) => {
             return this.$d(new Date(value))
           },
         },
+        {
+          key: 'confirmedAt',
+          label: this.$t('transactionlist.confirmed'),
+          formatter: (value, key, item) => {
+            if (value) {
+              return this.$d(new Date(value))
+            } else {
+              return null
+            }
+          },
+        },
+        {
+          key: 'state',
+          label: this.$t('transactionlist.state'),
+        },
         {
           key: 'amount',
           label: this.$t('transactionlist.amount'),
@@ -48,13 +63,6 @@ export default {
             return `${value} GDD`
           },
         },
-        {
-          key: 'linkedUser',
-          label: this.$t('transactionlist.community'),
-          formatter: (value, key, item) => {
-            return `${value.firstName} ${value.lastName}`
-          },
-        },
         { key: 'memo', label: this.$t('transactionlist.memo') },
       ],
       items: [],
@@ -73,7 +81,7 @@ export default {
           },
         })
         .then((result) => {
-          this.items = result.data.creationTransactionList
+          this.items = result.data.creationTransactionList.contributionList
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/graphql/creationTransactionList.js b/admin/src/graphql/creationTransactionList.js
index 327221814..fc3a80b18 100644
--- a/admin/src/graphql/creationTransactionList.js
+++ b/admin/src/graphql/creationTransactionList.js
@@ -8,14 +8,15 @@ export const creationTransactionList = gql`
       order: $order
       userId: $userId
     ) {
-      id
-      amount
-      balanceDate
-      creationDate
-      memo
-      linkedUser {
-        firstName
-        lastName
+      contributionCount
+      contributionList {
+        id
+        amount
+        createdAt
+        confirmedAt
+        contributionDate
+        memo
+        state
       }
     }
   }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b688e95fc..8c5c3b40f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -144,6 +144,8 @@
     "community": "Gemeinschaft",
     "confirmed": "Bestätigt",
     "memo": "Nachricht",
+    "period": "Zeitraum",
+    "state": "Status",  
     "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 7267fbeec..0b428fa20 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -144,6 +144,8 @@
     "community": "Community",
     "confirmed": "Confirmed",
     "memo": "Message",
+    "period": "Period",
+    "state": "State",
     "submitted": "Submitted",
     "title": "All creation-transactions for the user"
   },

From 00d0068efcdf458eefb33ca2ec2c6df019922e85 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:44:42 +0200
Subject: [PATCH 06/18] Remove unused imports.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index d5293dcce..49b02a605 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -26,10 +26,8 @@ import SearchUsersArgs from '@arg/SearchUsersArgs'
 import ContributionLinkArgs from '@arg/ContributionLinkArgs'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { Transaction } from '@model/Transaction'
 import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
@@ -44,7 +42,6 @@ import { Decay } from '@model/Decay'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
-import { communityUser } from '@/util/communityUser'
 import { checkOptInCode, activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'

From a3a565ff01914781259e1ead4f250feaa2980ab5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:46:56 +0200
Subject: [PATCH 07/18] Removed unused locale key.

---
 admin/src/locales/de.json | 3 +--
 admin/src/locales/en.json | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 8c5c3b40f..4f80fde4f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -141,11 +141,10 @@
   },
   "transactionlist": {
     "amount": "Betrag",
-    "community": "Gemeinschaft",
     "confirmed": "Bestätigt",
     "memo": "Nachricht",
     "period": "Zeitraum",
-    "state": "Status",  
+    "state": "Status",
     "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0b428fa20..6acf3ae60 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -141,7 +141,6 @@
   },
   "transactionlist": {
     "amount": "Amount",
-    "community": "Community",
     "confirmed": "Confirmed",
     "memo": "Message",
     "period": "Period",

From 00ae91177e8f1e7ae2734408fcd0490f416c8577 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 21 Sep 2022 13:55:37 +0200
Subject: [PATCH 08/18] Change the result of the query in test file.

---
 .../CreationTransactionList.spec.js           | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 3e2d5893e..01a18e325 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -6,30 +6,29 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    creationTransactionList: [
-      {
-        id: 1,
-        amount: 100,
-        balanceDate: 0,
-        creationDate: new Date(),
-        memo: 'Testing',
-        linkedUser: {
-          firstName: 'Gradido',
-          lastName: 'Akademie',
+    creationTransactionList: {
+      contributionCount: 2,
+      contributionList: [
+        {
+          id: 1,
+          amount: 5.8,
+          createdAt: '2022-09-21T11:09:51.000Z',
+          confirmedAt: null,
+          contributionDate: '2022-08-01T00:00:00.000Z',
+          memo: 'für deine Hilfe, Fräulein Rottenmeier',
+          state: 'PENDING',
         },
-      },
-      {
-        id: 2,
-        amount: 200,
-        balanceDate: 0,
-        creationDate: new Date(),
-        memo: 'Testing 2',
-        linkedUser: {
-          firstName: 'Gradido',
-          lastName: 'Akademie',
+        {
+          id: 2,
+          amount: '47',
+          createdAt: '2022-09-21T11:09:28.000Z',
+          confirmedAt: '2022-09-21T11:09:28.000Z',
+          contributionDate: '2022-08-01T00:00:00.000Z',
+          memo: 'für deine Hilfe, Frau Holle',
+          state: 'CONFIRMED',
         },
-      },
-    ],
+      ],
+    },
   },
 })
 

From c62f1af0bb15dfe23195868318dc7de908b9564c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:23:49 +0200
Subject: [PATCH 09/18] add pagination for CreationTransactionList.vue

---
 .../components/CreationTransactionList.vue    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 8bf27c275..5f906f1bf 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -3,6 +3,15 @@
     <div class="h3">{{ $t('transactionlist.title') }}</div>
     <b-table striped hover :fields="fields" :items="items"></b-table>
     <div>
+      <b-pagination
+        pills
+        size="lg"
+        v-model="currentPage"
+        :per-page="perPage"
+        :total-rows="rows"
+        align="center"
+        :hide-ellipsis="true"
+      ></b-pagination>
       <b-button v-b-toggle.collapse-1 variant="light" size="sm">{{ $t('help.help') }}</b-button>
       <b-collapse id="collapse-1" class="mt-2">
         <div>
@@ -26,6 +35,10 @@ export default {
   },
   data() {
     return {
+      items: [],
+      rows: 0,
+      currentPage: 1,
+      perPage: 25,
       fields: [
         {
           key: 'createdAt',
@@ -65,7 +78,6 @@ export default {
         },
         { key: 'memo', label: this.$t('transactionlist.memo') },
       ],
-      items: [],
     }
   },
   methods: {
@@ -74,13 +86,14 @@ export default {
         .query({
           query: creationTransactionList,
           variables: {
-            currentPage: 1,
-            pageSize: 25,
+            currentPage: this.currentPage,
+            pageSize: this.perPage,
             order: 'DESC',
             userId: parseInt(this.userId),
           },
         })
         .then((result) => {
+          this.rows = result.data.creationTransactionList.contributionCount
           this.items = result.data.creationTransactionList.contributionList
         })
         .catch((error) => {
@@ -91,5 +104,10 @@ export default {
   created() {
     this.getTransactions()
   },
+  watch: {
+    currentPage() {
+      this.getTransactions()
+    },
+  },
 }
 </script>

From 1c2df858f78df042583c3d0dd62f99c76b141460 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:40:25 +0200
Subject: [PATCH 10/18] help text

---
 .../slots/ContributionMessagesListItem.spec.js            | 2 +-
 admin/src/components/CreationTransactionList.vue          | 8 ++++++++
 admin/src/locales/de.json                                 | 4 +++-
 admin/src/locales/en.json                                 | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index 7cca315d7..f8575492a 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -20,7 +20,7 @@ describe('ContributionMessagesListItem', () => {
 
   const propsData = {
     contributionId: 42,
-    state: 'PENDING0',
+    state: 'PENDING',
     message: {
       id: 111,
       message: 'asd asda sda sda',
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 5f906f1bf..e9c885cdb 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -18,10 +18,18 @@
           {{ $t('transactionlist.submitted') }} {{ $t('math.equals') }}
           {{ $t('help.transactionlist.submitted') }}
         </div>
+        <div>
+          {{ $t('transactionlist.period') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.periods') }}
+        </div>
         <div>
           {{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }}
           {{ $t('help.transactionlist.confirmed') }}
         </div>
+        <div>
+          {{ $t('transactionlist.state') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.state') }}
+        </div>
       </b-collapse>
     </div>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 4f80fde4f..870ff31e4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -78,7 +78,9 @@
     "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
-      "submitted": "Für welchen Zeitraum wurde vom User eingereicht."
+      "state":"[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+      "submitted": "Wann wurde es vom Mitglied eingereicht",
+      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht."
     }
   },
   "hide_details": "Details verbergen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 6acf3ae60..9ba6f50f4 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -78,7 +78,9 @@
     "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
-      "submitted": "For which period was submitted by the user."
+      "state":"[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "submitted": "When was it submitted by the member",
+      "periods": "For what period was it submitted by the member."
     }
   },
   "hide_details": "Hide details",

From 1043ec1061d42895d1f25b38ee0bd2eee1aef0ef Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:41:04 +0200
Subject: [PATCH 11/18] fix lint and locales

---
 admin/src/locales/de.json | 6 +++---
 admin/src/locales/en.json | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 870ff31e4..f8251803a 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -78,9 +78,9 @@
     "help": "Hilfe",
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
-      "state":"[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
-      "submitted": "Wann wurde es vom Mitglied eingereicht",
-      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht."
+      "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht.",
+      "state": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+      "submitted": "Wann wurde es vom Mitglied eingereicht"
     }
   },
   "hide_details": "Details verbergen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 9ba6f50f4..43073fff5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -78,9 +78,9 @@
     "help": "Help",
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
-      "state":"[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
-      "submitted": "When was it submitted by the member",
-      "periods": "For what period was it submitted by the member."
+      "periods": "For what period was it submitted by the member.",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "submitted": "When was it submitted by the member"
     }
   },
   "hide_details": "Hide details",

From 976620e60359874178aeceebd6632ee1f737e025 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 12:48:08 +0200
Subject: [PATCH 12/18] the name of the month written out

---
 admin/src/components/CreationTransactionList.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index e9c885cdb..2ce143c7f 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -1,7 +1,14 @@
 <template>
   <div class="component-creation-transaction-list">
     <div class="h3">{{ $t('transactionlist.title') }}</div>
-    <b-table striped hover :fields="fields" :items="items"></b-table>
+    <b-table striped hover :fields="fields" :items="items">
+      <template #cell(contributionDate)="data">
+        <div class="font-weight-bold">
+          {{ $d(new Date(data.item.contributionDate), 'month') }}
+        </div>
+        <div>{{ $d(new Date(data.item.contributionDate)) }}</div>
+      </template>
+    </b-table>
     <div>
       <b-pagination
         pills
@@ -46,7 +53,7 @@ export default {
       items: [],
       rows: 0,
       currentPage: 1,
-      perPage: 25,
+      perPage: 10,
       fields: [
         {
           key: 'createdAt',
@@ -58,9 +65,6 @@ export default {
         {
           key: 'contributionDate',
           label: this.$t('transactionlist.period'),
-          formatter: (value, key, item) => {
-            return this.$d(new Date(value))
-          },
         },
         {
           key: 'confirmedAt',

From 347591783e116a502e31ff66390eb1182e463163 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 13:44:25 +0200
Subject: [PATCH 13/18] fix test

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

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 01a18e325..ff9607424 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -42,7 +42,7 @@ const mocks = {
 
 const propsData = {
   userId: 1,
-  fields: ['date', 'balance', 'name', 'memo', 'decay'],
+  fields: ['createdAt', 'contributionDate', 'confirmedAt', 'amount', 'memo'],
 }
 
 describe('CreationTransactionList', () => {
@@ -62,7 +62,7 @@ describe('CreationTransactionList', () => {
         expect.objectContaining({
           variables: {
             currentPage: 1,
-            pageSize: 25,
+            pageSize: 10,
             order: 'DESC',
             userId: 1,
           },

From 209c61e5d84c848705561fb141203f73af6ab72c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 26 Sep 2022 08:48:04 +0200
Subject: [PATCH 14/18] Change call from Contribution to DbContribution and use
 Contribution as model.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index ddd3a7f76..16ab3671c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -248,7 +248,7 @@ export class AdminResolver {
     const creationDateObj = new Date(creationDate)
     logger.trace('creationDateObj:', creationDateObj)
     validateContribution(creations, amount, creationDateObj)
-    const contribution = Contribution.create()
+    const contribution = DbContribution.create()
     contribution.userId = emailContact.userId
     contribution.amount = amount
     contribution.createdAt = new Date()
@@ -259,7 +259,7 @@ export class AdminResolver {
     contribution.contributionStatus = ContributionStatus.PENDING
 
     logger.trace('contribution to save', contribution)
-    await Contribution.save(contribution)
+    await DbContribution.save(contribution)
     return getUserCreation(emailContact.userId)
   }
 

From 186e6711f55714302b9865145932e50a635cc360 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 26 Sep 2022 09:10:58 +0200
Subject: [PATCH 15/18] Remove unused import.

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 16ab3671c..3435edb94 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -39,7 +39,6 @@ import { Decay } from '@model/Decay'
 import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
-import { communityUser } from '@/util/communityUser'
 import { findUserByEmail, activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'

From 825b364a3b979ee26374cbe70dc220e4e2a8e6cd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 27 Sep 2022 19:13:32 +0200
Subject: [PATCH 16/18] fix user contact migration. Each user must have one
 contact, forget about that email_opt_in trash data

---
 .../0049-add_user_contacts_table.ts           | 55 ++++---------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index c3b89ed88..0a6d4c89f 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -14,8 +14,8 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
         \`type\` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
         \`user_id\` int(10) unsigned NOT NULL,
         \`email\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL UNIQUE,
-        \`email_verification_code\` bigint(20) unsigned NOT NULL UNIQUE,
-        \`email_opt_in_type_id\` int NOT NULL,
+        \`email_verification_code\` bigint(20) unsigned DEFAULT NULL UNIQUE,
+        \`email_opt_in_type_id\` int DEFAULT NULL,
         \`email_resend_count\` int DEFAULT '0',
         \`email_checked\` tinyint(4) NOT NULL DEFAULT 0,
         \`phone\` varchar(255) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
@@ -41,47 +41,10 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
   // merge values from login_email_opt_in table with users.email in new user_contacts table
   await queryFn(`
-  INSERT INTO user_contacts
-  (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
-  SELECT 
-    'EMAIL', 
-     u.id as user_id,
-     u.email,
-     e.verification_code as email_verification_code,
-     e.email_opt_in_type_id,
-     e.resend_count as email_resend_count,
-     u.email_checked,
-     e.created as created_at,
-     e.updated as updated_at,
-     u.deletedAt as deleted_at\
-   FROM 
-     users as u,
-     login_email_opt_in as e
-   WHERE 
-     u.id = e.user_id AND
-     e.id in (
-       WITH opt_in AS ( 
-         SELECT 
-           le.id, le.user_id, le.created, le.updated, ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
-         FROM 
-           login_email_opt_in as le
-       )
-       SELECT 
-         opt_in.id
-       FROM 
-         opt_in
-       WHERE
-         row_num = 1);`)
-  /*         
-      // SELECT 
-      //   le.id 
-      // FROM 
-      //   login_email_opt_in as le
-      // WHERE
-      //   le.user_id = u.id  
-      // ORDER BY 
-      //   le.updated DESC, le.created DESC LIMIT 1);`)
-      */
+    INSERT INTO \`user_contacts\`
+      (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
+      SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
+      FROM users LEFT JOIN (SELECT * FROM \`login_email_opt_in\` ORDER BY created DESC LIMIT 1) AS optin ON users.id = optin.\`user_id\`;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)
@@ -113,11 +76,13 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
   )
 
   // reconstruct the previous email back from contacts to users table
-  const contacts = await queryFn(`SELECT c.id, c.email, c.user_id FROM user_contacts as c`)
+  const contacts = await queryFn(
+    `SELECT c.id, c.email, c.user_id, c.email_checked FROM user_contacts as c`,
+  )
   for (const id in contacts) {
     const contact = contacts[id]
     await queryFn(
-      `UPDATE users SET email = "${contact.email}" WHERE id = "${contact.user_id}" and email_id = "${contact.id}"`,
+      `UPDATE users SET email = "${contact.email}", email_checked="${contact.email_checked}" WHERE id = "${contact.user_id}" and email_id = "${contact.id}"`,
     )
   }
   await queryFn('ALTER TABLE users MODIFY COLUMN email varchar(255) NOT NULL UNIQUE;')

From 5bb6fd048de04dd740d94a5fc65d115685e617f1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 28 Sep 2022 22:15:21 +0200
Subject: [PATCH 17/18] get email optin in a better way

---
 database/migrations/0049-add_user_contacts_table.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index 0a6d4c89f..964285420 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -44,7 +44,10 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
     INSERT INTO \`user_contacts\`
       (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
       SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
-      FROM users LEFT JOIN (SELECT * FROM \`login_email_opt_in\` ORDER BY created DESC LIMIT 1) AS optin ON users.id = optin.\`user_id\`;`)
+      FROM users LEFT JOIN
+      (SELECT le.id, le.user_id, le.verification_code, le.email_opt_in_type_id, le.resend_count, le.created, le.updated,
+         ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
+       FROM login_email_opt_in as le) AS optin ON users.id = optin.\`user_id\` AND row_num = 1;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)

From 0ed12f878f70018069b6d2c4542ca9f3dfdf55c2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 29 Sep 2022 04:38:33 +0200
Subject: [PATCH 18/18] remove back ticks in sql statement

---
 database/migrations/0049-add_user_contacts_table.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/0049-add_user_contacts_table.ts b/database/migrations/0049-add_user_contacts_table.ts
index 964285420..acdd1af61 100644
--- a/database/migrations/0049-add_user_contacts_table.ts
+++ b/database/migrations/0049-add_user_contacts_table.ts
@@ -41,13 +41,13 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
   // merge values from login_email_opt_in table with users.email in new user_contacts table
   await queryFn(`
-    INSERT INTO \`user_contacts\`
+    INSERT INTO user_contacts
       (type, user_id, email, email_verification_code, email_opt_in_type_id, email_resend_count, email_checked, created_at, updated_at, deleted_at)
-      SELECT 'EMAIL', \`users\`.id, \`users\`.email, optin.\`verification_code\`, optin.\`email_opt_in_type_id\`, optin.\`resend_count\`, users.\`email_checked\`, users.created, null, users.deletedAt
+      SELECT 'EMAIL', users.id, users.email, optin.verification_code, optin.email_opt_in_type_id, optin.resend_count, users.email_checked, users.created, null, users.deletedAt
       FROM users LEFT JOIN
       (SELECT le.id, le.user_id, le.verification_code, le.email_opt_in_type_id, le.resend_count, le.created, le.updated,
          ROW_NUMBER() OVER (PARTITION BY le.user_id ORDER BY le.created DESC) AS row_num
-       FROM login_email_opt_in as le) AS optin ON users.id = optin.\`user_id\` AND row_num = 1;`)
+       FROM login_email_opt_in as le) AS optin ON users.id = optin.user_id AND row_num = 1;`)
 
   // insert in users table the email_id of the new created email-contacts
   const contacts = await queryFn(`SELECT c.id, c.user_id FROM user_contacts as c`)