Slugy, webp, hromada zmen

src/graphql_schema/entities/resolvers/base.py

@@ -33,7 +33,6 @@ class BaseQueryResolver(BaseResolver):
             object_id: Optional[int] = None,
             order_by: Optional[list] = None,
             only_public: Optional[bool] = False,
-            *args,
             **kwargs,
     ):
         query = self.query_builder.get_simple_query(created_by_id=user_id, order_by=order_by, only_public=only_public)
@@ -52,8 +51,8 @@ class BaseQueryResolver(BaseResolver):
         query = self.get_query(user_id, **kwargs)
         return await self._get_list(query)
 
-    async def get_one(self, id: int, user_id: Optional[int] = None, **kwargs) -> GQL_TYPE:
-        query = self.get_query(user_id, object_id=id, **kwargs)
+    async def get_one(self, user_id: Optional[int] = None, **kwargs) -> GQL_TYPE:
+        query = self.get_query(user_id, **kwargs)
         return await self._get_one(query)
 
 
@@ -62,21 +61,31 @@ class BaseMutationResolver(BaseResolver):
         query = self.query_builder.get_simple_query(created_by_id=created_by_id).filter(self.model.id == id)
         return (await db.scalars(query)).one()
 
-    async def _do_create(self, data) -> GQL_TYPE:
-        async with get_session() as db:
-            model = await self.model.create(db, data=data)
-            return self.graphql_type(**model.as_dict())
+    async def _do_create(self, db: AsyncSession, data: dict) -> GQL_TYPE:
+        model = await self.model.create(db, data=data)
+        return self.graphql_type(**model.as_dict())
 
-    async def _do_update(self, db: AsyncSession, obj: models.BaseModel | dict, data: dict) -> GQL_TYPE:
+    async def _do_update(self, db: AsyncSession, obj: models.BaseModel | dict | int, data: dict) -> GQL_TYPE:
         update_where = {}
         if isinstance(obj, models.BaseModel):
             update_where['obj'] = obj
-        else:
+        elif isinstance(obj, dict):
             update_where['id'] = obj['id']
+        else:
+            update_where['id'] = obj
 
         model = await self.model.update(db, data=data, **update_where)
         return self.graphql_type(**model.as_dict())
 
+    async def create(self, context, data: BaseGraphqlInputType) -> GQL_TYPE:
+        input_data = data.to_dict()
+
+        if hasattr(self.model, "created_by_id"):
+            input_data['created_by_id'] = context.user_id
+
+        async with get_session() as db:
+            return await self._do_create(db, input_data)
+
     async def update(self, id: int, data: BaseGraphqlInputType, user_id: int) -> GQL_TYPE:
         async with get_session() as db:
             item = await self._get_one(db, id, user_id)
@@ -93,9 +102,3 @@ class BaseMutationResolver(BaseResolver):
 
             return self.graphql_type(**model.as_dict())
 
-    async def create(self, data: dict, user_id: Optional[int] = None) -> GQL_TYPE:
-        input_data = {**data}
-        if hasattr(self.model, "created_by_id"):
-            input_data['created_by_id'] = user_id
-
-        return await self._do_create(input_data)