From 689cb96b8712de8089d24d92f55ad86b0136deff Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Mon, 13 Nov 2023 17:58:45 +0100
Subject: [PATCH 1/5] replace mkdir and cp with npm modules to get platfrom
 independence

---
 backend/package.json  |  6 ++++--
 backend/yarn.lock     | 12 +++++++++++-
 database/package.json |  6 ++++--
 database/yarn.lock    | 10 ++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index b25a7dedb..8324932a3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
-    "build": "tsc --build && mkdir -p build/src/emails/templates/ && cp -r src/emails/templates/* build/src/emails/templates/ && mkdir -p build/src/locales/ && cp -r src/locales/*.json build/src/locales/",
+    "build": "tsc --build && mkdirp build/src/emails/templates/ && ncp src/emails/templates build/src/emails/templates && mkdirp build/src/locales/ && ncp src/locales build/src/locales",
     "clean": "tsc --build --clean",
     "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts,pug,json,css --exec ts-node -r tsconfig-paths/register src/index.ts",
@@ -80,7 +80,9 @@
     "ts-jest": "^27.0.5",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "^3.14.0",
-    "typescript": "^4.3.4"
+    "typescript": "^4.3.4",
+    "mkdirp": "^3.0.1",
+    "ncp": "^2.0.0"
   },
   "nodemonConfig": {
     "ignore": [
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 84553d73e..0b3ceb323 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3679,7 +3679,7 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
 "gradido-database@file:../database":
-  version "1.22.0"
+  version "2.0.1"
   dependencies:
     "@types/uuid" "^8.3.4"
     cross-env "^7.0.3"
@@ -5280,6 +5280,11 @@ mkdirp@^2.1.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
+mkdirp@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
 moo@^0.5.0, moo@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
@@ -5371,6 +5376,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+ncp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
+
 nearley@^2.20.1:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
diff --git a/database/package.json b/database/package.json
index 8916962be..12a6c758c 100644
--- a/database/package.json
+++ b/database/package.json
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
-    "build": "mkdir -p build/src/config/ && cp src/config/*.txt build/src/config/ && tsc --build",
+    "build": "mkdirp build/src/config/ && ncp src/config build/src/config && tsc --build",
     "clean": "tsc --build --clean",
     "up": "cross-env TZ=UTC node build/src/index.js up",
     "down": "cross-env TZ=UTC node build/src/index.js down",
@@ -35,7 +35,9 @@
     "eslint-plugin-security": "^1.7.1",
     "prettier": "^2.8.7",
     "ts-node": "^10.2.1",
-    "typescript": "^4.3.5"
+    "typescript": "^4.3.5",
+    "mkdirp": "^3.0.1",
+    "ncp": "^2.0.0"
   },
   "dependencies": {
     "@types/uuid": "^8.3.4",
diff --git a/database/yarn.lock b/database/yarn.lock
index ac35e1eaa..d8a0d6ffb 100644
--- a/database/yarn.lock
+++ b/database/yarn.lock
@@ -1718,6 +1718,11 @@ mkdirp@^2.1.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
+mkdirp@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -1778,6 +1783,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+ncp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
+
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"

From b6821a56fc42a1fdbf44fa4b0fb98ba2fd5ca7f6 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Thu, 16 Nov 2023 14:08:52 +0100
Subject: [PATCH 2/5] extend admin test to keep coverage

---
 .../ContributionMessagesFormular.spec.js      | 27 +++++++++++++++++++
 .../ContributionMessagesFormular.vue          | 10 +------
 .../ContributionMessagesList.spec.js          | 21 +++++++++++++++
 .../Tables/OpenCreationsTable.spec.js         | 11 ++++++++
 admin/src/graphql/adminUpdateContribution.js  |  2 +-
 5 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index 60395c68b..f19459ce9 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils'
 import ContributionMessagesFormular from './ContributionMessagesFormular'
 import { toastErrorSpy, toastSuccessSpy } from '../../../test/testSetup'
 import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
+import { adminUpdateContribution } from '@/graphql/adminUpdateContribution'
 
 const localVue = global.localVue
 
@@ -136,6 +137,32 @@ describe('ContributionMessagesFormular', () => {
       })
     })
 
+    describe('update contribution memo from moderator for user created contributions', () => {
+      beforeEach(async () => {
+        await wrapper.setData({
+          form: {
+            memo: 'changed memo',
+          },
+          chatOrMemo: 1,
+        })
+        await wrapper.find('button[data-test="submit-dialog"]').trigger('click')
+      })
+
+      it('adminUpdateContribution was called with contributionId and updated memo', () => {
+        expect(apolloMutateMock).toBeCalledWith({
+          mutation: adminUpdateContribution,
+          variables: {
+            id: 42,
+            memo: 'changed memo',
+          },
+        })
+      })
+
+      it('toasts an success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith('message.request')
+      })
+    })
+
     describe('send contribution message with error', () => {
       beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 96ecef6c1..be97d9c13 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -64,15 +64,7 @@
 </template>
 <script>
 import { adminCreateContributionMessage } from '@/graphql/adminCreateContributionMessage'
-import gql from 'graphql-tag'
-
-export const adminUpdateContribution = gql`
-  mutation ($id: Int!, $memo: String!) {
-    adminUpdateContribution(id: $id, memo: $memo) {
-      memo
-    }
-  }
-`
+import { adminUpdateContribution } from '@/graphql/adminUpdateContribution'
 
 export default {
   name: 'ContributionMessagesFormular',
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 671a05f83..b38c4e7d4 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -134,5 +134,26 @@ describe('ContributionMessagesList', () => {
         expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
       })
     })
+
+    describe('call updateStatus', () => {
+      beforeEach(() => {
+        wrapper.vm.updateStatus(4)
+      })
+
+      it('emits update-status', () => {
+        expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy()
+      })
+    })
+
+    describe('test reload-contribution', () => {
+      beforeEach(() => {
+        wrapper.vm.reloadContribution(3)
+      })
+
+      it('emits reload-contribution', () => {
+        expect(wrapper.emitted('reload-contribution')).toBeTruthy()
+        expect(wrapper.emitted('reload-contribution')[0]).toEqual([3])
+      })
+    })
   })
 })
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 11c5fd240..054ef9067 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -140,5 +140,16 @@ describe('OpenCreationsTable', () => {
         expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy()
       })
     })
+
+    describe('test reload-contribution', () => {
+      beforeEach(() => {
+        wrapper.vm.reloadContribution(3)
+      })
+
+      it('emits reload-contribution', () => {
+        expect(wrapper.emitted('reload-contribution')).toBeTruthy()
+        expect(wrapper.emitted('reload-contribution')[0]).toEqual([3])
+      })
+    })
   })
 })
