fix/refactor id_cast_func usage

Author: mahenzon

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -154,11 +154,10 @@ def _apply_client_generated_id(
 
         extra = data_create.__fields__["id"].field_info.extra
         if extra.get("client_can_set_id"):
-            # TODO: remove crutch, there is no possibility
-            #       to pass cast_func through the field_info.extra
-            #       because all extra kwargs placing in openapi schema and this
-            #       break down /docs endpoint
-            model_kwargs["id"] = data_create._id_cast_func(data_create.id)
+            id_value = data_create.id
+            if cast_type := extra.get("id_cast_func"):
+                id_value = cast_type(id_value)
+            model_kwargs["id"] = id_value
 
         return model_kwargs
 

fastapi_jsonapi/schema_builder.py

@@ -354,9 +354,15 @@ def _build_jsonapi_object(
 
         field_type, field_info, id_cast_func = resource_id_field
 
+        id_field_kw = {
+            **field_info.extra,
+        }
+        if id_cast_func:
+            id_field_kw.update(id_cast_func=id_cast_func)
+
         object_jsonapi_schema_fields = {
             "attributes": (attributes_schema, ...),
-            "id": (str, Field(None, **field_info.extra)),
+            "id": (str, Field(None, **id_field_kw)),
         }
         if includes:
             object_jsonapi_schema_fields.update(
@@ -369,8 +375,6 @@ def _build_jsonapi_object(
             type=(str, Field(default=resource_type or self._resource_type, description="Resource type")),
             __base__=model_base,
         )
-        if id_cast_func:
-            object_jsonapi_schema._id_cast_func = id_cast_func
 
         if use_schema_cache:
             self.base_jsonapi_object_schemas_cache[base_name] = object_jsonapi_schema