From 22c408f6333f06ea7248d1bdcf04187a5ff48582 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Feb 2022 14:34:43 +0100
Subject: [PATCH 1/7] fix: Catch GDT Server Errors

---
 backend/src/graphql/resolver/GdtResolver.ts      | 16 ++++++++++------
 .../src/graphql/resolver/TransactionResolver.ts  | 12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index a727c8784..a00537dd5 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -25,13 +25,17 @@ export class GdtResolver {
     const userRepository = getCustomRepository(UserRepository)
     const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
 
-    const resultGDT = await apiGet(
-      `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`,
-    )
-    if (!resultGDT.success) {
-      throw new Error(resultGDT.data)
+    try {
+      const resultGDT = await apiGet(
+        `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`,
+      )
+      if (!resultGDT.success) {
+        throw new Error(resultGDT.data)
+      }
+      return new GdtEntryList(resultGDT.data)
+    } catch (err: any) {
+      throw new Error(err)
     }
-    return new GdtEntryList(resultGDT.data)
   }
 
   @Authorized([RIGHTS.EXIST_PID])
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 8fe1e8484..d42f3b62e 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -331,11 +331,13 @@ export class TransactionResolver {
     )
 
     // get gdt sum
-    const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
-      email: userEntity.email,
-    })
-    if (!resultGDTSum.success) throw new Error(resultGDTSum.data)
-    transactions.gdtSum = Number(resultGDTSum.data.sum) || 0
+    transactions.gdtSum = 0
+    try {
+      const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
+        email: userEntity.email,
+      })
+      if (resultGDTSum.success) transactions.gdtSum = Number(resultGDTSum.data.sum) || 0
+    } catch (err: any) {}
 
     // get balance
     const balanceRepository = getCustomRepository(BalanceRepository)

From 58ee714e17d16834bc890763ae968320f93760a3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:05:42 +0100
Subject: [PATCH 2/7] allow gdtSum to be null

---
 backend/src/graphql/model/TransactionList.ts        | 4 ++--
 backend/src/graphql/resolver/TransactionResolver.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts
index 0175048d1..f1973b7e7 100644
--- a/backend/src/graphql/model/TransactionList.ts
+++ b/backend/src/graphql/model/TransactionList.ts
@@ -13,8 +13,8 @@ export class TransactionList {
     this.decayDate = ''
   }
 
-  @Field(() => Number)
-  gdtSum: number
+  @Field(() => Number, { nullable: true })
+  gdtSum: number | null
 
   @Field(() => Number)
   count: number
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d42f3b62e..4e40a35c2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -331,7 +331,7 @@ export class TransactionResolver {
     )
 
     // get gdt sum
-    transactions.gdtSum = 0
+    transactions.gdtSum = null
     try {
       const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
         email: userEntity.email,

From d9694b28d696184a45b882ea1c2c7d7335a54bb8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:07:38 +0100
Subject: [PATCH 3/7] show dash when gdt sum is null due to gdt server errors

---
 frontend/src/components/Status.vue                      | 2 +-
 frontend/src/views/Layout/DashboardLayout_gdd.vue       | 2 +-
 frontend/src/views/Pages/UserProfileTransactionList.vue | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 7900763f7..92d00452d 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending ? '—' : $n(balance, 'decimal') }} {{ statusText }}
