fix(ai): avoid constant oauth token ordering (#503)

* fix(dashboard): align goals with funnels layout

* fix(dashboard): show public website link immediately

* feat(insights): improve slack digest markdown

* chore(insights): tighten investigation copy guidance

* fix(insights): address slack digest review feedback

* fix(ai): avoid constant oauth token ordering

Author: izadoesdev

packages/ai/src/ai/tools/utils/oauth-token-ordering.ts

@@ -0,0 +1,13 @@
+import { account, member } from "@databuddy/db/schema";
+import { sql } from "drizzle-orm";
+
+const ROLE_PRIORITY = sql`CASE ${member.role} WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 ELSE 2 END`;
+
+export function getOAuthTokenOrderBy(preferUserId?: string) {
+	return preferUserId
+		? [
+				sql`CASE WHEN ${account.userId} = ${preferUserId} THEN 0 ELSE 1 END`,
+				ROLE_PRIORITY,
+			]
+		: [ROLE_PRIORITY];
+}

packages/ai/src/ai/tools/utils/oauth-token.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, test } from "bun:test";
+import { PgDialect } from "drizzle-orm/pg-core";
+
+import { getOAuthTokenOrderBy } from "./oauth-token-ordering";
+
+const dialect = new PgDialect();
+
+function renderOrderBy(preferUserId?: string): string[] {
+	return getOAuthTokenOrderBy(preferUserId).map(
+		(expression) => dialect.sqlToQuery(expression).sql
+	);
+}
+
+describe("getOAuthTokenOrderBy", () => {
+	test("does not order by a constant when no preferred user is provided", () => {
+		expect(renderOrderBy()).toEqual([
+			`CASE "member"."role" WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 ELSE 2 END`,
+		]);
+	});
+
+	test("prefers the requested user before role priority when present", () => {
+		expect(renderOrderBy("user_123")).toEqual([
+			`CASE WHEN "account"."user_id" = $1 THEN 0 ELSE 1 END`,
+			`CASE "member"."role" WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 ELSE 2 END`,
+		]);
+	});
+});

packages/ai/src/ai/tools/utils/oauth-token.ts

@@ -1,8 +1,8 @@
 import { auth } from "@databuddy/auth";
-import { and, db, eq, sql } from "@databuddy/db";
+import { and, db, eq } from "@databuddy/db";
 import { account, member } from "@databuddy/db/schema";
+import { getOAuthTokenOrderBy } from "./oauth-token-ordering";
 
-const ROLE_PRIORITY = sql`CASE ${member.role} WHEN 'owner' THEN 0 WHEN 'admin' THEN 1 ELSE 2 END`;
 const TOKEN_TTL_MS = 45 * 60 * 1000;
 const NEGATIVE_TTL_MS = 5 * 60 * 1000;
 const EXPIRY_SKEW_MS = 60 * 1000;
@@ -68,9 +68,7 @@ async function resolveOAuthToken(
 	preferUserId?: string,
 	requiredScope?: string
 ): Promise<ResolvedToken | null> {
-	const preference = preferUserId
-		? sql`CASE WHEN ${account.userId} = ${preferUserId} THEN 0 ELSE 1 END`
-		: sql`0`;
+	const orderBy = getOAuthTokenOrderBy(preferUserId);
 
 	const candidates: TokenCandidate[] = await db
 		.select({
@@ -89,7 +87,7 @@ async function resolveOAuthToken(
 				eq(account.providerId, providerId)
 			)
 		)
-		.orderBy(preference, ROLE_PRIORITY)
+		.orderBy(...orderBy)
 		.limit(MAX_CANDIDATES);
 
 	for (const candidate of candidates) {