Merge pull request #246 from OpenGeoscience/refactor-guardian

Move model-specific logic out of `GuardianPermission` class

Author: annehaley

geoinsight/core/models/chart.py

@@ -16,6 +16,10 @@ class Chart(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(project__in=projects)
+
     def spawn_conversion_task(
         self,
         conversion_options=None,

geoinsight/core/models/colormap.py

@@ -37,6 +37,10 @@ class Colormap(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(models.Q(project__isnull=True) | models.Q(project__in=projects))
+
     def clean(self):
         if len(self.markers):
             validate(instance=self.markers, schema=MARKER_SCHEMA)

geoinsight/core/models/data.py

@@ -23,6 +23,10 @@ class RasterData(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(dataset__project__in=projects)
+
     def get_image_data(self, resolution: float = 1.0):
         with tempfile.TemporaryDirectory() as tmp:
             raster_path = Path(tmp, 'raster')
@@ -48,6 +52,10 @@ class VectorData(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(dataset__project__in=projects)
+
     def write_geojson_data(self, content: str | dict):
         if isinstance(content, str):
             data = content

geoinsight/core/models/dataset.py

@@ -29,6 +29,11 @@ class Meta:
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        # Dataset permissions are not determined by Project permissions
+        return queryset
+
     def owner(self) -> User | None:
         users = typing.cast(
             list[User], list(get_users_with_perms(self, only_with_perms_in=['owner']))

geoinsight/core/models/file_item.py

@@ -22,6 +22,10 @@ class FileItem(TimeStampedModel):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(dataset__project__in=projects)
+
 
 @receiver(models.signals.post_delete, sender=FileItem)
 def delete_content(sender, instance, **kwargs):

geoinsight/core/models/layer.py

@@ -19,6 +19,10 @@ class Layer(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(dataset__project__in=projects)
+
 
 class LayerFrame(models.Model):
     name = models.CharField(max_length=255, default='Layer Frame')
@@ -41,6 +45,10 @@ class Meta:
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(layer__dataset__project__in=projects)
+
     def get_data(self):
         if self.raster is not None:
             return self.raster

geoinsight/core/models/networks.py

@@ -53,6 +53,10 @@ class Network(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(vector_data__dataset__project__in=projects)
+
     @property
     def dataset(self):
         return self.vector_data.dataset
@@ -109,6 +113,10 @@ class NetworkNode(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(network__dataset__project__in=projects)
+
     @property
     def dataset(self):
         return self.network.dataset
@@ -145,6 +153,10 @@ class NetworkEdge(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(network__dataset__project__in=projects)
+
     @property
     def dataset(self):
         return self.network.dataset

geoinsight/core/models/project.py

@@ -18,6 +18,10 @@ class Project(models.Model):
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(id__in=projects.values_list('id', flat=True))
+
     def owner(self) -> User:
         users = typing.cast(
             list[User], list(get_users_with_perms(self, only_with_perms_in=['owner']))

geoinsight/core/models/regions.py

@@ -22,3 +22,7 @@ class Meta:
 
     def __str__(self):
         return f'{self.name} ({self.id})'
+
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(dataset__project__in=projects)

geoinsight/core/models/styles.py

@@ -29,6 +29,10 @@ class Meta:
     def __str__(self):
         return f'{self.name} ({self.id})'
 
+    @classmethod
+    def filter_queryset_by_projects(cls, queryset, projects):
+        return queryset.filter(layer__dataset__project__in=projects)
+
     def save_style_configs(self, style_spec):
         if style_spec is None:
             raise ValueError('style_spec must not be None.')