From 59a16a8c4651c98f350b162c5f7c273fd0669df5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 14 Jun 2023 13:45:02 +0200
Subject: [PATCH] refactor query

---
 backend/src/graphql/arg/SearchUsersArgs.ts | 21 ---------------------
 backend/src/seeds/graphql/queries.ts       | 13 ++++++++++---
 2 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 backend/src/graphql/arg/SearchUsersArgs.ts

diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts
deleted file mode 100644
index 0ebc442c3..000000000
--- a/backend/src/graphql/arg/SearchUsersArgs.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ArgsType, Field, Int } from 'type-graphql'
-
-import { SearchUsersFilters } from '@arg/SearchUsersFilters'
-
-@ArgsType()
-export class SearchUsersArgs {
-  @Field(() => String)
-  searchText: string
-
-  @Field(() => Int, { nullable: true })
-  // eslint-disable-next-line type-graphql/invalid-nullable-input-type
-  currentPage?: number
-
-  @Field(() => Int, { nullable: true })
-  // eslint-disable-next-line type-graphql/invalid-nullable-input-type
-  pageSize?: number
-
-  // eslint-disable-next-line type-graphql/wrong-decorator-signature
-  @Field(() => SearchUsersFilters, { nullable: true, defaultValue: null })
-  filters?: SearchUsersFilters | null
-}
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index ce7efbfc3..a964cdb3a 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -69,12 +69,19 @@ export const sendResetPasswordEmail = gql`
 `
 
 export const searchUsers = gql`
-  query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) {
+  query (
+    $query: String!
+    $filters: SearchUsersFilters
+    $currentPage: Int = 1
+    $pageSize: Int = 25
+    $order: Order = ASC
+  ) {
     searchUsers(
-      searchText: $searchText
+      query: $query
+      filters: $filters
       currentPage: $currentPage
       pageSize: $pageSize
-      filters: $filters
+      order: $order
     ) {
       userCount
       userList {