udata 9.2.2.dev31762__py2.py3-none-any.whl → 9.2.2.dev31791__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)