Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions backend/consultations/api/renderers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from typing import Any

from drf_orjson_renderer.renderers import ORJSONRenderer


def _stringify_keys(obj: Any) -> Any:
"""Recursively convert integer dict keys to strings.

DRF 3.18.0 changed list serializer errors to use integer-indexed dicts
(e.g. {0: [...]} instead of [[...]]). orjson does not support non-string
dict keys, so we normalise them here before serialisation.
"""
if isinstance(obj, dict):
return {str(k): _stringify_keys(v) for k, v in obj.items()}
if isinstance(obj, list):
return [_stringify_keys(item) for item in obj]
return obj


class ConsultORJSONRenderer(ORJSONRenderer):
def render(self, data: Any, accepted_media_type=None, renderer_context=None) -> bytes:
return super().render(_stringify_keys(data), accepted_media_type, renderer_context)
4 changes: 2 additions & 2 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ license = {text = "MIT"}
requires-python = ">=3.12,<3.13"
dependencies = [
"boto3>=1.43.62",
"django>=6.0.7",
"django>=6.1",
"django-environ>=0.14.0",
"django-filter>=26.1",
"django-redis>=7.0.0",
"django-rq>=4.1.1",
"django-simple-history>=3.13.0",
"django-storages>=1.14.6",
"djangorestframework>=3.17.1",
"djangorestframework>=3.18.0",
"djangorestframework-simplejwt[crypto]>=5.5.1",
"drf-nested-routers>=0.95.3",
"drf-orjson-renderer>=1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion backend/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
"PAGE_SIZE": 100,
"DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
"DEFAULT_RENDERER_CLASSES": (
"drf_orjson_renderer.renderers.ORJSONRenderer",
"consultations.api.renderers.ConsultORJSONRenderer",
"rest_framework.renderers.BrowsableAPIRenderer",
),
"DEFAULT_AUTHENTICATION_CLASSES": (
Expand Down
2 changes: 1 addition & 1 deletion backend/tests/unit/api/views/test_response_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ def test_patch_response_themes_invalid(self, client, staff_user_token, free_text
)
assert response.status_code == 400
assert response.json() == {
"themes": [[f'Invalid pk "{fake_uuid}" - object does not exist.']]
"themes": {"0": [f'Invalid pk "{fake_uuid}" - object does not exist.']}
}

@pytest.mark.parametrize("is_flagged", [True, False])
Expand Down
Loading
Loading