feat: academy list copilot comments resolved

Author: tsunkara-sonata

enterprise_access/apps/api/v1/tests/test_customer_billing_ssp_products.py

@@ -723,8 +723,8 @@ def test_retrieve_ssp_product_include_pricing_false(
 
     @mock.patch('enterprise_access.apps.api.v1.views.customer_billing.stripe.Price.list')
     @mock.patch('enterprise_access.apps.customer_billing.models.get_cached_academy_data')
-    def test_retrieve_falls_back_to_settings_lookup(self, mock_get_cached_academy_data, mock_price_list):
-        """If slug isn't a DB slug, `settings.SSP_PRODUCTS` mapping should allow lookup by lookup_key."""
+    def test_retrieve_ssp_product_by_slug_when_slug_matches_db(self, mock_get_cached_academy_data, mock_price_list):
+        """Retrieve resolves when the path slug matches the DB `slug`."""
         # create a product with a known lookup_key
         SspProduct.objects.create(
             slug='public-mapped-slug',
@@ -736,8 +736,6 @@ def test_retrieve_falls_back_to_settings_lookup(self, mock_get_cached_academy_da
             is_active=True,
         )
 
-        # mapping provided via override_settings decorator
-
         mock_get_cached_academy_data.return_value = {
             'title': 'Mapped Academy',
             'long_name': 'Mapped Academy Long',

enterprise_access/apps/api/v1/views/customer_billing.py

@@ -344,12 +344,11 @@ def list(self, request, *args, **kwargs):
         },
     )
     def retrieve(self, request, *args, **kwargs):
-        # Try normal lookup by slug first. If not found, allow fallback lookup where
-        # the provided slug corresponds to a configured SSP product key in
-        # `settings.SSP_PRODUCTS`. In that case, find the SspProduct by its
-        # configured `lookup_key` so routes like
+        # Try normal lookup by DB slug first. If not found, attempt fallback resolution where
+        # the provided path segment might be a Stripe Price lookup_key (or an alias that can be
+        # resolved to one via Stripe metadata). This supports routes like:
         # `/api/v1/ssp-products/essentials_tech_and_digital_transformation/`
-        # resolve correctly even when the DB `slug` differs.
+        # even when the DB `slug` differs.
         try:
             product = self.get_object()
         except (exceptions.NotFound, Http404) as exc:
@@ -365,9 +364,8 @@ def retrieve(self, request, *args, **kwargs):
             # First, check whether the requested slug actually matches a
             # database `stripe_price_lookup_key`. This allows direct lookup_key
             # URLs (where slug==lookup_key) to resolve without calling Stripe.
-            product = SspProduct.objects.filter(
+            product = self.get_queryset().filter(
                 stripe_price_lookup_key=requested_slug,
-                is_active=True,
             ).first()
             logger.debug('DB lookup for stripe_price_lookup_key=%s returned %s', requested_slug, bool(product))
 
@@ -427,9 +425,8 @@ def retrieve(self, request, *args, **kwargs):
                     lookup_key_candidate = None
 
             if not product and lookup_key_candidate:
-                product = SspProduct.objects.filter(
+                product = self.get_queryset().filter(
                     stripe_price_lookup_key=lookup_key_candidate,
-                    is_active=True,
                 ).first()
 
             # If no product was resolved via Stripe lookups, raise NotFound.