feat(nimbus): Add subscribed feature experiments to home view.

experimenter/experimenter/nimbus_ui/filtersets.py

@@ -353,7 +353,8 @@ def filter_channel(self, queryset, name, value):
 class MyDeliveriesChoices(models.TextChoices):
     ALL = "AllDeliveries", "All My Deliveries"
     OWNED = "AllOwned", "All Owned"
-    SUBSCRIBED = "AllSubscribed", "All Subscribed"
+    SUBSCRIBED = "AllSubscribed", "All Subscribed Deliveries"
+    FEATURE_SUBSCRIBED = "FeatureSubscribed", "All Subscribed Features"
 
 
 class HomeSortChoices(models.TextChoices):
@@ -481,10 +482,13 @@ def __init__(self, *args, **kwargs):
             self.filters["my_deliveries_status"].field.initial = MyDeliveriesChoices.ALL
 
         # Limit feature_configs to only features used in user's deliveries
+        # or features the user is directly subscribed to
         if hasattr(self, "request") and self.request.user.is_authenticated:
             user_feature_ids = (
                 NimbusExperiment.objects.filter(
-                    Q(owner=self.request.user) | Q(subscribers=self.request.user)
+                    Q(owner=self.request.user)
+                    | Q(subscribers=self.request.user)
+                    | Q(feature_configs__subscribers=self.request.user)
                 )
                 .values_list("feature_configs", flat=True)
                 .distinct()
@@ -505,6 +509,8 @@ def filter_my_deliveries(self, queryset, name, value):
                 return queryset.filter(owner=user)
             case MyDeliveriesChoices.SUBSCRIBED:
                 return queryset.filter(subscribers=user)
+            case MyDeliveriesChoices.FEATURE_SUBSCRIBED:
+                return queryset.filter(feature_configs__subscribers=user)
             case _:
                 return queryset  # Default = All Deliveries
 

experimenter/experimenter/nimbus_ui/tests/test_views.py

@@ -3376,6 +3376,10 @@ def test_my_deliveries_filter_options_all_deliveries_default(self):
         self.assertNotIn(unrelated, experiments)
 
     def test_my_deliveries_filter_options_all_deliveries(self):
+        subscribed_feature = NimbusFeatureConfigFactory.create(
+            slug="feature-subscribe", name="Feature Subscribe"
+        )
+        subscribed_feature.subscribers.add(self.user)
         owned = NimbusExperimentFactory.create_with_lifecycle(
             NimbusExperimentFactory.Lifecycles.CREATED, owner=self.user, slug="owned-exp"
         )
@@ -3390,12 +3394,18 @@ def test_my_deliveries_filter_options_all_deliveries(self):
             NimbusExperimentFactory.Lifecycles.LIVE_ENROLLING,
             slug="unrelated-exp",
         )
+        subscribed_feature_experiment = NimbusExperimentFactory.create_with_lifecycle(
+            NimbusExperimentFactory.Lifecycles.CREATED, slug="feature-subscribe-exp"
+        )
+        subscribed_feature_experiment.feature_configs.add(subscribed_feature)
+
         response = self.client.get(
             f"{reverse('nimbus-ui-home')}?my_deliveries_status={MyDeliveriesChoices.ALL}"
         )
         experiments = list(response.context["all_my_experiments_page"].object_list)
         self.assertIn(owned, experiments)
         self.assertIn(subscribed, experiments)
+        self.assertIn(subscribed_feature_experiment, experiments)
         self.assertNotIn(unrelated, experiments)
 
     def test_my_deliveries_filter_options_subscribed(self):
@@ -3435,6 +3445,28 @@ def test_my_deliveries_filter_options_owned(self):
         self.assertIn(owned, experiments)
         self.assertNotIn(unrelated, experiments)
 
+    def test_my_deliveries_filter_options_feature_subscribed_option(self):
+        feature = NimbusFeatureConfigFactory.create(
+            slug="feature-subscribe", name="Feature Subscribe"
+        )
+        feature.subscribers.add(self.user)
+
+        experiment = NimbusExperimentFactory.create_with_lifecycle(
+            NimbusExperimentFactory.Lifecycles.CREATED, slug="test-exp"
+        )
+        experiment.feature_configs.add(feature)
+
+        unrelated = NimbusExperimentFactory.create_with_lifecycle(
+            NimbusExperimentFactory.Lifecycles.LIVE_ENROLLING,
+            slug="unrelated-exp",
+        )
+        response = self.client.get(
+            f"{reverse('nimbus-ui-home')}?my_deliveries_status={MyDeliveriesChoices.FEATURE_SUBSCRIBED.value}"
+        )
+        experiments = list(response.context["all_my_experiments_page"].object_list)
+        self.assertIn(experiment, experiments)
+        self.assertNotIn(unrelated, experiments)
+
     def test_sorting_and_pagination_preserved(self):
         names = ["Charlie", "Alpha", "Foxtrot", "Bravo", "Echo", "Delta"]
         for name in names:

experimenter/experimenter/nimbus_ui/views.py

@@ -957,7 +957,11 @@ def get_queryset(self):
         return (
             NimbusExperiment.objects.with_merged_channel()
             .filter(is_archived=False)
-            .filter(Q(owner=self.request.user) | Q(subscribers=self.request.user))
+            .filter(
+                Q(owner=self.request.user)
+                | Q(subscribers=self.request.user)
+                | Q(feature_configs__subscribers=self.request.user)
+            )
             .distinct()
             .order_by("-_updated_date_time")
             .prefetch_related("subscribers")