udata 7.0.5.dev27885__py2.py3-none-any.whl → 7.0.5.dev27942__py2.py3-none-any.whl

udata/core/organization/csv.py

@@ -1,3 +1,4 @@
+from udata.core.dataset.models import Dataset
 from udata.frontend import csv
 
 from .models import Organization
@@ -5,6 +6,8 @@ from .models import Organization
 
 @csv.adapter(Organization)
 class OrganizationCsvAdapter(csv.Adapter):
+    downloads_counts = None
+
     fields = (
         'id',
         'name',
@@ -18,4 +21,27 @@ class OrganizationCsvAdapter(csv.Adapter):
     )
 
     def dynamic_fields(self):
-        return csv.metric_fields(Organization)
+        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

udata/frontend/csv.py

@@ -58,8 +58,8 @@ class Adapter(object):
                     else:
                         field_tuple = (name, self.getter(*field))
                 except Exception as e:  # Catch all errors intentionally.
-                    log.error('Error exporting CSV for {name}: {error}'.format(
-                        name=self.__class__.__name__, error=e))
+                    log.error('Error exporting CSV for {name}: {error_class} {error}'.format(
+                        name=self.__class__.__name__, error_class=e.__class__.__name__, error=e))
                 self._fields.append(field_tuple)
         return self._fields
 
@@ -89,8 +89,8 @@ class Adapter(object):
                 try:
                     content = safestr(getter(obj))
                 except Exception as e:  # Catch all errors intentionally.
-                    log.error('Error exporting CSV for {name}: {error}'.format(
-                        name=self.__class__.__name__, error=e))
+                    log.error('Error exporting CSV for {name}: {error_class} {error}'.format(
+                        name=self.__class__.__name__, error_class=e.__class__.__name__, error=e))
             row.append(content)
         return row
 
@@ -130,8 +130,8 @@ class NestedAdapter(Adapter):
                     else:
                         field_tuple = (name, self.getter(*field))
                 except Exception as e:  # Catch all errors intentionally.
-                    log.error('Error exporting CSV for {name}: {error}'.format(
-                        name=self.__class__.__name__, error=e))
+                    log.error('Error exporting CSV for {name}: {error_class} {error}'.format(
+                        name=self.__class__.__name__, error_class=e.__class__.__name__, error=e))
                 self._nested_fields.append(field_tuple)
         return self._nested_fields
 
@@ -155,8 +155,8 @@ class NestedAdapter(Adapter):
                 try:
                     content = safestr(getter(nested))
                 except Exception as e:  # Catch all errors intentionally.
-                    log.error('Error exporting CSV for {name}: {error}'.format(
-                        name=self.__class__.__name__, error=e))
+                    log.error('Error exporting CSV for {name}: {error_class} {error}'.format(
+                        name=self.__class__.__name__, error_class=e.__class__.__name__, error=e))
             row.append(content)
         return row
 

udata/tests/organization/test_csv_adapter.py

@@ -0,0 +1,43 @@
+from datetime import datetime, timedelta
+
+import pytest
+
+from udata.core.dataset.csv import ResourcesCsvAdapter, DatasetCsvAdapter
+from udata.core.dataset.factories import DatasetFactory, ResourceFactory
+from udata.core.dataset.models import Dataset
+from udata.core.organization.csv import OrganizationCsvAdapter
+from udata.core.organization.factories import OrganizationFactory
+from udata.core.organization.models import Organization
+
+
+@pytest.mark.frontend
+@pytest.mark.usefixtures('clean_db')
+class OrganizationCSVAdapterTest:
+
+    def test_organization_downloads_counts(self):
+        org_with_dataset = OrganizationFactory()
+        org_without_dataset = OrganizationFactory()
+
+        DatasetFactory(organization=org_with_dataset, resources=[
+            ResourceFactory(metrics={
+                'views': 42,
+            }),
+            ResourceFactory(metrics={
+                'views': 1337,
+            }),
+            ResourceFactory(),
+        ])
+        DatasetFactory(organization=org_with_dataset, resources=[])
+        adapter = OrganizationCsvAdapter(Organization.objects.all())
+
+        # Build a dict (Org ID to dict of header name to value) from the CSV values and headers to simplify testing below.
+        csv = {}
+        for row in adapter.rows():
+            values = dict(zip(adapter.header(), row))
+            csv[values['id']] = values
+
+        org_values = csv[str(org_with_dataset.id)]
+        assert org_values['downloads'] == 1337 + 42
+
+        org_values = csv[str(org_without_dataset.id)]
+        assert org_values['downloads'] == 0

