Merge pull request #7392 from akatsoulas/tags-caching

Add caching for tags

Author: akatsoulas

kitsune/questions/jinja2/questions/question_list.html

@@ -4,6 +4,7 @@
 {% from "sumo/includes/question_entry.html" import question_entry %}
 
 {% set classes = 'questions' %}
+{% set _user_is_contributor = is_contributor(request.user) %}
 
 {% if all_products %}
   {% set page_title = _('All Products') %}
@@ -200,7 +201,7 @@ <h1 class="sumo-page-heading {% if not logo %}no-logo{% endif %}">
         <section class="forum--question-list questions">
           {% for question in questions.object_list %}
             <article id="question-{{ question.id }}" class="question-entry">
-              {{ question_entry(question, request=request) }}
+              {{ question_entry(question, request=request, user_is_contributor=_user_is_contributor) }}
             </article>
           {% endfor %}
         </section>
@@ -235,7 +236,7 @@ <h1 class="sumo-page-heading {% if not logo %}no-logo{% endif %}">
   <nav class="sidebar-nav">
     <span class="details-heading"></span>
     <ul class="sidebar-nav--list">
-      {% if filters and is_contributor(request.user) %}
+      {% if filters and _user_is_contributor %}
         <li class="sidebar-subheading sidebar-nav--heading-item">{{ _('Filter by') }}</li>
         <li class="{{ 'selected' if filter == None else '' }}"><a href="{{ questions_url(filter=None, page=None) }}">{{ _('All') }}</a></li>
         {% for f, desc in filters.items() %}
@@ -360,7 +361,7 @@ <h1 class="sumo-page-heading {% if not logo %}no-logo{% endif %}">
         </li>
       {% endif %}
 
-      {% if show != "spam" and is_contributor(request.user) %}
+      {% if show != "spam" and _user_is_contributor %}
       <li class="sidebar-subheading sidebar-nav--heading-item">{{ _('Show me') }}</li>
       <li {{ owner|class_selected(None) }}><a href="{{ questions_url(owner='all', page=None) }}">{{ _('Posts from everyone') }}</a></li>
       <li {{ owner|class_selected('mine') }}><a href="{{ questions_url(owner='mine', page=None) }}">{{ _('My contributions') }}</a></li>

kitsune/questions/views.py

@@ -10,6 +10,7 @@
 from django.contrib.auth.views import redirect_to_login
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
+from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import EmptyPage, PageNotAnInteger
 from django.db.models import Count, Exists, F, OuterRef, Q
@@ -343,14 +344,17 @@ def question_list(request, product_slug=None, topic_slug=None):
             question_qs = Question.objects.none()
 
     # Top 50 tags from the pre-tag-filtered set, ordered by frequency.
-    # Force evaluation here so the template receives a plain list, avoiding
-    # lazy queryset double-evaluation issues.
-    available_tags = list(
-        Question.objects.filter(pk__in=base_qs.values("pk").distinct(), tags__isnull=False)
-        .values("tags__name", "tags__slug")
-        .annotate(count=Count("id", distinct=True))
-        .order_by("-count")[:50]
-    )
+    # Cache per product/topic/locale since this query is expensive and rarely changes.
+    _tags_cache_key = f"available_tags:{product_slug}:{topic_slug}:{request.LANGUAGE_CODE}"
+    available_tags = cache.get(_tags_cache_key)
+    if available_tags is None:
+        available_tags = list(
+            Question.objects.filter(pk__in=base_qs.values("pk").distinct(), tags__isnull=False)
+            .values("tags__name", "tags__slug")
+            .annotate(count=Count("id", distinct=True))
+            .order_by("-count")[:50]
+        )
+        cache.set(_tags_cache_key, available_tags, 60 * 5)
     tagged_set = set(tagged.split(",")) if tagged else set()
 
     # Set the order.

kitsune/sumo/jinja2/sumo/includes/question_entry.html

@@ -74,7 +74,7 @@
   {% endif %}
 {% endmacro %}
 
-{% macro question_entry(question, profile_username=None, request=None) %}
+{% macro question_entry(question, profile_username=None, request=None, user_is_contributor=False) %}
   {% set _base_url = url('users.questions', username=profile_username) if (question.channel == "direct_support" and profile_username) else None %}
   {% if _base_url %}
     {% set _product_url = (_base_url + '?channel=direct_support&product=' + question.product.slug) if question.product else None %}
@@ -183,7 +183,7 @@ <h3 class="question-entry--title">
            aria-hidden="true">
         <circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/>
       </svg>
-      {% if is_contributor(request.user) and not profile_username %}
+      {% if user_is_contributor and not profile_username %}
         {{ _('asked by') }} <a class="question-entry--meta-asked-by"
            href="{{ url('users.profile', question.creator.id) }}"
            title="{{ display_name(question.creator) }}">{{ display_name(question.creator)|truncate(20) }}</a>

kitsune/users/jinja2/users/questions_contributed.html

@@ -40,9 +40,10 @@ <h2 class="sumo-page-subheading">
       </p>
     {% else %}
       <ul class="question-entry-list">
+        {% set _user_is_contributor = is_contributor(request.user) %}
         {% for question in questions %}
           <li class="question-entry">
-            {{ question_entry(question, profile_username=profile.user.username, request=request) }}
+            {{ question_entry(question, profile_username=profile.user.username, request=request, user_is_contributor=_user_is_contributor) }}
           </li>
         {% endfor %}
       </ul>