udata 10.4.1.dev35182__py2.py3-none-any.whl → 10.4.1.dev35201__py2.py3-none-any.whl

udata/core/dataset/apiv2.py

@@ -191,7 +191,7 @@ dataset_fields = apiv2.model(
             spatial_coverage_fields, allow_null=True, description="The spatial coverage"
         ),
         "license": fields.Raw(
-            attribute=lambda d: marshal(d.license, license_fields)
+            attribute=lambda d: marshal(d.license or DEFAULT_LICENSE, license_fields)
             if request.headers.get(FULL_OBJECTS_HEADER, False, bool)
             else (d.license.id if d.license is not None else None),
             default=DEFAULT_LICENSE["id"],

udata/core/followers/api.py

@@ -51,10 +51,14 @@ class FollowAPI(API):
     def get(self, id):
         """List all followers for a given object"""
         args = parser.parse_args()
-        model = self.model.objects.only("id").get_or_404(id=id_or_404(id))
+        model = None
+        if hasattr(self.model, "slug"):
+            model = self.model.objects(slug=id).first()
+        model = model or self.model.objects.only("id").get_or_404(id=id_or_404(id))
         qs = Follow.objects(following=model, until=None)
         if args["user"]:
             qs = qs.filter(follower=id_or_404(args["user"]))
+
         return qs.paginate(args["page"], args["page_size"])
 
     @api.secure

udata/tests/api/test_datasets_api.py

@@ -19,6 +19,8 @@ from udata.core.dataset.api_fields import (
     resource_harvest_fields,
 )
 from udata.core.dataset.constants import (
+    DEFAULT_FREQUENCY,
+    DEFAULT_LICENSE,
     FULL_OBJECTS_HEADER,
     LEGACY_FREQUENCIES,
     RESOURCE_TYPES,
@@ -512,6 +514,7 @@ class DatasetAPITest(APITestCase):
         license = LicenseFactory(id="lov2", title="Licence Ouverte Version 2.0")
         paca, bdr, arles = create_geozones_fixtures()
         country = GeoLevelFactory(id="country", name="Pays", admin_level=10)
+        other = GeoLevelFactory(id="other", name="Autre")
 
         dataset = DatasetFactory(
             frequency="monthly",
@@ -542,6 +545,27 @@ class DatasetAPITest(APITestCase):
         assert response.json["spatial"]["granularity"]["id"] == "country"
         assert response.json["spatial"]["granularity"]["name"] == country.name
 
+        dataset_without_anything = DatasetFactory(
+            frequency=None,
+            license=None,
+            spatial=SpatialCoverageFactory(zones=[], granularity=None),
+        )
+
+        response = self.get(
+            url_for("apiv2.dataset", dataset=dataset_without_anything),
+            headers={
+                FULL_OBJECTS_HEADER: "True",
+            },
+        )
+        self.assert200(response)
+        assert response.json["frequency"]["id"] == DEFAULT_FREQUENCY
+        assert response.json["frequency"]["label"] == UPDATE_FREQUENCIES.get(DEFAULT_FREQUENCY)
+        assert response.json["license"]["id"] == DEFAULT_LICENSE["id"]
+        assert response.json["license"]["title"] == DEFAULT_LICENSE["title"]
+        assert len(response.json["spatial"]["zones"]) == 0
+        assert response.json["spatial"]["granularity"]["id"] == "other"
+        assert response.json["spatial"]["granularity"]["name"] == other.name
+
     def test_dataset_api_create(self):
         """It should create a dataset from the API"""
         data = DatasetFactory.as_dict()

{udata-10.4.1.dev35182.dist-info → udata-10.4.1.dev35201.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.4.1.dev35182
+Version: 10.4.1.dev35201
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -141,6 +141,8 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
+- Add missing default for license full object [#3317](https://github.com/opendatateam/udata/pull/3317/)
+- Check for slugs in followers API [#3320](https://github.com/opendatateam/udata/pull/3320)
 - Fix missing ID in dataset reuses mask [#3321](https://github.com/opendatateam/udata/pull/3321)
 
 ## 10.4.0 (2025-05-15)

{udata-10.4.1.dev35182.dist-info → udata-10.4.1.dev35201.dist-info}/RECORD

@@ -96,7 +96,7 @@ udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA
 udata/core/dataset/activities.py,sha256=v8k1jwhdx62Z2ARZq8Q-x86OWSsBK99hRloPl74OCgA,1502
 udata/core/dataset/api.py,sha256=jElQZuguc514Eb0cWdquEfosP1yB79hEQ52SV_SvLx8,33282
 udata/core/dataset/api_fields.py,sha256=SLuzWoPdMLPX28WQ9DRGUPKS27vlltiFeiTo6jXa55Q,17549
-udata/core/dataset/apiv2.py,sha256=zrqln8hYxYgOJdorL-gDX67W8iVBKAn8YDYY9wAY00c,20730
+udata/core/dataset/apiv2.py,sha256=YOCNqQh7_OODcrzqJqdAPc0CoB9vG0DVcFiJNl9yBwQ,20749
 udata/core/dataset/commands.py,sha256=__hPAk_6iHtgMnEG51ux0vbNWJHxUjXhi1ukH4hF5jY,3714
 udata/core/dataset/constants.py,sha256=fKn21GzRShZv6pzKy3TvEK1cevQ9H3dOFE-xTRuE0lA,2971
 udata/core/dataset/csv.py,sha256=aNJOytbFbH8OCYr6hyaSaqFSa94Xb3dvBd3QGZHJRsA,3633
@@ -125,7 +125,7 @@ udata/core/discussions/permissions.py,sha256=VY2_PEsazz1fBgCX9-K-_spRgxUoNY4HuND
 udata/core/discussions/signals.py,sha256=tJ83RJIsBAny08Q6IDwehE6lDDRf6ynIFCl0WqnayoU,543
 udata/core/discussions/tasks.py,sha256=j78n9Pv04ftyt5KJHVZQwaxjgxDqyc9jbV49286A0wE,2761
 udata/core/followers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/followers/api.py,sha256=ShJ6DPjpAAQLM51gjMWf7d4TZjZA2VqP8I2YBHPCfhA,2777
+udata/core/followers/api.py,sha256=oCkEl_NUuizkssowlUyzCNK5IUq8GjNLVz1HN4HVqlg,2904
 udata/core/followers/metrics.py,sha256=nKgoiM2Gu-XHrgEf9duW1My66zFSKbmw25BGqo5wWtY,190
 udata/core/followers/models.py,sha256=PvExrmKbdr0oFjoMYfg1ZUuFlPYGCKKwrE0_ouPaILs,1122
 udata/core/followers/signals.py,sha256=q0su1eArVO1pnCoNFDieG-kW3iL-hLuXTmnU1-NXNF0,528
@@ -626,7 +626,7 @@ udata/tests/api/test_auth_api.py,sha256=OMRlY0OQt60j5N4A-N3HdWTuffOjRlFHkz5a3jJF
 udata/tests/api/test_base_api.py,sha256=2w_vz0eEuq3P3aN-ByvxGc3VZAo7XtgatFfcrzf2uEU,2244
 udata/tests/api/test_contact_points.py,sha256=X_RWD_xCfR8WchhHfKEt5mxMHY77OmTyguNKCsZftdE,5337
 udata/tests/api/test_dataservices_api.py,sha256=fNpeHl4SMvci3QrC414X6KGorv7NS1y8LsGxcSMjjZY,25729
-udata/tests/api/test_datasets_api.py,sha256=3EQdnP0DX-6mmPP-1hQrMTOPE1ZxLFIgB5Y4bKvH27k,97751
+udata/tests/api/test_datasets_api.py,sha256=Igu8NrOfDEtYKjlG7CrL_VpiFN2Tp6W-Kj4r8mpK1os,98789
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=XP6I96JUNT6xjGcQOF7pug_T_i67HzCiOGLaPdpfpEQ,4912
 udata/tests/api/test_me_api.py,sha256=YPd8zmR3zwJKtpSqz8nY1nOOMyXs66INeBwyhg5D0Us,13846
@@ -726,9 +726,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=ViV14tUmjSydHS0TWG_mFikKQfyUaT
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=rzAD_MVoV54TmN3w1ECz3H2Ru5pM7hWMVH03SkY28Q8,47250
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=EHX1_D-Uglj38832G7BrA0QC5IuY3p8dKqi9T0DgPmE,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=3PMnbVhKVJh6Q8ABi1ZTZ8Dcf-sMjngLJZqLbonJoec,54225
-udata-10.4.1.dev35182.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.4.1.dev35182.dist-info/METADATA,sha256=Mn8zpH9xJH-oAQMT9YNrcl5ez8TWICA6gHYRI_EC3LQ,146149
-udata-10.4.1.dev35182.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.4.1.dev35182.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.4.1.dev35182.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.4.1.dev35182.dist-info/RECORD,,
+udata-10.4.1.dev35201.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.4.1.dev35201.dist-info/METADATA,sha256=KyBd59eD9z2ifJGnDzxBDkz9hw0mY69JJXtL9XdgQf4,146345
+udata-10.4.1.dev35201.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.4.1.dev35201.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.4.1.dev35201.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.4.1.dev35201.dist-info/RECORD,,