From c250eb6598df8d90457fcf99cbfcd5f6998a82a6 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:56:47 +0000
Subject: [PATCH] Use eventId not eventRecordId

---
 .../app/services/events/invokeDispatcher.server.ts       | 5 +++--
 apps/webapp/app/services/jobs/invokeJob.server.ts        | 2 +-
 apps/webapp/app/services/jobs/testJob.server.ts          | 2 +-
 apps/webapp/app/services/runs/createRun.server.ts        | 5 +++--
 apps/webapp/app/services/runs/reRun.server.ts            | 9 +++++----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/webapp/app/services/events/invokeDispatcher.server.ts b/apps/webapp/app/services/events/invokeDispatcher.server.ts
index a0785d89e..d123a44a6 100644
--- a/apps/webapp/app/services/events/invokeDispatcher.server.ts
+++ b/apps/webapp/app/services/events/invokeDispatcher.server.ts
@@ -42,6 +42,7 @@ export class InvokeDispatcherService {
       },
       select: {
         id: true,
+        eventId: true,
       },
     });
 
@@ -85,7 +86,7 @@ export class InvokeDispatcherService {
 
         await createRunService.call({
           batched: !!eventDispatcher.batcher,
-          eventIds: eventRecords.map((e) => e.id),
+          eventIds: eventRecords.map((e) => e.eventId),
           job: jobVersion.job,
           version: jobVersion,
           environment: eventDispatcher.environment,
@@ -136,7 +137,7 @@ export class InvokeDispatcherService {
 
           await createRunService.call({
             batched: !!eventDispatcher.batcher,
-            eventIds: eventRecords.map((e) => e.id),
+            eventIds: eventRecords.map((e) => e.eventId),
             job: job,
             version: latestJobVersion,
             environment: eventDispatcher.environment,
diff --git a/apps/webapp/app/services/jobs/invokeJob.server.ts b/apps/webapp/app/services/jobs/invokeJob.server.ts
index e89b90a41..7d3f4ff9a 100644
--- a/apps/webapp/app/services/jobs/invokeJob.server.ts
+++ b/apps/webapp/app/services/jobs/invokeJob.server.ts
@@ -128,7 +128,7 @@ export class InvokeJobService {
       const run = await createRunService.call(
         {
           environment,
-          eventIds: [eventLog.id],
+          eventIds: [eventLog.eventId],
           job: job,
           version,
           batched: false
diff --git a/apps/webapp/app/services/jobs/testJob.server.ts b/apps/webapp/app/services/jobs/testJob.server.ts
index 9b9b1280a..09117424b 100644
--- a/apps/webapp/app/services/jobs/testJob.server.ts
+++ b/apps/webapp/app/services/jobs/testJob.server.ts
@@ -102,7 +102,7 @@ export class TestJobService {
 
         return await createRunService.call({
           environment,
-          eventIds: [eventLog.id],
+          eventIds: [eventLog.eventId],
           job: version.job,
           version,
           batched: false
diff --git a/apps/webapp/app/services/runs/createRun.server.ts b/apps/webapp/app/services/runs/createRun.server.ts
index 6d70c99fa..5b613c72e 100644
--- a/apps/webapp/app/services/runs/createRun.server.ts
+++ b/apps/webapp/app/services/runs/createRun.server.ts
@@ -39,7 +39,8 @@ export class CreateRunService {
 
     const eventRecords = await this.#prismaClient.eventRecord.findMany({
       where: {
-        id: { in: eventIds },
+        environmentId: environment.id,
+        eventId: { in: eventIds },
       },
     });
 
@@ -56,7 +57,7 @@ export class CreateRunService {
           jobId: job.id,
           versionId: version.id,
           eventId: firstEvent.id,
-          eventIds: eventRecords.map((event) => event.id),
+          eventIds: eventRecords.map((event) => event.eventId),
           environmentId: environment.id,
           organizationId: environment.organizationId,
           projectId: environment.projectId,
diff --git a/apps/webapp/app/services/runs/reRun.server.ts b/apps/webapp/app/services/runs/reRun.server.ts
index 12c58e5e6..d8c9ca04f 100644
--- a/apps/webapp/app/services/runs/reRun.server.ts
+++ b/apps/webapp/app/services/runs/reRun.server.ts
@@ -29,11 +29,12 @@ export class ReRunService {
 
         const eventIds = existingRun.eventIds.length
           ? existingRun.eventIds
-          : [existingRun.event.id];
+          : [existingRun.event.eventId];
 
         const eventRecords = await this.#prismaClient.eventRecord.findMany({
           where: {
-            id: { in: eventIds },
+            environmentId: existingRun.environmentId,
+            eventId: { in: eventIds },
           },
         });
 
@@ -60,7 +61,7 @@ export class ReRunService {
                 isTest: event.isTest,
               },
               select: {
-                id: true,
+                eventId: true,
               },
             })
           )
@@ -74,7 +75,7 @@ export class ReRunService {
             organization: existingRun.organization,
             project: existingRun.project,
           },
-          eventIds: eventLogs.map((e) => e.id),
+          eventIds: eventLogs.map((e) => e.eventId),
           job: existingRun.job,
           version: existingRun.version,
           batched: existingRun.batched,