From e8aba864309665c5842c24cf95a94856e1aceb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 20 Apr 2022 08:53:12 +0200 Subject: [PATCH] Rename isDeleted to deletedAt --- admin/src/graphql/searchUsers.js | 4 ++-- admin/src/pages/Creation.spec.js | 8 ++++---- admin/src/pages/Creation.vue | 2 +- admin/src/pages/UserSearch.spec.js | 12 ++++++------ admin/src/pages/UserSearch.vue | 2 +- backend/src/graphql/arg/SearchUsersArgs.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index ca7bc4718..fc81f3f1b 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -6,14 +6,14 @@ export const searchUsers = gql` $currentPage: Int $pageSize: Int $emailChecked: Boolean - $isDeleted: Boolean + $deletedAt: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize emailChecked: $emailChecked - isDeleted: $isDeleted + deletedAt: $deletedAt ) { userCount userList { diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 1f172139b..e60625dd2 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -72,7 +72,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -272,7 +272,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -289,7 +289,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -306,7 +306,7 @@ describe('Creation', () => { currentPage: 2, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 6657b5915..30900a468 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -103,7 +103,7 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, emailChecked: true, - isDeleted: false, + deletedAt: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 18950c46a..907cbd7e0 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -83,7 +83,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -102,7 +102,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: null, + deletedAt: null, }, }), ) @@ -122,7 +122,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: true, + deletedAt: true, }, }), ) @@ -142,7 +142,7 @@ describe('UserSearch', () => { currentPage: 2, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -162,7 +162,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -179,7 +179,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 06abd25aa..e5f584a25 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -86,7 +86,7 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, emailChecked: this.filterCheckedEmails, - isDeleted: this.filterDeletedUser, + deletedAt: this.filterDeletedUser, }, fetchPolicy: 'no-cache', }) diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 677d1958b..103152bac 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -15,5 +15,5 @@ export default class SearchUsersArgs { emailChecked?: boolean | null @Field(() => Boolean, { nullable: true }) - isDeleted?: boolean | null + deletedAt?: boolean | null } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2801a2b81..495e6fb3f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -57,7 +57,7 @@ export class AdminResolver { currentPage = 1, pageSize = 25, emailChecked = null, - isDeleted = null, + deletedAt = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) @@ -67,8 +67,8 @@ export class AdminResolver { filterCriteria.push({ emailChecked: emailChecked }) } - if (isDeleted !== null) { - filterCriteria.push({ deletedAt: isDeleted ? Not(IsNull()) : IsNull() }) + if (deletedAt !== null) { + filterCriteria.push({ deletedAt: deletedAt ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']