udata 13.0.1.dev12__py3-none-any.whl → 14.4.1.dev7__py3-none-any.whl

udata/tests/api/test_base_api.py

@@ -27,7 +27,7 @@ class FakeFormAPI(API):
 class OptionsCORSTest(APITestCase):
     def test_should_allow_options_and_cors(self):
         """Should allow OPTIONS operation and give cors parameters"""
-        response = self.client.options(
+        response = self.options(
             url_for("api.fake-options"),
             headers={
                 "Origin": "http://localhost",
@@ -38,7 +38,7 @@ class OptionsCORSTest(APITestCase):
         self.assert204(response)
         self.assertEqual(response.headers["Access-Control-Allow-Origin"], "http://localhost")
 
-        response = self.client.options(
+        response = self.options(
             url_for("api.fake-options"),
             headers={
                 "Origin": "http://localhost",
@@ -55,8 +55,11 @@ class OptionsCORSTest(APITestCase):
 class JSONFormRequestTest(APITestCase):
     def test_non_json_content_type(self):
         """We expect JSON requests for forms and enforce it"""
-        response = self.client.post(
-            url_for("api.fake-form"), {}, headers={"Content-Type": "multipart/form-data"}
+        response = self.post(
+            url_for("api.fake-form"),
+            {},
+            json=False,
+            headers={"Content-Type": "multipart/form-data"},
         )
         self.assert400(response)
         self.assertEqual(response.json, {"errors": {"Content-Type": "expecting application/json"}})

udata/tests/api/test_dataservices_api.py

@@ -16,7 +16,7 @@ from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory, LicenseFactory
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Member
-from udata.core.topic.factories import TopicElementFactory, TopicFactory
+from udata.core.topic.factories import ReuseFactory, TopicElementFactory, TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
 from udata.tests.helpers import assert200, assert400, assert410
@@ -99,6 +99,34 @@ class DataserviceAPITest(APITestCase):
         assert len(response.json["data"]) == 1
         assert response.json["data"][0]["id"] == str(topic_dataservice.id)
 
+        # filter on reuse
+        reuse_dataservice = DataserviceFactory()
+        reuse = ReuseFactory(dataservices=[reuse_dataservice])
+        response = self.get(url_for("api.dataservices", reuse=reuse.id))
+        assert200(response)
+        assert len(response.json["data"]) == 1
+        assert response.json["data"][0]["id"] == str(reuse_dataservice.id)
+
+    def test_dataservices_topic_filter_errors(self):
+        # non-existing
+        response = self.get(url_for("api.dataservices", topic="690c7f48ec85adaa376c1e93"))
+        assert200(response)
+
+        # not an object ID
+        response = self.get(url_for("api.dataservices", topic="xxx"))
+        assert400(response)
+        assert "`topic` must be an identifier" in response.json["message"]
+
+    def test_dataservices_reuse_filter_errors(self):
+        # non-existing
+        response = self.get(url_for("api.dataservices", reuse="690c7f48ec85adaa376c1e93"))
+        assert200(response)
+
+        # not an object ID
+        response = self.get(url_for("api.dataservices", reuse="xxx"))
+        assert400(response)
+        assert "`reuse` must be an identifier" in response.json["message"]
+
     def test_dataservice_api_create(self):
         user = self.login()
         datasets = DatasetFactory.create_batch(3)

udata/tests/api/test_datasets_api.py

@@ -49,8 +49,7 @@ from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
 from udata.models import CommunityResource, Dataset, Follow, Member, db
 from udata.tags import TAG_MAX_LENGTH, TAG_MIN_LENGTH
-from udata.tests.features.territories import create_geozones_fixtures
-from udata.tests.helpers import assert200, assert404
+from udata.tests.helpers import assert200, assert404, create_geozones_fixtures
 from udata.utils import faker, unique_string
 
 from . import APITestCase, PytestOnlyAPITestCase
@@ -725,6 +724,19 @@ class DatasetAPITest(APITestCase):
         dataset = Dataset.objects.first()
         self.assertEqual(dataset.spatial.geom, SAMPLE_GEOM)
 
+    def test_dataset_api_create_with_invalid_geom_coordinates(self):
+        """It should return 400 with invalid GeoJSON coordinates, not 500"""
+        self.login()
+        data = DatasetFactory.as_dict()
+        # Invalid GeoJSON: {} in coordinates instead of numbers (Sentry issue)
+        data["spatial"] = {"geom": {"type": "Point", "coordinates": {}}}
+        response = self.post(url_for("api.datasets"), data)
+        self.assert400(response)
+        self.assertEqual(Dataset.objects.count(), 0)
+        # Verify error is properly captured in form validation errors
+        self.assertIn("errors", response.json)
+        self.assertIn("spatial", response.json["errors"])
+
     def test_dataset_api_create_with_legacy_frequency(self):
         """It should create a dataset from the API with a legacy frequency"""
         self.login()
@@ -1835,6 +1847,18 @@ class DatasetResourceAPITest(APITestCase):
             f"Resource ids must match existing ones in dataset, ie: {set(str(r.id) for r in self.dataset.resources)}",
         )
 
+    def test_invalid_reorder_dict_without_id(self):
+        """It should return 400 when dict in resources list has no 'id' key"""
+        self.dataset.resources = ResourceFactory.build_batch(3)
+        self.dataset.save()
+
+        # Dict without 'id' key should fail gracefully, not raise KeyError
+        wrong_order_dict_without_id = [{"title": "foo"}, {"title": "bar"}, {"title": "baz"}]
+        response = self.put(
+            url_for("api.resources", dataset=self.dataset), wrong_order_dict_without_id
+        )
+        self.assertStatus(response, 400)
+
     def test_update_local(self):
         resource = ResourceFactory()
         self.dataset.resources.append(resource)
@@ -2507,13 +2531,13 @@ class ResourcesTypesAPITest(APITestCase):
 
 
 class DatasetSchemasAPITest(PytestOnlyAPITestCase):
-    def test_dataset_schemas_api_list(self, api, rmock, app):
+    def test_dataset_schemas_api_list(self, rmock, app):
         # Can't use @pytest.mark.options otherwise a request will be
         # made before setting up rmock at module load, resulting in a 404
         app.config["SCHEMA_CATALOG_URL"] = "https://example.com/schemas"
 
         rmock.get("https://example.com/schemas", json=ResourceSchemaMockData.get_mock_data())
-        response = api.get(url_for("api.schemas"))
+        response = self.get(url_for("api.schemas"))
 
         assert200(response)
         assert (
@@ -2521,27 +2545,27 @@ class DatasetSchemasAPITest(PytestOnlyAPITestCase):
         )
 
     @pytest.mark.options(SCHEMA_CATALOG_URL=None)
-    def test_dataset_schemas_api_list_no_catalog_url(self, api):
-        response = api.get(url_for("api.schemas"))
+    def test_dataset_schemas_api_list_no_catalog_url(self):
+        response = self.get(url_for("api.schemas"))
 
         assert200(response)
         assert response.json == []
 
     @pytest.mark.options(SCHEMA_CATALOG_URL="https://example.com/notfound")
-    def test_dataset_schemas_api_list_not_found(self, api, rmock):
+    def test_dataset_schemas_api_list_not_found(self, rmock):
         rmock.get("https://example.com/notfound", status_code=404)
-        response = api.get(url_for("api.schemas"))
+        response = self.get(url_for("api.schemas"))
         assert404(response)
 
     @pytest.mark.options(SCHEMA_CATALOG_URL="https://example.com/schemas")
-    def test_dataset_schemas_api_list_error_no_cache(self, api, rmock):
+    def test_dataset_schemas_api_list_error_no_cache(self, rmock):
         rmock.get("https://example.com/schemas", status_code=500)
 
-        response = api.get(url_for("api.schemas"))
+        response = self.get(url_for("api.schemas"))
         assert response.status_code == 503
 
     @pytest.mark.options(SCHEMA_CATALOG_URL="https://example.com/schemas")
-    def test_dataset_schemas_api_list_error_w_cache(self, api, rmock, mocker):
+    def test_dataset_schemas_api_list_error_w_cache(self, rmock, mocker):
         cache_mock_set = mocker.patch.object(cache, "set")
         mocker.patch.object(
             cache, "get", return_value=ResourceSchemaMockData.get_mock_data()["schemas"]
@@ -2549,7 +2573,7 @@ class DatasetSchemasAPITest(PytestOnlyAPITestCase):
 
         # Fill cache
         rmock.get("https://example.com/schemas", json=ResourceSchemaMockData.get_mock_data())
-        response = api.get(url_for("api.schemas"))
+        response = self.get(url_for("api.schemas"))
         assert200(response)
         assert (
             response.json == ResourceSchemaMockData.get_expected_assignable_schemas_from_mock_data()
@@ -2560,7 +2584,7 @@ class DatasetSchemasAPITest(PytestOnlyAPITestCase):
         rmock.get("https://example.com/schemas", status_code=500)
 
         # Long term cache is used
-        response = api.get(url_for("api.schemas"))
+        response = self.get(url_for("api.schemas"))
         assert200(response)
         assert (
             response.json == ResourceSchemaMockData.get_expected_assignable_schemas_from_mock_data()
@@ -2568,7 +2592,7 @@ class DatasetSchemasAPITest(PytestOnlyAPITestCase):
 
 
 class HarvestMetadataAPITest(PytestOnlyAPITestCase):
-    def test_dataset_with_harvest_metadata(self, api):
+    def test_dataset_with_harvest_metadata(self):
         date = datetime(2022, 2, 22, tzinfo=pytz.UTC)
         harvest_metadata = HarvestDatasetMetadata(
             backend="DCAT",
@@ -2586,7 +2610,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
         )
         dataset = DatasetFactory(harvest=harvest_metadata)
 
-        response = api.get(url_for("api.dataset", dataset=dataset))
+        response = self.get(url_for("api.dataset", dataset=dataset))
         assert200(response)
         assert response.json["harvest"] == {
             "backend": "DCAT",
@@ -2603,7 +2627,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
             "archived": "not-on-remote",
         }
 
-    def test_dataset_with_resource_harvest_metadata(self, api):
+    def test_dataset_with_resource_harvest_metadata(self):
         date = datetime(2022, 2, 22, tzinfo=pytz.UTC)
 
         harvest_metadata = HarvestResourceMetadata(
@@ -2613,7 +2637,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
         )
         dataset = DatasetFactory(resources=[ResourceFactory(harvest=harvest_metadata)])
 
-        response = api.get(url_for("api.dataset", dataset=dataset))
+        response = self.get(url_for("api.dataset", dataset=dataset))
         assert200(response)
         assert response.json["resources"][0]["harvest"] == {
             "issued_at": date.isoformat(),
@@ -2621,7 +2645,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
             "uri": "http://domain.gouv.fr/dataset/uri",
         }
 
-    def test_dataset_with_harvest_computed_dates(self, api):
+    def test_dataset_with_harvest_computed_dates(self):
         # issued_date takes precedence over internal creation date and harvest created_at on dataset
         issued_date = datetime(2022, 2, 22, tzinfo=pytz.UTC)
         creation_date = datetime(2022, 2, 23, tzinfo=pytz.UTC)
@@ -2632,7 +2656,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
             modified_at=modification_date,
         )
         dataset = DatasetFactory(harvest=harvest_metadata)
-        response = api.get(url_for("api.dataset", dataset=dataset))
+        response = self.get(url_for("api.dataset", dataset=dataset))
         assert200(response)
         assert response.json["created_at"] == issued_date.isoformat()
         assert response.json["last_modified"] == modification_date.isoformat()
@@ -2644,7 +2668,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
             modified_at=modification_date,
         )
         dataset = DatasetFactory(harvest=harvest_metadata)
-        response = api.get(url_for("api.dataset", dataset=dataset))
+        response = self.get(url_for("api.dataset", dataset=dataset))
         assert200(response)
         assert response.json["created_at"] == creation_date.isoformat()
         assert response.json["last_modified"] == modification_date.isoformat()
@@ -2655,7 +2679,7 @@ class HarvestMetadataAPITest(PytestOnlyAPITestCase):
             modified_at=modification_date,
         )
         dataset = DatasetFactory(resources=[ResourceFactory(harvest=resource_harvest_metadata)])
-        response = api.get(url_for("api.dataset", dataset=dataset))
+        response = self.get(url_for("api.dataset", dataset=dataset))
         assert200(response)
         assert response.json["resources"][0]["created_at"] == issued_date.isoformat()
         assert response.json["resources"][0]["last_modified"] == modification_date.isoformat()