Merge pull request #134 from open-zaak/feature/catalogus-validation-z…

…aakinformatieobjecttype Feature/catalogus validation zaakinformatieobjecttype
open-zaak · Oct 29, 2019 · a5131e4 · a5131e4
2 parents 68d7bea + 015bf57
commit a5131e4
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/src/openzaak/components/catalogi/api/serializers/relatieklassen.py b/src/openzaak/components/catalogi/api/serializers/relatieklassen.py
@@ -3,6 +3,7 @@
 
 from ...constants import RichtingChoices
 from ...models import ZaakInformatieobjectType
+from ..validators import ZaakInformatieObjectTypeCatalogusValidator
 
 
 class ZaakTypeInformatieObjectTypeSerializer(serializers.HyperlinkedModelSerializer):
@@ -28,6 +29,7 @@ class Meta:
             "informatieobjecttype": {"lookup_field": "uuid"},
             "statustype": {"lookup_field": "uuid"},
         }
+        validators = [ZaakInformatieObjectTypeCatalogusValidator()]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

diff --git a/src/openzaak/components/catalogi/api/validators.py b/src/openzaak/components/catalogi/api/validators.py
@@ -265,3 +265,24 @@ def __call__(self, attrs: dict):
                     }
                 )
             raise ValidationError(error_dict)
+
+
+class ZaakInformatieObjectTypeCatalogusValidator:
+    code = "relations-incorrect-catalogus"
+    message = _("The zaaktype has catalogus different from informatieobjecttype")
+
+    def set_context(self, serializer):
+        """
+        This hook is called by the serializer instance,
+        prior to the validation call being made.
+        """
+        self.instance = getattr(serializer, "instance", None)
+
+    def __call__(self, attrs: dict):
+        zaaktype = attrs.get("zaaktype") or self.instance.zaaktype
+        informatieobjecttype = (
+            attrs.get("informatieobjecttype") or self.instance.informatieobjecttype
+        )
+
+        if zaaktype.catalogus != informatieobjecttype.catalogus:
+            raise ValidationError(self.message, code=self.code)
diff --git a/src/openzaak/components/catalogi/tests/test_relatieklassen.py b/src/openzaak/components/catalogi/tests/test_relatieklassen.py
@@ -7,6 +7,7 @@
 from ..models import ZaakInformatieobjectType
 from .base import APITestCase
 from .factories import (
+    CatalogusFactory,
     InformatieObjectTypeFactory,
     ZaakInformatieobjectTypeArchiefregimeFactory,
     ZaakInformatieobjectTypeFactory,
@@ -64,7 +65,9 @@ def test_get_detail(self):
     def test_create_ziot(self):
         zaaktype = ZaakTypeFactory.create()
         zaaktype_url = reverse(zaaktype)
-        informatieobjecttype = InformatieObjectTypeFactory.create()
+        informatieobjecttype = InformatieObjectTypeFactory.create(
+            catalogus=zaaktype.catalogus
+        )
         informatieobjecttype_url = reverse(informatieobjecttype)
         data = {
             "zaaktype": f"http://testserver{zaaktype_url}",
@@ -85,7 +88,9 @@ def test_create_ziot(self):
     def test_create_ziot_fail_not_concept_zaaktype(self):
         zaaktype = ZaakTypeFactory.create(concept=False)
         zaaktype_url = reverse(zaaktype)
-        informatieobjecttype = InformatieObjectTypeFactory.create()
+        informatieobjecttype = InformatieObjectTypeFactory.create(
+            catalogus=zaaktype.catalogus
+        )
         informatieobjecttype_url = reverse(informatieobjecttype)
         data = {
             "zaaktype": f"http://testserver{zaaktype_url}",
@@ -107,7 +112,9 @@ def test_create_ziot_fail_not_concept_zaaktype(self):
     def test_create_ziot_fail_not_concept_informatieobjecttype(self):
         zaaktype = ZaakTypeFactory.create()
         zaaktype_url = reverse(zaaktype)
-        informatieobjecttype = InformatieObjectTypeFactory.create(concept=False)
+        informatieobjecttype = InformatieObjectTypeFactory.create(
+            concept=False, catalogus=zaaktype.catalogus
+        )
         informatieobjecttype_url = reverse(informatieobjecttype)
         data = {
             "zaaktype": f"http://testserver{zaaktype_url}",
@@ -392,3 +399,28 @@ def test_get_detail(self):
             "rstzdt.selectielijstklasse": None,
         }
         self.assertEqual(response.json(), expected)
+
+
+class ZaakInformatieobjecttypeValidationTests(APITestCase):
+    maxDiff = None
+
+    list_url = reverse_lazy(ZaakInformatieobjectType)
+
+    def test_catalogus_mismatch(self):
+        zaaktype = ZaakTypeFactory.create()
+        zaaktype_url = reverse(zaaktype)
+        informatieobjecttype = InformatieObjectTypeFactory.create()
+        informatieobjecttype_url = reverse(informatieobjecttype)
+        data = {
+            "zaaktype": f"http://testserver{zaaktype_url}",
+            "informatieobjecttype": f"http://testserver{informatieobjecttype_url}",
+            "volgnummer": 13,
+            "richting": RichtingChoices.inkomend,
+        }
+
+        response = self.client.post(self.list_url, data)
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+        error = get_validation_errors(response, "nonFieldErrors")
+        self.assertEqual(error["code"], "relations-incorrect-catalogus")