From f814267445a0f0754359021ca87fca1b54f3643d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 3 Feb 2022 11:40:04 +0100
Subject: [PATCH 01/12] add check for hasElopage in adminarea in usersearch
 list

---
 admin/src/components/UserTable.vue | 8 ++++++++
 admin/src/pages/UserSearch.vue     | 1 +
 2 files changed, 9 insertions(+)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4d14a35cb..31ecf32c3 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -72,6 +72,14 @@
         </b-button>
       </template>
 
+      <template #cell(has_elopage)="row">
+        <b-button :variant="row.item.hasElopage ? 'success' : 'danger'" size="md" class="mr-2">
+          <b-icon
+            :icon="row.item.hasElopage ? 'arrow-up-short' : 'exclamation-triangle-fill'"
+          ></b-icon>
+        </b-button>
+      </template>
+
       <template #cell(transactions_list)="row">
         <b-button variant="warning" size="md" @click="rowToogleDetails(row, 2)" class="mr-2">
           <b-icon icon="list"></b-icon>
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index b7c19d03a..d3b7d8068 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -111,6 +111,7 @@ export default {
         },
         { key: 'show_details', label: this.$t('details') },
         { key: 'confirm_mail', label: this.$t('confirmed') },
+        { key: 'has_elopage', label: 'elopage' },
         { key: 'transactions_list', label: this.$t('transaction') },
       ]
     },

From 4c3c49c9aa0bf1bbd52a6820c12c1680506c59d2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 3 Feb 2022 11:43:07 +0100
Subject: [PATCH 02/12] add hasElopage status in AdminResolver.ts

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

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 4204c6c2f..8afc7ba9c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -23,6 +23,7 @@ import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
 import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
+import { UserResolver } from './UserResolver'
 
 @Resolver()
 export class AdminResolver {
@@ -42,6 +43,7 @@ export class AdminResolver {
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
         adminUser.emailChecked = await hasActivatedEmail(user.email)
+        // TODO: adminUser.hasElopage = await hasElopage()
         return adminUser
       }),
     )

From 9d79e35f3643565a5966c3945ebc19b1d0281734 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Feb 2022 10:34:54 +0100
Subject: [PATCH 03/12] Refactor hasElopageBuys method to a utility method.

---
 backend/src/util/hasElopageBuys.ts | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 backend/src/util/hasElopageBuys.ts

diff --git a/backend/src/util/hasElopageBuys.ts b/backend/src/util/hasElopageBuys.ts
new file mode 100644
index 000000000..7078ed077
--- /dev/null
+++ b/backend/src/util/hasElopageBuys.ts
@@ -0,0 +1,9 @@
+
+import { getCustomRepository } from '@dbTools/typeorm'
+import { LoginElopageBuysRepository } from '../typeorm/repository/LoginElopageBuys'
+
+export async function hasElopageBuys(email: string): Promise<boolean> {
+  const loginElopageBuysRepository = getCustomRepository(LoginElopageBuysRepository)
+  const elopageBuyCount = await loginElopageBuysRepository.count({ payerEmail: email })
+  return elopageBuyCount > 0
+}

From 555420a56875aebbac430b56979b0ddcdbd12d7f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Feb 2022 10:36:43 +0100
Subject: [PATCH 04/12] Remove unused imports, extract hasElopageBuys to
 utility.

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

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 14a56b60b..ada2932dc 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -22,12 +22,12 @@ import { LoginUserBackup } from '@entity/LoginUserBackup'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { sendResetPasswordEmail } from '../../mailer/sendResetPasswordEmail'
 import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
-import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys'
 import { klicktippSignIn } from '../../apis/KlicktippController'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { ServerUserRepository } from '../../typeorm/repository/ServerUser'
 import { ROLE_ADMIN } from '../../auth/ROLES'
 import { randomBytes } from 'crypto'
+import { hasElopageBuys } from '../../util/hasElopageBuys'
 
 const EMAIL_OPT_IN_RESET_PASSWORD = 2
 const EMAIL_OPT_IN_REGISTER = 1
@@ -812,8 +812,6 @@ export class UserResolver {
       return false
     }
 
-    const loginElopageBuysRepository = getCustomRepository(LoginElopageBuysRepository)
-    const elopageBuyCount = await loginElopageBuysRepository.count({ payerEmail: userEntity.email })
-    return elopageBuyCount > 0
+    return hasElopageBuys(userEntity.email)
   }
 }

From 3806beb01e58b02671e2b50f7300245822dd1eb3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Feb 2022 10:38:35 +0100
Subject: [PATCH 05/12] Add hasElopage flag to user entity for the admin user
 search.

---
 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 8afc7ba9c..99a2a0e34 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -23,7 +23,7 @@ import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
 import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
-import { UserResolver } from './UserResolver'
+import { hasElopageBuys } from '../../util/hasElopageBuys'
 
 @Resolver()
 export class AdminResolver {
@@ -43,7 +43,7 @@ export class AdminResolver {
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
         adminUser.emailChecked = await hasActivatedEmail(user.email)
-        // TODO: adminUser.hasElopage = await hasElopage()
+        adminUser.hasElopage = await hasElopageBuys(user.email)
         return adminUser
       }),
     )

