From 93cf5dbc0a8f6a2c3642b3118f2cb55afd8f81f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Wed, 28 Feb 2024 21:24:29 +0100
Subject: [PATCH] try fix bugs

---
 apps/sdk-api/scripts/test-events.ts                |  4 ++--
 apps/sdk-api/src/controllers/event.controller.ts   | 14 +++++++-------
 .../[projectId]/events/event-list-item.tsx         |  2 +-
 apps/worker/src/jobs/events.create-session-end.ts  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/sdk-api/scripts/test-events.ts b/apps/sdk-api/scripts/test-events.ts
index 99e5b8a7..4fa0a234 100644
--- a/apps/sdk-api/scripts/test-events.ts
+++ b/apps/sdk-api/scripts/test-events.ts
@@ -201,9 +201,9 @@ async function createSessionEnd(
 ) {
   const properties: Record<string, unknown> = {};
   if (options.screenViews === 1) {
-    properties._bounce = true;
+    properties.__bounce = true;
   } else {
-    properties._bounce = false;
+    properties.__bounce = false;
   }
 
   const session: IServiceCreateEventPayload = {
diff --git a/apps/sdk-api/src/controllers/event.controller.ts b/apps/sdk-api/src/controllers/event.controller.ts
index 61e4e4b6..821f1e52 100644
--- a/apps/sdk-api/src/controllers/event.controller.ts
+++ b/apps/sdk-api/src/controllers/event.controller.ts
@@ -164,16 +164,11 @@ export async function postEvent(
     return reply.status(200).send('');
   }
 
-  const [geo, eventsJobs, events] = await Promise.all([
+  const [geo, eventsJobs] = await Promise.all([
     parseIp(ip),
     eventsQueue.getJobs(['delayed']),
-    getEvents(
-      `SELECT * FROM events WHERE name = 'session_start' AND profile_id = '${profileId}' AND project_id = '${projectId}' ORDER BY created_at DESC LIMIT 1`
-    ),
   ]);
 
-  const sessionStartEvent = events[0];
-
   // find session_end job
   const sessionEndJobCurrentDeviceId = findJobByPrefix(
     eventsJobs,
@@ -216,6 +211,10 @@ export async function postEvent(
     );
   }
 
+  const [sessionStartEvent] = await getEvents(
+    `SELECT * FROM events WHERE name = 'session_start' AND device_id = '${deviceId}' AND project_id = '${projectId}' ORDER BY created_at DESC LIMIT 1`
+  );
+
   request.log.info(
     {
       ip,
@@ -228,7 +227,8 @@ export async function postEvent(
       deviceId,
       bot,
       geo,
-      events,
+      sessionStartEvent,
+      path,
     },
     'incoming event'
   );
diff --git a/apps/web/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx b/apps/web/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx
index 6cf3d545..ad948713 100644
--- a/apps/web/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx
+++ b/apps/web/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx
@@ -108,7 +108,7 @@ export function EventListItem(props: EventListItemProps) {
       },
     },
     {
-      name: 'OS cersion',
+      name: 'OS version',
       value: osVersion,
       onClick() {
         setFilter('os_version', osVersion ?? '');
diff --git a/apps/worker/src/jobs/events.create-session-end.ts b/apps/worker/src/jobs/events.create-session-end.ts
index 7958f457..982c7012 100644
--- a/apps/worker/src/jobs/events.create-session-end.ts
+++ b/apps/worker/src/jobs/events.create-session-end.ts
@@ -60,7 +60,7 @@ export async function createSessionEnd(
     ...sessionStart,
     properties: {
       ...sessionStart.properties,
-      _bounce: screenViews.length <= 1,
+      __bounce: screenViews.length <= 1,
     },
     name: 'session_end',
     duration: sessionDuration,