Continue using per-view caching

Author: caduribas

rnacentral/portal/urls.py

@@ -16,33 +16,29 @@
 from django.conf import settings
 from django.http import FileResponse, Http404
 from django.urls import re_path
-from django.views.decorators.cache import cache_page
 from django.views.generic import RedirectView, TemplateView
 from portal import views
 from portal.models import EnsemblAssembly
 
-CACHE_TIMEOUT = 60 * 60 * 24 * 7
-
-
 urlpatterns = [
     # homepage
-    re_path(r"^$", cache_page(CACHE_TIMEOUT)(views.homepage), name="homepage"),
+    re_path(r"^$", views.homepage, name="homepage"),
     # unique RNA sequence
     re_path(
         r"^rna/(?P<upi>URS[0-9A-F]{10})/?$",
-        cache_page(CACHE_TIMEOUT)(views.generic_rna_view),
+        views.generic_rna_view,
         name="generic-rna-sequence",
     ),
     # species specific identifier with forward slash
     re_path(
         r"^rna/(?P<upi>URS[0-9A-F]{10})/(?P<taxid>\d+)/?$",
-        cache_page(CACHE_TIMEOUT)(views.rna_view),
+        views.rna_view,
         name="unique-rna-sequence",
     ),
     # species specific identifier with underscore
     re_path(
         r"^rna/(?P<upi>URS[0-9A-F]{10})_(?P<taxid>\d+)/?$",
-        cache_page(CACHE_TIMEOUT)(views.rna_view_redirect),
+        views.rna_view_redirect,
         name="unique-rna-sequence-redirect",
     ),
     # expert database

rnacentral/portal/views.py

@@ -31,7 +31,7 @@
 from django.shortcuts import redirect, render
 from django.template import TemplateDoesNotExist
 from django.template.loader import render_to_string
-from django.views.decorators.cache import cache_page, never_cache
+from django.views.decorators.cache import cache_control, cache_page, never_cache
 from django.views.generic.base import TemplateView
 from portal.config.expert_databases import expert_dbs
 from portal.config.go_dataset import go_set
@@ -78,7 +78,8 @@ def get_sequence_lineage(request, upi):
     return HttpResponse(json_lineage_tree, content_type="application/json")
 
 
-@cache_page(1)
+@cache_page(CACHE_TIMEOUT)
+@cache_control(max_age=0)
 def homepage(request):
     """RNAcentral homepage."""
     random.shuffle(examples)