diff --git a/admin/src/graphql/adminUpdateContribution.js b/admin/src/graphql/adminUpdateContribution.js
index c52a0cbc4..db2f09072 100644
--- a/admin/src/graphql/adminUpdateContribution.js
+++ b/admin/src/graphql/adminUpdateContribution.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const adminUpdateContribution = gql`
-  mutation ($id: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+  mutation ($id: Int!, $amount: Decimal, $memo: String, $creationDate: String) {
     adminUpdateContribution(id: $id, amount: $amount, memo: $memo, creationDate: $creationDate) {
       amount
       date

From 703dcbd0b394bb5dc30b0ba596fe06482c895ca1 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Thu, 16 Nov 2023 14:25:43 +0100
Subject: [PATCH 3/5] update locales check sorting script with fix option

---
 admin/scripts/sort.sh    | 15 +++++++--------
 backend/scripts/sort.sh  | 15 +++++++--------
 frontend/scripts/sort.sh | 15 +++++++--------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/admin/scripts/sort.sh b/admin/scripts/sort.sh
index e5c5c41c6..d24307d7c 100755
--- a/admin/scripts/sort.sh
+++ b/admin/scripts/sort.sh
@@ -2,24 +2,23 @@
 
 ROOT_DIR=$(dirname "$0")/..
 
-tmp=$(mktemp)
 exit_code=0
 
 for locale_file in $ROOT_DIR/src/locales/*.json
 do
-  jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
+  jq -M 'to_entries | sort_by(.key) | from_entries' "$locale_file" > tmp.json
+
   if [ "$*" == "--fix" ]
   then
-    mv "$tmp" $locale_file
+    mv tmp.json "$locale_file"
   else
-    if diff -q "$tmp" $locale_file > /dev/null ;
+    if ! diff -q tmp.json "$locale_file" > /dev/null ;
     then
-      : # all good
-    else
-      exit_code=$?
-      echo "$(basename -- $locale_file) is not sorted by keys"
+      exit_code=1
+      echo "$(basename -- "$locale_file") is not sorted by keys"
     fi
   fi
 done
 
+rm -f tmp.json
 exit $exit_code
diff --git a/backend/scripts/sort.sh b/backend/scripts/sort.sh
index e5c5c41c6..d24307d7c 100755
--- a/backend/scripts/sort.sh
+++ b/backend/scripts/sort.sh
@@ -2,24 +2,23 @@
 
 ROOT_DIR=$(dirname "$0")/..
 
-tmp=$(mktemp)
 exit_code=0
 
 for locale_file in $ROOT_DIR/src/locales/*.json
 do
-  jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
+  jq -M 'to_entries | sort_by(.key) | from_entries' "$locale_file" > tmp.json
+
   if [ "$*" == "--fix" ]
   then
-    mv "$tmp" $locale_file
+    mv tmp.json "$locale_file"
   else
-    if diff -q "$tmp" $locale_file > /dev/null ;
+    if ! diff -q tmp.json "$locale_file" > /dev/null ;
     then
-      : # all good
-    else
-      exit_code=$?
-      echo "$(basename -- $locale_file) is not sorted by keys"
+      exit_code=1
+      echo "$(basename -- "$locale_file") is not sorted by keys"
     fi
   fi
 done
 
+rm -f tmp.json
 exit $exit_code
diff --git a/frontend/scripts/sort.sh b/frontend/scripts/sort.sh
index e5c5c41c6..d24307d7c 100755
--- a/frontend/scripts/sort.sh
+++ b/frontend/scripts/sort.sh
@@ -2,24 +2,23 @@
 
 ROOT_DIR=$(dirname "$0")/..
 
-tmp=$(mktemp)
 exit_code=0
 
 for locale_file in $ROOT_DIR/src/locales/*.json
 do
-  jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
+  jq -M 'to_entries | sort_by(.key) | from_entries' "$locale_file" > tmp.json
+
   if [ "$*" == "--fix" ]
   then
-    mv "$tmp" $locale_file
+    mv tmp.json "$locale_file"
   else
-    if diff -q "$tmp" $locale_file > /dev/null ;
+    if ! diff -q tmp.json "$locale_file" > /dev/null ;
     then
-      : # all good
-    else
-      exit_code=$?
-      echo "$(basename -- $locale_file) is not sorted by keys"
+      exit_code=1
+      echo "$(basename -- "$locale_file") is not sorted by keys"
     fi
   fi
 done
 
+rm -f tmp.json
 exit $exit_code

From f61d61c861beea42af806e2d9e1966170a8d7cd9 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Thu, 16 Nov 2023 14:26:54 +0100
Subject: [PATCH 4/5] fix test and locals order

---
 .../ContributionMessagesFormular.vue                |  2 +-
 admin/src/graphql/getContribution.js                |  2 +-
 admin/src/locales/de.json                           | 12 ++++++------
 admin/src/locales/en.json                           | 12 ++++++------
 admin/src/pages/CreationConfirm.spec.js             | 13 ++++++-------
 frontend/src/locales/de.json                        |  6 +++---
 frontend/src/locales/en.json                        |  6 +++---
 frontend/src/locales/es.json                        |  2 +-
 frontend/src/locales/fr.json                        |  4 ++--
 frontend/src/locales/nl.json                        |  2 +-
 frontend/src/locales/tr.json                        |  2 +-
 11 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index be97d9c13..1e395c183 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -140,7 +140,7 @@ export default {
     },
     onReset(event) {
       this.form.text = ''
-      this.form.memo = this.contributionMemo 
+      this.form.memo = this.contributionMemo
     },
     enableMemo() {
       this.chatOrMemo = 1
diff --git a/admin/src/graphql/getContribution.js b/admin/src/graphql/getContribution.js
index bc42bceb1..34e260299 100644
--- a/admin/src/graphql/getContribution.js
+++ b/admin/src/graphql/getContribution.js
@@ -24,4 +24,4 @@ export const getContribution = gql`
       userId
     }
   }
