udata 14.5.1.dev9__py3-none-any.whl → 14.5.1.dev11__py3-none-any.whl

udata/core/post/models.py

@@ -4,6 +4,7 @@ from udata.api_fields import field, generate_fields
 from udata.core.dataset.api_fields import dataset_fields
 from udata.core.linkable import Linkable
 from udata.core.storages import default_image_basename, images
+from udata.core.user.api_fields import user_ref_fields
 from udata.i18n import lazy_gettext as _
 from udata.mongo import db
 from udata.uris import cdata_url
@@ -82,6 +83,7 @@ class Post(db.Datetimed, Linkable, db.Document):
 
     owner = field(
         db.ReferenceField("User"),
+        nested_fields=user_ref_fields,
         readonly=True,
         allow_null=True,
         description="The owner user",

udata/core/post/tests/test_api.py

@@ -56,9 +56,13 @@ class PostsAPITest(APITestCase):
 
     def test_post_api_get(self):
         """It should fetch a post from the API"""
-        post = PostFactory()
+        admin = AdminFactory()
+        post = PostFactory(owner=admin)
         response = self.get(url_for("api.post", post=post))
         assert200(response)
+        owner = response.json["owner"]
+        assert isinstance(owner, dict)
+        assert owner["id"] == str(admin.id)
 
     def test_post_api_create(self):
         """It should create a post from the API"""

udata/migrations/2021-08-17-harvest-integrity.py

@@ -5,6 +5,7 @@ Remove Harvest db integrity problems
 
 import logging
 
+import click
 import mongoengine
 
 from udata.core.jobs.models import PeriodicTask
@@ -16,29 +17,35 @@ log = logging.getLogger(__name__)
 def migrate(db):
     log.info("Processing HarvestJob source references.")
 
-    harvest_jobs = HarvestJob.objects().no_cache().all()
+    harvest_jobs = HarvestJob.objects().no_cache()
+    total = harvest_jobs.count()
     count = 0
-    for harvest_job in harvest_jobs:
-        try:
-            harvest_job.source.id
-        except mongoengine.errors.DoesNotExist:
-            count += 1
-            harvest_job.delete()
+    with click.progressbar(harvest_jobs, length=total, label="Checking sources refs") as jobs:
+        for harvest_job in jobs:
+            try:
+                if harvest_job.source is None:
+                    raise mongoengine.errors.DoesNotExist()
+                harvest_job.source.id
+            except mongoengine.errors.DoesNotExist:
+                count += 1
+                harvest_job.delete()
 
     log.info(f"Completed, removed {count} HarvestJob objects")
 
     log.info("Processing HarvestJob items references.")
 
-    harvest_jobs = HarvestJob.objects.filter(items__0__exists=True).no_cache().all()
+    harvest_jobs = HarvestJob.objects.filter(items__0__exists=True).no_cache()
+    total = harvest_jobs.count()
     count = 0
-    for harvest_job in harvest_jobs:
-        for item in harvest_job.items:
-            try:
-                item.dataset and item.dataset.id
-            except mongoengine.errors.DoesNotExist:
-                count += 1
-                item.dataset = None
-                harvest_job.save()
+    with click.progressbar(harvest_jobs, length=total, label="Checking items refs") as jobs:
+        for harvest_job in jobs:
+            for item in harvest_job.items:
+                try:
+                    item.dataset and item.dataset.id
+                except mongoengine.errors.DoesNotExist:
+                    count += 1
+                    item.dataset = None
+                    harvest_job.save()
 
     log.info(f"Completed, modified {count} HarvestJob objects")
 

{udata-14.5.1.dev9.dist-info → udata-14.5.1.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 14.5.1.dev9
+Version: 14.5.1.dev11
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>

{udata-14.5.1.dev9.dist-info → udata-14.5.1.dev11.dist-info}/RECORD

@@ -178,10 +178,10 @@ udata/core/post/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/post/api.py,sha256=H8IKX5x9MqcG36Y60DRxOhC00HKyhwLX5lvvSB2AO5c,4863
 udata/core/post/constants.py,sha256=W-xjOTv0lorD-RCV0YGtK0cT_RwgYmfrC8Ff6ywH7bM,215
 udata/core/post/factories.py,sha256=lcFe3zIadG7bc1jsydkOT7GfQX53V0x09Flpclyl6gI,619
-udata/core/post/models.py,sha256=BuctB_YvthUZh7gibtnBrPeTd2rAxug3Blvf5i6JIok,3780
+udata/core/post/models.py,sha256=p-p-MopRiNic02fTdLR3ECOFUR_nwS2xliTM9dujo0U,3874
 udata/core/post/permissions.py,sha256=uofU0TehhOGYyUoRXf3wuy816_D3xwMmaJbDvV336sw,83
 udata/core/post/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/post/tests/test_api.py,sha256=zaKfeBdG_cMdUXJ7-qGQIRyVO1t09h-kiJR2nw83bQk,6183
+udata/core/post/tests/test_api.py,sha256=eJWInJtMw4AHS5OpXTaW8oGLi_DdMrkWaSB3hYNQi8s,6347
 udata/core/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/reports/api.py,sha256=qrGi1DdRN4mO4nWcyG9rKMiBlw4C8UnzecJFqNAgF_8,2185
 udata/core/reports/constants.py,sha256=LRZSX3unyqZeB4yQjK3ws_hGbJcXYk4bu1Rhnhi5DEs,1235
@@ -371,7 +371,7 @@ udata/migrations/2021-05-27-fix-default-schema-name.py,sha256=n377iZDBGMivMvm_Ar
 udata/migrations/2021-07-05-remove-unused-badges.py,sha256=KJdDgCkCCevsmZ1n-xHnUwYgMK4MmgM67UEE_8oDdAA,921
 udata/migrations/2021-07-07-update-schema-for-community-resources.py,sha256=gj-CAQsGQ_lc7bmgZSo6sMqKLjgIYaLQShfC42Lql8w,866
 udata/migrations/2021-08-17-follow-integrity.py,sha256=wUpsXwTCaXFdhFW3zltvswm_Z0d0RafYsEandgJJ1QQ,532
-udata/migrations/2021-08-17-harvest-integrity.py,sha256=L0mEqlY6ekspIpPFq93grI6Gn1tT_Ii1WHaq_ORAMbU,1611
+udata/migrations/2021-08-17-harvest-integrity.py,sha256=pm9ofGmXay1DMmlB2K-VsAOPqwLrKUFvOsWC8x9Zi7w,2013
 udata/migrations/2021-08-17-oauth2client-integrity.py,sha256=SP8xqZCIBrNfFDlDMU4zcq5JaXdJ__qm19QtsGNvQic,598
 udata/migrations/2021-08-17-transfer-integrity.py,sha256=zXVwwS7YnsiXB7sY0fPSOXXTzJb0aRyJWVK4cT-SAcM,607
 udata/migrations/2021-08-17-users-integrity.py,sha256=IwRsIy0iQYzSm0-ESbfu7jjemRrm0o5RVRhJstllIKY,2094
@@ -580,9 +580,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=n7ZHvruSL9hIPoSl4aCkGeC52LZYeg
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=24CsHDZ84nqTMr-cOvOZ-LNYsokLQNyQchI41o3Cq9M,49765
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=pw3gsvr8lPQJZvX9Jo8ymu59I3L6-rrpX2Fqy0Nu5r4,20441
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=1h8akWRpcQ1uD5zezqjp-Q-gAld5_93MkJL4BRlqKjQ,54738
-udata-14.5.1.dev9.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-14.5.1.dev9.dist-info/METADATA,sha256=HzZLmJ05MmH_cM_Dfph767hBvXEDJ7l-PC0lZ1mZ4bA,4358
-udata-14.5.1.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-udata-14.5.1.dev9.dist-info/entry_points.txt,sha256=XwrEzP-n_6CKnwTsrNHzyCTWbMwg2FkvxVVB686f_C0,476
-udata-14.5.1.dev9.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
-udata-14.5.1.dev9.dist-info/RECORD,,
+udata-14.5.1.dev11.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-14.5.1.dev11.dist-info/METADATA,sha256=trjyuqYYSgV-Z_WlafWqiw-iwiQu4DG3Or0AOGHXajo,4359
+udata-14.5.1.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+udata-14.5.1.dev11.dist-info/entry_points.txt,sha256=XwrEzP-n_6CKnwTsrNHzyCTWbMwg2FkvxVVB686f_C0,476
+udata-14.5.1.dev11.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
+udata-14.5.1.dev11.dist-info/RECORD,,