main: Add explicit sort ordering for 'LandingJobStatus' statuses using Case statement (bug 1893455)

Author: ahochheiden

src/lando/main/migrations/0002_alter_landingjob_status.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.0.6 on 2024-05-08 18:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("main", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="landingjob",
+            name="status",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("SUBMITTED", "Submitted"),
+                    ("IN_PROGRESS", "In progress"),
+                    ("DEFERRED", "Deferred"),
+                    ("FAILED", "Failed"),
+                    ("LANDED", "Landed"),
+                    ("CANCELLED", "Cancelled"),
+                ],
+                default=None,
+                max_length=32,
+                null=True,
+            ),
+        ),
+    ]

src/lando/main/models/landing_job.py

@@ -229,7 +229,7 @@ def job_queue_query(
             output_field=IntegerField()
         )
 
-        q = q.annotate(custom_order=ordering).order_by("-custom_order", "-priority", "created_at")
+        q = q.annotate(status_order=ordering).order_by("-status_order", "-priority", "created_at")
 
         return q