Updated SensorThings DELETE Observations endpoints.

Author: Ken Lippold

sta/models/observation.py

@@ -34,6 +34,21 @@ def visible(self, user: Optional["User"]):
                   datastream__thing__workspace__collaborators__role__permissions__permission_type__in=["*", "view"])
             )
 
+    def removable(self, user: Optional["User"]):
+        if user is None:
+            return self.none()
+        elif user.account_type == "admin":
+            return self
+        else:
+            return self.filter(
+                Q(datastream__thing__workspace__owner=user) |
+                Q(datastream__thing__workspace__collaborators__user=user,
+                  datastream__thing__workspace__collaborators__role__permissions__resource_type__in=[
+                      "*", "Observation"
+                  ],
+                  datastream__thing__workspace__collaborators__role__permissions__permission_type__in=["*", "delete"])
+            )
+
 
 class Observation(models.Model, PermissionChecker):
     pk = models.CompositePrimaryKey("datastream_id", "phenomenon_time", "id")

sta/services/observation.py

@@ -24,7 +24,7 @@ def get_observation_for_action(user: User, uid: uuid.UUID, action: Literal["view
         try:
             observation = Observation.objects.select_related(
                 "datastream", "datastream__thing", "datastream__thing__workspace"
-            ).get(pk=uid)
+            ).get(id=uid)
         except Observation.DoesNotExist:
             raise HttpError(404, "Observation does not exist")
 

sta/services/sensorthings/observation.py

@@ -127,7 +127,7 @@ def create_observation(
             observation: ObservationPostBody
     ) -> UUID:
         datastream = datastream_service.get_datastream_for_action(
-            user=self.request.authenticated_user, uid=observation.datastream, action="view"  # noqa
+            user=self.request.authenticated_user, uid=observation.datastream.id, action="view"  # noqa
         )
 
         if not Observation.can_user_create(user=self.request.authenticated_user,  # noqa
@@ -159,7 +159,7 @@ def create_observations(
 
         for datastream_id, datastream_observations in observations.items():
             datastream = datastream_service.get_datastream_for_action(
-                user=self.request.authenticated_user, uid=observation.datastream, action="view"  # noqa
+                user=self.request.authenticated_user, uid=datastream_id, action="view"  # noqa
             )
 
             if not Observation.can_user_create(user=self.request.authenticated_user,  # noqa
@@ -214,15 +214,48 @@ def delete_observation(
             self,
             observation_id: str
     ) -> None:
-        pass
+
+        observation = observation_service.get_observation_for_action(
+            user=self.request.authenticated_user, uid=observation_id, action="delete"  # noqa
+        )
+
+        datastream_id = observation.datastream.id
+        observation.delete()
+
+        self.update_value_count(datastream_id=datastream_id)
 
     def delete_observations(
             self,
             datastream_id: UUID,
             start_time: Optional[datetime] = None,
             end_time: Optional[datetime] = None
     ) -> None:
-        return None
+
+        datastream = datastream_service.get_datastream_for_action(
+            user=self.request.authenticated_user, uid=datastream_id, action="view"  # noqa
+        )
+
+        observations_count = Observation.objects.filter(
+            datastream=datastream,
+            phenomenon_time__gte=start_time,
+            phenomenon_time__lte=end_time
+        ).count()
+
+        observations = Observation.objects.filter(
+            datastream_id=datastream_id,
+            phenomenon_time__gte=start_time,
+            phenomenon_time__lte=end_time
+        ).removable(user=self.request.authenticated_user)  # noqa
+
+        if observations_count == 0:
+            raise HttpError(400, "No observations to delete within the given range")
+
+        if observations_count != observations.count():
+            raise HttpError(403, "You do not have permission to delete one or more of these observations")
+
+        observations.delete()
+
+        self.update_value_count(datastream_id=datastream.id)
 
     @staticmethod
     def update_value_count(datastream_id: UUID) -> None:
@@ -231,9 +264,7 @@ def update_value_count(datastream_id: UUID) -> None:
             datastream_id=datastream_id
         )
 
-        datastream = Datastream.objects.get(
-            datastream_id=datastream_id
-        )
+        datastream = Datastream.objects.get(pk=datastream_id)
 
         datastream.value_count = int(observation_query.count())
         datastream.save()