Add localization, change filterState from string to array of string.

backend/src/graphql/resolver/ContributionResolver.ts

@@ -1,4 +1,5 @@
 import Decimal from 'decimal.js-light'
+import i18n from 'i18n'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { FindOperator, IsNull, In, getConnection, Equal } from '@dbTools/typeorm'
 
@@ -179,18 +180,43 @@ export class ContributionResolver {
   async listAllContributions(
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
-    @Arg('filterState', () => String, { nullable: true })
-    filterState: string | null,
+    @Arg('filterState', () => [String], { nullable: true })
+    filterStates: string[] | null,
+    @Ctx() context: Context,
   ): Promise<ContributionListResult> {
     const where: {
       contributionStatus?: FindOperator<string> | null
     } = {}
     const typeStatus = Object.values(ContributionStatus)
-    if (filterState !== null) {
+    const filterStateArray = []
+    const user = getUser(context)
+    i18n.setLocale(user.language)
+    if (filterStates !== null) {
       // Asked ChatGBT for explanation => filterState converted to ContributionStatus
-      const contributionStatus = ContributionStatus[filterState as keyof typeof ContributionStatus]
-      if (typeStatus.includes(contributionStatus)) {
-        where.contributionStatus = Equal(filterState)
+      const length = filterStates.length
+      let i = 0
+      for (i; i < length; i++) {
+        const filterState = filterStates[i].toUpperCase()
+        logger.info('filterState', filterState)
+        const contributionStatus =
+          ContributionStatus[filterState as keyof typeof ContributionStatus]
+        logger.info('contributionStatus', contributionStatus)
+        if (!typeStatus.includes(contributionStatus)) {
+          logger.error(
+            `${i18n.__('error.contributions.wrongFilterState', {
+              contributionState: filterStates[i],
+            })}`,
+          )
+          throw new Error(
+            `${i18n.__('error.contributions.wrongFilterState', {
+              contributionState: filterStates[i],
+            })}`,
+          )
+        }
+        filterStateArray.push(contributionStatus)
+      }
+      if (filterStateArray.length > 0) {
+        where.contributionStatus = In(filterStateArray)
       }
     }
 

backend/src/locales/de.json

@@ -55,6 +55,11 @@
       "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",

backend/src/locales/en.json

@@ -1,4 +1,5 @@
 {
+  "contributions": {},
   "emails": {
     "addedContributionMessage": {
       "commonGoodContributionMessage": "you have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.",
@@ -55,6 +56,11 @@
       "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",