Sorting by channel does not sort alphabetically fixes #1042

app/experimenter/experiments/models.py

@@ -7,7 +7,7 @@
 from django.contrib.postgres.fields import JSONField
 from django.core.validators import MaxValueValidator
 from django.db import models
-from django.db.models import Max
+from django.db.models import Func, Max
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -512,6 +512,17 @@ def population(self):
         )
 
 
+class FirefoxChannelSort(Func):
+    arity = 1
+    # Ordering given in https://github.com/mozilla/experimenter/issues/1042
+    template = f"""(CASE %(expressions)s
+    WHEN '' THEN 0
+    WHEN '{ExperimentConstants.CHANNEL_RELEASE}' THEN 1
+    WHEN '{ExperimentConstants.CHANNEL_BETA}' THEN 2
+    WHEN '{ExperimentConstants.CHANNEL_NIGHTLY}' THEN 3
+    END)"""
+
+
 class ExperimentVariant(models.Model):
     experiment = models.ForeignKey(
         Experiment,

app/experimenter/experiments/views.py

@@ -2,6 +2,7 @@
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.db.models import F
 from django.urls import reverse
 from django.shortcuts import redirect
 from django.views.generic import CreateView, DetailView, UpdateView
@@ -20,7 +21,7 @@
     ExperimentVariantsAddonForm,
     ExperimentVariantsPrefForm,
 )
-from experimenter.experiments.models import Experiment
+from experimenter.experiments.models import Experiment, FirefoxChannelSort
 
 
 class ExperimentFiltersetForm(forms.ModelForm):
@@ -111,8 +112,8 @@ class ExperimentOrderingForm(forms.Form):
         ("latest_change", "Least Recently Updated"),
         ("firefox_version", "Firefox Version Ascending"),
         ("-firefox_version", "Firefox Version Descending"),
-        ("firefox_channel", "Firefox Channel Ascending"),
-        ("-firefox_channel", "Firefox Channel Descending"),
+        ("firefox_channel_sort", "Firefox Channel Ascending"),
+        ("-firefox_channel_sort", "Firefox Channel Descending"),
     )
 
     ordering = forms.ChoiceField(
@@ -141,6 +142,13 @@ def get_filterset_kwargs(self, *args, **kwargs):
         kwargs["data"] = self.request.GET
         return kwargs
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        qs = qs.annotate(
+            firefox_channel_sort=FirefoxChannelSort(F("firefox_channel"))
+        )
+        return qs
+
     def get_ordering(self):
         self.ordering_form = ExperimentOrderingForm(self.request.GET)