From af62dbc1e9c7e5e599a321f0987f43a77e32a621 Mon Sep 17 00:00:00 2001
From: Gerard Clos <clos.gerard@gmail.com>
Date: Wed, 20 Nov 2024 11:07:40 +0100
Subject: [PATCH] quickfix(logs): inner join instead of where clause

---
 ...hDocumentLogsWithEvaluationResults.test.ts | 151 ++++++++++++++++++
 .../fetchDocumentLogsWithEvaluationResults.ts |   3 +-
 2 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.test.ts

diff --git a/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.test.ts b/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.test.ts
new file mode 100644
index 000000000..99337508b
--- /dev/null
+++ b/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.test.ts
@@ -0,0 +1,151 @@
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import {
+  Commit,
+  DocumentVersion,
+  EvaluationDto,
+  ProviderApiKey,
+  Providers,
+  Workspace,
+} from '../../browser'
+import * as factories from '../../tests/factories'
+import { fetchDocumentLogsWithEvaluationResults } from './fetchDocumentLogsWithEvaluationResults'
+
+describe('fetchDocumentLogsWithEvaluationResults', () => {
+  let workspace: Workspace
+  let evaluation: EvaluationDto
+  let commit: Commit
+  let document: DocumentVersion
+  let provider: ProviderApiKey
+
+  beforeEach(async () => {
+    // Setup project with a provider
+    const setup = await factories.createProject({
+      providers: [{ type: Providers.OpenAI, name: 'openai' }],
+      documents: {
+        'test.md': factories.helpers.createPrompt({
+          provider: 'openai',
+          model: 'gpt-4',
+        }),
+      },
+    })
+    provider = setup.providers[0]!
+    workspace = setup.workspace
+
+    // Create evaluation
+    evaluation = await factories.createLlmAsJudgeEvaluation({
+      workspace: setup.workspace,
+      user: setup.user,
+    })
+
+    // Create draft commit
+    const draftResult = await factories.createDraft({
+      project: setup.project,
+      user: setup.user,
+    })
+    commit = draftResult.commit
+    document = setup.documents[0]!
+
+    // Create document logs with provider logs and evaluation results
+    const { documentLog } = await factories.createDocumentLog({
+      document: setup.documents[0]!,
+      commit,
+    })
+
+    // Create provider log
+    await factories.createProviderLog({
+      workspace: setup.workspace,
+      documentLogUuid: documentLog.uuid,
+      providerId: setup.providers[0]!.id,
+      providerType: setup.providers[0]!.provider,
+    })
+
+    // Create evaluation result
+    await factories.createEvaluationResult({
+      evaluation,
+      documentLog,
+      evaluatedProviderLog: await factories.createProviderLog({
+        workspace: setup.workspace,
+        documentLogUuid: documentLog.uuid,
+        providerId: setup.providers[0]!.id,
+        providerType: setup.providers[0]!.provider,
+      }),
+    })
+  })
+
+  it('fetches document logs with evaluation results and provider logs', async () => {
+    const logs = await fetchDocumentLogsWithEvaluationResults({
+      evaluation,
+      documentUuid: document.documentUuid,
+      commit,
+      page: '1',
+      pageSize: '25',
+    })
+
+    expect(logs).toHaveLength(1)
+    expect(logs[0]).toMatchObject({
+      uuid: expect.any(String),
+      documentUuid: document.documentUuid,
+      result: expect.objectContaining({
+        evaluationId: evaluation.id,
+      }),
+      providerLogs: expect.arrayContaining([
+        expect.objectContaining({
+          uuid: expect.any(String),
+          documentLogUuid: expect.any(String),
+        }),
+      ]),
+    })
+  })
+
+  it('handles pagination correctly', async () => {
+    // Create additional document logs
+    for (let i = 0; i < 3; i++) {
+      const { documentLog } = await factories.createDocumentLog({
+        document,
+        commit,
+      })
+
+      await factories.createProviderLog({
+        workspace,
+        documentLogUuid: documentLog.uuid,
+        providerId: provider.id,
+        providerType: provider.provider,
+      })
+    }
+
+    const pageSize = '2'
+    const firstPage = await fetchDocumentLogsWithEvaluationResults({
+      evaluation,
+      documentUuid: document.documentUuid,
+      commit,
+      page: '1',
+      pageSize,
+    })
+
+    const secondPage = await fetchDocumentLogsWithEvaluationResults({
+      evaluation,
+      documentUuid: document.documentUuid,
+      commit,
+      page: '2',
+      pageSize,
+    })
+
+    expect(firstPage).toHaveLength(2)
+    expect(secondPage).toHaveLength(2)
+    expect(firstPage[0]!.id).not.toBe(secondPage[0]!.id)
+  })
+
+  it('returns empty array when no logs exist', async () => {
+    const nonExistentUuid = '123e4567-e89b-12d3-a456-426614174000' // does not exist
+    const logs = await fetchDocumentLogsWithEvaluationResults({
+      evaluation,
+      documentUuid: nonExistentUuid,
+      commit,
+      page: '1',
+      pageSize: '25',
+    })
+
+    expect(logs).toHaveLength(0)
+  })
+})
diff --git a/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.ts b/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.ts
index 9293bcc0b..208674310 100644
--- a/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.ts
+++ b/packages/core/src/services/documentLogs/fetchDocumentLogsWithEvaluationResults.ts
@@ -59,8 +59,7 @@ export async function fetchDocumentLogsWithEvaluationResults(
     ),
   )
 
-  const providerLogsResult = await providerLogsRepo.scope.innerJoin(
-    documentLogs,
+  const providerLogsResult = await providerLogsRepo.scope.where(
     inArray(
       providerLogs.documentLogUuid,
       logs.map((l) => l.uuid),