refactor(types): use drizzle $inferSelect for row types

Replace hand-written interfaces that duplicated schema shape with
typeof table.$inferSelect aliases for webhook, workflow, and
workspaceFiles rows. Also simplify metadata insert/update to use
.returning() instead of field-by-field copies.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/lib/uploads/server/metadata.ts

@@ -6,18 +6,7 @@ import type { StorageContext } from '../shared/types'
 
 const logger = createLogger('FileMetadata')
 
-export interface FileMetadataRecord {
-  id: string
-  key: string
-  userId: string
-  workspaceId: string | null
-  context: string
-  originalName: string
-  contentType: string
-  size: number
-  deletedAt?: Date | null
-  uploadedAt: Date
-}
+export type FileMetadataRecord = typeof workspaceFiles.$inferSelect
 
 export interface FileMetadataInsertOptions {
   key: string
@@ -52,7 +41,7 @@ export async function insertFileMetadata(
     .limit(1)
 
   if (existingDeleted.length > 0 && existingDeleted[0].deletedAt) {
-    await db
+    const [restored] = await db
       .update(workspaceFiles)
       .set({
         userId,
@@ -65,19 +54,9 @@ export async function insertFileMetadata(
         uploadedAt: new Date(),
       })
       .where(eq(workspaceFiles.id, existingDeleted[0].id))
+      .returning()
 
-    return {
-      id: existingDeleted[0].id,
-      key,
-      userId,
-      workspaceId: workspaceId || null,
-      context,
-      originalName,
-      contentType,
-      size,
-      deletedAt: null,
-      uploadedAt: new Date(),
-    }
+    return restored
   }
 
   const existing = await db
@@ -87,48 +66,29 @@ export async function insertFileMetadata(
     .limit(1)
 
   if (existing.length > 0) {
-    return {
-      id: existing[0].id,
-      key: existing[0].key,
-      userId: existing[0].userId,
-      workspaceId: existing[0].workspaceId,
-      context: existing[0].context,
-      originalName: existing[0].originalName,
-      contentType: existing[0].contentType,
-      size: existing[0].size,
-      deletedAt: existing[0].deletedAt,
-      uploadedAt: existing[0].uploadedAt,
-    }
+    return existing[0]
   }
 
   const fileId = id || (await import('uuid')).v4()
 
   try {
-    await db.insert(workspaceFiles).values({
-      id: fileId,
-      key,
-      userId,
-      workspaceId: workspaceId || null,
-      context,
-      originalName,
-      contentType,
-      size,
-      deletedAt: null,
-      uploadedAt: new Date(),
-    })
+    const [inserted] = await db
+      .insert(workspaceFiles)
+      .values({
+        id: fileId,
+        key,
+        userId,
+        workspaceId: workspaceId || null,
+        context,
+        originalName,
+        contentType,
+        size,
+        deletedAt: null,
+        uploadedAt: new Date(),
+      })
+      .returning()
 
-    return {
-      id: fileId,
-      key,
-      userId,
-      workspaceId: workspaceId || null,
-      context,
-      originalName,
-      contentType,
-      size,
-      deletedAt: null,
-      uploadedAt: new Date(),
-    }
+    return inserted
   } catch (error) {
     if (
       (error as any)?.code === '23505' ||
@@ -141,18 +101,7 @@ export async function insertFileMetadata(
         .limit(1)
 
       if (existingAfterError.length > 0) {
-        return {
-          id: existingAfterError[0].id,
-          key: existingAfterError[0].key,
-          userId: existingAfterError[0].userId,
-          workspaceId: existingAfterError[0].workspaceId,
-          context: existingAfterError[0].context,
-          originalName: existingAfterError[0].originalName,
-          contentType: existingAfterError[0].contentType,
-          size: existingAfterError[0].size,
-          deletedAt: existingAfterError[0].deletedAt,
-          uploadedAt: existingAfterError[0].uploadedAt,
-        }
+        return existingAfterError[0]
       }
     }
 
@@ -186,22 +135,7 @@ export async function getFileMetadataByKey(
     .where(conditions.length > 1 ? and(...conditions) : conditions[0])
     .limit(1)
 
-  if (!record) {
-    return null
-  }
-
-  return {
-    id: record.id,
-    key: record.key,
-    userId: record.userId,
-    workspaceId: record.workspaceId,
-    context: record.context,
-    originalName: record.originalName,
-    contentType: record.contentType,
-    size: record.size,
-    deletedAt: record.deletedAt,
-    uploadedAt: record.uploadedAt,
-  }
+  return record ?? null
 }
 
 /**
@@ -225,24 +159,11 @@ export async function getFileMetadataByContext(
     conditions.push(isNull(workspaceFiles.deletedAt))
   }
 
-  const records = await db
+  return db
     .select()
     .from(workspaceFiles)
     .where(conditions.length > 1 ? and(...conditions) : conditions[0])
     .orderBy(workspaceFiles.uploadedAt)
-
-  return records.map((record) => ({
-    id: record.id,
-    key: record.key,
-    userId: record.userId,
-    workspaceId: record.workspaceId,
-    context: record.context,
-    originalName: record.originalName,
-    contentType: record.contentType,
-    size: record.size,
-    deletedAt: record.deletedAt,
-    uploadedAt: record.uploadedAt,
-  }))
 }
 
 /**

apps/sim/lib/webhooks/polling/orchestrator.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateShortId } from '@sim/utils/id'
 import { getPollingHandler } from '@/lib/webhooks/polling/registry'
-import type { PollSummary, WebhookRecord, WorkflowRecord } from '@/lib/webhooks/polling/types'
+import type { PollSummary } from '@/lib/webhooks/polling/types'
 import { fetchActiveWebhooks, runWithConcurrency } from '@/lib/webhooks/polling/utils'
 
 /** Poll all active webhooks for a given provider. */
@@ -27,8 +27,8 @@ export async function pollProvider(providerName: string): Promise<PollSummary> {
     async (entry) => {
       const requestId = generateShortId()
       return handler.pollWebhook({
-        webhookData: entry.webhook as WebhookRecord,
-        workflowData: entry.workflow as WorkflowRecord,
+        webhookData: entry.webhook,
+        workflowData: entry.workflow,
         requestId,
         logger,
       })

apps/sim/lib/webhooks/polling/types.ts

@@ -1,3 +1,4 @@
+import type { webhook, workflow } from '@sim/db/schema'
 import type { Logger } from '@sim/logger'
 
 /** Summary returned after polling all webhooks for a provider. */
@@ -15,25 +16,8 @@ export interface PollWebhookContext {
   logger: Logger
 }
 
-/** DB row shape for the webhook table. */
-export interface WebhookRecord {
-  id: string
-  path: string
-  provider: string | null
-  blockId: string | null
-  providerConfig: unknown
-  credentialSetId: string | null
-  workflowId: string
-  [key: string]: unknown
-}
-
-/** DB row shape for the workflow table. */
-export interface WorkflowRecord {
-  id: string
-  userId: string
-  workspaceId: string
-  [key: string]: unknown
-}
+export type WebhookRecord = typeof webhook.$inferSelect
+export type WorkflowRecord = typeof workflow.$inferSelect
 
 /**
  * Strategy interface for provider-specific polling behavior.

apps/sim/lib/webhooks/polling/utils.ts

@@ -96,7 +96,7 @@ export async function fetchActiveWebhooks(
       )
     )
 
-  return rows as unknown as { webhook: WebhookRecord; workflow: WorkflowRecord }[]
+  return rows
 }
 
 /**

apps/sim/lib/webhooks/processor.ts

@@ -642,21 +642,8 @@ export interface PolledWebhookEventResult {
   statusCode?: number
 }
 
-interface PolledWebhookRecord {
-  id: string
-  path: string
-  provider: string | null
-  blockId: string | null
-  providerConfig: unknown
-  credentialSetId: string | null
-  workflowId: string
-}
-
-interface PolledWorkflowRecord {
-  id: string
-  userId: string
-  workspaceId: string
-}
+type PolledWebhookRecord = typeof webhook.$inferSelect
+type PolledWorkflowRecord = typeof workflow.$inferSelect
 
 /**
  * Processes a polled webhook event directly, bypassing the HTTP trigger route.
@@ -739,6 +726,7 @@ export async function processPolledWebhookEvent(
         triggerType: 'webhook',
       } satisfies AsyncExecutionCorrelation)
 
+    const workspaceId = foundWorkflow.workspaceId ?? undefined
     const payload = {
       webhookId: foundWebhook.id,
       workflowId: foundWorkflow.id,
@@ -751,15 +739,15 @@ export async function processPolledWebhookEvent(
       headers: { 'content-type': 'application/json' } as Record<string, string>,
       path: foundWebhook.path,
       blockId: foundWebhook.blockId ?? undefined,
-      workspaceId: foundWorkflow.workspaceId,
+      workspaceId,
       ...(credentialId ? { credentialId } : {}),
     }
 
     if (isPollingWebhookProvider(payload.provider) && !shouldExecuteInline()) {
       const jobId = await (await getJobQueue()).enqueue('webhook-execution', payload, {
         metadata: {
           workflowId: foundWorkflow.id,
-          workspaceId: foundWorkflow.workspaceId,
+          workspaceId,
           userId: actorUserId,
           correlation,
         },
@@ -772,7 +760,7 @@ export async function processPolledWebhookEvent(
       const jobId = await jobQueue.enqueue('webhook-execution', payload, {
         metadata: {
           workflowId: foundWorkflow.id,
-          workspaceId: foundWorkflow.workspaceId,
+          workspaceId,
           userId: actorUserId,
           correlation,
         },