Filter products per aaq_configs (#6713)

akatsoulas · web-flow · commit 67868ee4207b · 2025-06-10T07:58:12.000-07:00
diff --git a/kitsune/llm/questions/classifiers.py b/kitsune/llm/questions/classifiers.py
@@ -62,7 +62,7 @@ def handle_spam(payload: dict[str, Any], spam_result: dict[str, Any]) -> dict[st
         if not ((action == ModerationAction.SPAM) and spam_result.get("maybe_misclassified")):
             return {"action": action, "product_result": {}}
 
-        payload["products"] = get_products(output_format="JSON")
+        payload["products"] = get_products(only_with_forums=True, output_format="JSON")
         product_result = product_classification_chain.invoke(payload)
         new_product = product_result.get("product")
 
diff --git a/kitsune/products/managers.py b/kitsune/products/managers.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from django.db.models import Manager
 
 
@@ -8,12 +10,13 @@ def get_queryset(self):
 
 
 class ProductManager(NonArchivedManager):
-    def with_question_forums(self, request):
-        return (
-            self.filter(
-                aaq_configs__is_active=True,
-                aaq_configs__enabled_locales__locale=request.LANGUAGE_CODE,
-            )
-            .filter(codename="")
-            .distinct()
-        )
+    def with_question_forums(self, language_code: str = ""):
+
+        q_kwargs: dict[str, Any] = {
+            "aaq_configs__is_active": True,
+        }
+
+        if language_code:
+            q_kwargs["aaq_configs__enabled_locales__locale"] = language_code
+
+        return self.filter(**q_kwargs).filter(codename="").distinct()
diff --git a/kitsune/products/utils.py b/kitsune/products/utils.py
@@ -81,15 +81,20 @@ def get_topics(parent=None):
     return yaml.dump(result, indent=2, sort_keys=False)
 
 
-def get_products(output_format: str = "YAML") -> str:
+def get_products(only_with_forums: bool = False, output_format: str = "YAML") -> str:
     """
     Returns the currently active products, each with their title and description,
     as a string in the output format requested (either "YAML" or "JSON").
     """
     products: list[dict[str, str]] = []
     result = dict(products=products)
+    products_qs = Product.active
 
-    for product in Product.active.filter(Q(visible=True) | Q(slug="mozilla-account")):
+    if only_with_forums:
+        products_qs = products_qs.with_question_forums()
+    products_qs = products_qs.filter(Q(visible=True) | Q(slug="mozilla-account"))
+
+    for product in products_qs:
         products.append(
             dict(
                 title=product.title,
diff --git a/kitsune/questions/views.py b/kitsune/questions/views.py
@@ -125,7 +125,7 @@ def product_list(request):
     return render(
         request,
         "questions/product_list.html",
-        {"products": Product.active.with_question_forums(request)},
+        {"products": Product.active.with_question_forums(request.LANGUAGE_CODE)},
     )
 
 
@@ -170,7 +170,7 @@ def question_list(request, product_slug=None, topic_slug=None):
                 request, messages.WARNING, "You cannot list all questions at this time."
             )
             return HttpResponseRedirect("/")
-        products = Product.active.with_question_forums(request)
+        products = Product.active.with_question_forums(request.LANGUAGE_CODE)
 
     multiple = (len(products) > 1) or ("all" in product_slugs)
     product_with_aaq = False
@@ -450,7 +450,7 @@ def question_details(
 
     extra_kwargs.update(ans_)
 
-    products = Product.active.with_question_forums(request)
+    products = Product.active.with_question_forums(request.LANGUAGE_CODE)
     # Use get_hierarchical_topics instead of topics_for to match the moderate view
     topics = get_hierarchical_topics(question.product) if question.product else []
 
