From 6843ced3db20a3fa66fdfce5171211a917baf275 Mon Sep 17 00:00:00 2001
From: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date: Fri, 24 Oct 2025 07:44:47 +0100
Subject: [PATCH] Use correct memebrships for permission calculations (#24653)

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
---
 .../routers/viewer/eventTypes/usecases/EventGroupBuilder.ts    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts b/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
index 4d4fcf34c4..c4efce7fb1 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/usecases/EventGroupBuilder.ts
@@ -68,7 +68,8 @@ export class EventGroupBuilder {
       },
     }));
 
-    const teamMemberships = accessibleMemberships.map((membership) => ({
+    // This ensures org roles are considered when calculating effective permissions
+    const teamMemberships = profileMemberships.map((membership) => ({
       teamId: membership.team.id,
       membershipRole: membership.role,
     }));