Rename isDeleted to deletedAt

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 {

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,
             },
           }),
         )

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',
         })

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,
               },
             }),
           )

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',
         })

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
 }

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<SearchUsersResult> {
     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']