Refaktoring a bugfixing

src/graphql_schema/entities/event.py

@@ -1,68 +1,42 @@
-from typing import List, TYPE_CHECKING
+from typing import List
 import strawberry
 from database import models
 from decorators.endpoints import authenticated_user_only
-from dependencies.db import get_session
-from graphql_schema.sqlalchemy_to_strawberry_type import strawberry_sqlalchemy_input
-from .resolvers.base import get_base_resolver, get_list, get_one
+from database.transaction import get_session
+from graphql_schema.entities.resolvers.base import BaseQueryResolver, BaseMutationResolver
+from graphql_schema.entities.types.mutation_input import CreateEventInput, EditEventInput
 from graphql_schema.entities.types.types import Event
 
-if TYPE_CHECKING:
-    pass
-
 
 @strawberry.type
 class EventQueries:
     @strawberry.field()
     @authenticated_user_only()
     async def events(root, info) -> List[Event]:
-        query = get_base_resolver(
-            models.Event, user_id=info.context.user_id,
+        return await BaseQueryResolver(Event, models.Event).get_list(
+            info.context.user_id,
             order_by=[models.Event.date_from.desc(), models.Event.id.desc()]
         )
-        return await get_list(models.Event, query)
 
     @strawberry.field()
     @authenticated_user_only()
     async def event(root, info, id: int) -> Event:
-        query = get_base_resolver(models.Event, user_id=info.context.user_id, object_id=id)
-        return await get_one(models.Event, query)
+        return await BaseQueryResolver(Event, models.Event).get_one(id, user_id=info.context.user_id)
 
 
 @strawberry.type
-class CreateEventMutation:
-    @strawberry_sqlalchemy_input(model=models.Event, exclude_fields=["id"])
-    class CreateEventInput:
-        pass
-
+class EventMutation:
     @strawberry.mutation
     @authenticated_user_only()
     async def create_event(root, info, input: CreateEventInput) -> Event:
-        input_data = input.to_dict()
-        async with get_session() as db:
-            event = await models.Event.create(
-                db,
-                data=dict(
-                    **input_data,
-                    created_by_id=info.context.user_id,
-                )
-            )
-
-            return Event(**event.as_dict())
-
-
-@strawberry.type
-class EditEventMutation:
-    @strawberry_sqlalchemy_input(model=models.Event, exclude_fields=["id"])
-    class EditEventInput:
-        pass
+        return await BaseMutationResolver(Event, models.Event).create(input.to_dict(), info.context.user_id)
 
     @strawberry.mutation
     @authenticated_user_only()
     async def edit_event(root, info, id: int, input: EditEventInput) -> Event:
         async with get_session() as db:
             event = (await db.scalars(
-                get_base_resolver(models.Event, user_id=info.context.user_id, object_id=id)
+                BaseQueryResolver(Event, models.Event).get_query(user_id=info.context.user_id, object_id=id)
             )).one()
 
             updated_event = await models.Event.update(db, obj=event, data=input.to_dict())