-`
\ No newline at end of file
+`
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index fbfbc61d0..264029cc6 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,4 +1,5 @@
 {
+  "GDD": "GDD",
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "change_user_role": "Nutzerrolle ändern",
@@ -42,6 +43,7 @@
   "createdAt": "Angelegt",
   "creation": "Schöpfung",
   "creationList": "Schöpfungsliste",
+  "creation_for_month": "Schöpfung für Monat",
   "creation_form": {
     "creation_for": "Aktives Grundeinkommen für",
     "enter_text": "Text eintragen",
@@ -58,16 +60,15 @@
     "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit",
     "update_creation": "Schöpfung aktualisieren"
   },
-  "creation_for_month": "Schöpfung für Monat",
   "delete": "Löschen",
+  "delete_user": "Nutzer löschen",
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
-  "delete_user": "Nutzer löschen",
   "deny": "Ablehnen",
+  "e_mail": "E-Mail",
   "enabled": "aktiviert",
   "error": "Fehler",
   "expired": "abgelaufen",
-  "e_mail": "E-Mail",
   "federation": {
     "createdAt": "Erstellt am",
     "gradidoInstances": "Gradido Instanzen",
@@ -88,7 +89,6 @@
     "cancel": "Abbrechen",
     "submit": "Senden"
   },
-  "GDD": "GDD",
   "help": {
     "help": "Hilfe",
     "transactionlist": {
@@ -127,9 +127,9 @@
     "statistic": "Statistik",
     "user_search": "Nutzersuche"
   },
-  "not_open_creations": "Keine offenen Schöpfungen",
   "no_hashtag": "#Hashtags verbergen",
   "no_hashtag_tooltip": "Zeigt nur Beiträge ohne Hashtag im Text",
+  "not_open_creations": "Keine offenen Schöpfungen",
   "open": "offen",
   "open_creations": "Offene Schöpfungen",
   "overlay": {
@@ -200,7 +200,6 @@
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
   "undelete_user": "Nutzer wiederherstellen",
-  "unregistered_emails": "Nur unregistrierte Nutzer",
   "unregister_mail": {
     "button": "Registrierungs-Email bestätigen, jetzt senden",
     "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
@@ -210,6 +209,7 @@
     "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({email}) gesendet.",
     "text_true": " Die Email wurde bestätigt."
   },
+  "unregistered_emails": "Nur unregistrierte Nutzer",
   "userRole": {
     "notChangeYourSelf": "Als Admin/Moderator kannst du nicht selber deine Rolle ändern.",
     "selectLabel": "Rolle:",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 66c974ddf..dbd831bb9 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "GDD": "GDD",
   "all_emails": "All users",
   "back": "back",
   "change_user_role": "Change user role",
@@ -42,6 +43,7 @@
   "createdAt": "Created at",
   "creation": "Creation",
   "creationList": "Creation list",
+  "creation_for_month": "Creation for month",
   "creation_form": {
     "creation_for": "Active Basic Income for",
     "enter_text": "Enter text",
@@ -58,16 +60,15 @@
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
-  "creation_for_month": "Creation for month",
   "delete": "Delete",
+  "delete_user": "Delete user",
   "deleted": "deleted",
   "deleted_user": "All deleted user",
-  "delete_user": "Delete user",
   "deny": "Reject",
+  "e_mail": "E-mail",
   "enabled": "enabled",
   "error": "Error",
   "expired": "expired",
-  "e_mail": "E-mail",
   "federation": {
     "createdAt": "Created At ",
     "gradidoInstances": "Gradido Instances",
@@ -88,7 +89,6 @@
     "cancel": "Cancel",
     "submit": "Send"
   },
-  "GDD": "GDD",
   "help": {
     "help": "Help",
     "transactionlist": {
@@ -127,9 +127,9 @@
     "statistic": "Statistic",
     "user_search": "User search"
   },
-  "not_open_creations": "No open creations",
   "no_hashtag": "Hide #hashtags",
   "no_hashtag_tooltip": "Shows only contributions without hashtag in text",
+  "not_open_creations": "No open creations",
   "open": "open",
   "open_creations": "Open creations",
   "overlay": {
@@ -200,7 +200,6 @@
     "title": "All creation-transactions for the user"
   },
   "undelete_user": "Undelete User",
-  "unregistered_emails": "Only unregistered users",
   "unregister_mail": {
     "button": "Confirm registration email, send now",
     "error": "Error sending the confirmation link to the user: {message}",
@@ -210,6 +209,7 @@
     "text_false": "The last email was sent to the member ({email}) on {date}.",
     "text_true": "The email was confirmed."
   },
+  "unregistered_emails": "Only unregistered users",
   "userRole": {
     "notChangeYourSelf": "As an admin/moderator, you cannot change your own role.",
     "selectLabel": "Role:",
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d26b183e6..4842c8b3b 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -127,10 +127,7 @@ describe('CreationConfirm', () => {
     confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
   )
 
-  mockClient.setRequestHandler(
-    getContribution,
-    getContributionMock.mockResolvedValue({ data: {} }),
-  )
+  mockClient.setRequestHandler(getContribution, getContributionMock.mockResolvedValue({ data: {} }))
 
   const Wrapper = () => {
     return mount(CreationConfirm, { localVue, mocks, apolloProvider })
@@ -161,7 +158,7 @@ describe('CreationConfirm', () => {
         expect(wrapper.find('tbody').findAll('tr')).toHaveLength(2)
       })
     })
-    
+
     describe('actions in overlay', () => {
       describe('delete creation', () => {
         beforeEach(async () => {
@@ -523,12 +520,14 @@ describe('CreationConfirm', () => {
 
     describe('reload contribution', () => {
       beforeEach(async () => {
-        await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('reload-contribution', 1)
+        await wrapper
+          .findComponent({ name: 'OpenCreationsTable' })
+          .vm.$emit('reload-contribution', 1)
       })
 
       it('reloaded contribution', () => {
         expect(getContributionMock).toBeCalledWith({
-          id: 1
+          id: 1,
         })
       })
     })
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 763f6e099..65a19df67 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -5,6 +5,9 @@
   "1000thanks": "1000 Dank, weil du bei uns bist!",
   "125": "125%",
   "85": "85%",
+  "GDD": "GDD",
+  "GDT": "GDT",
+  "PersonalDetails": "Persönliche Angaben",
   "advanced-calculation": "Vorausberechnung",
   "asterisks": "****",
   "auth": {
@@ -179,7 +182,6 @@
     },
     "your_amount": "Dein Betrag"
   },
-  "GDD": "GDD",
   "gddKonto": "GDD Konto",
   "gdd_per_link": {
     "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest, und trage eine Nachricht ein. Die Nachricht ist ein Pflichtfeld.",
@@ -214,7 +216,6 @@
     "validUntil": "Gültig bis",
     "validUntilDate": "Der Link ist bis zum {date} gültig."
   },
-  "GDT": "GDT",
   "gdt": {
     "calculation": "Berechnung der Gradido Transform",
     "contribution": "Beitrag",
@@ -278,7 +279,6 @@
     "settings": "Einstellungen",
     "transactions": "Deine Transaktionen"
   },
-  "PersonalDetails": "Persönliche Angaben",
   "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index dbd355794..3d291b1f8 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -5,6 +5,9 @@
   "1000thanks": "1000 thanks for being with us!",
   "125": "125%",
   "85": "85%",
+  "GDD": "GDD",
+  "GDT": "GDT",
+  "PersonalDetails": "Personal details",
   "advanced-calculation": "Advanced calculation",
   "asterisks": "****",
   "auth": {
@@ -179,7 +182,6 @@
     },
     "your_amount": "Your amount"
   },
-  "GDD": "GDD",
   "gddKonto": "GDD Konto",
   "gdd_per_link": {
     "choose-amount": "Select an amount you want to send via link and enter a message. The message is mandatory.",
@@ -214,7 +216,6 @@
     "validUntil": "Valid until",
     "validUntilDate": "The link is valid until {date}."
   },
-  "GDT": "GDT",
   "gdt": {
     "calculation": "Calculation of Gradido Transform",
     "contribution": "Contribution",
@@ -278,7 +279,6 @@
     "settings": "Settings",
     "transactions": "Your transactions"
   },
-  "PersonalDetails": "Personal details",
   "qrCode": "QR Code",
   "send_gdd": "Send GDD",
   "send_per_link": "Send GDD via Link",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 971c7e32f..cea9f26a8 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -3,6 +3,7 @@
   "1000thanks": "1000 Gracias, por estar con nosotros!",
   "125": "125%",
   "85": "85%",
+  "GDD": "GDD",
   "advanced-calculation": "Proyección",
   "asterisks": "****",
   "auth": {
@@ -157,7 +158,6 @@
     },
     "your_amount": "Tu importe"
   },
-  "GDD": "GDD",
   "gdd_per_link": {
     "choose-amount": "Selecciona una cantidad que te gustaría enviar a través de un enlace. También puedes ingresar un mensaje. Cuando haces clic en 'Generar ahora', se crea un enlace que puedes enviar.",
     "copy-link": "Copiar enlace",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 14cb0d21c..66fcc7e21 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -5,6 +5,8 @@
   "1000thanks": "1000 mercis d'être avec nous!",
   "125": "125%",
   "85": "85%",
+  "GDD": "GDD",
+  "GDT": "GDT",
   "advanced-calculation": "Calcul avancé",
   "asterisks": "****",
   "auth": {
@@ -163,7 +165,6 @@
     },
     "your_amount": "Votre montant"
   },
-  "GDD": "GDD",
   "gddKonto": "Compte GDD",
   "gdd_per_link": {
     "choose-amount": "Sélectionnez le montant que vous souhaitez envoyer via lien. Vous pouvez également joindre un message. Cliquez sur ‘créer maintenant’ pour établir un lien que vous pourrez partager.",
@@ -197,7 +198,6 @@
     "validUntil": "Valide jusqu'au",
     "validUntilDate": "Le lien est valide jusqu'au {date}."
   },
-  "GDT": "GDT",
   "gdt": {
     "calculation": "Calcul de Gradido Transform",
     "contribution": "Contribution",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 553415baf..6de08baec 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -3,6 +3,7 @@
   "1000thanks": "1000 dank, omdat je bij ons bent!",
   "125": "125%",
   "85": "85%",
+  "GDD": "GDD",
   "advanced-calculation": "Voorcalculatie",
   "asterisks": "****",
   "auth": {
@@ -157,7 +158,6 @@
     },
     "your_amount": "Jouw bijdrage"
   },
-  "GDD": "GDD",
   "gdd_per_link": {
     "choose-amount": "Kies een bedrag dat je per link versturen wil. Je kunt ook nog een bericht invullen. Wanneer je „Nu genereren“ klikt, wordt er een link gecreëerd die je kunt versturen.",
     "copy-link": "Link kopiëren",
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index bb2d8e078..fcf225505 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -3,6 +3,7 @@
   "1000thanks": "Bizimle olduğun için 1000lerce teşekkür!",
   "125": "%125",
   "85": "%85",
+  "GDD": "GDD",
   "advanced-calculation": "Önceden hesaplama",
   "auth": {
     "left": {
@@ -148,7 +149,6 @@
     },
     "your_amount": "Sendeki tutar"
   },
-  "GDD": "GDD",
   "gdd_per_link": {
     "choose-amount": "Linke tıklayıp göndermek istediğiniz tutarı seç. Ayrıca bir mesaj da girebilirsin. Paylaşabileceğin bir bağlantı oluşturmak için 'Şimdi oluştur'a tıkla.",
     "copy-link": "Linki kopyala ",

From 50ecb94f2c233c052e0e09aeeae974ba41047e36 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Thu, 16 Nov 2023 14:29:44 +0100
Subject: [PATCH 5/5] fix linting

---
 backend/src/emails/sendEmailVariants.test.ts         |  7 +++----
 backend/src/graphql/resolver/ContributionResolver.ts | 12 +++++++++---
 .../UnconfirmedContributionAdmin.role.ts             | 11 +++++++----
 .../UnconfirmedContributionUser.role.ts              | 10 ++++++----
 .../UpdateUnconfirmedContribution.context.ts         |  4 ++--
 backend/src/util/time.ts                             |  4 +++-
 frontend/src/pages/Community.vue                     |  5 ++++-
 7 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index f0c431586..9a2cb4ce0 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -11,8 +11,6 @@ import { logger, i18n as localization } from '@test/testSetup'
 
 import { CONFIG } from '@/config'
 
-CONFIG.EMAIL_SENDER = 'info@gradido.net'
-
 import { sendEmailTranslated } from './sendEmailTranslated'
 import {
   sendAddedContributionMessageEmail,
@@ -27,6 +25,8 @@ import {
   sendContributionChangedByModeratorEmail,
 } from './sendEmailVariants'
 
+CONFIG.EMAIL_SENDER = 'info@gradido.net'
+
 let con: Connection
 let testEnv: {
   mutate: ApolloServerTestClient['mutate']
@@ -299,7 +299,7 @@ describe('sendEmailVariants', () => {
         senderFirstName: 'Bibi',
         senderLastName: 'Bloxberg',
         contributionMemo: 'My contribution.',
-        contributionMemoUpdated: 'This is a better contribution memo.'
+        contributionMemoUpdated: 'This is a better contribution memo.',
       })
     })
 
@@ -328,7 +328,6 @@ describe('sendEmailVariants', () => {
 
     describe('result', () => {
       it('is the expected object', () => {
-        console.log(result.originalMessage.text)
         expect(result).toMatchObject({
           envelope: {
             from: 'info@gradido.net',
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 84106aa37..fb0551dd1 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -22,6 +22,12 @@ import { OpenCreation } from '@model/OpenCreation'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 
 import { RIGHTS } from '@/auth/RIGHTS'
+import {
+  sendContributionChangedByModeratorEmail,
+  sendContributionConfirmedEmail,
+  sendContributionDeletedEmail,
+  sendContributionDeniedEmail,
+} from '@/emails/sendEmailVariants'
 import {
   EVENT_CONTRIBUTION_CREATE,
   EVENT_CONTRIBUTION_DELETE,
@@ -45,7 +51,6 @@ import { getUserCreation, validateContribution, getOpenCreations } from './util/
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
 import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
-import { sendContributionChangedByModeratorEmail, sendContributionConfirmedEmail, sendContributionDeletedEmail, sendContributionDeniedEmail } from '@/emails/sendEmailVariants'
 
 @Resolver()
 export class ContributionResolver {
@@ -255,7 +260,8 @@ export class ContributionResolver {
       adminUpdateContributionArgs,
       context,
     )
-    const { contribution, contributionMessage, createdByUserChangedByModerator } = await updateUnconfirmedContributionContext.run()
+    const { contribution, contributionMessage, createdByUserChangedByModerator } =
+      await updateUnconfirmedContributionContext.run()
     await getConnection().transaction(async (transactionalEntityManager: EntityManager) => {
       await Promise.all([
         transactionalEntityManager.save(contribution),
@@ -288,7 +294,7 @@ export class ContributionResolver {
         senderFirstName: moderator.firstName,
         senderLastName: moderator.lastName,
         contributionMemo: updateUnconfirmedContributionContext.getOldMemo(),
-        contributionMemoUpdated: contribution.memo
+        contributionMemoUpdated: contribution.memo,
       })
     }
 
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
index c55283272..cb62e2086 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
@@ -41,13 +41,16 @@ export class UnconfirmedContributionAdminRole extends UnconfirmedContributionRol
     }
     return this
   }
+
   protected async validate(clientTimezoneOffset: number): Promise<void> {
     await super.validate(clientTimezoneOffset)
     // creation date is currently not changeable
-    if (this.self.memo === this.updateData.memo && 
-        this.self.amount === this.updatedAmount &&
-        this.self.contributionDate.getTime() === (new Date(this.updatedCreationDate).getTime())) {
-        throw new LogError("the contribution wasn't changed at all")          
+    if (
+      this.self.memo === this.updateData.memo &&
+      this.self.amount === this.updatedAmount &&
+      this.self.contributionDate.getTime() === new Date(this.updatedCreationDate).getTime()
+    ) {
+      throw new LogError("the contribution wasn't changed at all")
     }
   }
 }
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
index 85374e3e8..8de960ed2 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
@@ -47,10 +47,12 @@ export class UnconfirmedContributionUserRole extends UnconfirmedContributionRole
   protected async validate(clientTimezoneOffset: number): Promise<void> {
     await super.validate(clientTimezoneOffset)
     // creation date is currently not changeable
-    if (this.self.memo === this.updateData.memo && 
-        this.self.amount === this.updatedAmount &&
-        this.self.contributionDate.getTime() === (new Date(this.updatedCreationDate).getTime())) {
-        throw new LogError("the contribution wasn't changed at all")          
+    if (
+      this.self.memo === this.updateData.memo &&
+      this.self.amount === this.updatedAmount &&
+      this.self.contributionDate.getTime() === new Date(this.updatedCreationDate).getTime()
+    ) {
+      throw new LogError("the contribution wasn't changed at all")
     }
   }
 }
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts
index 561866597..995de1658 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts
@@ -34,7 +34,7 @@ export class UpdateUnconfirmedContributionContext {
   public async run(): Promise<{
     contribution: Contribution
     contributionMessage: ContributionMessage
-    availableCreationSums: Decimal[],
+    availableCreationSums: Decimal[]
     createdByUserChangedByModerator: boolean
   }> {
     let createdByUserChangedByModerator = false
@@ -84,7 +84,7 @@ export class UpdateUnconfirmedContributionContext {
       contribution: contributionToUpdate,
       contributionMessage: contributionMessageBuilder.build(),
       availableCreationSums: unconfirmedContributionRole.getAvailableCreationSums(),
-      createdByUserChangedByModerator
+      createdByUserChangedByModerator,
     }
   }
 
diff --git a/backend/src/util/time.ts b/backend/src/util/time.ts
index 45b886702..538735766 100644
--- a/backend/src/util/time.ts
+++ b/backend/src/util/time.ts
@@ -1,4 +1,6 @@
-export const getTimeDurationObject = (time: number): {
+export const getTimeDurationObject = (
+  time: number,
+): {
   hours?: number
   minutes: number
 } => {
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 2381b5be1..8a1107766 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -187,7 +187,10 @@ export default {
       const originalContributionDate = new Date(this.originalContributionDate)
       if (this.openCreations && this.openCreations.length)
         return this.openCreations.slice(1).map((creation) => {
-          if (creation.year === originalContributionDate.getFullYear() && creation.month === originalContributionDate.getMonth())
+          if (
+            creation.year === originalContributionDate.getFullYear() &&
+            creation.month === originalContributionDate.getMonth()
+          )
             return parseInt(creation.amount) + this.amountToAdd
           return parseInt(creation.amount)
         })