diff --git a/packages/hoppscotch-backend/src/admin/admin.service.ts b/packages/hoppscotch-backend/src/admin/admin.service.ts index 649bd9c48..e2409a657 100644 --- a/packages/hoppscotch-backend/src/admin/admin.service.ts +++ b/packages/hoppscotch-backend/src/admin/admin.service.ts @@ -145,9 +145,23 @@ export class AdminService { * @returns an Either of array of `InvitedUser` object or error */ async fetchInvitedUsers() { - const invitedUsers = await this.prisma.invitedUsers.findMany(); + const userEmailObjs = await this.prisma.user.findMany({ + select: { + email: true, + }, + }); - const users: InvitedUser[] = invitedUsers.map( + const pendingInvitedUsers = await this.prisma.invitedUsers.findMany({ + where: { + NOT: { + inviteeEmail: { + in: userEmailObjs.map((user) => user.email), + }, + }, + }, + }); + + const users: InvitedUser[] = pendingInvitedUsers.map( (user) => { ...user }, );