From 492141547d6f1c89fb506376ac4dcfbdad304471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Sat, 20 Jul 2024 16:34:31 +0200
Subject: [PATCH] improve session end

---
 apps/worker/src/jobs/events.create-session-end.ts | 2 ++
 apps/worker/src/jobs/events.incoming-event.ts     | 1 +
 packages/queue/src/queues.ts                      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/worker/src/jobs/events.create-session-end.ts b/apps/worker/src/jobs/events.create-session-end.ts
index 0e1e0d45..9ac19922 100644
--- a/apps/worker/src/jobs/events.create-session-end.ts
+++ b/apps/worker/src/jobs/events.create-session-end.ts
@@ -21,12 +21,14 @@ export async function createSessionEnd(
   SELECT * FROM ${TABLE_NAMES.events} 
   WHERE 
     session_id = '${payload.sessionId}' 
+    ${payload.projectId ? `AND project_id = '${payload.projectId}' ` : ''}
     AND created_at >= (
       SELECT created_at 
       FROM ${TABLE_NAMES.events}
       WHERE 
         session_id = '${payload.sessionId}' 
         AND name = 'session_start'
+        ${payload.projectId ? `AND project_id = '${payload.projectId}' ` : ''}
       ORDER BY created_at DESC
       LIMIT 1
     ) 
diff --git a/apps/worker/src/jobs/events.incoming-event.ts b/apps/worker/src/jobs/events.incoming-event.ts
index 8caa06f8..cb2bfd40 100644
--- a/apps/worker/src/jobs/events.incoming-event.ts
+++ b/apps/worker/src/jobs/events.incoming-event.ts
@@ -113,6 +113,7 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
     sessionId: uuid(),
     deviceId: currentDeviceId,
     profileId,
+    projectId,
   };
 
   const sessionEndJobId =
diff --git a/packages/queue/src/queues.ts b/packages/queue/src/queues.ts
index bdc1c8b3..1abd55d2 100644
--- a/packages/queue/src/queues.ts
+++ b/packages/queue/src/queues.ts
@@ -33,7 +33,7 @@ export interface EventsQueuePayloadCreateSessionEnd {
   type: 'createSessionEnd';
   payload: Pick<
     IServiceCreateEventPayload,
-    'deviceId' | 'sessionId' | 'profileId'
+    'deviceId' | 'sessionId' | 'profileId' | 'projectId'
   >;
 }