From e5bbc46b0fead8ab52585473a4b2c135be26b39c Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Tue, 1 Jul 2025 00:07:10 -0400
Subject: [PATCH] Add org caching + fix a line

---
 backend/src/services/org/org-service.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts
index c509ec2db..0c1d64b90 100644
--- a/backend/src/services/org/org-service.ts
+++ b/backend/src/services/org/org-service.ts
@@ -1434,14 +1434,21 @@ export const orgServiceFactory = ({
     const invitedUsers = await orgMembershipDAL.findRecentInvitedMemberships();
     const appCfg = getConfig();
 
+    const orgCache: Record<string, { name: string; id: string } | undefined> = {};
+
     await Promise.all(
       invitedUsers.map(async (invitedUser) => {
-        const org = await orgDAL.findById(invitedUser.orgId);
-        if (!org) return;
+        let org = orgCache[invitedUser.orgId];
+        if (!org) {
+          org = await orgDAL.findById(invitedUser.orgId);
+          orgCache[invitedUser.orgId] = org;
+        }
+
+        if (!org || !invitedUser.userId) return;
 
         const token = await tokenService.createTokenForUser({
           type: TokenType.TOKEN_EMAIL_ORG_INVITATION,
-          userId: invitedUser.id,
+          userId: invitedUser.userId,
           orgId: org.id
         });