use base db interface

Author: NatalyaGrigoreva

fastapi_jsonapi/data_layers/base.py

@@ -226,68 +226,7 @@ async def delete_relationship(
         """
         raise NotImplementedError
 
-    def get_related_model_query_base(
-        self,
-        related_model: Type[TypeModel],
-    ):
-        """
-        Prepare query for the related model
-
-        :param related_model: Related ORM model class (not instance)
-        :return:
-        """
-        raise NotImplementedError
-
-    def get_related_object_query(
-        self,
-        related_model: Type[TypeModel],
-        related_id_field: str,
-        id_value: str,
-    ):
-        """
-        Prepare query to get related object
-
-        :param related_model:
-        :param related_id_field:
-        :param id_value:
-        :return:
-        """
-        raise NotImplementedError
-
-    def get_related_objects_list_query(
-        self,
-        related_model: Type[TypeModel],
-        related_id_field: str,
-        ids: list[str],
-    ):
-        """
-        Prepare query to get related objects list
-
-        :param related_model:
-        :param related_id_field:
-        :param ids:
-        :return:
-        """
-        raise NotImplementedError
-
-    # async def get_related_object_query(self):
-    async def get_related_object(
-        self,
-        related_model: Type[TypeModel],
-        related_id_field: str,
-        id_value: str,
-    ) -> TypeModel:
-        """
-        Get related object.
-
-        :param related_model: Related ORM model class (not instance)
-        :param related_id_field: id field of the related model (usually it's `id`)
-        :param id_value: related object id value
-        :return: an ORM object
-        """
-        raise NotImplementedError
-
-    async def get_related_objects_list(
+    async def get_related_objects(
         self,
         related_model: Type[TypeModel],
         related_id_field: str,
@@ -303,14 +242,6 @@ async def get_related_objects_list(
         """
         raise NotImplementedError
 
-    def query(self, view_kwargs):
-        """
-        Construct the base query to retrieve wanted data
-
-        :param view_kwargs: kwargs from the resource view
-        """
-        raise NotImplementedError
-
     async def before_create_object(self, data, view_kwargs):
         """
         Provide additional data before object creation

fastapi_jsonapi/data_layers/sqla/base_model.py

@@ -36,15 +36,11 @@ def _check_field_exists(
     def _fill(
         cls,
         model: TypeModel,
-        relationships: list[tuple[str, TypeModel]],
         **kwargs,
     ) -> None:
         for key, value in kwargs.items():
             cls._check_field_exists(model, key)
             setattr(model, key, value)
-        for relation_name, related_data in relationships:
-            cls._check_field_exists(model, relation_name)
-            setattr(model, relation_name, related_data)
 
     @classmethod
     async def _save(
@@ -111,12 +107,11 @@ async def create(
         session: AsyncSession,
         model: TypeModel,
         resource_type: str,
-        relationships: list[tuple[str, TypeModel]],
         commit: bool = True,
         id_: Optional[str] = None,
         **kwargs,
     ) -> TypeModel:
-        cls._fill(model, relationships, **kwargs)
+        cls._fill(model, **kwargs)
         session.add(model)
         return await cls._save(
             session=session,
@@ -219,12 +214,11 @@ async def update(
         session: AsyncSession,
         model: TypeModel,
         resource_type: str,
-        relationships: list[tuple[str, TypeModel]],
         commit: bool = True,
         id_: Optional[str] = None,
         **kwargs,
     ) -> TypeModel:
-        cls._fill(model, relationships, **kwargs)
+        cls._fill(model, **kwargs)
         session.add(model)
         return await cls._save(
             session=session,