diff --git a/setup.cfg b/setup.cfg index ddf45571..7cf3fdcd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,6 +53,7 @@ install_requires = PyJWT>=2.0.0 pyyaml requests + coreapi tests_require = pytest pytest-django diff --git a/vng_api_common/inspectors/query.py b/vng_api_common/inspectors/query.py index 579fa6a4..9fdea531 100644 --- a/vng_api_common/inspectors/query.py +++ b/vng_api_common/inspectors/query.py @@ -30,7 +30,7 @@ def get_filter_parameters(self, filter_backend): if fields: queryset = self.view.get_queryset() - filter_class = filter_backend.get_filter_class(self.view, queryset) + filter_class = filter_backend.get_filterset_class(self.view, queryset) for parameter in fields: filter_field = filter_class.base_filters[parameter.name] diff --git a/vng_api_common/oas.py b/vng_api_common/oas.py index 6328561f..e1ec4201 100644 --- a/vng_api_common/oas.py +++ b/vng_api_common/oas.py @@ -73,6 +73,10 @@ def obj_has_shape(obj: Union[list, dict], schema: dict, resource: str) -> bool: if "$ref" in prop_schema: continue + # TODO Handling allOf and oneOf not yet implemented + if "allOf" in prop_schema or "oneOf" in prop_schema: + continue + # Allow None if property is nullable if value is None: if prop_schema.get("nullable", False):