From 9ceef43c7425e44fcdfc591d459b22e79c7ff0df Mon Sep 17 00:00:00 2001
From: mirarifhasan <arif.ishan05@gmail.com>
Date: Mon, 29 Jan 2024 17:38:41 +0600
Subject: [PATCH] feat: change fetchAllUsersV2 to fetchAllUsers

---
 .../src/admin/admin.service.ts                  | 15 ++-------------
 .../src/admin/infra.resolver.ts                 | 14 ++------------
 .../hoppscotch-backend/src/user/user.service.ts | 17 +----------------
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/packages/hoppscotch-backend/src/admin/admin.service.ts b/packages/hoppscotch-backend/src/admin/admin.service.ts
index c4e1c579d..e16f3c6e2 100644
--- a/packages/hoppscotch-backend/src/admin/admin.service.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.service.ts
@@ -45,28 +45,17 @@ export class AdminService {
     private readonly configService: ConfigService,
   ) {}
 
-  /**
-   * Fetch all the users in the infra.
-   * @param cursorID Users uid
-   * @param take number of users to fetch
-   * @returns an Either of array of user or error
-   */
-  async fetchUsers(cursorID: string, take: number) {
-    const allUsers = await this.userService.fetchAllUsers(cursorID, take);
-    return allUsers;
-  }
-
   /**
    * Fetch all the users in the infra.
    * @param searchString search on users displayName or email
    * @param paginationOption pagination options
    * @returns an Either of array of user or error
    */
-  async fetchUsersV2(
+  async fetchUsers(
     searchString: string,
     paginationOption: OffsetPaginationArgs,
   ) {
-    const allUsers = await this.userService.fetchAllUsersV2(
+    const allUsers = await this.userService.fetchAllUsers(
       searchString,
       paginationOption,
     );
diff --git a/packages/hoppscotch-backend/src/admin/infra.resolver.ts b/packages/hoppscotch-backend/src/admin/infra.resolver.ts
index 459c95c84..0881512be 100644
--- a/packages/hoppscotch-backend/src/admin/infra.resolver.ts
+++ b/packages/hoppscotch-backend/src/admin/infra.resolver.ts
@@ -79,19 +79,9 @@ export class InfraResolver {
 
   @ResolveField(() => [User], {
     description: 'Returns a list of all the users in infra',
-    deprecationReason: 'Use allUsersV2 instead',
   })
   @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async allUsers(@Args() args: PaginationArgs): Promise<AuthUser[]> {
-    const users = await this.adminService.fetchUsers(args.cursor, args.take);
-    return users;
-  }
-
-  @ResolveField(() => [User], {
-    description: 'Returns a list of all the users in infra',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async allUsersV2(
+  async allUsers(
     @Args({
       name: 'searchString',
       nullable: true,
@@ -100,7 +90,7 @@ export class InfraResolver {
     searchString: string,
     @Args() paginationOption: OffsetPaginationArgs,
   ): Promise<AuthUser[]> {
-    const users = await this.adminService.fetchUsersV2(
+    const users = await this.adminService.fetchUsers(
       searchString,
       paginationOption,
     );
diff --git a/packages/hoppscotch-backend/src/user/user.service.ts b/packages/hoppscotch-backend/src/user/user.service.ts
index 864beb6e2..379820124 100644
--- a/packages/hoppscotch-backend/src/user/user.service.ts
+++ b/packages/hoppscotch-backend/src/user/user.service.ts
@@ -282,28 +282,13 @@ export class UserService {
     return E.right(jsonSession.right);
   }
 
-  /**
-   * Fetch all the users in the `User` table based on cursor
-   * @param cursorID string of userUID or null
-   * @param take number of users to query
-   * @returns an array of `User` object
-   */
-  async fetchAllUsers(cursorID: string, take: number) {
-    const fetchedUsers = await this.prisma.user.findMany({
-      skip: cursorID ? 1 : 0,
-      take: take,
-      cursor: cursorID ? { uid: cursorID } : undefined,
-    });
-    return fetchedUsers;
-  }
-
   /**
    * Fetch all the users in the `User` table based on cursor
    * @param searchString search on user's displayName or email
    * @param paginationOption pagination options
    * @returns an array of `User` object
    */
-  async fetchAllUsersV2(
+  async fetchAllUsers(
     searchString: string,
     paginationOption: OffsetPaginationArgs,
   ) {