Merge pull request #3997 from open-formulieren/refactor/3977-update-a…

…ppointments-validation

Update appointments validation

src/openforms/appointments/api/serializers.py

@@ -7,7 +7,7 @@
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 
-from openforms.formio.service import validate_formio_data
+from openforms.formio.service import build_serializer
 from openforms.forms.models import Form
 from openforms.submissions.api.fields import PrivacyPolicyAcceptedField
 from openforms.submissions.models import Submission
@@ -274,12 +274,16 @@ def validate(self, attrs: dict) -> dict:
                 {"datetime": _("The selected datetime is not available (anymore).")}
             )
 
-        # 5. Validate contact details against product
+        # 5. Validate contact details against product(s)
         contact_details_meta = plugin.get_required_customer_fields(products)
-        try:
-            validate_formio_data(contact_details_meta, attrs["contact_details"])
-        except serializers.ValidationError as errors:
-            raise serializers.ValidationError({"contactDetails": errors.detail})
+        contact_details_serializer = build_serializer(
+            contact_details_meta,
+            data=attrs["contact_details"],
+            context=self.context,
+        )
+        if not contact_details_serializer.is_valid():
+            errors = contact_details_serializer.errors
+            raise serializers.ValidationError({"contact_details": errors})
 
         # expose additional metadata
         attrs.update(

src/openforms/appointments/contrib/jcc/tests/test_plugin.py

@@ -8,7 +8,7 @@
 import requests_mock
 from hypothesis import given, strategies as st
 
-from openforms.formio.validation import build_validation_chain
+from openforms.formio.service import build_serializer
 from openforms.utils.tests.logging import disable_logging
 from openforms.utils.xml import fromstring
 from soap.tests.factories import SoapServiceFactory
@@ -696,13 +696,15 @@ def test_all_customer_fields_have_required_formio_properties(self):
                 self.assertIn("key", component)
                 self.assertIn("label", component)
 
-    def test_can_create_validation_chain_for_formio_fields(self):
+    def test_can_create_serializer_for_formio_fields(self):
         for component in FIELD_TO_FORMIO_COMPONENT.values():
             assert "key" in component
             with self.subTest(component=component["key"]):
                 try:
-                    build_validation_chain(component)
+                    serializer = build_serializer([component])
                 except Exception as exc:
                     raise self.failureException(
                         "Could not create validation chain"
                     ) from exc
+
+                self.assertIn(component["key"], serializer.fields)

src/openforms/appointments/contrib/qmatic/tests/test_plugin.py

@@ -7,7 +7,7 @@
 import requests_mock
 from hypothesis import given, strategies as st
 
-from openforms.formio.validation import build_validation_chain
+from openforms.formio.service import build_serializer
 from openforms.utils.date import TIMEZONE_AMS
 from openforms.utils.tests.logging import disable_logging
 
@@ -609,13 +609,15 @@ def test_all_customer_fields_have_required_formio_properties(self):
                 self.assertIn("key", component)
                 self.assertIn("label", component)
 
-    def test_can_create_validation_chain_for_formio_fields(self):
+    def test_can_create_serializer_for_formio_fields(self):
         for component in FIELD_TO_FORMIO_COMPONENT.values():
             assert "key" in component
             with self.subTest(component=component["key"]):
                 try:
-                    build_validation_chain(component)
+                    serializer = build_serializer([component])
                 except Exception as exc:
                     raise self.failureException(
                         "Could not create validation chain"
                     ) from exc
+
+                self.assertIn(component["key"], serializer.fields)

src/openforms/appointments/tests/test_api_appointment_create.py

@@ -616,9 +616,10 @@ def test_invalid_contact_details(self):
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
             invalid_params = response.json()["invalidParams"]
             self.assertEqual(len(invalid_params), 2)
-            self.assertEqual(invalid_params[0]["name"], "contactDetails.0")
+            self.assertEqual(invalid_params[0]["name"], "contactDetails.lastName")
             self.assertEqual(invalid_params[0]["code"], "required")
-            self.assertEqual(invalid_params[1]["name"], "contactDetails.1")
+
+            self.assertEqual(invalid_params[1]["name"], "contactDetails.email")
             self.assertEqual(invalid_params[1]["code"], "required")
 
         with self.subTest("value too long"):
@@ -634,8 +635,9 @@ def test_invalid_contact_details(self):
 
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
             invalid_params = response.json()["invalidParams"]
+
             self.assertEqual(len(invalid_params), 2)
-            self.assertEqual(invalid_params[0]["name"], "contactDetails.0")
+            self.assertEqual(invalid_params[0]["name"], "contactDetails.lastName")
             self.assertEqual(invalid_params[0]["code"], "max_length")
-            self.assertEqual(invalid_params[1]["name"], "contactDetails.1")
+            self.assertEqual(invalid_params[1]["name"], "contactDetails.email")
             self.assertEqual(invalid_params[1]["code"], "max_length")

src/openforms/formio/service.py

@@ -29,7 +29,6 @@
 from .serializers import build_serializer as _build_serializer
 from .typing import Component
 from .utils import iter_components, iterate_data_with_components, recursive_apply
-from .validation import validate_formio_data
 from .variables import inject_variables
 
 __all__ = [
@@ -41,7 +40,6 @@
     "rewrite_formio_components_for_request",
     "FormioData",
     "iterate_data_with_components",
-    "validate_formio_data",
     "recursive_apply",
     "build_serializer",
 ]