From 4dc4f30097a52a9cabde3fe2f6ca4c03dae023d2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Feb 2022 10:39:01 +0100
Subject: [PATCH 06/12] Add hasElopage to the UserAdmin model.

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

diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 9e28a33d6..27dfe96f1 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -19,6 +19,9 @@ export class UserAdmin {
 
   @Field(() => Boolean)
   emailChecked: boolean
+
+  @Field(() => Boolean)
+  hasElopage: boolean
 }
 
 @ObjectType()

From c66e45957215894a1499bfebb45be9ca67589a62 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Feb 2022 10:40:15 +0100
Subject: [PATCH 07/12] Add hasElopage for each user to the graphql query
 searchUsers.

---
 admin/src/graphql/searchUsers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 2bd6d2004..68b6efc82 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -16,6 +16,7 @@ export const searchUsers = gql`
         email
         creation
         emailChecked
+        hasElopage
       }
     }
   }

From d502b3d0521fa2ed42b2e8facf52daed061cbb42 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 7 Feb 2022 13:05:06 +0100
Subject: [PATCH 08/12] yarn lint --fix.

---
 backend/src/util/hasElopageBuys.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/util/hasElopageBuys.ts b/backend/src/util/hasElopageBuys.ts
index 7078ed077..624cd0815 100644
--- a/backend/src/util/hasElopageBuys.ts
+++ b/backend/src/util/hasElopageBuys.ts
@@ -1,4 +1,3 @@
-
 import { getCustomRepository } from '@dbTools/typeorm'
 import { LoginElopageBuysRepository } from '../typeorm/repository/LoginElopageBuys'
 

From afae9f47e1c1d1bafad126b8797dbec6635716db Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Feb 2022 15:40:51 +0100
Subject: [PATCH 09/12] remove button, add icon

---
 admin/src/components/UserTable.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 9292253e3..5fe59f285 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -65,11 +65,9 @@
       </template>
 
       <template #cell(has_elopage)="row">
-        <b-button :variant="row.item.hasElopage ? 'success' : 'danger'" size="md" class="mr-2">
-          <b-icon
-            :icon="row.item.hasElopage ? 'arrow-up-short' : 'exclamation-triangle-fill'"
-          ></b-icon>
-        </b-button>
+        <b-icon
+          :icon="row.item.hasElopage ? 'arrow-up-short' : 'exclamation-triangle-fill'"
+        ></b-icon>
       </template>
 
       <template #cell(transactions_list)="row">

From 75a37b6af8e98a944817bdc40ab49a20d646316b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Feb 2022 15:47:59 +0100
Subject: [PATCH 10/12] change icons in for hasElopage adminarea

---
 admin/src/components/UserTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 5fe59f285..d86159297 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -65,8 +65,8 @@
       </template>
 
       <template #cell(has_elopage)="row">
-        <b-icon
-          :icon="row.item.hasElopage ? 'arrow-up-short' : 'exclamation-triangle-fill'"
+        <b-icon :variant="row.item.hasElopage ? 'success' : 'danger'"
+          :icon="row.item.hasElopage ? 'check-circle' : 'x-circle'"
         ></b-icon>
       </template>
 

From 6601d0ec4ad578a10216edec26202f59d686152a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Feb 2022 15:48:36 +0100
Subject: [PATCH 11/12] yarn lint fix

---
 admin/src/components/UserTable.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index d86159297..fb24cf0f1 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -65,7 +65,8 @@
       </template>
 
       <template #cell(has_elopage)="row">
-        <b-icon :variant="row.item.hasElopage ? 'success' : 'danger'"
+        <b-icon
+          :variant="row.item.hasElopage ? 'success' : 'danger'"
           :icon="row.item.hasElopage ? 'check-circle' : 'x-circle'"
         ></b-icon>
       </template>

From ee94c655ef80064391aadc083a40e151c3a37108 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 8 Feb 2022 15:59:59 +0100
Subject: [PATCH 12/12] fix elopage buys not using repository but entity

---
 backend/src/util/hasElopageBuys.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/src/util/hasElopageBuys.ts b/backend/src/util/hasElopageBuys.ts
index 624cd0815..4e23e717c 100644
--- a/backend/src/util/hasElopageBuys.ts
+++ b/backend/src/util/hasElopageBuys.ts
@@ -1,8 +1,6 @@
-import { getCustomRepository } from '@dbTools/typeorm'
-import { LoginElopageBuysRepository } from '../typeorm/repository/LoginElopageBuys'
+import { LoginElopageBuys } from '@entity/LoginElopageBuys'
 
 export async function hasElopageBuys(email: string): Promise<boolean> {
-  const loginElopageBuysRepository = getCustomRepository(LoginElopageBuysRepository)
-  const elopageBuyCount = await loginElopageBuysRepository.count({ payerEmail: email })
+  const elopageBuyCount = await LoginElopageBuys.count({ payerEmail: email })
   return elopageBuyCount > 0
 }