Merge tag '1.2.1' into stable/1.2.x

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 1.2.0
+current_version = 1.2.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)([-](?P<release>(rc|alpha))+(?P<build>\d+))?
 serialize =
 	{major}.{minor}.{patch}-{release}{build}

CHANGELOG.rst

@@ -1,6 +1,15 @@
 ===========
 Wijzigingen
 ===========
+1.2.1 (2023-02-14)
+===========
+
+* Bumped common-api version
+* Fixed generation of openapi.yaml to not include /api/v1 in it's path
+* Added a way to turn off Notifications when running in a container
+
+
+
 1.2.0 (2022-12-19)
 ===========
 
@@ -46,7 +55,7 @@ API spec changes
 ----------------
 
 * Change ``ResultaatType.omschrijving`` max length from 20 to 30 (`Issue 1766`_);
-* Change unique constraint of ``ZaakType.omschrijving`` & ``ZaakType.catalogus`` to ``ZaakType.identificatie`` & ``ZaakType.catalogus`` (`Issue 1639`_); 
+* Change unique constraint of ``ZaakType.omschrijving`` & ``ZaakType.catalogus`` to ``ZaakType.identificatie`` & ``ZaakType.catalogus`` (`Issue 1639`_);
 
 
 .. _Issue 1847: https://github.com/VNG-Realisatie/gemma-zaken/issues/1847

README.rst

@@ -2,7 +2,7 @@
 Catalogi API
 ============
 
-:Version: 1.2.0
+:Version: 1.2.1
 :Source: https://github.com/VNG-Realisatie/zaaktypecataloguscomponent
 :Keywords: zaaktypen, ztc, imztc, ztc2, ztcaas, saas, rest, api
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ztc",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "ztc referentie-implementatie API",
     "directories": {"doc": "doc"},
     "scripts": {"build": "npm run bundle", "bundle": "webpack", "watch": "webpack -w"},

requirements/base.in

@@ -10,7 +10,6 @@ django-axes
 django-choices
 django-hijack
 django-hijack-admin
-django-choices
 django-markup[all_filter_dependencies]
 django-rosetta
 django-redis
@@ -22,7 +21,7 @@ django-filter~=21.1
 djangorestframework-camel-case
 drf_spectacular
 
-vng_api_common==2.0.0
+vng-api-common==2.0.4
 drf-flex-fields
 django-cors-middleware
 drf-writable-nested

requirements/base.txt

@@ -228,7 +228,7 @@ uritemplate==4.1.1
     # via drf-spectacular
 urllib3==1.26.10
     # via requests
-vng-api-common==2.0.0
+vng-api-common==2.0.4
     # via -r requirements/base.in
 webencodings==0.5.1
     # via

requirements/ci.txt

@@ -366,7 +366,7 @@ urllib3==1.26.10
     # via
     #   -r requirements/base.txt
     #   requests
-vng-api-common==2.0.0
+vng-api-common==2.0.4
     # via -r requirements/base.txt
 webencodings==0.5.1
     # via

requirements/dev.txt

@@ -368,7 +368,7 @@ urllib3==1.26.10
     # via
     #   -r requirements/base.txt
     #   requests
-vng-api-common==2.0.0
+vng-api-common==2.0.4
     # via -r requirements/base.txt
 webencodings==0.5.1
     # via

requirements/production.txt

@@ -324,7 +324,7 @@ urllib3==1.26.10
     #   requests
 uwsgi==2.0.20
     # via -r requirements/production.in
-vng-api-common==2.0.0
+vng-api-common==2.0.4
     # via -r requirements/base.txt
 webencodings==0.5.1
     # via

setup.py

