perf(db): reduce read/write fanout across hot paths (#4704)

* perf(db): reduce read/write fanout across hot paths

* fix(templates): include name/workflowId/status/tags in DELETE projection

* fix(db): address review feedback (joinedAt backfill, mcp delete error, chatDeploy projection, sql newline)

* fix(webhooks): include NULL failedCount in markWebhookSuccess guard

Author: waleedlatif1

apps/sim/app/api/templates/[id]/route.ts

@@ -311,7 +311,17 @@ export const DELETE = withRouteHandler(
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
       }
 
-      const existing = await db.select().from(templates).where(eq(templates.id, id)).limit(1)
+      const existing = await db
+        .select({
+          name: templates.name,
+          workflowId: templates.workflowId,
+          creatorId: templates.creatorId,
+          status: templates.status,
+          tags: templates.tags,
+        })
+        .from(templates)
+        .where(eq(templates.id, id))
+        .limit(1)
       if (existing.length === 0) {
         logger.warn(`[${requestId}] Template not found for delete: ${id}`)
         return NextResponse.json({ error: 'Template not found' }, { status: 404 })

apps/sim/app/api/users/me/settings/route.ts

@@ -39,7 +39,24 @@ export const GET = withRouteHandler(async () => {
     }
 
     const userId = session.user.id
-    const result = await db.select().from(settings).where(eq(settings.userId, userId)).limit(1)
+    const result = await db
+      .select({
+        theme: settings.theme,
+        autoConnect: settings.autoConnect,
+        telemetryEnabled: settings.telemetryEnabled,
+        emailPreferences: settings.emailPreferences,
+        billingUsageNotificationsEnabled: settings.billingUsageNotificationsEnabled,
+        showTrainingControls: settings.showTrainingControls,
+        superUserModeEnabled: settings.superUserModeEnabled,
+        mothershipEnvironment: settings.mothershipEnvironment,
+        errorNotificationsEnabled: settings.errorNotificationsEnabled,
+        snapToGridSize: settings.snapToGridSize,
+        showActionBar: settings.showActionBar,
+        lastActiveWorkspaceId: settings.lastActiveWorkspaceId,
+      })
+      .from(settings)
+      .where(eq(settings.userId, userId))
+      .limit(1)
 
     if (!result.length) {
       return NextResponse.json({ data: defaultSettings }, { status: 200 })

apps/sim/app/api/v1/admin/organizations/[id]/billing/route.ts

@@ -55,7 +55,11 @@ export const GET = withRouteHandler(
     try {
       if (!isBillingEnabled) {
         const [[orgData], [memberCount]] = await Promise.all([
-          db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),
+          db
+            .select({ id: organization.id, name: organization.name })
+            .from(organization)
+            .where(eq(organization.id, organizationId))
+            .limit(1),
           db
             .select({ count: count() })
             .from(member)

apps/sim/app/api/v1/admin/organizations/route.ts

@@ -71,7 +71,22 @@ export const GET = withRouteHandler(
     try {
       const [countResult, organizations] = await Promise.all([
         db.select({ total: count() }).from(organization),
-        db.select().from(organization).orderBy(organization.name).limit(limit).offset(offset),
+        db
+          .select({
+            id: organization.id,
+            name: organization.name,
+            slug: organization.slug,
+            logo: organization.logo,
+            orgUsageLimit: organization.orgUsageLimit,
+            storageUsedBytes: organization.storageUsedBytes,
+            departedMemberUsage: organization.departedMemberUsage,
+            createdAt: organization.createdAt,
+            updatedAt: organization.updatedAt,
+          })
+          .from(organization)
+          .orderBy(organization.name)
+          .limit(limit)
+          .offset(offset),
       ])
 
       const total = countResult[0].total

apps/sim/app/api/v1/admin/types.ts

@@ -198,7 +198,23 @@ export interface AdminWorkflowDetail extends AdminWorkflow {
   edgeCount: number
 }
 
-export function toAdminWorkflow(dbWorkflow: DbWorkflow): AdminWorkflow {
+export type AdminWorkflowSource = Pick<
+  DbWorkflow,
+  | 'id'
+  | 'name'
+  | 'description'
+  | 'color'
+  | 'workspaceId'
+  | 'folderId'
+  | 'isDeployed'
+  | 'deployedAt'
+  | 'runCount'
+  | 'lastRunAt'
+  | 'createdAt'
+  | 'updatedAt'
+>
+
+export function toAdminWorkflow(dbWorkflow: AdminWorkflowSource): AdminWorkflow {
   return {
     id: dbWorkflow.id,
     name: dbWorkflow.name,
@@ -443,7 +459,20 @@ export interface AdminOrganizationDetail extends AdminOrganization {
   subscription: AdminSubscription | null
 }
 
-export function toAdminOrganization(dbOrg: DbOrganization): AdminOrganization {
+export type AdminOrganizationSource = Pick<
+  DbOrganization,
+  | 'id'
+  | 'name'
+  | 'slug'
+  | 'logo'
+  | 'orgUsageLimit'
+  | 'storageUsedBytes'
+  | 'departedMemberUsage'
+  | 'createdAt'
+  | 'updatedAt'
+>
+
+export function toAdminOrganization(dbOrg: AdminOrganizationSource): AdminOrganization {
   return {
     id: dbOrg.id,
     name: dbOrg.name,

apps/sim/app/api/v1/admin/workflows/route.ts

@@ -33,7 +33,25 @@ export const GET = withRouteHandler(
     try {
       const [countResult, workflows] = await Promise.all([
         db.select({ total: count() }).from(workflow),
-        db.select().from(workflow).orderBy(workflow.name).limit(limit).offset(offset),
+        db
+          .select({
+            id: workflow.id,
+            name: workflow.name,
+            description: workflow.description,
+            color: workflow.color,
+            workspaceId: workflow.workspaceId,
+            folderId: workflow.folderId,
+            isDeployed: workflow.isDeployed,
+            deployedAt: workflow.deployedAt,
+            runCount: workflow.runCount,
+            lastRunAt: workflow.lastRunAt,
+            createdAt: workflow.createdAt,
+            updatedAt: workflow.updatedAt,
+          })
+          .from(workflow)
+          .orderBy(workflow.name)
+          .limit(limit)
+          .offset(offset),
       ])
 
       const total = countResult[0].total

apps/sim/app/api/v1/admin/workspaces/[id]/workflows/route.ts

@@ -63,7 +63,20 @@ export const GET = withRouteHandler(
           .from(workflow)
           .where(and(eq(workflow.workspaceId, workspaceId), isNull(workflow.archivedAt))),
         db
-          .select()
+          .select({
+            id: workflow.id,
+            name: workflow.name,
+            description: workflow.description,
+            color: workflow.color,
+            workspaceId: workflow.workspaceId,
+            folderId: workflow.folderId,
+            isDeployed: workflow.isDeployed,
+            deployedAt: workflow.deployedAt,
+            runCount: workflow.runCount,
+            lastRunAt: workflow.lastRunAt,
+            createdAt: workflow.createdAt,
+            updatedAt: workflow.updatedAt,
+          })
           .from(workflow)
           .where(and(eq(workflow.workspaceId, workspaceId), isNull(workflow.archivedAt)))
           .orderBy(workflow.name)

apps/sim/app/api/v1/tables/[tableId]/rows/[rowId]/route.ts

@@ -230,7 +230,7 @@ export const DELETE = withRouteHandler(async (request: NextRequest, context: Row
           eq(userTableRows.workspaceId, workspaceId)
         )
       )
-      .returning()
+      .returning({ id: userTableRows.id })
 
     if (!deletedRow) {
       return NextResponse.json({ error: 'Row not found' }, { status: 404 })

apps/sim/app/api/webhooks/[id]/route.ts

@@ -137,13 +137,23 @@ export const PATCH = withRouteHandler(
       }
       await assertWorkflowMutable(webhookData.workflow.id)
 
+      const setClause: Partial<typeof webhook.$inferInsert> = {}
+      if (isActive !== undefined && isActive !== webhooks[0].webhook.isActive) {
+        setClause.isActive = isActive
+      }
+      if (failedCount !== undefined && failedCount !== webhooks[0].webhook.failedCount) {
+        setClause.failedCount = failedCount
+      }
+
+      if (Object.keys(setClause).length === 0) {
+        logger.info(`[${requestId}] No-op webhook PATCH (no field changes): ${id}`)
+        return NextResponse.json({ webhook: webhooks[0].webhook }, { status: 200 })
+      }
+
+      setClause.updatedAt = new Date()
       const updatedWebhook = await db
         .update(webhook)
-        .set({
-          isActive: isActive !== undefined ? isActive : webhooks[0].webhook.isActive,
-          failedCount: failedCount !== undefined ? failedCount : webhooks[0].webhook.failedCount,
-          updatedAt: new Date(),
-        })
+        .set(setClause)
         .where(eq(webhook.id, id))
         .returning()
 

apps/sim/app/workspace/[workspaceId]/logs/logs.tsx

@@ -103,6 +103,8 @@ import {
 const LOGS_PER_PAGE = 50 as const
 const SORTABLE_COLUMNS: readonly LogSortBy[] = ['date', 'duration', 'cost', 'status'] as const
 const REFRESH_SPINNER_DURATION_MS = 1000 as const
+const LIVE_REFRESH_INTERVAL_MS = 10_000 as const
+const ACTIVE_RUN_DETAIL_REFRESH_MS = 3_000 as const
 
 const LOG_COLUMNS: ResourceColumn[] = [
   { id: 'workflow', header: 'Workflow' },
@@ -317,7 +319,7 @@ export default function Logs() {
     (query: { state: { data?: WorkflowLogDetail } }) => {
       if (!isLive) return false
       const status = query.state.data?.status
-      return status === 'running' || status === 'pending' ? 3000 : false
+      return status === 'running' || status === 'pending' ? ACTIVE_RUN_DETAIL_REFRESH_MS : false
     },
     [isLive]
   )
@@ -365,7 +367,7 @@ export default function Logs() {
   )
 
   const logsQuery = useLogsList(workspaceId, logFilters, {
-    refetchInterval: isLive ? 3000 : false,
+    refetchInterval: isLive ? LIVE_REFRESH_INTERVAL_MS : false,
   })
 
   const dashboardFilters = useMemo(
@@ -383,7 +385,7 @@ export default function Logs() {
   )
 
   const dashboardStatsQuery = useDashboardStats(workspaceId, dashboardFilters, {
-    refetchInterval: isLive ? 3000 : false,
+    refetchInterval: isLive ? LIVE_REFRESH_INTERVAL_MS : false,
   })
 
   const logs = useMemo(() => {