From d8145bbc78e3f76a6c50ae6635724dfcef7c9269 Mon Sep 17 00:00:00 2001 From: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Date: Fri, 30 May 2025 04:31:34 -0400 Subject: [PATCH] Remove error if team members and hosts do not match (#21598) --- ...findTeamMembersMatchingAttributeLogicOfRoute.handler.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts index 5fe7bb2ed1..ff35fd7aec 100644 --- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts +++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts @@ -255,16 +255,15 @@ export const findTeamMembersMatchingAttributeLogicOfRouteHandler = async ({ } const matchingTeamMembersIds = matchingTeamMembersWithResult.map((member) => member.userId); - const matchingTeamMembers = await UserRepository.findByIds({ ids: matchingTeamMembersIds }); const matchingHosts = await enrichHostsWithDelegationCredentials({ orgId: formOrgId, hosts: eventType.hosts.filter((host) => matchingTeamMembersIds.includes(host.user.id)), }); - if (matchingTeamMembers.length !== matchingHosts.length) { + if (!matchingHosts.length) { throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", - message: "Looks like not all matching team members are assigned to the event", + message: "No matching team members found", }); } @@ -273,7 +272,7 @@ export const findTeamMembersMatchingAttributeLogicOfRouteHandler = async ({ users: orderedLuckyUsers, perUserData, isUsingAttributeWeights, - } = matchingTeamMembers.length + } = matchingHosts.length ? await getOrderedListOfLuckyUsers({ // Assuming all are available availableUsers: [