refactor(graphql): simplify queries, migrate to order_type, and clean lint issues

- Replace resolver-based pagination with plain offset_paginated fields
- Migrate deprecated strawberry_django.order to order_type
- Fix typo in sentry transaction helper (atrack → attrack)
- Clean up list concatenations and docstrings for ruff compliance

Author: sudip-khanal

.pre-commit-config.yaml

@@ -78,10 +78,3 @@ repos:
             typing_extensions,
             wadler_lindig,
           ]
-
-# TODO: Setup https://pre-commit.ci/
-# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
-# ci:
-#   autoupdate_schedule: weekly
-#   skip: []
-#   submodules: false

apps/common/graphql/__init__.py

@@ -337,13 +337,16 @@ class UserAnswerAdmin(admin.ModelAdmin):  # type: ignore[reportMissingTypeArgume
     search_fields = ["submission__id", "question__title"]
 
     def get_fields(self, request, obj=None):  # type: ignore[reportMissingTypeArgument]
-        """Show only relevant fields based on question type"""
+        """Show only relevant fields based on question type."""
         base_fields = ["submission", "question"]
+
         if obj and obj.question.question_type == "ordinal":
-            return base_fields + ["ordinal_value"]
+            return [*base_fields, "ordinal_value"]
+
         if obj and obj.question.question_type == "checkbox":
-            return base_fields + ["selected_options"]
-        return base_fields + ["ordinal_value", "selected_options"]
+            return [*base_fields, "selected_options"]
+
+        return [*base_fields, "ordinal_value", "selected_options"]
 
     def get_form(self, request, obj=None, **kwargs):  # type: ignore[reportMissingTypeArgument]
         form = super().get_form(request, obj, **kwargs)

apps/tool_picker/admin.py

@@ -7,7 +7,7 @@
 @strawberry_django.filters.filter(Catalog, lookups=True)
 class CatalogFilter:
     id: strawberry.ID | None
-    show_in_help_me_choose: strawberry.auto
+    show_in_help_me_choose: bool | None
 
 
 @strawberry_django.filters.filter(Tool, lookups=True)

apps/tool_picker/graphql/filters.py

@@ -4,11 +4,11 @@
 from apps.tool_picker.models import Catalog, Tool
 
 
-@strawberry_django.ordering.order(Catalog)
+@strawberry_django.order_type(Catalog)
 class CatalogOrder:
     id: strawberry.auto
 
 
-@strawberry_django.ordering.order(Tool)
+@strawberry_django.order_type(Tool)
 class ToolOrder:
     id: strawberry.auto

apps/tool_picker/graphql/orders.py

@@ -1,37 +1,24 @@
 import strawberry
 import strawberry_django
-from django.db.models import QuerySet
 from strawberry_django.pagination import OffsetPaginated
 
-from apps.tool_picker.models import Catalog, Tool
-
 from .filters import CatalogFilter, ToolFilter
 from .orders import CatalogOrder, ToolOrder
 from .types import CatalogType, ToolType
 
 
 @strawberry.type
 class Query:
-    @strawberry_django.offset_paginated(
-        OffsetPaginated[CatalogType],
+    catalogs: OffsetPaginated[CatalogType] = strawberry_django.offset_paginated(
         order=CatalogOrder,
         filters=CatalogFilter,
     )
-    def catalogs(
-        self,
-    ) -> QuerySet[Catalog]:
-        return Catalog.objects.all()
 
     catalog: CatalogType = strawberry_django.field()
 
-    @strawberry_django.offset_paginated(
-        OffsetPaginated[ToolType],
+    tools: OffsetPaginated[ToolType] = strawberry_django.offset_paginated(
         order=ToolOrder,
         filters=ToolFilter,
     )
-    def tools(
-        self,
-    ) -> QuerySet[Tool]:
-        return Tool.objects.all()
 
     tool: ToolType = strawberry_django.field()

apps/tool_picker/graphql/queries.py

@@ -1,23 +1,9 @@
 import strawberry
 import strawberry_django
-from django.db import models
 
 from apps.user.models import User
 
 
 @strawberry_django.filters.filter(User, lookups=True)
 class UserFilter:
     id: strawberry.auto
-
-    @strawberry_django.filter_field
-    def search(
-        self,
-        queryset: models.QuerySet[User],
-        value: str,
-        prefix: str,
-    ) -> tuple[models.QuerySet[User], models.Q]:
-        return queryset, models.Q(
-            **{
-                f"{prefix}display_name__icontains": value,
-            },
-        )

apps/user/graphql/dataloaders.py

@@ -4,7 +4,6 @@
 from apps.user.models import User
 
 
-@strawberry_django.ordering.order(User)
+@strawberry_django.order_type(User)
 class UserOrder:
     id: strawberry.auto
-    display_name: strawberry.auto

apps/user/graphql/filters.py

@@ -1,16 +1,9 @@
 import strawberry
-import strawberry_django
 from asgiref.sync import sync_to_async
-from django.db import models
-from strawberry_django.pagination import OffsetPaginated
-from strawberry_django.permissions import IsAuthenticated
 
-from apps.user.models import User
 from main.graphql.context import Info
 
-from .filters import UserFilter
-from .orders import UserOrder
-from .types import UserMeType, UserType
+from .types import UserMeType
 
 
 @strawberry.type
@@ -23,14 +16,3 @@ def me(self, info: Info) -> UserMeType | None:
         if user.is_authenticated:
             return user  # type: ignore[reportGeneralTypeIssues]
         return None
-
-    # Private --------------------
-    # --- Paginated
-    @strawberry_django.offset_paginated(
-        OffsetPaginated[UserType],
-        order=UserOrder,
-        filters=UserFilter,
-        extensions=[IsAuthenticated()],
-    )
-    def users(self) -> models.QuerySet[User]:
-        return User.objects.filter(is_active=True)