Fold userPlan into getOrganizationBillingInfo as a single query

Instead of a separate resolveOrganizationPlan call, embed a scalar subquery
in getOrganizationBillingInfo that checks if any org member has plan "pro".
All trigger paths now read billingInfo.userPlan with no extra round trip.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: bchapuis

apps/api/src/db/queries.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { and, eq } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import { v7 as uuidv7 } from "uuid";
 
 import { TRIAL_CREDITS } from "../constants/billing";
@@ -2128,7 +2128,8 @@ export async function getOrganizationComputeCredits(
 }
 
 /**
- * Get organization billing info for workflow execution
+ * Get organization billing info for workflow execution.
+ * Includes the best user plan in the org (pro > trial) via a single query.
  */
 export async function getOrganizationBillingInfo(
   db: ReturnType<typeof createDatabase>,
@@ -2139,6 +2140,7 @@ export async function getOrganizationBillingInfo(
       subscriptionStatus: string | null;
       currentPeriodEnd: Date | null;
       overageLimit: number | null;
+      userPlan: string;
     }
   | undefined
 > {
@@ -2148,32 +2150,20 @@ export async function getOrganizationBillingInfo(
       subscriptionStatus: organizations.subscriptionStatus,
       currentPeriodEnd: organizations.currentPeriodEnd,
       overageLimit: organizations.overageLimit,
+      userPlan: sql<string>`coalesce(
+        (select ${users.plan} from ${users}
+         where ${users.organizationId} = ${organizations.id}
+           and ${users.plan} = ${Plan.PRO}
+         limit 1),
+        ${Plan.TRIAL}
+      )`.as("user_plan"),
     })
     .from(organizations)
     .where(eq(organizations.id, organizationId))
     .limit(1);
   return organization;
 }
 
-/**
- * Resolve user plan for an organization by checking its members.
- * Used by automated triggers where no specific user context is available.
- * Returns "pro" if any member has a pro plan, "trial" otherwise.
- */
-export async function resolveOrganizationPlan(
-  db: ReturnType<typeof createDatabase>,
-  organizationId: string
-): Promise<string> {
-  const [user] = await db
-    .select({ plan: users.plan })
-    .from(users)
-    .where(
-      and(eq(users.organizationId, organizationId), eq(users.plan, Plan.PRO))
-    )
-    .limit(1);
-  return user?.plan ?? Plan.TRIAL;
-}
-
 /**
  * Create a new secret for an organization
  *

apps/api/src/email.ts

@@ -1,11 +1,7 @@
 import type { Workflow } from "@dafthunk/types";
 
 import type { Bindings } from "./context";
-import {
-  createDatabase,
-  getOrganizationBillingInfo,
-  resolveOrganizationPlan,
-} from "./db";
+import { createDatabase, getOrganizationBillingInfo } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
 import { WorkflowStore } from "./stores/workflow-store";
@@ -179,7 +175,7 @@ async function triggerWorkflowForEmail({
     userId: "email_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: await resolveOrganizationPlan(db, organizationId),
+    userPlan: billingInfo.userPlan,
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/queue.ts

@@ -4,7 +4,6 @@ import { createDatabase } from "./db";
 import {
   getOrganizationBillingInfo,
   getQueueTriggersByQueue,
-  resolveOrganizationPlan,
 } from "./db/queries";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -42,7 +41,7 @@ async function executeWorkflow(
       userId: "queue_trigger",
       organizationId: workflowInfo.organizationId,
       computeCredits: billingInfo.computeCredits,
-      userPlan: await resolveOrganizationPlan(db, workflowInfo.organizationId),
+      userPlan: billingInfo.userPlan,
       workflow: {
         id: workflowInfo.id,
         name: workflowData.name,

apps/api/src/routes/discord-webhook.ts

@@ -8,7 +8,6 @@ import {
   getDiscordBotById,
   getDiscordTriggersByBot,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -299,7 +298,7 @@ async function executeWorkflow(
     userId: "discord_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: await resolveOrganizationPlan(db, organizationId),
+    userPlan: billingInfo.userPlan,
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/routes/telegram-webhook.ts

@@ -8,7 +8,6 @@ import {
   getTelegramBot,
   getTelegramSecretTokenByBot,
   getTelegramTriggersByBot,
-  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -216,7 +215,7 @@ async function executeWorkflow(
     userId: "telegram_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: await resolveOrganizationPlan(db, organizationId),
+    userPlan: billingInfo.userPlan,
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/routes/whatsapp-webhook.ts

@@ -8,7 +8,6 @@ import {
   getWhatsAppAccount,
   getWhatsAppTriggersByAccount,
   getWhatsAppVerifyTokenByAccount,
-  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -322,7 +321,7 @@ async function executeWorkflow(
     userId: "whatsapp_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: await resolveOrganizationPlan(db, organizationId),
+    userPlan: billingInfo.userPlan,
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/scheduled.ts

@@ -5,7 +5,6 @@ import {
   createDatabase,
   getActiveScheduledTriggers,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
 } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -74,7 +73,7 @@ export async function handleScheduledEvent(
         userId: "scheduled_trigger",
         organizationId: workflow.organizationId,
         computeCredits: billingInfo.computeCredits,
-        userPlan: await resolveOrganizationPlan(db, workflow.organizationId),
+        userPlan: billingInfo.userPlan,
         workflow: {
           id: workflow.id,
           name: workflow.name,