{udata-7.0.5.dev27885.dist-info → udata-7.0.5.dev27942.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.5.dev27885
+Version: 7.0.5.dev27942
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,6 +142,7 @@ It is collectively taken care of by members of the
 - Fix: updating a dataset without `private` do not reset `private` to `False`, the previous saved value is kept [#2955](https://github.com/opendatateam/udata/pull/2955)
 - Fix: return the correct error when no `Content-Type` is sent instead of 500 [#2967](https://github.com/opendatateam/udata/pull/2967)
 - Improve documentation for API errors [#2952](https://github.com/opendatateam/udata/pull/2965)
+- Add downloads' count to organizations CSV [#2973](https://github.com/opendatateam/udata/pull/2973)
 
 ## 7.0.4 (2024-02-27)
 

{udata-7.0.5.dev27885.dist-info → udata-7.0.5.dev27942.dist-info}/RECORD

@@ -129,7 +129,7 @@ udata/core/organization/api.py,sha256=dqXecBhVMvLb2xUcqno25oX1DwBDKg2qxjItDlvEtN
 udata/core/organization/api_fields.py,sha256=x1UXdRnwNzJ4veyJJc-S5MxbnoArAM7rrUn1OIZXo7E,5426
 udata/core/organization/apiv2.py,sha256=VAU_y9Zz-VhBgS-LWVbGOEZdSt3b44nZd5bzTV2wU8g,3206
 udata/core/organization/commands.py,sha256=FaSYxyWfQDR5tWvrAXmwcF2VMREOC13XTK8DD4vp_sY,1623
-udata/core/organization/csv.py,sha256=k62dvI-4bw_y74F3PepdJp-ryBJxLvZWvYyShq2876Y,502
+udata/core/organization/csv.py,sha256=x0afMfhWYvx_karwuw5jXqBhMbzkrsiEuAq1wTVurZI,1491
 udata/core/organization/factories.py,sha256=5BABVcDhEChRhJsDfCDm8WyJG4l9j3H1_OFZa3VtlVs,646
 udata/core/organization/forms.py,sha256=SLREg-Sfza7uQcFEOqfUBhCbP2U8Ek2gWX2xe5EUWpA,3540
 udata/core/organization/metrics.py,sha256=nQiRscXRgpuzpfg5nNE6-kyJqk36KdRXKD_G5MmiJok,750
@@ -247,7 +247,7 @@ udata/forms/fields.py,sha256=WTCAc4KVPS6EanpUPuan_reDM9gwx4K2wdvJBxu_pTY,29129
 udata/forms/validators.py,sha256=EqCJloDOR3BonrR34N_ZaMGBXr0iuliDc82khc98e20,2816
 udata/forms/widgets.py,sha256=P-D3uYfNH5OhAa-SqNoXROg_DuDlnpv_DaO_e4LcJ5I,1380
 udata/frontend/__init__.py,sha256=Xc71TI6a8b_QR_wqEOc1tty2y1CwHVbV4tS04nElme0,3494
-udata/frontend/csv.py,sha256=BbbwUHwNIkVojOn1h5kfBXIPtrzHdZUc4AGE1ZaFOF4,7982
+udata/frontend/csv.py,sha256=mKK3d3O-hpeDcf-rV2l0uB2GVxNmSmNNl8v_iFruPMM,8174
 udata/frontend/markdown.py,sha256=41bOiU6AKng4U-5v3otBed3dyCu63NI9fnznUQThbIk,4377
 udata/harvest/__init__.py,sha256=C4y5w4vGb_F9Opy62lzV3eHo4DkNyRgPCq-wsarPXiQ,28
 udata/harvest/actions.py,sha256=LaNBcblE0Ak03KUKTBaERCtNoRsy8NuaAB9n0ovXrJU,9603
@@ -611,6 +611,7 @@ udata/tests/frontend/test_csv.py,sha256=mBJdEwXc6YQSzSqrnup_v76Ct_LGRRhO2wxheoOX
 udata/tests/frontend/test_hooks.py,sha256=ZTIHWjtqzBXNQK-5EH4zmqLeBBX0S617i4A_dnO3xIw,4077
 udata/tests/frontend/test_markdown.py,sha256=KHh0rFfWHqzes0qvLPPFc7uV_IPSS7ymVsQeVpjpPA4,12689
 udata/tests/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+udata/tests/organization/test_csv_adapter.py,sha256=u2w5EOvkz6BH3ACdzW4MdzjOpbHRn-nq67HTmC_8hYA,1568
 udata/tests/organization/test_notifications.py,sha256=rR1iGtMSmP9htrDJTIVZdvvgO3YNtfoADySGsMzzWdE,1410
 udata/tests/organization/test_organization_model.py,sha256=3VdpRPPnhPkRN0yj-hTYIclXWUUCuU1oMQG_gMl22wA,2046
 udata/tests/organization/test_organization_rdf.py,sha256=XPk__wiDeF8E02ORR0v9LIyUK2QJ6hJB_lqjxesCApQ,6354
@@ -649,9 +650,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=dXTr2zzGPgclSMzAJo4qhOEVHYWYP7
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=G-MNwE4Gih-4w-xNAjp7PAvQOeW1uyM-27Z6O08_SCc,42104
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=5bvKeJp9nqk76tZsgbGC2qnbpJws5lODdMcezr6LKbQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=d_uBu93oIsmeewv8QzrB2Z8tmkUXn8juwT5OiySALog,48684
-udata-7.0.5.dev27885.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.5.dev27885.dist-info/METADATA,sha256=kcy_O4ue_mJRqxGZ2UdLKoxeigd80IF9igrM5DCOfxI,118247
-udata-7.0.5.dev27885.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.5.dev27885.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
-udata-7.0.5.dev27885.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.5.dev27885.dist-info/RECORD,,
+udata-7.0.5.dev27942.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.5.dev27942.dist-info/METADATA,sha256=vgocyJrmxGFVfhVKbzgrRTR2-0UhAEG2lUnHRO4eP3g,118348
+udata-7.0.5.dev27942.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.5.dev27942.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
+udata-7.0.5.dev27942.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.5.dev27942.dist-info/RECORD,,