diff --git a/apps/api/v1/lib/utils/retrieveScopedAccessibleUsers.ts b/apps/api/v1/lib/utils/retrieveScopedAccessibleUsers.ts index 9e80317de0..08bfc37dd7 100644 --- a/apps/api/v1/lib/utils/retrieveScopedAccessibleUsers.ts +++ b/apps/api/v1/lib/utils/retrieveScopedAccessibleUsers.ts @@ -27,7 +27,7 @@ const getAllAdminMemberships = async (userId: number) => { where: { userId: userId, accepted: true, - OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }], + role: { in: [MembershipRole.OWNER, MembershipRole.ADMIN] }, }, select: { team: { @@ -56,16 +56,19 @@ export const getAccessibleUsers = async ({ memberUserIds, adminUserId, }: AccessibleUsersType): Promise => { + const orConditions = []; + if (memberUserIds.length > 0) { + orConditions.push({ userId: { in: memberUserIds } }); + } + orConditions.push({ userId: adminUserId, role: { in: [MembershipRole.OWNER, MembershipRole.ADMIN] } }); + const memberships = await prisma.membership.findMany({ where: { team: { isOrganization: true, }, accepted: true, - OR: [ - { userId: { in: memberUserIds } }, - { userId: adminUserId, role: { in: [MembershipRole.OWNER, MembershipRole.ADMIN] } }, - ], + OR: orConditions, }, select: { userId: true,