Ordered version dumps

cbv/management/commands/cbv_dumpversion.py

@@ -1,3 +1,5 @@
+from itertools import chain
+
 from django.core import serializers
 from django.core.management.base import LabelCommand
 
@@ -8,19 +10,26 @@ class Command(LabelCommand):
     """Dump the django cbv app data for a specific version."""
 
     def handle_label(self, label, **options):
-        filtered_models = (
-            (models.ProjectVersion, "version_number"),
-            (models.Module, "project_version__version_number"),
-            (models.Klass, "module__project_version__version_number"),
-            (models.KlassAttribute, "klass__module__project_version__version_number"),
-            (models.Method, "klass__module__project_version__version_number"),
-            (models.Inheritance, "parent__module__project_version__version_number"),
+        querysets = (
+            # There will be only one ProjectVersion, so no need for ordering.
+            models.ProjectVersion.objects.filter(version_number=label),
+            models.Module.objects.filter(
+                project_version__version_number=label
+            ).order_by("name"),
+            models.Klass.objects.filter(
+                module__project_version__version_number=label
+            ).order_by("module__name", "name"),
+            models.KlassAttribute.objects.filter(
+                klass__module__project_version__version_number=label
+            ).order_by("klass__module__name", "klass__name", "name"),
+            models.Method.objects.filter(
+                klass__module__project_version__version_number=label
+            ).order_by("klass__module__name", "klass__name", "name"),
+            models.Inheritance.objects.filter(
+                parent__module__project_version__version_number=label
+            ).order_by("child__module__name", "child__name", "order"),
         )
-        objects = []
-        for model, version_arg in filtered_models:
-            filter_kwargs = {version_arg: label}
-            result = model.objects.filter(**filter_kwargs)
-            objects = objects + list(result)
+        objects = list(chain.from_iterable(querysets))
         for obj in objects:
             obj.pk = None
         dump = serializers.serialize(

cbv/tests/test_models.py

@@ -1,6 +1,6 @@
 import pytest
 
-from .factories import InheritanceFactory
+from .factories import InheritanceFactory, KlassFactory
 
 
 @pytest.mark.django_db
@@ -18,10 +18,11 @@ def test_linear(self) -> None:
 
         C.__mro__ would be [C, B, A].
         """
-        b_child_of_a = InheritanceFactory.create(child__name="b", parent__name="a")
-        a = b_child_of_a.parent
-        b = b_child_of_a.child
-        c = InheritanceFactory.create(parent=b, child__name="c").child
+        a = KlassFactory.create(name="a")
+        b = KlassFactory.create(name="b")
+        c = KlassFactory.create(name="c")
+        InheritanceFactory.create(parent=a, child=b)
+        InheritanceFactory.create(parent=b, child=c)
 
         mro = c.get_all_ancestors()
 
@@ -40,11 +41,13 @@ def test_diamond(self) -> None:
 
         D.__mro__ would be [D, B, C, A].
         """
-        b_child_of_a = InheritanceFactory.create(child__name="b", parent__name="a")
-        a = b_child_of_a.parent
-        b = b_child_of_a.child
-        c = InheritanceFactory.create(parent=a, child__name="c").child
-        d = InheritanceFactory.create(parent=b, child__name="d").child
+        a = KlassFactory.create(name="a")
+        b = KlassFactory.create(name="b")
+        c = KlassFactory.create(name="c")
+        d = KlassFactory.create(name="d")
+        InheritanceFactory.create(parent=a, child=b)
+        InheritanceFactory.create(parent=a, child=c)
+        InheritanceFactory.create(parent=b, child=d)
         InheritanceFactory.create(parent=c, child=d, order=2)
 
         mro = d.get_all_ancestors()

mypy-ratchet.json

@@ -5,9 +5,7 @@
     "Function is missing a type annotation for one or more arguments  [no-untyped-def]": 12
   },
   "cbv/management/commands/cbv_dumpversion.py": {
-    "\"Type[object]\" has no attribute \"objects\"  [attr-defined]": 1,
-    "Function is missing a type annotation  [no-untyped-def]": 1,
-    "Need type annotation for \"objects\" (hint: \"objects: List[<type>] = ...\")  [var-annotated]": 1
+    "Function is missing a type annotation  [no-untyped-def]": 1
   },
   "cbv/management/commands/fetch_docs_urls.py": {
     "Call to untyped function \"bless_prints\" in typed context  [no-untyped-call]": 3,