From e92bb9043b7f1fd424f5f5c5ddbe0b48bfd7557f Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Thu, 13 Aug 2026 11:04:11 -0400
Subject: [PATCH] Fix issues with possible null providerId

---
 server/routers/auditLogs/queryAiSessionLog.ts | 13 +++++++--
 .../auditLogs/queryAiUsageProviders.ts        | 27 ++++++++++++++-----
 server/routers/auditLogs/types.ts             |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/server/routers/auditLogs/queryAiSessionLog.ts b/server/routers/auditLogs/queryAiSessionLog.ts
index 437d74550..ac2d99b65 100644
--- a/server/routers/auditLogs/queryAiSessionLog.ts
+++ b/server/routers/auditLogs/queryAiSessionLog.ts
@@ -208,7 +208,14 @@ async function enrichWithDetails(
                 type: aiProviders.type
             })
             .from(aiProviders)
-            .where(inArray(aiProviders.providerId, providerIds));
+            .where(
+                inArray(
+                    aiProviders.providerId,
+                    providerIds.filter(
+                        (id): id is number => id !== null && id !== undefined
+                    )
+                )
+            );
 
         for (const p of providerDetails) {
             providerMap.set(p.providerId, { name: p.name, type: p.type });
@@ -336,7 +343,9 @@ async function enrichWithDetails(
     }
 
     return logs.map((log) => {
-        const provider = providerMap.get(log.providerId);
+        const provider = log.providerId
+            ? providerMap.get(log.providerId)
+            : null;
 
         let resourceId = log.resourceId;
         let resourceName: string | null = null;
diff --git a/server/routers/auditLogs/queryAiUsageProviders.ts b/server/routers/auditLogs/queryAiUsageProviders.ts
index 77df6330d..8536ad79f 100644
--- a/server/routers/auditLogs/queryAiUsageProviders.ts
+++ b/server/routers/auditLogs/queryAiUsageProviders.ts
@@ -93,9 +93,17 @@ async function query(data: Q) {
     const nameMap = new Map<number, string | null>();
     if (providerIds.length > 0) {
         const providerDetails = await db
-            .select({ providerId: aiProviders.providerId, name: aiProviders.name })
+            .select({
+                providerId: aiProviders.providerId,
+                name: aiProviders.name
+            })
             .from(aiProviders)
-            .where(inArray(aiProviders.providerId, providerIds));
+            .where(
+                inArray(
+                    aiProviders.providerId,
+                    providerIds.filter((id): id is number => id !== null)
+                )
+            );
         for (const p of providerDetails) {
             nameMap.set(p.providerId, p.name);
         }
@@ -103,7 +111,7 @@ async function query(data: Q) {
 
     const topProviders = topProvidersRaw.map((r) => ({
         providerId: r.providerId,
-        name: nameMap.get(r.providerId) ?? null,
+        name: r.providerId ? (nameMap.get(r.providerId) ?? null) : null,
         requests: r.requests,
         totalTokens: r.totalTokens,
         costUsd: r.costUsd
@@ -119,7 +127,8 @@ async function query(data: Q) {
 registry.registerPath({
     method: "get",
     path: "/org/{orgId}/logs/ai/usage/providers",
-    description: "Query the AI usage analytics provider breakdown for an organization",
+    description:
+        "Query the AI usage analytics provider breakdown for an organization",
     tags: [OpenAPITags.Logs],
     request: {
         query: aiUsageAnalyticsFiltersQuery,
@@ -154,14 +163,20 @@ export async function queryAiUsageProviders(
         const parsedQuery = aiUsageAnalyticsFiltersQuery.safeParse(req.query);
         if (!parsedQuery.success) {
             return next(
-                createHttpError(HttpCode.BAD_REQUEST, fromError(parsedQuery.error))
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedQuery.error)
+                )
             );
         }
 
         const parsedParams = aiUsageAnalyticsParams.safeParse(req.params);
         if (!parsedParams.success) {
             return next(
-                createHttpError(HttpCode.BAD_REQUEST, fromError(parsedParams.error))
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error)
+                )
             );
         }
 
diff --git a/server/routers/auditLogs/types.ts b/server/routers/auditLogs/types.ts
index dc8d4015f..21663f6ce 100644
--- a/server/routers/auditLogs/types.ts
+++ b/server/routers/auditLogs/types.ts
@@ -99,7 +99,7 @@ export type QueryAiSessionLogResponse = {
         id: number;
         sessionId: string;
         orgId: string | null;
-        providerId: number;
+        providerId: number | null;
         providerName: string | null;
         providerType: string | null;
         capability: string;