udata 10.8.3.dev37212__py2.py3-none-any.whl → 10.8.3.dev37272__py2.py3-none-any.whl

udata/core/organization/csv.py

@@ -4,6 +4,13 @@ from udata.core.dataset.models import Dataset
 from .models import Organization
 
 
+def get_resource_download_count(organization: Organization) -> int:
+    return sum(
+        dat.metrics.get("resources_downloads", 0) or 0
+        for dat in Dataset.objects(organization=organization).only("metrics").visible()
+    )
+
+
 @csv.adapter(Organization)
 class OrganizationCsvAdapter(csv.Adapter):
     downloads_counts = None
@@ -21,32 +28,8 @@ class OrganizationCsvAdapter(csv.Adapter):
         "last_modified",
         "business_number_id",
         ("members_count", lambda o: len(o.members)),
+        ("downloads", get_resource_download_count),
     )
 
     def dynamic_fields(self):
-        return csv.metric_fields(Organization) + self.get_dynamic_field_downloads()
-
-    def get_dynamic_field_downloads(self):
-        downloads_counts = self.get_downloads_counts()
-        return [("downloads", lambda o: downloads_counts.get(str(o.id), 0))]
-
-    def get_downloads_counts(self):
-        """
-        Prefetch all the resources' downloads for all selected organization into memory
-        """
-        if self.downloads_counts is not None:
-            return self.downloads_counts
-
-        self.downloads_counts = {}
-
-        ids = [o.id for o in self.queryset]
-        for dataset in Dataset.objects(organization__in=ids):
-            org_id = str(dataset.organization.id)
-            if self.downloads_counts.get(org_id) is None:
-                self.downloads_counts[org_id] = 0
-
-            self.downloads_counts[org_id] += sum(
-                resource.metrics.get("views", 0) for resource in dataset.resources
-            )
-
-        return self.downloads_counts
+        return csv.metric_fields(Organization)