Merge pull request #170 from open-zaak/issue/fix_klantcontact_pagination

Issue/fix klantcontact pagination
open-zaak · Nov 7, 2019 · 1b4b8be · 1b4b8be
2 parents 5528160 + c17be64
commit 1b4b8be
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 40 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -61,4 +61,4 @@ unidecode==1.0.22         # via vng-api-common
 uritemplate==3.0.0        # via coreapi, drf-yasg
 urllib3==1.24.3           # via requests
 uwsgi==2.0.18
-vng-api-common==1.0.27
+vng-api-common==1.0.31
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -68,4 +68,4 @@ unidecode==1.0.22
 uritemplate==3.0.0
 urllib3==1.24.3
 uwsgi==2.0.18
-vng-api-common==1.0.27
+vng-api-common==1.0.31
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -98,7 +98,7 @@ unidecode==1.0.22
 uritemplate==3.0.0
 urllib3==1.24.3
 uwsgi==2.0.18
-vng-api-common==1.0.27
+vng-api-common==1.0.31
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools==41.6.0        # via sphinx
diff --git a/src/openzaak/components/besluiten/tests/test_besluit_create.py b/src/openzaak/components/besluiten/tests/test_besluit_create.py
@@ -126,12 +126,16 @@ def test_opvragen_informatieobjecten_besluit(self):
         base_uri = get_operation_url("besluitinformatieobject_list")
 
         response1 = self.client.get(
-            base_uri, {"besluit": f"http://openzaak.nl{besluit1_uri}"}
+            base_uri,
+            {"besluit": f"http://openzaak.nl{besluit1_uri}"},
+            HTTP_HOST="openzaak.nl",
         )
         self.assertEqual(len(response1.data), 3)
 
         response2 = self.client.get(
-            base_uri, {"besluit": f"http://openzaak.nl{besluit2_uri}"}
+            base_uri,
+            {"besluit": f"http://openzaak.nl{besluit2_uri}"},
+            HTTP_HOST="openzaak.nl",
         )
         self.assertEqual(len(response2.data), 2)
 

