Optimize marker cache invalidation on model deletes

Author: daniel-slaugh

domains/iam/models/workspace.py

@@ -12,6 +12,12 @@
 
 
 class WorkspaceQueryset(models.QuerySet):
+    def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
+        return super().delete(*args, **kwargs)
+
     def get_queryset(self):
         return self.select_related("transfer_confirmation", "delete_confirmation")
 
@@ -118,6 +124,9 @@ def get_principal_permissions(
                 return []
 
     def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
         self.delete_contents(filter_arg=self, filter_suffix="")
         super().delete(*args, **kwargs)
 

domains/sta/models/location.py

@@ -14,6 +14,12 @@
 
 
 class LocationQuerySet(models.QuerySet):
+    def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
+        return super().delete(*args, **kwargs)
+
     def visible(self, principal: Optional[Union["User", "APIKey"]]):
         if hasattr(principal, "account_type"):
             if principal.account_type == "admin":
@@ -77,3 +83,9 @@ class Location(models.Model, PermissionChecker):
 
     def __str__(self):
         return f"{self.name} - {self.id}"
+
+    def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
+        return super().delete(*args, **kwargs)

domains/sta/models/thing.py

@@ -16,6 +16,12 @@
 
 
 class ThingQuerySet(models.QuerySet):
+    def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
+        return super().delete(*args, **kwargs)
+
     def visible(self, principal: Optional[Union["User", "APIKey"]]):
         if hasattr(principal, "account_type"):
             if principal.account_type == "admin":
@@ -111,6 +117,9 @@ def get_principal_permissions(
         return permissions
 
     def delete(self, *args, **kwargs):
+        from domains.sta.cache import invalidate_public_thing_markers_cache
+
+        invalidate_public_thing_markers_cache()
         self.delete_contents(filter_arg=self, filter_suffix="")
         super().delete(*args, **kwargs)
 

domains/sta/signals.py

@@ -1,15 +1,12 @@
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_save
 from django.dispatch import receiver
 from domains.iam.models import Workspace
 from domains.sta.cache import invalidate_public_thing_markers_cache
 from domains.sta.models import Location, Thing
 
 
 @receiver(post_save, sender=Thing)
-@receiver(post_delete, sender=Thing)
 @receiver(post_save, sender=Location)
-@receiver(post_delete, sender=Location)
 @receiver(post_save, sender=Workspace)
-@receiver(post_delete, sender=Workspace)
 def invalidate_public_thing_markers(*args, **kwargs) -> None:
     invalidate_public_thing_markers_cache()