Added distinct filter to STA engine.

hydroserver2 · Oct 3, 2024 · a6bd510 · a6bd510
1 parent 395fe4a
commit a6bd510
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 29 deletions.
diff --git a/stapi/engine/components/datastreams.py b/stapi/engine/components/datastreams.py
@@ -66,6 +66,8 @@ def get_datastreams(
                 order_by=ordering
             )
 
+        datastreams = datastreams.distinct()
+
         if get_count:
             count = datastreams.count()
         else:

diff --git a/stapi/engine/components/locations.py b/stapi/engine/components/locations.py
@@ -63,6 +63,8 @@ def get_locations(
                 order_by=ordering
             )
 
+        things = things.distinct()
+
         if get_count:
             count = things.count()
         else:

diff --git a/stapi/engine/components/observations.py b/stapi/engine/components/observations.py
@@ -77,13 +77,13 @@ def get_observations(
             order_by=ordering
         )
 
+        observations = observations.distinct()
+
         if get_count:
             count = observations.count()
         else:
             count = None
 
-        observations = observations.distinct()
-
         if datastream_ids:
             observations = self.apply_rank(
                 component=ObservationSchema,

diff --git a/stapi/engine/components/observed_properties.py b/stapi/engine/components/observed_properties.py
@@ -45,6 +45,8 @@ def get_observed_properties(
                 order_by=ordering
             )
 
+        observed_properties = observed_properties.distinct()
+
         if get_count:
             count = observed_properties.count()
         else:

diff --git a/stapi/engine/components/sensors.py b/stapi/engine/components/sensors.py
@@ -44,6 +44,8 @@ def get_sensors(
                 order_by=ordering
             )
 
+        sensors = sensors.distinct()
+
         if get_count:
             count = sensors.count()
         else:

diff --git a/stapi/engine/components/things.py b/stapi/engine/components/things.py
@@ -64,6 +64,8 @@ def get_things(
                 order_by=ordering
             )
 
+        things = things.distinct()
+
         if get_count:
             count = things.count()
         else:

diff --git a/tests/test_sensorthings_endpoints.py b/tests/test_sensorthings_endpoints.py