diff --git a/src/openzaak/components/besluiten/tests/test_besluitinformatieobjecten.py b/src/openzaak/components/besluiten/tests/test_besluitinformatieobjecten.py
@@ -95,12 +95,16 @@ def test_filter_by_besluit(self):
         bio_list_url = reverse("besluitinformatieobject-list")
 
         response = self.client.get(
-            bio_list_url, {"besluit": f"http://openzaak.nl{besluit_url}"}
+            bio_list_url,
+            {"besluit": f"http://openzaak.nl{besluit_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["besluit"], f"http://testserver{besluit_url}")
+        self.assertEqual(
+            response.data[0]["besluit"], f"http://openzaak.nl{besluit_url}"
+        )
 
     def test_filter_by_informatieobject(self):
         bio = BesluitInformatieObjectFactory.create()

diff --git a/src/openzaak/components/catalogi/tests/test_relatieklassen.py b/src/openzaak/components/catalogi/tests/test_relatieklassen.py
@@ -228,32 +228,36 @@ def test_filter_zaaktype(self):
         ztiot1, ztiot2 = ZaakInformatieobjectTypeFactory.create_batch(
             2, zaaktype__concept=False, informatieobjecttype__concept=False
         )
-        url = f"http://testserver{reverse(ztiot1)}"
+        url = f"http://openzaak.nl{reverse(ztiot1)}"
         zaaktype1_uri = reverse(ztiot1.zaaktype)
         zaaktype2_uri = reverse(ztiot2.zaaktype)
         zaaktype1_url = f"http://openzaak.nl{zaaktype1_uri}"
 
-        response = self.client.get(self.list_url, {"zaaktype": zaaktype1_url})
+        response = self.client.get(
+            self.list_url, {"zaaktype": zaaktype1_url}, HTTP_HOST="openzaak.nl"
+        )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         data = response.json()["results"]
 
         self.assertEqual(data[0]["url"], url)
-        self.assertEqual(data[0]["zaaktype"], f"http://testserver{zaaktype1_uri}")
-        self.assertNotEqual(data[0]["zaaktype"], f"http://testserver{zaaktype2_uri}")
+        self.assertEqual(data[0]["zaaktype"], f"http://openzaak.nl{zaaktype1_uri}")
+        self.assertNotEqual(data[0]["zaaktype"], f"http://openzaak.nl{zaaktype2_uri}")
 
     def test_filter_informatieobjecttype(self):
         ztiot1, ztiot2 = ZaakInformatieobjectTypeFactory.create_batch(
             2, zaaktype__concept=False, informatieobjecttype__concept=False
         )
-        url = f"http://testserver{reverse(ztiot1)}"
+        url = f"http://openzaak.nl{reverse(ztiot1)}"
         informatieobjecttype1_uri = reverse(ztiot1.informatieobjecttype)
         informatieobjecttype2_uri = reverse(ztiot2.informatieobjecttype)
         informatieobjecttype1_url = f"http://openzaak.nl{informatieobjecttype1_uri}"
 
         response = self.client.get(
-            self.list_url, {"informatieobjecttype": informatieobjecttype1_url}
+            self.list_url,
+            {"informatieobjecttype": informatieobjecttype1_url},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -263,11 +267,11 @@ def test_filter_informatieobjecttype(self):
         self.assertEqual(data[0]["url"], url)
         self.assertEqual(
             data[0]["informatieobjecttype"],
-            f"http://testserver{informatieobjecttype1_uri}",
+            f"http://openzaak.nl{informatieobjecttype1_uri}",
         )
         self.assertNotEqual(
             data[0]["informatieobjecttype"],
-            f"http://testserver{informatieobjecttype2_uri}",
+            f"http://openzaak.nl{informatieobjecttype2_uri}",
         )
 
     def test_filter_ziot_status_alles(self):

diff --git a/src/openzaak/components/catalogi/tests/test_resultaattype.py b/src/openzaak/components/catalogi/tests/test_resultaattype.py
@@ -539,15 +539,19 @@ def test_filter_on_zaaktype(self):
         zt2_url = "http://openzaak.nl{}".format(zt2_uri)
         list_url = reverse("resultaattype-list")
 
-        response = self.client.get(list_url, {"zaaktype": zt1_url})
+        response = self.client.get(
+            list_url, {"zaaktype": zt1_url}, HTTP_HOST="openzaak.nl"
+        )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         response_data = response.json()["results"]
         self.assertEqual(len(response_data), 1)
-        self.assertEqual(response_data[0]["url"], f"http://testserver{rt1_uri}")
-        self.assertEqual(response_data[0]["zaaktype"], f"http://testserver{zt1_uri}")
-        self.assertNotEqual(response_data[0]["url"], f"http://testserver{rt2_uri}")
-        self.assertNotEqual(response_data[0]["zaaktype"], f"http://testserver{zt2_uri}")
+        self.assertEqual(response_data[0]["url"], f"http://openzaak.nl{rt1_uri}")
+        self.assertEqual(response_data[0]["zaaktype"], f"http://openzaak.nl{zt1_uri}")
+        self.assertNotEqual(response_data[0]["url"], f"http://openzaak.nl{rt2_uri}")
+        self.assertNotEqual(
+            response_data[0]["zaaktype"], f"http://openzaak.nl{zt2_uri}"
+        )
 
     def test_filter_resultaattype_status_alles(self):
         ResultaatTypeFactory.create(zaaktype__concept=True)

diff --git a/src/openzaak/components/catalogi/tests/test_roltype.py b/src/openzaak/components/catalogi/tests/test_roltype.py
@@ -277,15 +277,17 @@ def test_filter_zaaktype(self):
         zaaktype1_url = reverse(zaaktype1)
 
         response = self.client.get(
-            roltype_list_url, {"zaaktype": f"http://openzaak.nl{zaaktype1_url}"}
+            roltype_list_url,
+            {"zaaktype": f"http://openzaak.nl{zaaktype1_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
 
         data = response.json()["results"]
 
         self.assertEqual(len(data), 1)
-        self.assertEqual(data[0]["url"], f"http://testserver{roltype1_url}")
+        self.assertEqual(data[0]["url"], f"http://openzaak.nl{roltype1_url}")
 
 
 class RolTypePaginationTestCase(APITestCase):

diff --git a/src/openzaak/components/documenten/tests/test_objectinformatieobject.py b/src/openzaak/components/documenten/tests/test_objectinformatieobject.py
@@ -202,13 +202,15 @@ def test_filter_eio(self):
         eio_detail_url = reverse(bio.informatieobject.latest_version)
 
         response = self.client.get(
-            self.list_url, {"informatieobject": f"http://openzaak.nl{eio_detail_url}"},
+            self.list_url,
+            {"informatieobject": f"http://openzaak.nl{eio_detail_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
         self.assertEqual(
-            response.data[0]["informatieobject"], f"http://testserver{eio_detail_url}"
+            response.data[0]["informatieobject"], f"http://openzaak.nl{eio_detail_url}"
         )
 
     def test_filter_zaak(self):
@@ -218,13 +220,15 @@ def test_filter_zaak(self):
         zaak_url = reverse(zio.zaak)
 
         response = self.client.get(
-            self.list_url, {"object": f"http://openzaak.nl{zaak_url}"}
+            self.list_url,
+            {"object": f"http://openzaak.nl{zaak_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
         self.assertEqual(
-            response.data[0]["informatieobject"], f"http://testserver{eio_detail_url}"
+            response.data[0]["informatieobject"], f"http://openzaak.nl{eio_detail_url}"
         )
 
     def test_filter_besluit(self):
@@ -234,13 +238,15 @@ def test_filter_besluit(self):
         besluit_url = reverse(bio.besluit)
 
         response = self.client.get(
-            self.list_url, {"object": f"http://openzaak.nl{besluit_url}"}
+            self.list_url,
+            {"object": f"http://openzaak.nl{besluit_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
         self.assertEqual(
-            response.data[0]["informatieobject"], f"http://testserver{bio_detail_url}"
+            response.data[0]["informatieobject"], f"http://openzaak.nl{bio_detail_url}"
         )
 
     def test_validate_unknown_query_params(self):

diff --git a/src/openzaak/components/zaken/tests/test_create_melding_rol.py b/src/openzaak/components/zaken/tests/test_create_melding_rol.py
@@ -148,7 +148,9 @@ def test_ophalen_alle_betrokkenen(self):
         rollen_list_url = get_operation_url("rol_list")
 
         response = self.client.get(
-            rollen_list_url, {"zaak": f"http://openzaak.nl{zaak_url}"}
+            rollen_list_url,
+            {"zaak": f"http://openzaak.nl{zaak_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -157,12 +159,12 @@ def test_ophalen_alle_betrokkenen(self):
         self.assertEqual(len(response_data), 3)
 
         expected_urls = {
-            f"http://testserver{get_operation_url('rol_read', uuid=rol.uuid)}"
+            f"http://openzaak.nl{get_operation_url('rol_read', uuid=rol.uuid)}"
             for rol in rollen1
         }
 
         received_urls = {rol["url"] for rol in response_data}
         self.assertEqual(received_urls, expected_urls)
 
-        rol2_url = f"http://testserver{get_operation_url('rol_read', uuid=rol2.uuid)}"
+        rol2_url = f"http://openzaak.nl{get_operation_url('rol_read', uuid=rol2.uuid)}"
         self.assertNotIn(rol2_url, received_urls)
diff --git a/src/openzaak/components/zaken/tests/test_klantcontact.py b/src/openzaak/components/zaken/tests/test_klantcontact.py
@@ -21,3 +21,14 @@ def test_list_klantcontact(self):
 
         data = response.json()["results"]
         self.assertEqual(len(data), 2)
+
+    def test_list_klantcontact_page(self):
+        KlantContactFactory.create_batch(2)
+        list_url = reverse("klantcontact-list")
+
+        response = self.client.get(list_url, {"page": 1})
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        data = response.json()["results"]
+        self.assertEqual(len(data), 2)
diff --git a/src/openzaak/components/zaken/tests/test_statussen.py b/src/openzaak/components/zaken/tests/test_statussen.py
@@ -18,15 +18,16 @@ def test_filter_statussen_op_zaak(self):
         status2_url = reverse("status-detail", kwargs={"uuid": status2.uuid})
 
         list_url = reverse("status-list")
-
         zaak_url = reverse("zaak-detail", kwargs={"uuid": status1.zaak.uuid})
 
-        response = self.client.get(list_url, {"zaak": f"http://openzaak.nl{zaak_url}"})
+        response = self.client.get(
+            list_url, {"zaak": f"http://openzaak.nl{zaak_url}"}, HTTP_HOST="openzaak.nl"
+        )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         data = response.json()["results"]
 
         self.assertEqual(len(data), 1)
-        self.assertEqual(data[0]["url"], f"http://testserver{status1_url}")
-        self.assertNotEqual(data[0]["url"], f"http://testserver{status2_url}")
+        self.assertEqual(data[0]["url"], f"http://openzaak.nl{status1_url}")
+        self.assertNotEqual(data[0]["url"], f"http://openzaak.nl{status2_url}")
diff --git a/src/openzaak/components/zaken/tests/test_zaak_zoek.py b/src/openzaak/components/zaken/tests/test_zaak_zoek.py
@@ -78,6 +78,7 @@ def test_filter_ook_zaaktype(self):
                 "zaaktype": f"http://openzaak.nl{zaaktype1_url}",
             },
             **ZAAK_WRITE_KWARGS,
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)

diff --git a/src/openzaak/components/zaken/tests/test_zaakinformatieobjecten.py b/src/openzaak/components/zaken/tests/test_zaakinformatieobjecten.py
@@ -168,12 +168,14 @@ def test_filter_by_zaak(self):
         zio_list_url = reverse("zaakinformatieobject-list")
 
         response = self.client.get(
-            zio_list_url, {"zaak": f"http://openzaak.nl{zaak_url}"}
+            zio_list_url,
+            {"zaak": f"http://openzaak.nl{zaak_url}"},
+            HTTP_HOST="openzaak.nl",
         )
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
-        self.assertEqual(response.data[0]["zaak"], f"http://testserver{zaak_url}")
+        self.assertEqual(response.data[0]["zaak"], f"http://openzaak.nl{zaak_url}")
 
     def test_filter_by_local_informatieobject(self):
         zio = ZaakInformatieObjectFactory.create()
@@ -327,7 +329,9 @@ def test_relate_external_document(self):
 
         with self.subTest(section="zio-list"):
             list_response = self.client.get(
-                reverse(ZaakInformatieObject), {"zaak": zaak_url}
+                reverse(ZaakInformatieObject),
+                {"zaak": zaak_url},
+                HTTP_HOST="openzaak.nl",
             )
 
             self.assertEqual(list_response.status_code, status.HTTP_200_OK)

diff --git a/src/openzaak/components/zaken/tests/test_zaakobject_filter.py b/src/openzaak/components/zaken/tests/test_zaakobject_filter.py
@@ -35,14 +35,16 @@ def test_filter_zaak(self):
         zaakobject1_url = get_operation_url("zaakobject_read", uuid=zaakobject1.uuid)
         url = get_operation_url("zaakobject_list")
 
-        response = self.client.get(url, {"zaak": f"http://openzaak.nl{zaak_url}"})
+        response = self.client.get(
+            url, {"zaak": f"http://openzaak.nl{zaak_url}"}, HTTP_HOST="openzaak.nl"
+        )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         data = response.json()["results"]
 
         self.assertEqual(len(data), 1)
-        self.assertEqual(data[0]["url"], f"http://testserver{zaakobject1_url}")
+        self.assertEqual(data[0]["url"], f"http://openzaak.nl{zaakobject1_url}")
 
     def test_filter_object(self):
         zaakobject1 = ZaakObjectFactory.create(object="http://example.com/objects/1")