From 64c1d42a15411a65ad0c171a1d2f61b5606b9ca3 Mon Sep 17 00:00:00 2001 From: sudan45 Date: Tue, 31 Dec 2024 11:18:22 +0545 Subject: [PATCH] Refactor code --- apps/common/dataloaders.py | 1 - apps/etl/dataloaders.py | 4 +--- apps/etl/queries.py | 3 ++- main/graphql/dataloaders.py | 4 ---- main/graphql/schema.py | 24 ++++++++---------------- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/apps/common/dataloaders.py b/apps/common/dataloaders.py index a4e2891..62cb81b 100644 --- a/apps/common/dataloaders.py +++ b/apps/common/dataloaders.py @@ -1,4 +1,3 @@ - import typing from django.db import models diff --git a/apps/etl/dataloaders.py b/apps/etl/dataloaders.py index e688361..e573dc3 100644 --- a/apps/etl/dataloaders.py +++ b/apps/etl/dataloaders.py @@ -1,12 +1,10 @@ - import typing from asgiref.sync import sync_to_async +from common.dataloaders import load_model_objects from django.utils.functional import cached_property from strawberry.dataloader import DataLoader -from common.dataloaders import load_model_objects - from .models import User if typing.TYPE_CHECKING: diff --git a/apps/etl/queries.py b/apps/etl/queries.py index f0d5be3..bc40d52 100644 --- a/apps/etl/queries.py +++ b/apps/etl/queries.py @@ -1,10 +1,11 @@ import strawberry -from strawberry.types import Info from asgiref.sync import sync_to_async +from strawberry.types import Info from apps.common.types import UserMeType from apps.etl.types import ExtractionDataType from main.graphql.paginations import CountList, pagination_field + from .filters import ExtractionDataFilter diff --git a/main/graphql/dataloaders.py b/main/graphql/dataloaders.py index f876ad0..9ada4c7 100644 --- a/main/graphql/dataloaders.py +++ b/main/graphql/dataloaders.py @@ -1,6 +1,2 @@ -from django.utils.functional import cached_property - - - class GlobalDataLoader: pass diff --git a/main/graphql/schema.py b/main/graphql/schema.py index 3b0b217..4a094e3 100644 --- a/main/graphql/schema.py +++ b/main/graphql/schema.py @@ -1,11 +1,11 @@ import strawberry - from strawberry.django.views import AsyncGraphQLView + from apps.etl import queries as etl_queries -from .permission import IsAuthenticated -from .dataloaders import GlobalDataLoader from .context import GraphQLContext +from .dataloaders import GlobalDataLoader +from .permission import IsAuthenticated class CustomAsyncGraphQLView(AsyncGraphQLView): @@ -18,37 +18,29 @@ async def get_context(self, *args, **kwargs) -> GraphQLContext: @strawberry.type -class PublicQuery( -): +class PublicQuery: id: strawberry.ID = strawberry.ID("public") @strawberry.type -class PrivateQuery( - etl_queries.PrivateQuery -): +class PrivateQuery(etl_queries.PrivateQuery): id: strawberry.ID = strawberry.ID("private") @strawberry.type -class PublicMutation( -): +class PublicMutation: id: strawberry.ID = strawberry.ID("public") @strawberry.type -class PrivateMutation( -): +class PrivateMutation: id: strawberry.ID = strawberry.ID("private") @strawberry.type class Query: public: PublicQuery = strawberry.field(resolver=lambda: PublicQuery()) - private: PrivateQuery = strawberry.field( - permission_classes=[IsAuthenticated], - resolver=lambda: PrivateQuery() - ) + private: PrivateQuery = strawberry.field(permission_classes=[IsAuthenticated], resolver=lambda: PrivateQuery()) @strawberry.type