Fix home view

Author: jochenklar

isimip_data/home/utils.py

@@ -4,35 +4,36 @@
 def get_home_links(tree, product, category_sector_resource):
     links = []
 
-    for simulation_round, simulation_round_tree in tree.tree_dict.items():
-        category_sector_resource_tree = simulation_round_tree.get('items', {}).get(product, {}).get('items', {})
-        if isinstance(category_sector_resource, str):
-            # this is a category or a sector
-            if category_sector_resource_tree.get(category_sector_resource):
-                links.append(
-                    (
-                        simulation_round,
-                        reverse('search', args=[
-                            f'tree/{simulation_round}/{product}/{category_sector_resource}'
-                        ])
+    if tree:
+        for simulation_round, simulation_round_tree in tree.tree_dict.items():
+            category_sector_resource_tree = simulation_round_tree.get('items', {}).get(product, {}).get('items', {})
+            if isinstance(category_sector_resource, str):
+                # this is a category or a sector
+                if category_sector_resource_tree.get(category_sector_resource):
+                    links.append(
+                        (
+                            simulation_round,
+                            reverse('search', args=[
+                                f'tree/{simulation_round}/{product}/{category_sector_resource}'
+                            ])
+                        )
                     )
-                )
-        else:
-            # this is a resource
-            for resource_path in category_sector_resource.paths:
-                resource_simulation_round, resource_product, resource_publication = resource_path.split('/')
-                if resource_simulation_round == simulation_round and resource_product == product:
-                    tree_publication = category_sector_resource_tree.get(resource_publication) or \
-                                       category_sector_resource_tree.get(resource_publication.lower())
-                    if tree_publication:
-                        publication = tree_publication.get('specifier')
-                        links.append(
-                            (
-                                simulation_round,
-                                reverse('search', args=[
-                                    f'tree/{simulation_round}/{product}/{publication}'
-                                ])
+            else:
+                # this is a resource
+                for resource_path in category_sector_resource.paths:
+                    resource_simulation_round, resource_product, resource_publication = resource_path.split('/')
+                    if resource_simulation_round == simulation_round and resource_product == product:
+                        tree_publication = category_sector_resource_tree.get(resource_publication) or \
+                                           category_sector_resource_tree.get(resource_publication.lower())
+                        if tree_publication:
+                            publication = tree_publication.get('specifier')
+                            links.append(
+                                (
+                                    simulation_round,
+                                    reverse('search', args=[
+                                        f'tree/{simulation_round}/{product}/{publication}'
+                                    ])
+                                )
                             )
-                        )
 
     return links

isimip_data/home/views.py

@@ -1,19 +1,11 @@
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.db.models import Q
 from django.shortcuts import render
 
 from isimip_data.metadata.models import Resource, Tree
 
 
 def home(request):
     tree = Tree.objects.using('metadata').first()
-
-    # get all tree_path for DerivedOutputData and construct a Q object for all resources for DerivedOutputData
-    q = Q()
-    for simulation_round in tree.tree_dict.keys():
-        q |= Q(paths_agg__icontains=f'{simulation_round}/DerivedOutputData/')
-
-    resources = Resource.objects.using('metadata').annotate(paths_agg=ArrayAgg('paths')).filter(q).order_by('paths')
+    resources = Resource.objects.using('metadata').filter_by_tree(tree, product='DerivedOutputData')
 
     return render(request, 'home/home.html', {
         'tree': tree,

isimip_data/metadata/managers.py

@@ -1,3 +1,4 @@
+from django.contrib.postgres.aggregates import ArrayAgg
 from django.db import models
 
 
@@ -24,3 +25,22 @@ class IdentifierManager(models.Manager):
 
     def get_queryset(self):
         return IdentifierQuerySet(self.model, using=self._db)
+
+
+class ResourceQuerySet(models.QuerySet):
+
+    def filter_by_tree(self, tree, product=None):
+        if tree:
+            if product is not None:
+                # get all tree_path for the product and construct a Q object for all resources
+                q = models.Q()
+                for simulation_round in tree.tree_dict.keys():
+                    q |= models.Q(paths_agg__icontains=f'{simulation_round}/{product}/')
+
+            return self.annotate(paths_agg=ArrayAgg('paths')).filter(q).order_by('paths')
+
+
+class ResourceManager(models.Manager):
+
+    def get_queryset(self):
+        return ResourceQuerySet(self.model, using=self._db)

isimip_data/metadata/models.py

@@ -8,7 +8,7 @@
 from django.utils.functional import cached_property
 
 from .constants import RIGHTS
-from .managers import DatasetManager, IdentifierManager
+from .managers import DatasetManager, IdentifierManager, ResourceManager
 from .utils import get_json_ld_name, get_terms_of_use, merge_identifiers, merge_specifiers, prettify_specifiers
 
 
@@ -203,6 +203,8 @@ def get_absolute_url(self):
 
 class Resource(models.Model):
 
+    objects = ResourceManager()
+
     id = models.UUIDField(primary_key=True)
     doi = models.TextField()
     title = models.TextField()