Run formatter and linter

Author: diesieben07

strawberry_django/optimizer.py

@@ -707,15 +707,13 @@ def _must_use_prefetch_related(
     model_field: models.ForeignKey | OneToOneRel,
 ) -> bool:
     f_type = _get_django_type(field)
-    if f_type and hasattr(f_type, "get_queryset"):
-        # If the field has a get_queryset method, change strategy to Prefetch
-        # so it will be respected
-        return True
-    if is_polymorphic_model(model_field.related_model):
-        # If the model is using django-polymorphic, change strategy to Prefetch,
-        # so its custom queryset will be used, returning polymorphic models
-        return True
-    return False
+
+    # - If the field has a get_queryset method, use Prefetch so it will be respected
+    # - If the model is using django-polymorphic,
+    #   use Prefetch so its custom queryset will be used, returning polymorphic models
+    return (f_type and hasattr(f_type, "get_queryset")) or is_polymorphic_model(
+        model_field.related_model
+    )
 
 
 def _get_hints_from_django_foreign_key(

tests/polymorphism_custom/models.py

@@ -3,14 +3,22 @@
 
 class Company(models.Model):
     name = models.CharField(max_length=100)
-    main_project = models.ForeignKey('CustomPolyProject', null=True, blank=True, on_delete=models.CASCADE)
+    main_project = models.ForeignKey(
+        "CustomPolyProject", null=True, blank=True, on_delete=models.CASCADE
+    )
 
     class Meta:
-        ordering = ('name',)
+        ordering = ("name",)
 
 
 class CustomPolyProject(models.Model):
-    company = models.ForeignKey(Company, null=True, blank=True, on_delete=models.CASCADE, related_name='projects')
+    company = models.ForeignKey(
+        Company,
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+        related_name="projects",
+    )
     topic = models.CharField(max_length=30)
     artist = models.CharField(max_length=30, blank=True)
     supervisor = models.CharField(max_length=30, blank=True)

tests/polymorphism_custom/schema.py

@@ -8,7 +8,7 @@
 from strawberry_django.pagination import OffsetPaginated
 from strawberry_django.relay import ListConnectionWithTotalCount
 
-from .models import CustomPolyProject, Company
+from .models import Company, CustomPolyProject
 
 
 @strawberry_django.interface(CustomPolyProject)

tests/polymorphism_custom/test_optimizer.py

@@ -4,7 +4,7 @@
 
 from tests.utils import assert_num_queries
 
-from .models import CustomPolyProject, Company
+from .models import Company, CustomPolyProject
 from .schema import schema
 
 
@@ -257,7 +257,7 @@ def test_polymorphic_relation():
                     "topic": rp.topic,
                     "supervisor": rp.supervisor,
                 },
-            }
+            },
         ]
     }
 
@@ -266,7 +266,9 @@ def test_polymorphic_relation():
 def test_polymorphic_nested_list():
     company = Company.objects.create(name="Company")
     ap = CustomPolyProject.objects.create(company=company, topic="Art", artist="Artist")
-    rp = CustomPolyProject.objects.create(company=company, topic="Research", supervisor="Supervisor")
+    rp = CustomPolyProject.objects.create(
+        company=company, topic="Research", supervisor="Supervisor"
+    )
 
     query = """\
     query {