From 8b3423b91b2cd632befe4adb5d2b9ed2d0b87e16 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 25 Jan 2023 16:40:32 +0100
Subject: [PATCH] Remove i18n, change state to status.

---
 .../graphql/resolver/ContributionResolver.ts  | 35 +++++++------------
 backend/src/locales/de.json                   |  5 ---
 backend/src/locales/en.json                   |  5 ---
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 36d7c2237..799747013 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -180,38 +180,27 @@ export class ContributionResolver {
   async listAllContributions(
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
-    @Arg('filterState', () => [ContributionStatus], { nullable: true })
-    filterStates: ContributionStatus[] | null,
-    @Ctx() context: Context,
+    @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
+    statusFilters: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
     const where: {
       contributionStatus?: FindOperator<string> | null
     } = {}
     const typeStatus = Object.values(ContributionStatus)
-    const user = getUser(context)
-    i18n.setLocale(user.language)
-    if (filterStates !== null) {
-      const filterStateArray = []
-      const length = filterStates.length
+    if (statusFilters !== null) {
+      const statusFilterArray = []
+      const length = statusFilters.length
       let i = 0
       for (i; i < length; i++) {
-        const filterState = filterStates[i]
-        if (!typeStatus.includes(filterState)) {
-          logger.error(
-            `${i18n.__('error.contributions.wrongFilterState', {
-              contributionState: filterStates[i],
-            })}`,
-          )
-          throw new Error(
-            `${i18n.__('error.contributions.wrongFilterState', {
-              contributionState: filterStates[i],
-            })}`,
-          )
+        const statusFilter = statusFilters[i]
+        if (!typeStatus.includes(statusFilter)) {
+          logger.error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
+          throw new Error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
         }
-        filterStateArray.push(filterState)
+        statusFilterArray.push(statusFilter)
       }
-      if (filterStateArray.length > 0) {
-        where.contributionStatus = In(filterStateArray)
+      if (statusFilterArray.length > 0) {
+        where.contributionStatus = In(statusFilterArray)
       }
     }
 
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index d547fd951..38b53508b 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -55,11 +55,6 @@
       "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
     }
   },
-  "error": {
-    "contributions": {
-      "wrongFilterState": "Nicht definierter Status wurde gesendet: {contributionState}"
-    }
-  },
   "general": {
     "decimalSeparator": ",",
     "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index be26a8467..fa45c6635 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -56,11 +56,6 @@
       "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
     }
   },
-  "error": {
-    "contributions": {
-      "wrongFilterState": "Send a state that isn't defined: {contributionState}"
-    }
-  },
   "general": {
     "decimalSeparator": ".",
     "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",