feat(nimbus): use channels in table filters (mozilla#13244)

Becuase

* We want to be able to filter on both the channel and channels fields
* This should be transparent to the user so there should only be one
channel filter

This commit

* Searches both the channel and channels fields in the channel filter on
the table page

fixes mozilla#13239

Author: jaredlockhart

experimenter/experimenter/experiments/tests/factories.py

@@ -455,16 +455,18 @@ class NimbusExperimentFactory(factory.django.DjangoModelFactory):
     channels = factory.LazyAttribute(
         lambda o: [
             str(c)
-            for c in random.choices(
-                list(
-                    set(
-                        NimbusExperiment.APPLICATION_CONFIGS[
-                            o.application
-                        ].channel_app_id.keys()
-                    )
-                    - {NimbusExperiment.Channel.NO_CHANNEL}
-                ),
-                k=2,
+            for c in set(
+                random.choices(
+                    list(
+                        set(
+                            NimbusExperiment.APPLICATION_CONFIGS[
+                                o.application
+                            ].channel_app_id.keys()
+                        )
+                        - {NimbusExperiment.Channel.NO_CHANNEL}
+                    ),
+                    k=2,
+                )
             )
         ]
     )

experimenter/experimenter/nimbus_ui/filtersets.py

@@ -126,6 +126,7 @@ class NimbusExperimentFilter(django_filters.FilterSet):
         ),
     )
     channel = django_filters.MultipleChoiceFilter(
+        method="filter_channel",
         choices=NimbusExperiment.Channel.choices,
         widget=IconMultiSelectWidget(
             icon="fa-solid fa-road",
@@ -301,3 +302,9 @@ def filter_takeaways(self, queryset, name, values):
             elif value in NimbusExperiment.ConclusionRecommendation:
                 query |= Q(conclusion_recommendations__contains=[value])
         return queryset.filter(query)
+
+    def filter_channel(self, queryset, name, value):
+        query = Q(channel__in=value)
+        for channel in value:
+            query |= Q(channels__contains=[channel])
+        return queryset.filter(query)

experimenter/experimenter/nimbus_ui/tests/test_views.py

@@ -299,10 +299,20 @@ def test_filter_application(self):
     def test_filter_channel(self):
         channel = NimbusExperiment.Channel.NIGHTLY
         experiment = NimbusExperimentFactory.create(
-            status=NimbusExperiment.Status.LIVE, channel=channel
+            application=NimbusExperiment.Application.FENIX,
+            slug=f"channel-{channel}",
+            status=NimbusExperiment.Status.LIVE,
+            channel=channel,
+            channels=[],
         )
         [
-            NimbusExperimentFactory.create(status=NimbusExperiment.Status.LIVE, channel=c)
+            NimbusExperimentFactory.create(
+                application=NimbusExperiment.Application.FENIX,
+                slug=f"channel-{c}",
+                status=NimbusExperiment.Status.LIVE,
+                channel=c,
+                channels=[],
+            )
             for c in {*list(NimbusExperiment.Channel)} - {channel}
         ]
 
@@ -315,6 +325,70 @@ def test_filter_channel(self):
             {e.slug for e in response.context["experiments"]}, {experiment.slug}
         )
 
+    def test_filter_channels(self):
+        experiment_nightly = NimbusExperimentFactory.create(
+            slug="nightly",
+            status=NimbusExperiment.Status.LIVE,
+            application=NimbusExperiment.Application.FENIX,
+            channel=NimbusExperiment.Channel.NIGHTLY,
+            channels=[],
+        )
+        experiment_nightly_beta = NimbusExperimentFactory.create(
+            slug="nightly-beta",
+            status=NimbusExperiment.Status.LIVE,
+            application=NimbusExperiment.Application.DESKTOP,
+            channel=NimbusExperiment.Channel.NO_CHANNEL,
+            channels=[NimbusExperiment.Channel.NIGHTLY, NimbusExperiment.Channel.BETA],
+        )
+        experiment_release_beta = NimbusExperimentFactory.create(
+            slug="release-beta",
+            status=NimbusExperiment.Status.LIVE,
+            application=NimbusExperiment.Application.DESKTOP,
+            channel=NimbusExperiment.Channel.NO_CHANNEL,
+            channels=[NimbusExperiment.Channel.RELEASE, NimbusExperiment.Channel.BETA],
+        )
+        experiment_release_dev = NimbusExperimentFactory.create(
+            slug="release-dev",
+            status=NimbusExperiment.Status.LIVE,
+            application=NimbusExperiment.Application.DESKTOP,
+            channel=NimbusExperiment.Channel.NO_CHANNEL,
+            channels=[
+                NimbusExperiment.Channel.RELEASE,
+                NimbusExperiment.Channel.DEVELOPER,
+            ],
+        )
+        NimbusExperimentFactory.create(
+            slug="aurora-dev",
+            status=NimbusExperiment.Status.LIVE,
+            application=NimbusExperiment.Application.DESKTOP,
+            channel=NimbusExperiment.Channel.NO_CHANNEL,
+            channels=[
+                NimbusExperiment.Channel.AURORA,
+                NimbusExperiment.Channel.DEVELOPER,
+            ],
+        )
+
+        response = self.client.get(
+            reverse("nimbus-list"),
+            {
+                "status": NimbusExperiment.Status.LIVE,
+                "channel": [
+                    NimbusExperiment.Channel.NIGHTLY,
+                    NimbusExperiment.Channel.RELEASE,
+                ],
+            },
+        )
+
+        self.assertEqual(
+            {e.slug for e in response.context["experiments"]},
+            {
+                experiment_nightly.slug,
+                experiment_nightly_beta.slug,
+                experiment_release_beta.slug,
+                experiment_release_dev.slug,
+            },
+        )
+
     def test_filter_version(self):
         version = NimbusExperiment.Version.FIREFOX_120
         experiment = NimbusExperimentFactory.create(