Skip to content

⚡ Bolt: [performance improvement] Bypass redundant database calls in tenant resolution #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brycejohnson1417 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡ Bolt: [performance improvement] Bypass redundant database calls in tenant resolution #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .jules/bolt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 2024-05-14 - Bypass redundant getWorkspaceExperienceBySlug calls in tenant resolution
**Learning:** When fetching organizations upfront (like in batch queries for memberships), calling `getWorkspaceExperienceBySlug` introduces redundant database lookups because it refetches the organization. `compileWorkspaceExperience` can be called directly synchronously if the `Organization` object is already available.
**Action:** Always check if the full `Organization` object is already fetched in the current execution flow. If so, bypass cached fetchers and directly use `compileWorkspaceExperience` to avoid N+1-like redundant queries during tenant resolution.
4 changes: 2 additions & 2 deletions lib/application/auth/tenant-access-selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export interface MembershipSelectionOrganization {
slug: string;
}

export function selectMembershipOrganization(input: {
export function selectMembershipOrganization<T extends MembershipSelectionOrganization>(input: {
memberships: MembershipSelectionMember[];
organizationsById: Map<string, MembershipSelectionOrganization>;
organizationsById: Map<string, T>;
requestedSlug?: string | null;
}) {
const requestedSlug = input.requestedSlug?.trim() || null;
Expand Down
7 changes: 4 additions & 3 deletions lib/application/auth/tenant-access.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from "@/lib/application/auth/tenant-routing";
import { selectMembershipOrganization } from "@/lib/application/auth/tenant-access-selection";
import { getWorkspaceExperienceBySlug } from "@/lib/application/workspace/workspace-service";
import { compileWorkspaceExperience } from "@/lib/platform/workspace/compiler";
import { OrganizationMemberRepository } from "@/lib/infrastructure/supabase/organization-member-repository";
import { OrganizationRepository } from "@/lib/infrastructure/supabase/organization-repository";
import { resolveWorkspaceTemplateForEmailDomain } from "@/lib/platform/workspace/registry";
Expand Down Expand Up @@ -110,7 +111,7 @@ export async function resolveTenantAccess(
});

if (organization) {
const workspace = await getWorkspaceExperienceBySlug(organization.slug);
const workspace = compileWorkspaceExperience({ slug: organization.slug, organization });
return existingWorkspaceAccess({
slug: organization.slug,
name: organization.name,
Expand All @@ -124,7 +125,7 @@ export async function resolveTenantAccess(
if (emailDomain) {
const workspaceOrganization = await organizations.findFirstByWorkspaceEmailDomain(emailDomain);
if (workspaceOrganization && (!requestedSlug || workspaceOrganization.slug === requestedSlug)) {
const workspace = await getWorkspaceExperienceBySlug(workspaceOrganization.slug);
const workspace = compileWorkspaceExperience({ slug: workspaceOrganization.slug, organization: workspaceOrganization });
return existingWorkspaceAccess({
slug: workspaceOrganization.slug,
name: workspaceOrganization.name,
Expand All @@ -143,7 +144,7 @@ export async function resolveTenantAccess(
if (guessed.slug) {
const existingOrganization = await organizations.findBySlug(guessed.slug).catch(() => null);
if (existingOrganization) {
const workspace = await getWorkspaceExperienceBySlug(existingOrganization.slug);
const workspace = compileWorkspaceExperience({ slug: existingOrganization.slug, organization: existingOrganization });
return existingWorkspaceAccess({
slug: existingOrganization.slug,
name: existingOrganization.name,
Expand Down
Loading