Simplify optimize_querset signature with qs.model

Author: Jacob Foster

Diff for: graphene_django/fields.py

@@ -27,7 +27,7 @@ def list_resolver(resolver, root, args, context, info):
         qs = maybe_queryset(resolver(root, args, context, info))
 
         if isinstance(qs, QuerySet):
-            qs = optimize_queryset(qs.model, qs, info.field_asts[0])
+            qs = optimize_queryset(qs, info.field_asts[0])
 
         return qs
 
@@ -76,7 +76,7 @@ def resolve_connection(cls, connection, default_manager, args, info, iterable):
             if iterable is not default_manager:
                 default_queryset = maybe_queryset(default_manager)
                 iterable = cls.merge_querysets(default_queryset, iterable)
-            iterable = optimize_queryset(default_manager.model, iterable, info.field_asts[0])
+            iterable = optimize_queryset(iterable, info.field_asts[0])
             _len = iterable.count()
         else:
             _len = len(iterable)

Diff for: graphene_django/filter/fields.py

@@ -76,7 +76,7 @@ def connection_resolver(cls, resolver, connection, default_manager, max_limit,
             data=filter_kwargs,
             queryset=default_manager.get_queryset()
         ).qs
-        qs = optimize_queryset(default_manager.model, qs, info.field_asts[0])
+        qs = optimize_queryset(qs, info.field_asts[0])
 
         return super(DjangoFilterConnectionField, cls).connection_resolver(
             resolver,

Diff for: graphene_django/optimization.py

@@ -82,8 +82,8 @@ def get_related_fetches_for_model(model, graphql_ast):
     return relateds
 
 
-def optimize_queryset(model, queryset, graphql_ast):
-    relateds = get_related_fetches_for_model(model, graphql_ast)
+def optimize_queryset(queryset, graphql_ast):
+    relateds = get_related_fetches_for_model(queryset.model, graphql_ast)
 
     for related in relateds:
         if related.fetch_type == SELECT:

Diff for: graphene_django/tests/test_optimization.py

@@ -44,7 +44,7 @@ class RootQuery(graphene.ObjectType):
 
     def resolve_article(self, args, context, info):
         qs = ArticleModel.objects
-        qs = optimize_queryset(ArticleModel, qs, info.field_asts[0])
+        qs = optimize_queryset(qs, info.field_asts[0])
         return qs.get(**args)
 
     def resolve_reporters(self, args, context, info):

Diff for: graphene_django/types.py

@@ -121,7 +121,7 @@ def is_type_of(cls, root, context, info):
     @classmethod
     def get_node(cls, id, context, info):
         query = cls._meta.model._meta.default_manager
-        query = optimize_queryset(cls._meta.model, query, info.field_asts[0])
+        query = optimize_queryset(query, info.field_asts[0])
         try:
             return query.get(pk=id)
         except cls._meta.model.DoesNotExist: