udata 10.6.1.dev36082__py2.py3-none-any.whl → 10.6.1.dev36098__py2.py3-none-any.whl

udata/tests/api/test_topics_api.py

@@ -50,13 +50,13 @@ class TopicsAPITest(APITestCase):
         for dataset, expected in zip(datasets, [d.fetch() for d in tag_topic_1.datasets]):
             self.assertEqual(dataset["id"], str(expected.id))
             self.assertEqual(dataset["title"], str(expected.title))
-            self.assertIsNotNone(dataset["page"])
+            self.assertIsNone(dataset["page"])  # we don't have cdata in tests
             self.assertIsNotNone(dataset["uri"])
         reuses = response.json["data"][0]["reuses"]
         for reuse, expected in zip(reuses, [r.fetch() for r in tag_topic_1.reuses]):
             self.assertEqual(reuse["id"], str(expected.id))
             self.assertEqual(reuse["title"], str(expected.title))
-            self.assertIsNotNone(reuse["page"])
+            self.assertIsNone(reuse["page"])  # we don't have cdata in tests
             self.assertIsNotNone(reuse["uri"])
         self.assertEqual(len(reuses), 3)
 
@@ -132,13 +132,13 @@ class TopicsAPITest(APITestCase):
         for dataset, expected in zip(data["datasets"], [d.fetch() for d in topic.datasets]):
             self.assertEqual(dataset["id"], str(expected.id))
             self.assertEqual(dataset["title"], str(expected.title))
-            self.assertIsNotNone(dataset["page"])
+            self.assertIsNone(dataset["page"])  # we don't have cdata by default
             self.assertIsNotNone(dataset["uri"])
 
         for reuse, expected in zip(data["reuses"], [r.fetch() for r in topic.reuses]):
             self.assertEqual(reuse["id"], str(expected.id))
             self.assertEqual(reuse["title"], str(expected.title))
-            self.assertIsNotNone(reuse["page"])
+            self.assertIsNone(reuse["page"])  # we don't have cdata by default
             self.assertIsNotNone(reuse["uri"])
 
         self.assertIsNotNone(data.get("created_at"))

udata/tests/dataset/test_dataset_rdf.py

@@ -48,7 +48,6 @@ from udata.rdf import (
     primary_topic_identifier_from_rdf,
 )
 from udata.tests.helpers import assert200, assert_redirects
-from udata.uris import endpoint_for
 from udata.utils import faker
 
 pytestmark = pytest.mark.usefixtures("app")
@@ -347,14 +346,7 @@ class DatasetToRdfTest:
         len(list(g.subjects(RDF.type, DCAT.Distribution))) == 4
         len(list(g.subjects(RDF.type, DCAT.DataService))) == 1
         dataservice_as_distribution = g.resource(next(g.subjects(DCAT.accessService)))
-        dataservice_uri = URIRef(
-            endpoint_for(
-                "dataservices.show_redirect",
-                "api.dataservice",
-                dataservice=dataservice.id,
-                _external=True,
-            )
-        )
+        dataservice_uri = URIRef(dataservice.url_for(_useId=True))
         assert dataservice_as_distribution.value(DCAT.accessURL).identifier == URIRef(
             dataservice.base_api_url
         )

udata/tests/test_discussions.py

@@ -137,7 +137,7 @@ class DiscussionsTest(APITestCase):
         )
         self.assert400(response)
 
-    @pytest.mark.options(SPAM_WORDS=["spam"])
+    @pytest.mark.options(SPAM_WORDS=["spam"], CDATA_BASE_URL="https://data.gouv.fr")
     def test_spam_in_new_discussion_title(self):
         self.login()
         dataset = Dataset.objects.create(title="Test dataset")
@@ -148,7 +148,7 @@ class DiscussionsTest(APITestCase):
             def check_signal(args):
                 self.assertIsNotNone(discussion_id)
                 self.assertIn(
-                    f"http://local.test/api/1/datasets/{dataset.slug}/#discussion-{discussion_id}",
+                    f"https://data.gouv.fr/datasets/{dataset.slug}/discussions/?discussion_id={discussion_id}",
                     args[1]["message"],
                 )
 
@@ -579,7 +579,7 @@ class DiscussionsTest(APITestCase):
         with assert_not_emit(on_new_discussion_comment):
 
             def check_signal(args):
-                self.assertIn(discussion.external_url, args[1]["message"])
+                self.assertIn(discussion.url_for(), args[1]["message"])
 
             with assert_emit(on_new_potential_spam, assertions_callback=check_signal):
                 response = self.post(

udata/tests/test_mail.py

@@ -57,6 +57,10 @@ class MailSendTest(TestCase, DBTestMixin):
 @pytest.mark.frontend
 class MailCampaignTest:
     def test_send_mail_campaign_link_new_member(self, app):
+        # MTM campaign are only added on web URL (not API ones generated when
+        # no front-end is configured)
+        app.config["CDATA_BASE_URL"] = "https://www.data.gouv.fr"
+
         org = OrganizationFactory()
         recipient = UserFactory(email="recipient@udata")
 
@@ -88,6 +92,10 @@ class MailCampaignTest:
         assert "mtm_campaign=data-gouv-fr" in message.html
 
     def test_send_mail_campaign_link_badge_added_company(self, app):
+        # MTM campaign are only added on web URL (not API ones generated when
+        # no front-end is configured)
+        app.config["CDATA_BASE_URL"] = "https://www.data.gouv.fr"
+
         app.config["SEND_MAIL"] = True
         org = OrganizationFactory()
         org.add_badge("company")

udata/uris.py

@@ -1,10 +1,12 @@
 import re
+from typing import Optional
+from urllib.parse import urlencode, urljoin, urlparse, urlunparse
 
 from flask import current_app, url_for
 from netaddr import AddrFormatError, IPAddress
-from werkzeug.routing import BuildError
 
 from udata.i18n import _
+from udata.mail import get_mail_campaign_dict
 from udata.settings import Defaults
 
 URL_REGEX = re.compile(
@@ -66,14 +68,33 @@ def config_for(value, key):
         return getattr(Defaults, key)
 
 
-def endpoint_for(endpoint, fallback_endpoint=None, **values):
-    try:
-        return url_for(endpoint, **values)
-    except BuildError:
-        if fallback_endpoint:
-            return url_for(fallback_endpoint, **values)
+def homepage_url(**kwargs) -> str:
+    return cdata_url("/", **kwargs) or url_for("api.site", **kwargs)
+
+
+def cdata_url(uri: str, **kwargs) -> Optional[str]:
+    base_url = current_app.config["CDATA_BASE_URL"]
+    if not base_url:
         return None
 
+    if kwargs.pop("_mailCampaign", False):
+        kwargs.update(get_mail_campaign_dict())
+
+    uri = uri.rstrip("/")
+    append = kwargs.pop("append", None)
+    if append:
+        uri += f"/{append.lstrip('/')}"
+
+    url = urljoin(base_url, uri)
+    if not url.endswith("/"):
+        url += "/"
+
+    url_parts = list(urlparse(url))
+    url_parts[4] = urlencode(
+        {k: v for k, v in kwargs.items() if not k.startswith("_")}
+    )  # index 4 is the query params
+    return urlunparse(url_parts)
+
 
 def idna(string):
     return string.encode("idna").decode("utf8")

{udata-10.6.1.dev36082.dist-info → udata-10.6.1.dev36098.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.6.1.dev36082
+Version: 10.6.1.dev36098
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team