Merge pull request #1398 from open-zaak/issue/1326-remove-local-services

remove local services required configuration

requirements/base.txt

@@ -61,7 +61,9 @@ commonground-api-common==1.10.2
     #   -r requirements/base.in
     #   drc-cmis
 coreapi==2.3.3
-    # via drf-yasg
+    # via
+    #   django-loose-fk
+    #   drf-yasg
 coreschema==0.0.4
     # via
     #   coreapi
@@ -133,7 +135,7 @@ django-filter==21.1
     #   django-loose-fk
 django-ipware==4.0.2
     # via django-axes
-django-loose-fk==1.0.2
+django-loose-fk==1.0.3
     # via -r requirements/base.in
 django-markup==1.5
     # via -r requirements/base.in

requirements/ci.txt

@@ -96,6 +96,7 @@ commonground-api-common==1.10.2
 coreapi==2.3.3
     # via
     #   -r requirements/base.txt
+    #   django-loose-fk
     #   drf-yasg
 coreschema==0.0.4
     # via
@@ -176,7 +177,7 @@ django-ipware==4.0.2
     # via
     #   -r requirements/base.txt
     #   django-axes
-django-loose-fk==1.0.2
+django-loose-fk==1.0.3
     # via -r requirements/base.txt
 django-markup==1.5
     # via -r requirements/base.txt

requirements/dev.txt

@@ -115,6 +115,7 @@ commonmark==0.9.1
 coreapi==2.3.3
     # via
     #   -r requirements/ci.txt
+    #   django-loose-fk
     #   drf-yasg
 coreschema==0.0.4
     # via
@@ -203,7 +204,7 @@ django-ipware==4.0.2
     # via
     #   -r requirements/ci.txt
     #   django-axes
-django-loose-fk==1.0.2
+django-loose-fk==1.0.3
     # via -r requirements/ci.txt
 django-markup==1.5
     # via -r requirements/ci.txt

src/openzaak/components/besluiten/models.py

@@ -7,6 +7,7 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from django_loose_fk.virtual_models import ProxyMixin
 from vng_api_common.fields import RSINField
 from vng_api_common.models import APIMixin
 from vng_api_common.utils import generate_unique_identification
@@ -195,10 +196,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # save previous zaak for triggers
-        # self._previous_zaak = self.zaak
-
-        self._previous_zaak = self._zaak
-        self._previous_zaak_url = self._zaak_url
+        # for virtual models we can't use FK field because of handler assertions
+        if isinstance(self, ProxyMixin):
+            self._previous_zaak = self.zaak
+        else:
+            self._previous_zaak = self._zaak
+            self._previous_zaak_url = self._zaak_url
 
     def __str__(self):
         return f"{self.verantwoordelijke_organisatie} - {self.identificatie}"

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

@@ -397,9 +397,7 @@ def test_bio_visibility_outside_transaction(self):
         self.setUpTestData()
         document = f"{self.base}enkelvoudiginformatieobjecten/{uuid.uuid4()}"
 
