udata 9.2.2.dev31715__py2.py3-none-any.whl → 9.2.2.dev31769__py2.py3-none-any.whl

udata/core/contact_point/api.py

@@ -1,3 +1,5 @@
+import mongoengine
+
 from udata.api import API, api
 from udata.api.parsers import ModelApiParser
 
@@ -29,7 +31,10 @@ class ContactPointsListAPI(API):
     def post(self):
         """Creates a contact point"""
         form = api.validate(ContactPointForm)
-        contact_point = form.save()
+        try:
+            contact_point = form.save()
+        except mongoengine.errors.ValidationError as e:
+            api.abort(400, e.message)
         return contact_point, 201
 
 

udata/core/contact_point/forms.py

@@ -12,6 +12,9 @@ class ContactPointForm(ModelForm):
         _("Name"),
         [validators.DataRequired(), validators.NoURLs(_("URLs not allowed in this field"))],
     )
-    email = fields.StringField(_("Email"), [validators.DataRequired(), validators.Email()])
+    email = fields.StringField(_("Email"), [validators.optional(), validators.Email()])
+    contact_form = fields.URLField(
+        _("Contact form"), description=_("The organization web contact form")
+    )
     owner = fields.CurrentUserField()
     organization = fields.PublishAsField(_("Publish as"))

udata/core/contact_point/models.py

@@ -5,7 +5,15 @@ __all__ = ("ContactPoint",)
 
 
 class ContactPoint(db.Document, Owned):
-    email = db.StringField(max_length=255, required=True)
     name = db.StringField(max_length=255, required=True)
+    email = db.StringField(max_length=255)
+    contact_form = db.URLField()
 
     meta = {"queryset_class": OwnedQuerySet}
+
+    def validate(self, clean=True):
+        if not self.email and not self.contact_form:
+            raise db.ValidationError(
+                "At least an email or a contact form is required for a contact point"
+            )
+        return super().validate(clean=clean)

udata/core/dataservices/models.py

@@ -122,10 +122,7 @@ class Dataservice(WithMetrics, Owned, db.Document):
         readonly=True,
     )
     description = field(db.StringField(default=""), description="In markdown")
-    base_api_url = field(
-        db.URLField(required=True),
-        sortable=True,
-    )
+    base_api_url = field(db.URLField(), sortable=True)
     endpoint_description_url = field(db.URLField())
     authorization_request_url = field(db.URLField())
     availability = field(db.FloatField(min=0, max=100), example="99.99")

udata/tests/api/test_contact_points.py

@@ -2,8 +2,10 @@ import pytest
 from flask import url_for
 
 from udata.core.contact_point.factories import ContactPointFactory
+from udata.i18n import gettext as _
 from udata.models import ContactPoint
