calculate id col name on each request

Author: mahenzon

fastapi_jsonapi/api/schemas.py

@@ -1,13 +1,19 @@
 from typing import Iterable, Optional, Type, Union
 
-from pydantic import BaseModel
+from fastapi import APIRouter
+from pydantic import BaseModel, ConfigDict
 
 from fastapi_jsonapi.data_typing import TypeModel, TypeSchema
 from fastapi_jsonapi.views import Operation, ViewBase
 
 
 class ResourceData(BaseModel):
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+    )
+
     path: Union[str, list[str]]
+    router: Optional[APIRouter]
     tags: list[str]
     view: Type[ViewBase]
     model: Type[TypeModel]

fastapi_jsonapi/data_layers/base.py

@@ -14,6 +14,7 @@
 from fastapi_jsonapi.data_typing import TypeModel, TypeSchema
 from fastapi_jsonapi.querystring import QueryStringManager
 from fastapi_jsonapi.schema import BaseJSONAPIItemInSchema
+from fastapi_jsonapi.storages import models_storage
 from fastapi_jsonapi.views import RelationshipRequestInfo
 
 
@@ -51,6 +52,7 @@ def __init__(
         self.disable_collection_count: bool = disable_collection_count
         self.default_collection_count: int = default_collection_count
         self.is_atomic = False
+        self.id_column_name = models_storage.get_model_id_field_name(resource_type)
 
     async def atomic_start(self, previous_dl: Optional["BaseDataLayer"] = None):
         self.is_atomic = True

fastapi_jsonapi/data_layers/sqla/base_model.py

@@ -11,7 +11,6 @@
 from fastapi_jsonapi.data_layers.sqla.query_building import RelationshipInfo
 from fastapi_jsonapi.data_typing import TypeModel
 from fastapi_jsonapi.exceptions import BadRequest, InternalServerError, ObjectNotFound
-from fastapi_jsonapi.storages.models_storage import models_storage
 
 log = logging.getLogger(__name__)
 
@@ -98,10 +97,9 @@ async def count(
         cls,
         session: AsyncSession,
         stmt: Select,
-        resource_type: str,
+        id_field_name: str = "id",
     ) -> int:
-        id_col = models_storage.get_model_id_field_name(resource_type)
-        stmt = select(func.count(distinct(column(id_col)))).select_from(stmt.subquery())
+        stmt = select(func.count(distinct(column(id_field_name)))).select_from(stmt.subquery())
         return (await session.execute(stmt)).scalar_one()
 
     @classmethod

fastapi_jsonapi/data_layers/sqla/orm.py

@@ -428,7 +428,7 @@ async def get_collection(
             objects_count = await self._base_sql.count(
                 session=self.session,
                 stmt=query,
-                resource_type=self.resource_type,
+                id_field_name=self.id_column_name,
             )
 
         collection = await self.after_get_collection(collection, qs, view_kwargs)