Fix read model id field

Author: mahenzon

examples/api_for_sqlalchemy/models/base.py

@@ -3,9 +3,13 @@
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 
-class Base(DeclarativeBase):
+class BaseWithoutId(DeclarativeBase):
     __table_args__: ClassVar[dict[str, Any]] = {
         "extend_existing": True,
     }
 
+
+class Base(BaseWithoutId):
+    __abstract__ = True
+
     id: Mapped[int] = mapped_column(primary_key=True)

fastapi_jsonapi/data_layers/sqla/base_model.py

@@ -11,6 +11,7 @@
 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__)
 
@@ -97,8 +98,10 @@ async def count(
         cls,
         session: AsyncSession,
         stmt: Select,
+        resource_type: str,
     ) -> int:
-        stmt = select(func.count(distinct(column("id")))).select_from(stmt.subquery())
+        id_col = models_storage.get_model_id_field_name(resource_type)
+        stmt = select(func.count(distinct(column(id_col)))).select_from(stmt.subquery())
         return (await session.execute(stmt)).scalar_one()
 
     @classmethod

fastapi_jsonapi/data_layers/sqla/orm.py

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

fastapi_jsonapi/views/view_base.py

@@ -264,10 +264,13 @@ def _prepare_item_data(
         attrs_schema = schemas_storage.get_attrs_schema(resource_type, operation_type="get")
 
         if include_fields is None or not (field_schemas := include_fields.get(resource_type)):
-
+            id_val = models_storage.get_object_id(
+                db_object=db_item,
+                resource_type=resource_type,
+            )
             data_schema = schemas_storage.get_data_schema(resource_type, operation_type="get")
             return data_schema(
-                id=f"{db_item.id}",
+                id=f"{id_val}",
                 attributes=attrs_schema.model_validate(db_item),
             ).model_dump()