Skip to content

Commit

Permalink
Production release to v1.3.0 (#182)
Browse files Browse the repository at this point in the history
* feat: Add 'documenten.lezen' and 'zaken.lezen' scopes (#179)

This commit introduces two new scopes, 'documenten.lezen' and 'zaken.lezen', to the catalogi-api. These scopes inherit the same permissions as the existing 'catalogi.lezen' scope. The addition of these scopes is necessary to accommodate the new expand model, which involves requesting information from the catalogi-api through the documenten-api and zaken-api.

Issue #2262

Implemented and Refactored Features, Bug Fixes, and Formatting Changes:

Added feature in perform_create to automatically add zaaktype relations
Added feature in perform_create to besluittype to add zaaktype relations
Added query parameter "datumGeldigheid" to the GET (retrieve) request
Changed: Moved geldigheid datum validation into the PUBLISH operation from the POST operation
Changed: Updated perform_create for gerelateerde_zaken to create correct relations
Changed: Refactored views and updated openapi documentation
Changed: ZIOT relatie class now uses a char model instead of a foreignfield model for informatieobjecttype
Changed: informatieobjecttype correlates its zaaktype now through a custom serializer
Changed: zaaktype now correlates its informatieobjecttype through a custom serializer
Changed: zaaktype serializer outputs informatieobject URL instead of omschrijvingen
Changed: Disabled notification in base
Changed: post to block creation of two concepts for one zaaktype
Changed: Zaken publish restrictions adapted to the new history model
Fixed: Query parameter in retrieve /zaaktypen gave incorrect dates
Fixed: Unit test using incorrect ZIOT information
Fixed: URL creation in viewsets
Removed: NotificationViewSetMixin from imports
Removed hard-coded strings in extract_relevant_m2m
Updated favicon to VNG logo
--------

* bump version to 1.3.0 (#180)
  • Loading branch information
MatthijsBekendam authored Aug 22, 2023
1 parent a62a60a commit 3e7eb3a
Show file tree
Hide file tree
Showing 49 changed files with 2,270 additions and 2,028 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = False
tag = False
current_version = 1.3.0-rc3
current_version = 1.3.0
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)([-](?P<release>(rc|alpha))+(?P<build>\d+))?
serialize =
{major}.{minor}.{patch}-{release}{build}
Expand Down
42 changes: 42 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,48 @@
===========
Wijzigingen
===========
1.3.0 (2023-08-22)
===========

Implementation changes
----------------------

`Issue 1838`_:

* Added feature in perform_create to automatically add zaaktype relations
* Added feature in perform_create to besluittype to add zaaktype relations
* Added query parameter "datumGeldigheid" to the GET (retrieve) request
* Changed: Moved geldigheid datum validation into the PUBLISH operation from the POST operation
* Changed: Updated perform_create for gerelateerde_zaken to create correct relations
* Changed: Refactored views and updated openapi documentation
* Changed: ZIOT relatie class now uses a char model instead of a foreignfield model for informatieobjecttype
* Changed: informatieobjecttype correlates its zaaktype now through a custom serializer
* Changed: zaaktype now correlates its informatieobjecttype through a custom serializer
* Changed: zaaktype serializer outputs informatieobject URL instead of omschrijvingen
* Changed: Disabled notification in base
* Changed: post to block creation of two concepts for one zaaktype
* Changed: Zaken publish restrictions adapted to the new history model
* Fixed: Query parameter in retrieve /zaaktypen gave incorrect dates
* Fixed: Unit test using incorrect ZIOT information
* Fixed: URL creation in viewsets
* Removed: NotificationViewSetMixin from imports
* Removed hard-coded strings in extract_relevant_m2m
* Updated favicon to VNG logo

`Issue 2262`_:

* Introduce two new scopes, 'documenten.lezen' and 'zaken.lezen', in the catalogi-api.
* These new scopes inherit permissions from the existing 'catalogi.lezen' scope.
* The addition of these scopes is essential to support the new expand model.
* The expand model involves requesting data from the catalogi-api via the documenten-api and zaken-api.


API spec changes
-----------------

.. _Issue 1838: https://github.com/VNG-Realisatie/gemma-zaken/issues/1838
.. _Issue 2262: https://github.com/VNG-Realisatie/gemma-zaken/issues/2262

1.2.1 (2023-02-14)
===========

Expand Down
11 changes: 7 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Catalogi API
============

:Version: 1.3.0-rc3
:Version: 1.3.0
:Source: https://github.com/VNG-Realisatie/zaaktypecataloguscomponent
:Keywords: zaaktypen, ztc, imztc, ztc2, ztcaas, saas, rest, api

Expand All @@ -25,9 +25,12 @@ Versie Release datum API specificatie
master n.v.t. `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/master/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/master/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/master/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/master/src/openapi.yaml>`_
(`verschillen <https://github.com/VNG-Realisatie/catalogi-api/compare/1.1.0..master?diff=split#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
1.1.1 2020-06-22 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.1.1/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/1.1.1/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/1.1.1/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.1.1/src/openapi.yaml>`_
(`verschillen <https://github.com/VNG-Realisatie/catalogi-api/compare/1.1.0..1.1.1?diff=split#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
1.3.0 2023-08-22 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.3.0/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/1.3.0/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/1.3.0/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.3.0/src/openapi.yaml>`_
1.2.1 2023-02-21 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.2.1/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/1.2.1/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/1.2.1/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.2.1/src/openapi.yaml>`_
1.2.0 2022-12-20 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.2.0/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/1.2.0/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/1.2.0/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.2.0/src/openapi.yaml>`_
1.1.0 2020-01-08 `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.1.0/src/openapi.yaml>`_, `Scopes <https://github.com/VNG-Realisatie/catalogi-api/blob/1.1.0/src/autorisaties.md>`_ `Berichtkenmerken <https://github.com/VNG-Realisatie/catalogi-api/blob/1.1.0/src/notificaties.md>`_
`Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/VNG-Realisatie/catalogi-api/1.1.0/src/openapi.yaml>`_
(`verschillen <https://github.com/VNG-Realisatie/catalogi-api/compare/1.0.0..1.1.0?diff=split#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ztc",
"version": "1.3.0-rc3",
"version": "1.3.0",
"description": "ztc referentie-implementatie API",
"directories": {"doc": "doc"},
"scripts": {"build": "npm run bundle", "bundle": "webpack", "watch": "webpack -w"},
Expand Down
3 changes: 2 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ python-dateutil
pytz
raven
markdown
pyyaml==6.0.1

Django~=3.2.0
django-axes
Expand All @@ -21,7 +22,7 @@ django-filter~=21.1
djangorestframework-camel-case
drf_spectacular

vng_api_common==2.0.4
vng_api_common==2.0.5
drf-flex-fields
django-cors-middleware
drf-writable-nested
5 changes: 3 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,9 @@ pytz==2022.1
# via
# -r requirements/base.in
# django
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.in
# drf-spectacular
# gemma-zds-client
# oyaml
Expand Down Expand Up @@ -228,7 +229,7 @@ uritemplate==4.1.1
# via drf-spectacular
urllib3==1.26.10
# via requests
vng-api-common==2.0.4
vng-api-common==2.0.5
# via -r requirements/base.in
webencodings==0.5.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ pytz==2022.1
# via
# -r requirements/base.txt
# django
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# drf-spectacular
Expand Down Expand Up @@ -361,7 +361,7 @@ urllib3==1.26.10
# via
# -r requirements/base.txt
# requests
vng-api-common==2.0.4
vng-api-common==2.0.5
# via -r requirements/base.txt
webencodings==0.5.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ pytz==2022.1
# via
# -r requirements/base.txt
# django
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# drf-spectacular
Expand Down Expand Up @@ -368,7 +368,7 @@ urllib3==1.26.10
# via
# -r requirements/base.txt
# requests
vng-api-common==2.0.4
vng-api-common==2.0.5
# via -r requirements/base.txt
webencodings==0.5.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ pytz==2022.1
# via
# -r requirements/base.txt
# django
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# drf-spectacular
Expand Down Expand Up @@ -324,7 +324,7 @@ urllib3==1.26.10
# requests
uwsgi==2.0.20
# via -r requirements/production.in
vng-api-common==2.0.4
vng-api-common==2.0.5
# via -r requirements/base.txt
webencodings==0.5.1
# via
Expand Down
22 changes: 22 additions & 0 deletions src/autorisaties.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ Zie de repository van de [Autorisaties API](https://github.com/VNG-Realisatie/au
* schrijfoperaties uit te voeren in de API. Alle resources zijn beschikbaar.


### documenten.lezen

**Scope**
`documenten.lezen`


**Laat toe om**:

* leesoperaties uit te voeren vanaf de Documenten API. Alle resources zijn beschikbaar.


### notificaties.publiceren

**Scope**
Expand All @@ -61,3 +72,14 @@ Zie de repository van de [Autorisaties API](https://github.com/VNG-Realisatie/au



### zaken.lezen

**Scope**
`zaken.lezen`


**Laat toe om**:

* leesoperaties uit te voeren vanaf de Zaken API. Alle resources zijn beschikbaar.


6 changes: 0 additions & 6 deletions src/notificaties.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ De architectuur van de notificaties staat beschreven op <a href="https://github.
**Resources en acties**


* <code>besluittype</code>: create, update, destroy


### informatieobjecttypen

Expand All @@ -48,8 +46,6 @@ De architectuur van de notificaties staat beschreven op <a href="https://github.
**Resources en acties**


* <code>informatieobjecttype</code>: create, update, destroy


### zaaktypen

Expand All @@ -69,6 +65,4 @@ De architectuur van de notificaties staat beschreven op <a href="https://github.
**Resources en acties**


* <code>zaaktype</code>: create, update, destroy


Loading

0 comments on commit 3e7eb3a

Please sign in to comment.