-from udata.tests.helpers import assert200, assert204
+from udata.tests.helpers import assert200, assert201, assert204, assert400
+from udata.utils import faker
 
 pytestmark = [
     pytest.mark.usefixtures("clean_db"),
@@ -13,6 +15,43 @@ pytestmark = [
 class ContactPointAPITest:
     modules = []
 
+    def test_contact_point_api_create(self, api):
+        api.login()
+        data = {"name": faker.word(), "email": faker.email(), "contact_form": faker.url()}
+        response = api.post(url_for("api.contact_points"), data=data)
+        assert201(response)
+        assert ContactPoint.objects.count() == 1
+
+    def test_contact_point_api_create_email_or_contact_form(self, api):
+        api.login()
+        data = {"name": faker.word(), "contact_form": faker.url()}
+        response = api.post(url_for("api.contact_points"), data=data)
+        assert201(response)
+        assert ContactPoint.objects.count() == 1
+
+        data = {"name": faker.word(), "email": faker.email()}
+        response = api.post(url_for("api.contact_points"), data=data)
+        assert201(response)
+        assert ContactPoint.objects.count() == 2
+
+    def test_contact_point_api_invalid_email(self, api):
+        api.login()
+        data = {"name": faker.word(), "email": faker.word()}
+        response = api.post(url_for("api.contact_points"), data=data)
+        assert400(response)
+        assert "email" in response.json["errors"]
+        assert ContactPoint.objects.count() == 0
+
+    def test_contact_point_missing_contact_information(self, api):
+        api.login()
+        data = {"name": faker.word()}
+        response = api.post(url_for("api.contact_points"), data=data)
+        assert400(response)
+        assert response.json["message"] == _(
+            "At least an email or a contact form is required for a contact point"
+        )
+        assert ContactPoint.objects.count() == 0
+
     def test_contact_point_api_update(self, api):
         api.login()
         contact_point = ContactPointFactory()

{udata-9.2.2.dev31715.dist-info → udata-9.2.2.dev31769.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.2.2.dev31715
+Version: 9.2.2.dev31769
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -143,6 +143,8 @@ It is collectively taken care of by members of the
 - Add a filter on organization and document sort parameters in the `/discussions` endpoint [#3147](https://github.com/opendatateam/udata/pull/3147)
 - Move discussion catalog creation and add fields [#3152](https://github.com/opendatateam/udata/pull/3152) and [#3154](https://github.com/opendatateam/udata/pull/3154)
 - Add resources formats and harvest remote_url on dataset catalog [#3159](https://github.com/opendatateam/udata/pull/3159)
+- Add contact form in contact point model [#3164](https://github.com/opendatateam/udata/pull/3164)
+- Make base_api_url optional in dataservice [https://github.com/opendatateam/udata/pull/3163](#3163)
 
 ## 9.2.1 (2024-09-23)
 

{udata-9.2.2.dev31715.dist-info → udata-9.2.2.dev31769.dist-info}/RECORD

@@ -74,15 +74,15 @@ udata/core/badges/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 udata/core/badges/tests/test_commands.py,sha256=KrzUsW4jtiFAvq6n83MkDXc1gung0XX8ditQfOXvomI,1364
 udata/core/badges/tests/test_model.py,sha256=05bG0CLqOhedYNeqgI8oCBm7mnGMQUf1Z10OrFzcBgA,4859
 udata/core/contact_point/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/contact_point/api.py,sha256=MgPRiSIzujHY1Q3BCUjcYW65upTU2xn4iuiAWnHAlVs,1820
+udata/core/contact_point/api.py,sha256=hK5fanw-QZvenqu2XQW5xKmhPNPGK6xplUWqaMy_Il4,1951
 udata/core/contact_point/api_fields.py,sha256=w6DyfvaIrX12mwaCLjk6ioAt81-GuRxdv69bTAhar1U,970
 udata/core/contact_point/factories.py,sha256=MWu3fbE6G84e-7_gtsM5OifZPxHFRWDjw__qjd5fwDc,248
-udata/core/contact_point/forms.py,sha256=uioyzAySatniPdDdoBYyHj9n-m1LkMtaJpCnyS0-IRU,572
-udata/core/contact_point/models.py,sha256=yB82UcZJGeVhSIsvnpAT8yao7fmAyl59WVGphP3LGHw,309
+udata/core/contact_point/forms.py,sha256=ykdnfLPrY2awIis2Ms57Wj0zuhws7dNPFkLpnkq7sas,688
+udata/core/contact_point/models.py,sha256=Peli1ZbNBLydbhh9kBc0gKYFMxMiwjQAIFIjNZHUqNc,600
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataservices/api.py,sha256=uwKSwwZEskECTzt9ePaAbfpwx6DbEP0eE3Ovopo2DPk,4750
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
-udata/core/dataservices/models.py,sha256=lJYU5K-ZEYlh6oGFEGKOXLqOosOdu0GCKChFghuz9Qo,8275
+udata/core/dataservices/models.py,sha256=BFnfGPmhZM2mSnv4eIy_s67iTGUPTdOnYNpOpSFiDyo,8239
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
 udata/core/dataservices/rdf.py,sha256=l1vItR7jhaTxs5f6kU6MAR32uvRR233GDbp1hIUbP3k,4673
 udata/core/dataservices/tasks.py,sha256=a43x1oKNF-EYmzM3O-8GQPJvZsgJmQiXOZx8Qti3M4E,960
@@ -601,7 +601,7 @@ udata/tests/api/__init__.py,sha256=y4sL7LD1-KwONHF0q_Rhk2W6BmGUlp7Uz2JnX3e27sk,1
 udata/tests/api/test_activities_api.py,sha256=RjDDeNle3T-ydVnh6BRypqxAE_244-DXaKkuUCT0HVU,2823
 udata/tests/api/test_auth_api.py,sha256=OMRlY0OQt60j5N4A-N3HdWTuffOjRlFHkz5a3jJFieI,25987
 udata/tests/api/test_base_api.py,sha256=2w_vz0eEuq3P3aN-ByvxGc3VZAo7XtgatFfcrzf2uEU,2244
-udata/tests/api/test_contact_points.py,sha256=pyakkKnM4lH_asuEoXq9lQyJC9to6ZxSp4QQrHh1c1U,1041
+udata/tests/api/test_contact_points.py,sha256=jumil3faYa11KmSZgZgl592IrDqKcthHUjRv1zqWWn8,2702
 udata/tests/api/test_dataservices_api.py,sha256=SoiAOv3q0z41iEYXkZwnvr9KzULtfD_MlIQkLcfdf-E,15337
 udata/tests/api/test_datasets_api.py,sha256=LQAUaYY8Sj2HibHu6Qg1T46LlLxlPRa_aP0r1Z7A0jc,80614
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
@@ -698,9 +698,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=WpPzAqVd2Onv_kz45ULUySKPLrpjcc
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=18Op9RUITewoDRewlOdYzzq6gjsf1lsvepACV1d7zxs,44976
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=NIYRNhVoETZUvIvWm3cCW7DtMBAnS2vXzZjMF5ZzD_c,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=rQB-4V4WJ7bURj6g2j653vItr5TMHadcLQxec7_fDmg,51545
-udata-9.2.2.dev31715.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.2.2.dev31715.dist-info/METADATA,sha256=XlXC0-adCHiuoexgRT_okP5QO6oX5nHI_DSYXsJukjs,131319
-udata-9.2.2.dev31715.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.2.2.dev31715.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.2.2.dev31715.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.2.2.dev31715.dist-info/RECORD,,
+udata-9.2.2.dev31769.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.2.2.dev31769.dist-info/METADATA,sha256=lb21wiV4o0sr4pvv2hSACtkciLYjTZstoxbSxDlWL8E,131519
+udata-9.2.2.dev31769.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.2.2.dev31769.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.2.2.dev31769.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.2.2.dev31769.dist-info/RECORD,,