From 9694c0d373b335cf4a9f7afe85de6324bfe3c622 Mon Sep 17 00:00:00 2001
From: mirarifhasan <arif.ishan05@gmail.com>
Date: Mon, 29 Apr 2024 22:29:39 +0600
Subject: [PATCH] refactor: getMembersOfTeam function improved

---
 .../src/team/team.service.ts                  | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/hoppscotch-backend/src/team/team.service.ts b/packages/hoppscotch-backend/src/team/team.service.ts
index 86e65e0dd..e4e23d73c 100644
--- a/packages/hoppscotch-backend/src/team/team.service.ts
+++ b/packages/hoppscotch-backend/src/team/team.service.ts
@@ -459,25 +459,12 @@ export class TeamService implements UserDataHandler, OnModuleInit {
   ): Promise<TeamMember[]> {
     let teamMembers: DbTeamMember[];
 
-    if (!cursor) {
-      teamMembers = await this.prisma.teamMember.findMany({
-        take: 10,
-        where: {
-          teamID,
-        },
-      });
-    } else {
-      teamMembers = await this.prisma.teamMember.findMany({
-        take: 10,
-        skip: 1,
-        cursor: {
-          id: cursor,
-        },
-        where: {
-          teamID,
-        },
-      });
-    }
+    teamMembers = await this.prisma.teamMember.findMany({
+      take: 10,
+      skip: cursor ? 1 : 0,
+      cursor: cursor ? { id: cursor } : undefined,
+      where: { teamID },
+    });
 
     const members = teamMembers.map(
       (entry) =>