From 626585f5d0a45f8b6a6c0da90d5075ad4123f580 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Wed, 22 Oct 2025 21:30:26 +0530 Subject: [PATCH] fix: Handle empty array in Prisma OR conditions for Prisma 6.16 (#24638) After upgrading to Prisma 6.16.0, empty arrays in 'in' clauses within OR conditions are now optimized to return no results. This caused integration tests to fail when querying memberships with empty memberUserIds arrays. Changes: - Dynamically build OR conditions to exclude empty 'in' arrays - Simplify getAllAdminMemberships to use 'in' instead of OR for roles - Fixes retrieveScopedAccessibleUsers and getAccessibleUsers queries Fixes integration test failures: - apps/api/v1/test/lib/utils/retrieveScopedAccessibleUsers.integration-test.ts - apps/api/v1/test/lib/bookings/[id]/_patch.integration-test.ts Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .../v1/lib/utils/retrieveScopedAccessibleUsers.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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,