LITE-28127: fix serialization of Paginator

cloudblue · Jul 24, 2023 · db9dab4 · db9dab4
1 parent a43d0be
commit db9dab4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/connect/eaas/core/contrib/django/rql.py b/connect/eaas/core/contrib/django/rql.py
@@ -5,6 +5,7 @@
 from dj_rql.transformer import RQLLimitOffsetTransformer
 from django.db.models.query import QuerySet
 from fastapi import Depends, Request
+from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse
 from lark.exceptions import LarkError
 from py_rql.exceptions import RQLFilterParsingError
@@ -43,7 +44,7 @@ def serialize(self, queryset, model):
                 if self.limit + self.offset > self.count:
                     self.limit = self.count - self.offset
                 body = [
-                    dict(model.from_orm(item))
+                    dict(jsonable_encoder(model.from_orm(item)))
                     for item in queryset[self.offset: self.offset + self.limit]
                 ]
 
@@ -67,7 +68,7 @@ async def aserialize(self, queryset, model):
                 if self.limit + self.offset > self.count:
                     self.limit = self.count - self.offset
                 body = [
-                    dict(model.from_orm(item))
+                    dict(jsonable_encoder(model.from_orm(item)))
                     async for item in queryset[self.offset: self.offset + self.limit]
                 ]
 

diff --git a/connect/eaas/core/extension.py b/connect/eaas/core/extension.py
@@ -15,8 +15,8 @@
     ANVIL_CALLABLE_ATTR_NAME,
     ANVIL_KEY_VAR_ATTR_NAME,
     CUSTOMER_PAGES_ATTR_NAME,
-    DJANGO_SECRET_KEY_VAR_ATTR_NAME,
     DEVOPS_PAGES_ATTR_NAME,
+    DJANGO_SECRET_KEY_VAR_ATTR_NAME,
     EVENT_INFO_ATTR_NAME,
     MODULE_PAGES_ATTR_NAME,
     PROXIED_CONNECT_API_ATTR_NAME,