udata 8.0.1.dev28859__py2.py3-none-any.whl → 8.0.1.dev28882__py2.py3-none-any.whl

udata/api/__init__.py

@@ -321,7 +321,6 @@ def init_app(app):
     # Load all core APIs
     import udata.core.activity.api  # noqa
     import udata.core.spatial.api  # noqa
-    import udata.core.metrics.api  # noqa
     import udata.core.user.api  # noqa
     import udata.core.dataset.api  # noqa
     import udata.core.dataset.apiv2  # noqa

udata/core/metrics/commands.py

@@ -5,7 +5,7 @@ import click
 from flask import current_app
 
 from udata.commands import cli, success
-from udata.models import User, Dataset, Reuse, Organization, Site
+from udata.models import User, Dataset, Reuse, Organization, Site, GeoZone
 
 log = logging.getLogger(__name__)
 
@@ -24,11 +24,12 @@ def grp():
               help='Compute datasets metrics')
 @click.option('-r', '--reuses', is_flag=True, help='Compute reuses metrics')
 @click.option('-u', '--users', is_flag=True, help='Compute users metrics')
+@click.option('-g', '--geozones', is_flag=True, help='Compute geo levels metrics')
 @click.option('--drop', is_flag=True, help='Clear old metrics before computing new ones')
 def update(site=False, organizations=False, users=False, datasets=False,
-           reuses=False, drop=False):
+           reuses=False, geozones = False, drop=False):
     '''Update all metrics for the current date'''
-    do_all = not any((site, organizations, users, datasets, reuses))
+    do_all = not any((site, organizations, users, datasets, reuses, geozones))
 
     if do_all or site:
         log.info('Update site metrics')
@@ -114,4 +115,18 @@ def update(site=False, organizations=False, users=False, datasets=False,
                 except Exception as e:
                     log.info(f'Error during update: {e}')
                     continue
+
+    if do_all or geozones:
+        log.info('Update GeoZone metrics')
+        all_geozones = GeoZone.objects.timeout(False)
+        with click.progressbar(all_geozones, length=GeoZone.objects.count()) as geozones_bar:
+            for geozone in geozones_bar:
+                try:
+                    if drop:
+                        geozone.metrics.clear()
+                    geozone.count_datasets()
+                except Exception as e:
+                    log.info(f'Error during update: {e}')
+                    continue
+
     success('All metrics have been updated')

udata/core/spatial/api.py

@@ -162,11 +162,6 @@ class SpatialCoverageAPI(API):
         features = []
 
         for zone in GeoZone.objects(level=level.id):
-            # fetch nested levels IDs
-            ids = []
-            ids.append(zone.id)
-            # Count datasets in zone
-            nb_datasets = Dataset.objects(spatial__zones__in=ids).count()
             features.append({
                 'id': zone.id,
                 'type': 'Feature',
@@ -174,7 +169,7 @@ class SpatialCoverageAPI(API):
                     'name': _(zone.name),
                     'code': zone.code,
                     'uri': zone.uri,
-                    'datasets': nb_datasets
+                    'datasets': zone.metrics.get('datasets', 0)
                 }
             })
 

udata/core/spatial/models.py

@@ -3,6 +3,7 @@ from werkzeug.local import LocalProxy
 from werkzeug.utils import cached_property
 
 from udata.app import cache
+from udata.core.metrics.models import WithMetrics
 from udata.uris import endpoint_for
 from udata.i18n import _, get_locale, language
 from udata.mongo import db
@@ -21,7 +22,6 @@ class GeoLevel(db.Document):
                               max_value=ADMIN_LEVEL_MAX,
                               default=100)
 
-
 class GeoZoneQuerySet(db.BaseQuerySet):
 
     def resolve(self, geoid, id_only=False):
@@ -40,7 +40,7 @@ class GeoZoneQuerySet(db.BaseQuerySet):
         return result.id if id_only and result else result
 
 
-class GeoZone(db.Document):
+class GeoZone(WithMetrics, db.Document):
     SEPARATOR = ':'
 
     id = db.StringField(primary_key=True)
@@ -101,6 +101,11 @@ class GeoZone(db.Document):
     def external_url(self):
         return endpoint_for('territories.territory', territory=self, _external=True)
 
+    def count_datasets(self):
+        from udata.models import Dataset
+        self.metrics['datasets'] = Dataset.objects(spatial__zones=self.id).visible().count()
+        self.save()
+
     def toGeoJSON(self):
         return {
             'id': self.id,

udata/core/spatial/tasks.py

@@ -0,0 +1,7 @@
+from udata.core.spatial.models import GeoZone
+from udata.tasks import job
+
+@job('compute-geozones-metrics')
+def compute_geozones_metrics(self):
+    for geozone in GeoZone.objects.timeout(False):
+        geozone.count_datasets()

udata/core/spatial/tests/test_api.py

@@ -10,6 +10,7 @@ from udata.core.dataset.factories import DatasetFactory
 from udata.core.spatial.factories import (
     SpatialCoverageFactory, GeoZoneFactory, GeoLevelFactory
 )
+from udata.core.spatial.tasks import compute_geozones_metrics
 
 
 class SpatialApiTest(APITestCase):
@@ -229,6 +230,31 @@ class SpatialApiTest(APITestCase):
             'features': [],
         })
 
+    def test_coverage_datasets_count(self):
+        GeoLevelFactory(id='fr:commune')
+        paris = GeoZoneFactory(
+            id='fr:commune:75056', level='fr:commune',
+            name='Paris', code='75056')
+        arles = GeoZoneFactory(
+            id='fr:commune:13004', level='fr:commune',
+            name='Arles', code='13004')
+
+        for _ in range(3):
+            DatasetFactory(
+                spatial=SpatialCoverageFactory(zones=[paris.id]))
+        for _ in range(2):
+            DatasetFactory(
+                spatial=SpatialCoverageFactory(zones=[arles.id]))
+                    
+        compute_geozones_metrics()
+
+        response = self.get(url_for('api.spatial_coverage', level='fr:commune'))
+        self.assert200(response)
+        self.assertEqual(response.json['features'][0]['id'], 'fr:commune:13004')
+        self.assertEqual(response.json['features'][0]['properties']['datasets'], 2)
+        self.assertEqual(response.json['features'][1]['id'], 'fr:commune:75056')
+        self.assertEqual(response.json['features'][1]['properties']['datasets'], 3)
+
 
 class SpatialTerritoriesApiTest(APITestCase):
     modules = []