refactor

Author: CosmoV

fastapi_jsonapi/data_layers/base.py

@@ -5,11 +5,12 @@
 """
 
 import types
-from typing import List, Optional, Tuple, Type
+from typing import Dict, List, Optional, Tuple, Type
 
 from fastapi_jsonapi.data_typing import TypeModel, TypeSchema
 from fastapi_jsonapi.querystring import QueryStringManager
 from fastapi_jsonapi.schema import BaseJSONAPIItemInSchema
+from fastapi_jsonapi.schema_builder import FieldConfig, TransferSaveWrapper
 
 
 class BaseDataLayer:
@@ -75,6 +76,38 @@ async def atomic_start(self, previous_dl: Optional["BaseDataLayer"] = None):
     async def atomic_end(self, success: bool = True):
         raise NotImplementedError
 
+    def _unwrap_field_config(self, extra: Dict):
+        field_config_wrapper: Optional[TransferSaveWrapper] = extra.get("field_config")
+
+        if field_config_wrapper:
+            return field_config_wrapper.get_field_config()
+
+        return FieldConfig()
+
+    def _apply_client_generated_id(
+        self,
+        data_create: BaseJSONAPIItemInSchema,
+        model_kwargs: dict,
+    ):
+        """
+        :param data_create: the data validated by pydantic.
+        :param model_kwargs: the data validated by pydantic.
+        """
+        if data_create.id is None:
+            return model_kwargs
+
+        extra = data_create.__fields__["id"].field_info.extra
+        if extra.get("client_can_set_id"):
+            id_value = data_create.id
+            field_config = self._unwrap_field_config(extra)
+
+            if field_config.cast_type:
+                id_value = field_config.cast_type(id_value)
+
+            model_kwargs["id"] = id_value
+
+        return model_kwargs
+
     async def create_object(self, data_create: BaseJSONAPIItemInSchema, view_kwargs: dict) -> TypeModel:
         """
         Create an object

fastapi_jsonapi/data_layers/sqla_orm.py

@@ -1,6 +1,6 @@
 """This module is a CRUD interface between resource managers and the sqlalchemy ORM"""
 import logging
-from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Any, Iterable, List, Optional, Tuple, Type
 
 from sqlalchemy import delete, func, select
 from sqlalchemy.exc import DBAPIError, IntegrityError, NoResultFound
@@ -32,7 +32,6 @@
     get_related_schema,
 )
 from fastapi_jsonapi.schema_base import RelationshipInfo
-from fastapi_jsonapi.schema_builder import FieldConfig, TransferSaveWrapper
 from fastapi_jsonapi.splitter import SPLIT_REL
 from fastapi_jsonapi.utils.sqla import get_related_model_cls
 
@@ -185,38 +184,6 @@ async def apply_relationships(self, obj: TypeModel, data_create: BaseJSONAPIItem
             # todo: relation name may be different?
             setattr(obj, relation_name, related_data)
 
-    def _unwrap_field_config(self, extra: Dict):
-        field_config_wrapper: TransferSaveWrapper = extra.get("field_config")
-
-        if field_config_wrapper:
-            return field_config_wrapper.field_config
-
-        return FieldConfig()
-
-    def _apply_client_generated_id(
-        self,
-        data_create: BaseJSONAPIItemInSchema,
-        model_kwargs: dict,
-    ):
-        """
-        :param data_create: the data validated by pydantic.
-        :param model_kwargs: the data validated by pydantic.
-        """
-        if data_create.id is None:
-            return model_kwargs
-
-        extra = data_create.__fields__["id"].field_info.extra
-        if extra.get("client_can_set_id"):
-            id_value = data_create.id
-            field_config = self._unwrap_field_config(extra)
-
-            if field_config.cast_type:
-                id_value = field_config.cast_type(id_value)
-
-            model_kwargs["id"] = id_value
-
-        return model_kwargs
-
     async def create_object(self, data_create: BaseJSONAPIItemInSchema, view_kwargs: dict) -> TypeModel:
         """
         Create an object through sqlalchemy.

fastapi_jsonapi/schema_builder.py

@@ -62,11 +62,10 @@ class TransferSaveWrapper:
     """
 
     def __init__(self, field_config: FieldConfig):
-        self.get_config = lambda: field_config
+        def get_field_config() -> FieldConfig:
+            return field_config
 
-    @property
-    def field_config(self) -> FieldConfig:
-        return self.get_config()
+        self.get_field_config = get_field_config
 
 
 @dataclass(frozen=True)