Fix Devin Review bugs: postgres event repository fallback and error presenter clients

Co-Authored-By: Matt Aitken <matt@mattaitken.com>

Author: devin-ai-integration[bot]

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx

@@ -241,12 +241,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const directionRaw = url.searchParams.get("direction") ?? undefined;
   const direction = directionRaw ? DirectionSchema.parse(directionRaw) : undefined;
 
-  const clickhouseClient = await clickhouseFactory.getClickhouseForOrganization(
-    environment.organizationId,
-    "logs"
-  );
+  const [logsClickhouseClient, clickhouseClient] = await Promise.all([
+    clickhouseFactory.getClickhouseForOrganization(environment.organizationId, "logs"),
+    clickhouseFactory.getClickhouseForOrganization(environment.organizationId, "standard"),
+  ]);
 
-  const presenter = new ErrorGroupPresenter($replica, clickhouseClient, clickhouseClient);
+  const presenter = new ErrorGroupPresenter($replica, logsClickhouseClient, clickhouseClient);
 
   const detailPromise = presenter
     .call(project.organizationId, environment.id, {

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors._index/route.tsx

@@ -123,11 +123,11 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const plan = await getCurrentPlan(project.organizationId);
   const retentionLimitDays = plan?.v3Subscription?.plan?.limits.logRetentionDays.number ?? 30;
 
-  const queryClickhouse = await clickhouseFactory.getClickhouseForOrganization(
+  const logsClickhouseClient = await clickhouseFactory.getClickhouseForOrganization(
     project.organizationId,
-    "query"
+    "logs"
   );
-  const presenter = new ErrorsListPresenter($replica, queryClickhouse);
+  const presenter = new ErrorsListPresenter($replica, logsClickhouseClient);
 
   const listPromise = presenter
     .call(project.organizationId, environment.id, {

apps/webapp/app/v3/eventRepository/index.server.ts

@@ -57,14 +57,15 @@ export async function getConfiguredEventRepository(
     (organization.featureFlags as Record<string, unknown> | null) ?? undefined
   );
 
-  const { repository: resolvedRepository } =
-    await clickhouseFactory.getEventRepositoryForOrganization(taskEventStore, organizationId);
-
   if (taskEventStore === EVENT_STORE_TYPES.CLICKHOUSE_V2) {
+    const { repository: resolvedRepository } =
+      await clickhouseFactory.getEventRepositoryForOrganization(taskEventStore, organizationId);
     return { repository: resolvedRepository, store: EVENT_STORE_TYPES.CLICKHOUSE_V2 };
   }
 
   if (taskEventStore === EVENT_STORE_TYPES.CLICKHOUSE) {
+    const { repository: resolvedRepository } =
+      await clickhouseFactory.getEventRepositoryForOrganization(taskEventStore, organizationId);
     return { repository: resolvedRepository, store: EVENT_STORE_TYPES.CLICKHOUSE };
   }
 
@@ -104,6 +105,15 @@ export async function getV3EventRepository(
   parentStore: string | undefined
 ): Promise<{ repository: IEventRepository; store: string }> {
   if (typeof parentStore === "string") {
+    // Support legacy Postgres store for self-hosters and runs persisted with a
+    // non-ClickHouse store — fall back to the Prisma-based event repository.
+    if (
+      parentStore !== EVENT_STORE_TYPES.CLICKHOUSE &&
+      parentStore !== EVENT_STORE_TYPES.CLICKHOUSE_V2
+    ) {
+      return { repository: eventRepository, store: parentStore };
+    }
+
     const { repository: resolvedRepository } =
       await clickhouseFactory.getEventRepositoryForOrganization(parentStore, organizationId);
     return { repository: resolvedRepository, store: parentStore };