+      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
     </div>
   </div>
 </template>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 5e566d3f8..000a4a08d 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -92,7 +92,7 @@ export default {
           const {
             data: { transactionList },
           } = result
-          this.GdtBalance = Number(transactionList.gdtSum)
+          this.GdtBalance = transactionList.gdtSum === null ? null : Number(transactionList.gdtSum)
           this.transactions = transactionList.transactions
           this.balance = Number(transactionList.decay)
           this.bookedBalance = Number(transactionList.balance)
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 97f0d84c1..383e908b6 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pb-4">
     <b-tabs content-class="" justified>
-      <b-tab :title="'Gradido  (' + $n(balance, 'decimal') + ' GDD)'" class="px-4">
+      <b-tab :title="`Gradido  (${$n(balance, 'decimal')} GDD)`" class="px-4">
         <p class="tab-tex">{{ $t('transaction.gdd-text') }}</p>
 
         <gdd-transaction-list
@@ -13,7 +13,10 @@
         />
       </b-tab>
 
-      <b-tab :title="'Gradido Transform  (' + $n(GdtBalance, 'decimal') + ' GDT)'" class="px-4">
+      <b-tab
+        :title="`Gradido Transform  (${GdtBalance === null ? '—' : $n(GdtBalance, 'decimal')} GDT)`"
+        class="px-4"
+      >
         <p class="">{{ $t('transaction.gdt-text') }}</p>
 
         <gdt-transaction-list />

From 283cfcc84a427c1fdb4c37437c9b8d70df7d1d52 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:23:58 +0100
Subject: [PATCH 4/7] GDT server not reachable error thrown

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

diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index a00537dd5..c515b4e26 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -34,7 +34,7 @@ export class GdtResolver {
       }
       return new GdtEntryList(resultGDT.data)
     } catch (err: any) {
-      throw new Error(err)
+      throw new Error('GDT Server is not reachable.')
     }
   }
 

From 6cbbbb10f47f9ace1eaab9ead845864d4a75c26b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:25:14 +0100
Subject: [PATCH 5/7] display message on GDT transaction list when GDT server
 is not reachable

---
 frontend/src/locales/de.json                                   | 1 +
 frontend/src/locales/en.json                                   | 1 +
 .../src/views/Pages/AccountOverview/GdtTransactionList.vue     | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index fbd9c8e91..b39e7988f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -109,6 +109,7 @@
     "funding": "Zu den Förderbeiträgen",
     "gdt-received": "GradidoTransform (GDT) erhalten",
     "no-transactions": "Du hast noch keine GradidoTransform (GDT).",
+    "not-reachable": "Der GDT Server ist nicht erreichbar.",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
     "recruited-member": "Eingeladenes Mitglied"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 534aa25e8..1e41e5418 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -109,6 +109,7 @@
     "funding": "To the funding contributions",
     "gdt-received": "GradidoTransform (GDT) received",
     "no-transactions": "You do not have GradidoTransform (GDT) yet.",
+    "not-reachable": "The GDT Server is not reachable.",
     "publisher": "A member you referred has paid a contribution",
     "raise": "Increase",
     "recruited-member": "Invited member"
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 9c8b51f5e..8a33e7084 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -8,6 +8,9 @@
           {{ $t('gdt.funding') }}
         </b-button>
       </div>
+      <div v-else-if="typeof transactionGdtCount === 'object'" class="text-center">
+        {{ $t('gdt.not-reachable') }}
+      </div>
       <div
         v-else
         v-for="{ id, amount, date, comment, gdtEntryType, factor, gdt } in transactionsGdt"

From efaef025ee1b2a7de841eca79e5a881b6a060691 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:32:24 +0100
Subject: [PATCH 6/7] do not throw error when GDT server is not reachable

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

diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index c515b4e26..27523b401 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -33,9 +33,7 @@ export class GdtResolver {
         throw new Error(resultGDT.data)
       }
       return new GdtEntryList(resultGDT.data)
-    } catch (err: any) {
-      throw new Error('GDT Server is not reachable.')
-    }
+    } catch (err: any) {}
   }
 
   @Authorized([RIGHTS.EXIST_PID])

From 229499773440f00af356f08f7956198b09697527 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 16 Feb 2022 09:39:42 +0100
Subject: [PATCH 7/7] throw again when GDT server is not reachable

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

diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index 27523b401..c515b4e26 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -33,7 +33,9 @@ export class GdtResolver {
         throw new Error(resultGDT.data)
       }
       return new GdtEntryList(resultGDT.data)
-    } catch (err: any) {}
+    } catch (err: any) {
+      throw new Error('GDT Server is not reachable.')
+    }
   }
 
   @Authorized([RIGHTS.EXIST_PID])