@adventurelabs/scout-core 1.0.17 → 1.0.19

package/dist/helpers/tags.js

@@ -164,25 +164,68 @@ export async function get_event_and_tags_by_event_id(event_id) {
             data: null,
         };
     }
-    if (!data[0]) {
+    if (!data || data.length === 0) {
         return {
             status: EnumWebResponse.ERROR,
             msg: "Event not found",
             data: null,
         };
     }
-    // Transform location to latitude/longitude
+    // Debug the raw event data from database
+    console.log("Raw event data from DB:", {
+        eventId: data[0].id,
+        mediaUrl: data[0].media_url,
+        filePath: data[0].file_path,
+        message: data[0].message,
+        deviceId: data[0].device_id,
+        location: data[0].location,
+        locationType: typeof data[0].location,
+        hasCoordinates: data[0].location &&
+            typeof data[0].location === "object" &&
+            "coordinates" in data[0].location,
+    });
+    // Transform location to latitude/longitude with better error handling
+    let latitude = null;
+    let longitude = null;
+    try {
+        if (data[0].location) {
+            if (typeof data[0].location === "object" && data[0].location !== null) {
+                // Handle PostGIS Point format: { coordinates: [lon, lat] }
+                if ("coordinates" in data[0].location &&
+                    Array.isArray(data[0].location.coordinates)) {
+                    longitude = data[0].location.coordinates[0];
+                    latitude = data[0].location.coordinates[1];
+                }
+                // Handle alternative format: { x: lon, y: lat }
+                else if ("x" in data[0].location && "y" in data[0].location) {
+                    longitude = data[0].location.x;
+                    latitude = data[0].location.y;
+                }
+            }
+            // Handle string format: "Point(lon lat)"
+            else if (typeof data[0].location === "string") {
+                const match = data[0].location.match(/Point\(([^)]+)\)/);
+                if (match) {
+                    const coords = match[1].split(" ").map(Number);
+                    if (coords.length === 2) {
+                        longitude = coords[0];
+                        latitude = coords[1];
+                    }
+                }
+            }
+        }
+    }
+    catch (locationError) {
+        console.warn("Error parsing location data:", locationError);
+        // Continue with null coordinates
+    }
     const transformedData = {
         id: data[0].id,
         inserted_at: data[0].inserted_at,
         message: data[0].message,
         media_url: data[0].media_url,
-        latitude: data[0].location
-            ? data[0].location.coordinates[1]
-            : null,
-        longitude: data[0].location
-            ? data[0].location.coordinates[0]
-            : null,
+        latitude: latitude,
+        longitude: longitude,
         altitude: data[0].altitude,
         heading: data[0].heading,
         media_type: data[0].media_type,
@@ -191,8 +234,22 @@ export async function get_event_and_tags_by_event_id(event_id) {
         is_public: data[0].is_public,
         tags: data[0].tags || [],
         earthranger_url: data[0].earthranger_url,
+        file_path: data[0].file_path,
     };
+    // Debug before signed URL generation
+    console.log("Before signed URL generation:", {
+        eventId: transformedData.id,
+        mediaUrl: transformedData.media_url,
+        filePath: transformedData.file_path,
+        hasFilePath: !!transformedData.file_path,
+    });
     // Add signed URL to event using the same client
     const eventWithSignedUrl = await addSignedUrlToEvent(transformedData, supabase);
+    // Debug after signed URL generation
+    console.log("After signed URL generation:", {
+        eventId: eventWithSignedUrl.id,
+        mediaUrl: eventWithSignedUrl.media_url,
+        filePath: eventWithSignedUrl.file_path,
+    });
     return IWebResponse.success(eventWithSignedUrl).to_compatible();
 }

package/dist/types/db.d.ts

@@ -18,6 +18,7 @@ export type IUserRolePerHerd = Database["public"]["Tables"]["users_roles_per_her
 export type IHerd = Database["public"]["Tables"]["herds"]["Row"];
 export type IEventWithTags = Database["public"]["CompositeTypes"]["event_with_tags"] & {
     earthranger_url: string | null;
+    file_path: string | null;
 };
 export type IDevicePrettyLocation = Database["public"]["CompositeTypes"]["device_pretty_location"];
 export type IEventAndTagsPrettyLocation = Database["public"]["CompositeTypes"]["event_and_tags_pretty_location"];

package/package.json

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