diff --git a/packages/hoppscotch-backend/src/team/team.service.ts b/packages/hoppscotch-backend/src/team/team.service.ts index 71c37ec7f..bc5a0bb9b 100644 --- a/packages/hoppscotch-backend/src/team/team.service.ts +++ b/packages/hoppscotch-backend/src/team/team.service.ts @@ -264,37 +264,25 @@ export class TeamService implements UserDataHandler, OnModuleInit { } async getTeamsOfUser(uid: string, cursor: string | null): Promise { - if (!cursor) { - const entries = await this.prisma.teamMember.findMany({ - take: 10, - where: { - userUid: uid, - }, - include: { - team: true, - }, - }); - - return entries.map((entry) => entry.team); - } else { - const entries = await this.prisma.teamMember.findMany({ - take: 10, - skip: 1, - cursor: { - teamID_userUid: { - teamID: cursor, - userUid: uid, - }, - }, - where: { - userUid: uid, - }, - include: { - team: true, - }, - }); - return entries.map((entry) => entry.team); - } + const entries = await this.prisma.teamMember.findMany({ + take: 10, + skip: cursor ? 1 : 0, + cursor: cursor + ? { + teamID_userUid: { + teamID: cursor, + userUid: uid, + }, + } + : undefined, + where: { + userUid: uid, + }, + include: { + team: true, + }, + }); + return entries.map((entry) => entry.team); } async getTeamWithID(teamID: string): Promise {