Merge pull request #163 from open-zaak/issue/external-url-not-json

fix external fk for non-JSON urls

src/openzaak/components/besluiten/tests/test_besluit_create.py

@@ -8,7 +8,10 @@
 from rest_framework.test import APITestCase
 from vng_api_common.tests import TypeCheckMixin, get_validation_errors, reverse
 
-from openzaak.components.catalogi.tests.factories import BesluitTypeFactory
+from openzaak.components.catalogi.tests.factories import (
+    BesluitTypeFactory,
+    CatalogusFactory,
+)
 from openzaak.components.documenten.tests.factories import (
     EnkelvoudigInformatieObjectFactory,
 )
@@ -215,3 +218,27 @@ def test_create_external_besluittype(self):
             )
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
+
+    def test_create_external_besluittype_fail_bad_url(self):
+        url = reverse(Besluit)
+
+        response = self.client.post(
+            url,
+            {
+                "verantwoordelijke_organisatie": "517439943",  # RSIN
+                "identificatie": "123123",
+                "besluittype": "http://example.com",
+                "datum": "2018-09-06",
+                "toelichting": "Vergunning verleend.",
+                "ingangsdatum": "2018-10-01",
+                "vervaldatum": "2018-11-01",
+                "vervalreden": VervalRedenen.tijdelijk,
+            },
+        )
+
+        self.assertEqual(
+            response.status_code, status.HTTP_400_BAD_REQUEST, response.data
+        )
+
+        error = get_validation_errors(response, "besluittype")
+        self.assertEqual(error["code"], "bad-url")

src/openzaak/loaders.py

@@ -1,3 +1,5 @@
+import json
+
 import requests
 from django_loose_fk.loaders import BaseLoader, FetchError
 
@@ -18,4 +20,10 @@ def fetch_object(url: str) -> dict:
             response.raise_for_status()
         except requests.HTTPError as exc:
             raise FetchError(exc.args[0]) from exc
-        return response.json()
+
+        try:
+            data = response.json()
+        except json.JSONDecodeError as exc:
+            raise FetchError(exc.args[0]) from exc
+
+        return data