working order by, refactor models merging, refactors ordering into dict

tests/test_order_by.py

@@ -1,3 +1,5 @@
+from typing import List, Optional
+
 import databases
 import pytest
 import sqlalchemy
@@ -41,6 +43,45 @@ class Toy(ormar.Model):
     owner: Owner = ormar.ForeignKey(Owner)
 
 
+class Factory(ormar.Model):
+    class Meta:
+        tablename = "factories"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+
+
+class Car(ormar.Model):
+    class Meta:
+        tablename = "cars"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    factory: Optional[Factory] = ormar.ForeignKey(Factory)
+
+
+class UsersCar(ormar.Model):
+    class Meta:
+        tablename = "cars_x_users"
+        metadata = metadata
+        database = database
+
+
+class User(ormar.Model):
+    class Meta:
+        tablename = "users"
+        metadata = metadata
+        database = database
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    cars: List[Car] = ormar.ManyToMany(Car, through=UsersCar)
+
+
 @pytest.fixture(autouse=True, scope="module")
 def create_test_database():
     engine = sqlalchemy.create_engine(DATABASE_URL)
@@ -93,10 +134,10 @@ async def test_sort_order_on_related_model():
         hermes = await Owner.objects.create(name="Hermes")
         zeus = await Owner.objects.create(name="Zeus")
 
-        await Toy.objects.create(name="Toy 1", owner=zeus)
+        await Toy.objects.create(name="Toy 4", owner=zeus)
         await Toy.objects.create(name="Toy 5", owner=hermes)
         await Toy.objects.create(name="Toy 2", owner=aphrodite)
-        await Toy.objects.create(name="Toy 4", owner=zeus)
+        await Toy.objects.create(name="Toy 1", owner=zeus)
         await Toy.objects.create(name="Toy 3", owner=aphrodite)
         await Toy.objects.create(name="Toy 6", owner=hermes)
 
@@ -108,10 +149,129 @@ async def test_sort_order_on_related_model():
         assert toys[1].owner == aphrodite
 
         toys = await Toy.objects.select_related("owner").order_by("owner__name").all()
+        assert toys[0].owner.name == toys[1].owner.name == "Aphrodite"
+        assert toys[2].owner.name == toys[3].owner.name == "Hermes"
+        assert toys[4].owner.name == toys[5].owner.name == "Zeus"
 
         owner = (
             await Owner.objects.select_related("toys")
             .order_by("toys__name")
             .filter(name="Zeus")
+            .get()
+        )
+        assert owner.toys[0].name == "Toy 1"
+        assert owner.toys[1].name == "Toy 4"
+
+        owner = (
+            await Owner.objects.select_related("toys")
+            .order_by("-toys__name")
+            .filter(name="Zeus")
+            .get()
+        )
+        assert owner.toys[0].name == "Toy 4"
+        assert owner.toys[1].name == "Toy 1"
+
+        owners = (
+            await Owner.objects.select_related("toys")
+            .order_by("-toys__name")
+            .filter(name__in=["Zeus", "Hermes"])
             .all()
         )
+        assert owners[0].toys[0].name == "Toy 6"
+        assert owners[0].toys[1].name == "Toy 5"
+        assert owners[0].name == "Hermes"
+
+        assert owners[1].toys[0].name == "Toy 4"
+        assert owners[1].toys[1].name == "Toy 1"
+        assert owners[1].name == "Zeus"
+
+        await Toy.objects.create(name="Toy 7", owner=zeus)
+
+        owners = (
+            await Owner.objects.select_related("toys")
+            .order_by("-toys__name")
+            .filter(name__in=["Zeus", "Hermes"])
+            .all()
+        )
+        assert owners[0].toys[0].name == "Toy 7"
+        assert owners[0].toys[1].name == "Toy 4"
+        assert owners[0].toys[2].name == "Toy 1"
+        assert owners[0].name == "Zeus"
+
+        assert owners[1].toys[0].name == "Toy 6"
+        assert owners[1].toys[1].name == "Toy 5"
+        assert owners[1].name == "Hermes"
+
+
+@pytest.mark.asyncio
+async def test_sort_order_on_many_to_many():
+    async with database:
+        factory1 = await Factory.objects.create(name="Factory 1")
+        factory2 = await Factory.objects.create(name="Factory 2")
+
+        car1 = await Car.objects.create(name="Buggy", factory=factory1)
+        car2 = await Car.objects.create(name="VW", factory=factory2)
+        car3 = await Car.objects.create(name="Ferrari", factory=factory1)
+        car4 = await Car.objects.create(name="Volvo", factory=factory2)
+        car5 = await Car.objects.create(name="Skoda", factory=factory1)
+        car6 = await Car.objects.create(name="Seat", factory=factory2)
+
+        user1 = await User.objects.create(name="Mark")
+        user2 = await User.objects.create(name="Julie")
+
+        await user1.cars.add(car1)
+        await user1.cars.add(car3)
+        await user1.cars.add(car4)
+        await user1.cars.add(car5)
+
+        await user2.cars.add(car1)
+        await user2.cars.add(car2)
+        await user2.cars.add(car5)
+        await user2.cars.add(car6)
+
+        user = (
+            await User.objects.select_related("cars")
+            .filter(name="Mark")
+            .order_by("cars__name")
+            .get()
+        )
+        assert user.cars[0].name == "Buggy"
+        assert user.cars[1].name == "Ferrari"
+        assert user.cars[2].name == "Skoda"
+        assert user.cars[3].name == "Volvo"
+
+        user = (
+            await User.objects.select_related("cars")
+            .filter(name="Mark")
+            .order_by("-cars__name")
+            .get()
+        )
+        assert user.cars[3].name == "Buggy"
+        assert user.cars[2].name == "Ferrari"
+        assert user.cars[1].name == "Skoda"
+        assert user.cars[0].name == "Volvo"
+
+        users = await User.objects.select_related("cars").order_by("-cars__name").all()
+        assert users[0].name == "Mark"
+        assert users[1].cars[0].name == "VW"
+        assert users[1].cars[1].name == "Skoda"
+        assert users[1].cars[2].name == "Seat"
+        assert users[1].cars[3].name == "Buggy"
+
+        users = (
+            await User.objects.select_related(["cars", "cars__factory"])
+            .order_by(["-cars__factory__name", "cars__name"])
+            .all()
+        )
+
+        assert users[0].name == "Julie"
+        assert users[0].cars[0].name == "Seat"
+        assert users[0].cars[1].name == "VW"
+        assert users[0].cars[2].name == "Buggy"
+        assert users[0].cars[3].name == "Skoda"
+
+        assert users[1].name == "Mark"
+        assert users[1].cars[0].name == "Volvo"
+        assert users[1].cars[1].name == "Buggy"
+        assert users[1].cars[2].name == "Ferrari"
+        assert users[1].cars[3].name == "Skoda"