@adventurelabs/scout-core 1.0.30 → 1.0.31

package/dist/helpers/events.d.ts

@@ -1,6 +1,11 @@
 import { IEvent } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
-export declare function server_get_events_by_herd(herd_id: number): Promise<IWebResponseCompatible<IEvent[]>>;
-export declare function server_get_more_events_by_herd(herd_id: number, offset: number, page_count?: number): Promise<IWebResponseCompatible<IEvent[]>>;
-export declare function server_get_total_events_by_herd(herd_id: number): Promise<IWebResponseCompatible<number>>;
+export declare enum EnumSessionsVisibility {
+    Only = 0,
+    Exclude = 1,
+    Combine = 2
+}
+export declare function server_get_events_by_herd(herd_id: number, sessions_visibility: EnumSessionsVisibility): Promise<IWebResponseCompatible<IEvent[]>>;
+export declare function server_get_more_events_by_herd(herd_id: number, offset: number, page_count: number | undefined, includeSessionEvents: boolean): Promise<IWebResponseCompatible<IEvent[]>>;
+export declare function server_get_total_events_by_herd(herd_id: number, sessions_visibility: EnumSessionsVisibility): Promise<IWebResponseCompatible<number>>;
 export declare function server_create_event(newEvent: any): Promise<IWebResponseCompatible<boolean>>;

package/dist/helpers/events.js

@@ -2,18 +2,31 @@
 import { newServerClient } from "../supabase/server";
 import { EnumWebResponse, IWebResponse, } from "../types/requests";
 import { addSignedUrlsToEvents } from "./storage";
-export async function server_get_events_by_herd(herd_id) {
+export var EnumSessionsVisibility;
+(function (EnumSessionsVisibility) {
+    EnumSessionsVisibility[EnumSessionsVisibility["Only"] = 0] = "Only";
+    EnumSessionsVisibility[EnumSessionsVisibility["Exclude"] = 1] = "Exclude";
+    EnumSessionsVisibility[EnumSessionsVisibility["Combine"] = 2] = "Combine";
+})(EnumSessionsVisibility || (EnumSessionsVisibility = {}));
+export async function server_get_events_by_herd(herd_id, sessions_visibility) {
     const supabase = await newServerClient();
     // fetch events and include devices
     // sort by timestamp
-    const { data } = await supabase
+    let query = supabase
         .from("events")
         .select(`
       *,
       devices: devices!inner(*)
       `)
-        .eq("devices.herd_id", herd_id)
-        .order("timestamp_observation", { ascending: false });
+        .eq("devices.herd_id", herd_id);
+    // Apply session filter based on sessions_visibility
+    if (sessions_visibility === EnumSessionsVisibility.Only) {
+        query = query.not("session_id", "is", null);
+    }
+    else if (sessions_visibility === EnumSessionsVisibility.Exclude) {
+        query = query.is("session_id", null);
+    }
+    const { data } = await query.order("timestamp_observation", { ascending: false });
     // Add signed URLs to events using the same client
     const eventsWithSignedUrls = data
         ? await addSignedUrlsToEvents(data, supabase)
@@ -22,21 +35,29 @@ export async function server_get_events_by_herd(herd_id) {
     let response = IWebResponse.success(eventsWithSignedUrls);
     return response.to_compatible();
 }
-export async function server_get_more_events_by_herd(herd_id, offset, page_count = 10) {
+export async function server_get_more_events_by_herd(herd_id, offset, page_count = 10, includeSessionEvents) {
     const from = offset * page_count;
     const to = from + page_count - 1;
     const supabase = await newServerClient();
     // fetch events and include devices
     // sort by timestamp
-    const { data } = await supabase
+    let query = supabase
         .from("events")
         .select(`
       *,
       devices: devices!inner(*)
       `)
         .eq("devices.herd_id", herd_id)
-        .range(from, to)
-        .order("timestamp_observation", { ascending: false });
+        .range(from, to);
+    if (includeSessionEvents) {
+        // Include only events that have a session_id
+        query = query.not("session_id", "is", null);
+    }
+    else {
+        // Include only events that don't have a session_id
+        query = query.is("session_id", null);
+    }
+    const { data } = await query.order("timestamp_observation", { ascending: false });
     // Add signed URLs to events using the same client
     const eventsWithSignedUrls = data
         ? await addSignedUrlsToEvents(data, supabase)
@@ -46,12 +67,19 @@ export async function server_get_more_events_by_herd(herd_id, offset, page_count
     return response.to_compatible();
 }
 // function to get total number of events for a herd
-export async function server_get_total_events_by_herd(herd_id) {
+export async function server_get_total_events_by_herd(herd_id, sessions_visibility) {
     const supabase = await newServerClient();
-    // call public.get_total_events_for_herd(herd_id)
-    const { data, error } = await supabase.rpc("get_total_events_for_herd", {
-        herd_id_caller: herd_id,
-    });
+    let query = supabase
+        .from("events")
+        .select("id", { count: "exact", head: true })
+        .eq("devices.herd_id", herd_id);
+    if (sessions_visibility === EnumSessionsVisibility.Only) {
+        query = query.not("session_id", "is", null);
+    }
+    else if (sessions_visibility === EnumSessionsVisibility.Exclude) {
+        query = query.is("session_id", null);
+    }
+    const { count, error } = await query;
     if (error) {
         return {
             status: EnumWebResponse.ERROR,
@@ -60,7 +88,7 @@ export async function server_get_total_events_by_herd(herd_id) {
         };
     }
     else {
-        return IWebResponse.success(data).to_compatible();
+        return IWebResponse.success(count || 0).to_compatible();
     }
 }
 export async function server_create_event(newEvent) {

package/dist/types/herd_module.js

@@ -1,6 +1,6 @@
 import { LABELS } from "../constants/annotator";
 import { get_devices_by_herd } from "../helpers/devices";
-import { server_get_total_events_by_herd } from "../helpers/events";
+import { EnumSessionsVisibility, server_get_total_events_by_herd, } from "../helpers/events";
 import { server_get_plans_by_herd } from "../helpers/plans";
 import { server_get_events_and_tags_for_device } from "../helpers/tags";
 import { server_get_users_with_herd_access } from "../helpers/users";
@@ -88,7 +88,7 @@ export class HerdModule {
                     console.warn("Failed to get user roles:", error);
                     return { status: EnumWebResponse.ERROR, data: null };
                 }),
-                server_get_total_events_by_herd(herd.id).catch((error) => {
+                server_get_total_events_by_herd(herd.id, EnumSessionsVisibility.Exclude).catch((error) => {
                     console.warn("Failed to get total events count:", error);
                     return { status: EnumWebResponse.ERROR, data: null };
                 }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",