From 5c5f1ebc9c20a8c53f4e5f88a2359fcc36d4b7a3 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Fri, 11 Aug 2023 20:24:43 +0200
Subject: [PATCH] add memo search to find function, update placeholder in admin

---
 admin/src/components/UserQuery.vue                   |  2 +-
 admin/src/locales/de.json                            |  3 ++-
 admin/src/locales/en.json                            |  3 ++-
 .../src/graphql/resolver/util/findContributions.ts   | 12 ++++++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/UserQuery.vue b/admin/src/components/UserQuery.vue
index 2a31a8dea..8e28c1c0c 100644
--- a/admin/src/components/UserQuery.vue
+++ b/admin/src/components/UserQuery.vue
@@ -5,7 +5,7 @@
         type="text"
         class="test-input-criteria"
         v-model="currentValue"
-        :placeholder="$t('user_search')"
+        :placeholder="$t('user_memo_search')"
       ></b-form-input>
       <b-input-group-append class="test-click-clear-criteria" @click="currentValue = ''">
         <b-input-group-text class="pointer">
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index d4209ce83..fd7eae320 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -217,5 +217,6 @@
   },
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
-  "user_search": "Nutzer-Suche"
+  "user_search": "Nutzer-Suche",
+  "user_memo_search": "Nutzer-Kommentar-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 35aacfa69..b501a521f 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -217,5 +217,6 @@
   },
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
-  "user_search": "User search"
+  "user_search": "User search",
+  "user_memo_search": "User and Memo search"
 }
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index b35d75b6b..762f9ace0 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -33,8 +33,8 @@ export const findContributions = async (
     ...(statusFilter?.length && { contributionStatus: In(statusFilter) }),
     ...(userId && { userId }),
   }
-
-  const where =
+  
+  let where =
     query && relations?.user
       ? [
           {
@@ -57,8 +57,16 @@ export const findContributions = async (
               },
             },
           },
+          {
+            ...requiredWhere,
+            memo: Like(`%${query}%`)
+          },
         ]
       : requiredWhere
+  
+  if (!relations?.user && query) {
+    where = [{...requiredWhere, memo: Like(`%${query}%`)}]
+  }
 
   return DbContribution.findAndCount({
     relations,