Don't save repeated queries to the history

Author: matt-aitken

apps/webapp/app/services/queryService.server.ts

@@ -166,23 +166,39 @@ export async function executeQuery<TOut extends z.ZodSchema>(
     // If query succeeded and history options provided, save to history
     // Skip history for EXPLAIN queries (admin debugging) and when explicitly skipped (e.g., impersonating)
     if (result[0] === null && history && !history.skip && !baseOptions.explain) {
-      const stats = result[1].stats;
-      const byteSeconds = parseFloat(stats.byte_seconds) || 0;
-      const costInCents = byteSeconds * env.CENTS_PER_QUERY_BYTE_SECOND;
-
-      await prisma.customerQuery.create({
-        data: {
-          query: options.query,
-          scope: scopeToEnum[scope],
-          stats: { ...stats },
-          costInCents,
-          source: history.source,
+      // Check if this query is the same as the last one saved (avoid duplicate history entries)
+      const lastQuery = await prisma.customerQuery.findFirst({
+        where: {
           organizationId,
-          projectId: scope === "project" || scope === "environment" ? projectId : null,
-          environmentId: scope === "environment" ? environmentId : null,
+          source: history.source,
           userId: history.userId ?? null,
         },
+        orderBy: { createdAt: "desc" },
+        select: { query: true, scope: true },
       });
+
+      const isDuplicate =
+        lastQuery && lastQuery.query === options.query && lastQuery.scope === scopeToEnum[scope];
+
+      if (!isDuplicate) {
+        const stats = result[1].stats;
+        const byteSeconds = parseFloat(stats.byte_seconds) || 0;
+        const costInCents = byteSeconds * env.CENTS_PER_QUERY_BYTE_SECOND;
+
+        await prisma.customerQuery.create({
+          data: {
+            query: options.query,
+            scope: scopeToEnum[scope],
+            stats: { ...stats },
+            costInCents,
+            source: history.source,
+            organizationId,
+            projectId: scope === "project" || scope === "environment" ? projectId : null,
+            environmentId: scope === "environment" ? environmentId : null,
+            userId: history.userId ?? null,
+          },
+        });
+      }
     }
 
     return result;