improve session end

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
     ) 

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 =

packages/queue/src/queues.ts

@@ -33,7 +33,7 @@ export interface EventsQueuePayloadCreateSessionEnd {
   type: 'createSessionEnd';
   payload: Pick<
     IServiceCreateEventPayload,
-    'deviceId' | 'sessionId' | 'profileId'
+    'deviceId' | 'sessionId' | 'profileId' | 'projectId'
   >;
 }