feat: limit location query to 50 measurements

Author: NejcKle

rest_api/main.py

@@ -159,6 +159,7 @@ def get_locations(
 ):
     """Fetch locations for a given list of sensors."""
     ret = fetch_locations_for_device_list(conn, sensor_list)
+    print(f"Returning {ret} locations")
     return {"locations": ret}
 
 

rest_api/src/handlers.py

@@ -161,6 +161,7 @@ def fetch_measurements_for_sensor(
         return measurements
 
 
+# TODO: Implement device list
 def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
     """Fetch the latest location for each device in the device_list."""
     with conn.cursor() as cur:
@@ -174,7 +175,7 @@ def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
             ON m.registry_id = r.id
             JOIN sensors s
             ON m.sensor_id = s.id
-            ORDER BY m.timestamp DESC
+            ORDER BY m.timestamp DESC LIMIT 50
         """
         cur.execute(
             query,
@@ -185,9 +186,9 @@ def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
         # Step 2: Group measurement_ids by table name
         table_to_ids = defaultdict(list)
         for measurement_id, table_name, sensor_name in rows:
-            print(
-                f"Sensor name in DB: {sensor_name}, measurement_id: {measurement_id}, table_name: {table_name}"
-            )
+            # print(
+            #     f"Sensor name in DB: {sensor_name}, measurement_id: {measurement_id}, table_name: {table_name}"
+            # )
             table_to_ids[table_name].append((measurement_id, sensor_name))
 
         locations = []
@@ -196,7 +197,7 @@ def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
         for table_name, info in table_to_ids.items():
             measurement_ids, sensor_names = zip(*info)
             ids = list(measurement_ids)
-            print(f"IDs: {ids}")
+            # print(f"IDs: {ids}")
             # Check if latitude and longitude columns exist in the table
             cur.execute(
                 sql.SQL(
@@ -224,7 +225,7 @@ def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
 
                     # sensor_name = sensor_names[ids.index(row[0])]
                     filtered_data["sensor_name"] = sensor_name
-                    print(f"Sensor name: {sensor_name}")
+                    # print(f"Sensor name: {sensor_name}")
                     if filtered_data:
                         if (
                             filtered_data.get("latitude") is not None
@@ -237,6 +238,9 @@ def fetch_locations_for_device_list(conn, device_list: list[str]) -> list:
                                     data=filtered_data,
                                 )
                             )
+                            print(
+                                f"Added location for sensor {sensor_name}: {filtered_data}"
+                            )
                             break
             except Exception as e:
                 print(f"Error executing query on table {table_name}: {e}")