Prepis strankovani na extension, sjednoceni volani resolveru

src/graphql_schema/entities/poi.py

@@ -1,44 +1,33 @@
-from typing import Optional
 import strawberry
 from database import models
-from decorators.endpoints import authenticated_user_only, allow_public
 from database.transaction import get_session
-from decorators.error_logging import error_logging
 from graphql_schema.entities.helpers.combobox import handle_combobox_save
-from graphql_schema.entities.helpers.detail import get_detail_filters
-from graphql_schema.entities.helpers.pagination import get_pagination_window, PaginationWindow
+from graphql_schema.entities.helpers.filters import get_detail_filters
+from graphql_schema.entities.helpers.pagination import PaginationWindow
 from graphql_schema.entities.resolvers.base import BaseQueryResolver, BaseMutationResolver
 from graphql_schema.entities.types.types import PointOfInterest
 from graphql_schema.entities.types.mutation_input import CreatePointOfInterestInput, EditPointOfInterestInput
+from graphql_schema.extensions.field.auth import AuthenticatedOnly, AllowPublicAccess
+from graphql_schema.extensions.field.pagination import OffsetPagination
 
 
 @strawberry.type
 class PointOfInterestQueries:
-    @strawberry.field()
-    @error_logging
-    @allow_public
+    @strawberry.field(extensions=[OffsetPagination(item_type=PointOfInterest), AllowPublicAccess()])
     async def points_of_interest(
         root, info,
-        limit: int, offset: int = 0,
         search: str | None = None,
-        public: bool = False
+        public: bool = False,
     ) -> PaginationWindow[PointOfInterest]:
-        query = BaseQueryResolver(PointOfInterest, models.PointOfInterest).get_query(
+        return BaseQueryResolver(PointOfInterest, models.PointOfInterest).get_query(
             info.context.user_id,
             only_my=bool(info.context.user_id),
             include_others_public=True,
             only_public=public,
             search=search,
         )
-        return await get_pagination_window(
-            query=query,
-            item_type=PointOfInterest,
-            limit=limit,
-            offset=offset
-        )
 
-    @strawberry.field()
-    @allow_public
+    @strawberry.field(extensions=[AllowPublicAccess()])
     async def point_of_interest(
         root, info,
         url_slug: str | None = None,
@@ -56,9 +45,7 @@ class PointOfInterestQueries:
 
 @strawberry.type
 class PointOfInterestMutation:
-    @strawberry.mutation
-    @error_logging
-    @authenticated_user_only()
+    @strawberry.mutation(extensions=[AuthenticatedOnly()])
     async def create_point_of_interest(root, info, input: CreatePointOfInterestInput) -> PointOfInterest:
         input_data = input.to_dict()
 
@@ -73,9 +60,7 @@ class PointOfInterestMutation:
                 db, input_data
             )
 
-    @strawberry.mutation
-    @error_logging
-    @authenticated_user_only()
+    @strawberry.mutation(extensions=[AuthenticatedOnly()])
     async def edit_point_of_interest(root, info, id: int, input: EditPointOfInterestInput) -> PointOfInterest:
         input_data = input.to_dict()
 
@@ -93,8 +78,6 @@ class PointOfInterestMutation:
             updated_poi = await models.PointOfInterest.update(db, obj=poi, data=input_data)
             return PointOfInterest(**updated_poi.as_dict())
 
-    @strawberry.mutation
-    @error_logging
-    @authenticated_user_only()
+    @strawberry.mutation(extensions=[AuthenticatedOnly()])
     async def delete_point_of_interest(self, info, id: int) -> PointOfInterest:
         return await BaseMutationResolver(PointOfInterest, models.PointOfInterest).delete(info.context.user_id, id=id)