-        besluit = BesluitFactory.create(
-            besluittype__concept=False, local_host="http://openzaak.nl/"
-        )
+        besluit = BesluitFactory.create(besluittype__concept=False)
         besluit_url = f"http://openzaak.nl{reverse(besluit)}"
         informatieobjecttype = InformatieObjectTypeFactory.create(
             catalogus=besluit.besluittype.catalogus, concept=False
@@ -660,9 +658,7 @@ def test_destroy_with_external_informatieobject(self):
             m.delete(oio, status_code=204)
 
             bio = BesluitInformatieObjectFactory.create(
-                informatieobject=self.document,
-                _objectinformatieobject_url=oio,
-                local_host="http://openzaak.nl",
+                informatieobject=self.document, _objectinformatieobject_url=oio,
             )
             bio_url = reverse(bio)
 
@@ -696,9 +692,7 @@ def test_destroy_with_external_informatieobject_fail_send(self):
             m.delete(oio, status_code=404, text="Not found")
 
             bio = BesluitInformatieObjectFactory.create(
-                informatieobject=self.document,
-                _objectinformatieobject_url=oio,
-                local_host="http://openzaak.nl",
+                informatieobject=self.document, _objectinformatieobject_url=oio,
             )
             bio_url = reverse(bio)
 

src/openzaak/components/documenten/tests/test_caching_cmis.py

@@ -7,6 +7,8 @@
 
 from rest_framework import status
 from vng_api_common.tests import CacheMixin, JWTAuthMixin, reverse
+from zgw_consumers.constants import APITypes
+from zgw_consumers.models import Service
 
 from openzaak.components.zaken.tests.factories import ZaakInformatieObjectFactory
 from openzaak.tests.utils import (
@@ -217,6 +219,7 @@ def test_invalidate_etag_after_change(self):
         Because changes are made to the informatieobject, a code 200 should be
         returned
         """
+        Service.objects.create(api_root="http://testserver/", api_type=APITypes.orc)
         eio = EnkelvoudigInformatieObjectFactory.create(titel="bla")
 
         key = get_etag_cache_key(eio)

src/openzaak/components/zaken/tests/test_zaak_archive.py

@@ -1028,7 +1028,7 @@ def test_add_resultaat_on_zaak_with_external_gerelateerde_zaak_(self):
         """
         Add RESULTAAT that causes `archiefactiedatum` to be set.
         """
-        zaak = ZaakFactory.create(local_host="http://testserver.com")
+        zaak = ZaakFactory.create()
         zaak_url = get_operation_url("zaak_read", uuid=zaak.uuid)
         zaaktype_url = f"http://testserver.com{reverse(zaak.zaaktype)}"
 

src/openzaak/components/zaken/tests/test_zaak_delete.py

@@ -13,6 +13,10 @@
 from zgw_consumers.test import mock_service_oas_get
 
 from openzaak.components.besluiten.tests.factories import BesluitFactory
+from openzaak.components.catalogi.tests.factories import (
+    InformatieObjectTypeFactory,
+    ZaakTypeFactory,
+)
 from openzaak.tests.utils import JWTAuthMixin, get_eio_response
 
 from ..models import (
@@ -137,20 +141,25 @@ def setUpTestData(cls):
 
     @requests_mock.Mocker()
     def test_zaak_delete_oio_removed(self, m):
+        # setup resources amd mocks
+        document_url = f"{self.base}enkelvoudiginformatieobjecten/{uuid.uuid4()}"
+        zaaktype = ZaakTypeFactory()
+        iotype = InformatieObjectTypeFactory(
+            zaaktypen=[zaaktype], catalogus=zaaktype.catalogus
+        )
+        zaak = ZaakFactory.create(zaaktype=zaaktype)
         mock_service_oas_get(m, self.base, APITypes.drc)
-        document = f"{self.base}enkelvoudiginformatieobjecten/{uuid.uuid4()}"
-        eio_response = get_eio_response(
-            document,
-            informatieobjecttype="http://testserver/catalogi/api/v1/iot/dummy",
+        document_data = get_eio_response(
+            document_url, informatieobjecttype=f"http://testserver{reverse(iotype)}"
         )
-        m.get(document, json=eio_response)
-        zaak = ZaakFactory.create()
+        m.get(document_url, json=document_data)
         zio = ZaakInformatieObjectFactory.create(
             zaak=zaak,
-            informatieobject=document,
+            informatieobject=document_url,
             _objectinformatieobject_url=f"{self.base}_objectinformatieobjecten/{uuid.uuid4()}",
         )
         m.delete(zio._objectinformatieobject_url, status_code=204)
+
         zaak_delete_url = get_operation_url("zaak_delete", uuid=zaak.uuid)
 
         with self.captureOnCommitCallbacks(execute=True):

src/openzaak/components/zaken/tests/test_zaakinformatieobjecten.py

@@ -245,9 +245,7 @@ def test_filter_by_external_informatieobject(self):
         zio_type = ZaakTypeInformatieObjectTypeFactory.create(
             informatieobjecttype__concept=False, zaaktype__concept=False
         )
-        zaak = ZaakFactory.create(
-            zaaktype=zio_type.zaaktype, local_host="http://openzaak.nl"
-        )
+        zaak = ZaakFactory.create(zaaktype=zio_type.zaaktype)
         zaak_url = f"http://openzaak.nl{reverse(zaak)}"
 
         eio1_response = get_eio_response(

src/openzaak/tests/utils/cmis.py

@@ -15,6 +15,8 @@
 from drc_cmis.client_builder import get_cmis_client
 from drc_cmis.models import CMISConfig, UrlMapping
 from rest_framework.test import APITestCase, APITransactionTestCase
+from zgw_consumers.constants import APITypes
+from zgw_consumers.models import Service
 
 from .helpers import can_connect
 from .mocks import MockSchemasMixin, get_eio_response
@@ -90,6 +92,9 @@ def setUpTestData(cls):
                 config=config,
             )
 
+        # add local service configuration - required for composite urls
+        Service.objects.create(api_root="http://testserver/", api_type=APITypes.orc)
+
     def setUp(self) -> None:
         # real_http=True to let the other calls pass through and use a different mocker
         # in specific tests cases to catch those requests

src/openzaak/tests/utils/factories.py

@@ -10,11 +10,8 @@
 class FkOrServiceUrlFactoryMixin:
     """
     create service instances for composite url fields
-    create service for provided parameter 'local_host'
     """
 
-    local_host = "http://testserver/"  # use to create service for local api
-
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
         """
@@ -38,12 +35,6 @@ def _create(cls, model_class, *args, **kwargs):
             # create Service instance for composite field
             base_url = furl(value).origin
             services.append(Service(api_root=base_url, api_type=APITypes.orc))
-            # service, created = Service.objects.get_or_create(api_root=base_url, defaults={"api_type": APITypes.orc})
-
-        # if local host specified create service for it
-        local_host = kwargs.pop("local_host", cls.local_host)
-        if local_host:
-            services.append(Service(api_root=local_host, api_type=APITypes.orc))
 
         Service.objects.bulk_create(services, ignore_conflicts=True)