udata 10.4.1.dev35191__py2.py3-none-any.whl → 10.4.1.dev35211__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/dataset/csv.py

@@ -40,7 +40,6 @@ class DatasetCsvAdapter(csv.Adapter):
         ("resources_count", lambda o: len(o.resources)),
         ("main_resources_count", lambda o: len([r for r in o.resources if r.type == "main"])),
         ("resources_formats", lambda o: ",".join(set(r.format for r in o.resources if r.format))),
-        "downloads",
         ("harvest.backend", lambda r: r.harvest and r.harvest.backend),
         ("harvest.domain", lambda r: r.harvest and r.harvest.domain),
         ("harvest.created_at", lambda r: r.harvest and r.harvest.created_at),

udata/core/dataset/models.py

@@ -897,10 +897,6 @@ class Dataset(WithMetrics, DatasetBadgeMixin, Owned, db.Document):
 
         return result
 
-    @property
-    def downloads(self):
-        return sum(resource.metrics.get("views", 0) for resource in self.resources)
-
     @staticmethod
     def normalize_score(score):
         """

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/tests/dataset/test_csv_adapter.py

@@ -21,7 +21,10 @@ class DatasetCSVAdapterTest:
                         "created_at": date_created,
                         "modified_at": date_modified,
                         "uri": "http://domain.gouv.fr/dataset/uri",
-                    }
+                    },
+                    metrics={
+                        "views": 42,
+                    },
                 )
             ],
             harvest={
@@ -41,6 +44,8 @@ class DatasetCSVAdapterTest:
         assert date_modified.isoformat() in d_row
         # dataset harvest dates should not be here
         assert another_date.isoformat() not in d_row
+        # assert resource metrics downloads
+        assert 42 in d_row
 
     def test_datasets_csv_adapter(self):
         date_created = datetime(2022, 12, 31)
@@ -87,10 +92,8 @@ class DatasetCSVAdapterTest:
         assert harvest_dataset_values["harvest.domain"] == "example.com"
         assert harvest_dataset_values["harvest.remote_url"] == "https://www.example.com/"
         assert harvest_dataset_values["resources_count"] == 0
-        assert harvest_dataset_values["downloads"] == 0
 
         resources_dataset_values = csv[str(resources_dataset.id)]
         assert resources_dataset_values["resources_count"] == 3
         assert resources_dataset_values["main_resources_count"] == 1
         assert set(resources_dataset_values["resources_formats"].split(",")) == set(["csv", "json"])
-        assert resources_dataset_values["downloads"] == 1337 + 42

{udata-10.4.1.dev35191.dist-info → udata-10.4.1.dev35211.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.4.1.dev35191
+Version: 10.4.1.dev35211
 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)
 
+- Remove duplicate `downloads` in dataset csv adapter [#3319](https://github.com/opendatateam/udata/pull/3319)
+- 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)
 

{udata-10.4.1.dev35191.dist-info → udata-10.4.1.dev35211.dist-info}/RECORD

@@ -96,15 +96,15 @@ 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
+udata/core/dataset/csv.py,sha256=OmfHUX5d325XJva2lqHNEBJz3vROfEqkiu1rBfS6Reg,3612
 udata/core/dataset/events.py,sha256=bSM0nFEX14r4JHc-bAM-7OOuD3JAxUIpw9GgXbOsUyw,4078
 udata/core/dataset/exceptions.py,sha256=uKiayLSpSzsnLvClObS6hOO0qXEqvURKN7_w8eimQNU,498
 udata/core/dataset/factories.py,sha256=fRDWDlybR_ud4pDs1-ntWuYHKtV9LMHeBOBp2SmTT6M,9006
 udata/core/dataset/forms.py,sha256=7KUxuFcEGT0MUe0cZCiZtsnZhvGgvEd68pe13NgeSMI,6292
-udata/core/dataset/models.py,sha256=2c6vjr5KPq6Pqg6MK5pRFrXzpTIXtRC2zRxDlxiFTL8,40834
+udata/core/dataset/models.py,sha256=lu-EFDSWa8qz81LbI39F1XsTO5Tv2QfEbEp5ieq-WIE,40710
 udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2Vcrc,1097
 udata/core/dataset/preview.py,sha256=IwCqiNTjjXbtA_SSKF52pwnzKKEz0GyYM95QNn2Dkog,2561
 udata/core/dataset/rdf.py,sha256=HkjzcWgq9AfPvUGMRI7-ufRrgnlfBmP8crbgRhg6Lz4,31789
@@ -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
@@ -653,7 +653,7 @@ udata/tests/dataservice/test_csv_adapter.py,sha256=UyDPiqKIDwe0AdXLKLpSsBqe4ZJsf
 udata/tests/dataservice/test_dataservice_rdf.py,sha256=VLFgdclFoIhmctfMEgTxvuNlRxcI1yDkZWE-lbEYGdQ,2984
 udata/tests/dataservice/test_dataservice_tasks.py,sha256=9XUoYLb_p3dzmgLfswaXjMG2civP0i1kzzP4VdJWE0k,1614
 udata/tests/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/tests/dataset/test_csv_adapter.py,sha256=CSAHEur5-183fRsD_cBgsHnLuohn0DOb9zkVT1q0PNo,3866
+udata/tests/dataset/test_csv_adapter.py,sha256=7U83RiuSKNVgX-mV45Txp9a828mnWE4eKrU7K-36Dbs,3906
 udata/tests/dataset/test_dataset_actions.py,sha256=bgDjVYjOvu3sX_FCTCzf2snZYSprsqor2nAhIVuokSs,722
 udata/tests/dataset/test_dataset_commands.py,sha256=zMPJG2wYwKBee2zI65kmboxf59Zqa84DDjT8V5wj9uo,801
 udata/tests/dataset/test_dataset_events.py,sha256=hlrpoOiBbnX_COUI9Pzdqlp45GZZDqu5piwupbnPiTI,3601
@@ -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.dev35191.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.4.1.dev35191.dist-info/METADATA,sha256=55hy4zgp-w3NGismUSBj82LLvsifMpzGiVT4s9PitrE,146241
-udata-10.4.1.dev35191.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.4.1.dev35191.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.4.1.dev35191.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.4.1.dev35191.dist-info/RECORD,,
+udata-10.4.1.dev35211.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.4.1.dev35211.dist-info/METADATA,sha256=_9rRGg-d94ckfv-S7fyQx-lTwUhyclEnoAyQe6PFAIg,146456
+udata-10.4.1.dev35211.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.4.1.dev35211.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.4.1.dev35211.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.4.1.dev35211.dist-info/RECORD,,