@@ -76,7 +76,7 @@ def deps(*f):
 
 setuptools.setup(
     name=NAME,
-    version="1.2.0-rc4",
+    version="1.2.1-rc4",
     description="Implementatie van het component Zaaktypecatalogus (ZTC)",
     long_description=long_description,
     keywords="zaaktypen ztc imztc ztc2, ztcaas, saas, rest, api",

src/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: Catalogi API
-  version: 1.2.0
+  version: 1.2.1
   description:
     "Een API om een zaaktypecatalogus (ZTC) te benaderen.\n\nDe zaaktypecatalogus\
     \ helpt gemeenten om het proces vanuit de 'vraag van een\nklant' (productaanvraag,\

src/ztc/__init__.py

@@ -6,7 +6,7 @@
 import re
 from collections import namedtuple
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 __author__ = "Maykin Media B.V., VNG Realisatie"
 __homepage__ = "https://github.com/VNG-Realisatie/zaaktypecataloguscomponent/"
 __docformat__ = "restructuredtext"

src/ztc/api/tests/test_caching.py

@@ -37,7 +37,7 @@ def test_besluittype_head_cache_header(self):
 
     def test_head_in_apischema(self):
         spec = get_spec()
-        endpoint = spec["paths"]["/api/v1/besluittypen/{uuid}"]
+        endpoint = spec["paths"]["/besluittypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -119,7 +119,7 @@ def test_catalogus_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/catalogussen/{uuid}"]
+        endpoint = spec["paths"]["/catalogussen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -201,7 +201,7 @@ def test_eigenschap_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/eigenschappen/{uuid}"]
+        endpoint = spec["paths"]["/eigenschappen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -283,7 +283,7 @@ def test_informatieobjecttype_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/informatieobjecttypen/{uuid}"]
+        endpoint = spec["paths"]["/informatieobjecttypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -372,7 +372,7 @@ def test_resultaattype_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/resultaattypen/{uuid}"]
+        endpoint = spec["paths"]["/resultaattypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -458,7 +458,7 @@ def test_roltype_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/roltypen/{uuid}"]
+        endpoint = spec["paths"]["/roltypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -538,7 +538,7 @@ def test_statustype_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/statustypen/{uuid}"]
+        endpoint = spec["paths"]["/statustypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -620,7 +620,7 @@ def test_zaakinformatieobjecttype_head_cache_header(self):
     def test_head_in_apischema(self):
         spec = get_spec()
 
-        endpoint = spec["paths"]["/api/v1/zaaktype-informatieobjecttypen/{uuid}"]
+        endpoint = spec["paths"]["/zaaktype-informatieobjecttypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 
@@ -714,7 +714,7 @@ def test_zaaktype_head_cache_header(self):
 
     def test_head_in_apischema(self):
         spec = get_spec()
-        endpoint = spec["paths"]["/api/v1/zaaktypen/{uuid}"]
+        endpoint = spec["paths"]["/zaaktypen/{uuid}"]
 
         self.assertIn("head", endpoint)
 

src/ztc/conf/api.py

@@ -2,7 +2,7 @@
 
 from vng_api_common.conf.api import *  # noqa - imports white-listed
 
-API_VERSION = "1.2.0"
+API_VERSION = "1.2.1"
 
 REST_FRAMEWORK = BASE_REST_FRAMEWORK.copy()
 REST_FRAMEWORK["DEFAULT_PERMISSION_CLASSES"] = (

src/ztc/conf/dev.py

@@ -1,6 +1,8 @@
 import os
 import sys
 
+from .docker import getenv  # noqa isort:skip
+
 os.environ.setdefault(
     "SECRET_KEY", "i3yihsrle$16%4_&0_ic5psrzih+ostvzkzn7zwj$qddcl18+j"
 )
@@ -50,6 +52,7 @@
 # Custom settings
 #
 ENVIRONMENT = "development"
+NOTIFICATIONS_DISABLED = bool(getenv("NOTIFICATIONS_DISABLED", False))
 
 #
 # Library settings
@@ -69,8 +72,6 @@
     REST_FRAMEWORK["DEFAULT_RENDERER_CLASSES"] += (
         "rest_framework.renderers.BrowsableAPIRenderer",
     )
-if "test" in sys.argv:
-    NOTIFICATIONS_DISABLED = True  # During dev unable to create 'notifications_api_service' required for sending notifications.
 
 # Override settings with local settings.
 try:

src/ztc/conf/docker.py

@@ -63,6 +63,7 @@ def getenv(key, default=None, required=False, split=False):
 # Custom settings
 #
 ENVIRONMENT = "docker"
+NOTIFICATIONS_DISABLED = bool(getenv("NOTIFICATIONS_DISABLED", False))
 
 
 if missing_environment_vars: