Switch on cache

Author: szabozoltan69

api/drf_views.py

@@ -14,9 +14,6 @@
 from django.db.models import Prefetch, Count, Q, OuterRef
 from django.utils import timezone
 
-# ¤ from django.utils.decorators import method_decorator
-# ¤ from django.views.decorators.cache import cache_page
-
 from main.utils import is_tableau
 from deployments.models import Personnel
 from databank.serializers import CountryOverviewSerializer
@@ -683,7 +680,6 @@ def remove_unconfirmed_events(self, objs):
         return [self.remove_unconfirmed_event(obj) for obj in objs]
 
     # Overwrite to exclude the events which require confirmation
-# ¤    @method_decorator(cache_page(1200))
     def list(self, request, *args, **kwargs):
         now = timezone.now()
         date = request.GET.get("date", now)

main/settings.py

@@ -213,9 +213,9 @@
     'django.middleware.locale.LocaleMiddleware',
     # 'middlewares.middlewares.LocaleMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    # ¤ 'middlewares.cache.UpdateCacheForUserMiddleware',
+    'middlewares.cache.UpdateCacheForUserMiddleware',
     'django.middleware.common.CommonMiddleware',
-    # ¤ 'middlewares.cache.FetchFromCacheForUserMiddleware',
+    'middlewares.cache.FetchFromCacheForUserMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',

middlewares/cache.py

@@ -1,7 +1,5 @@
-from re import sub
 from django.conf import settings
 from django.middleware.cache import FetchFromCacheMiddleware, UpdateCacheMiddleware
-from django.utils.cache import get_cache_key
 from rest_framework.views import APIView
 
 
@@ -10,20 +8,19 @@ def get_cache_key_prefix(request):
     drf_request = APIView().initialize_request(request)
 
     if drf_request.user.is_anonymous:
-        user_id = 'anonymous'
-    else:
-        user_id = drf_request.user.id
-    if not cache_prefix:
-        return f'user_{user_id}'
-    
-    return f'{cache_prefix}_user_{user_id}'
+        return f'{cache_prefix}_anonymous'
+
 
 class UpdateCacheForUserMiddleware(UpdateCacheMiddleware):
     def process_response(self, request, response):
-        self.key_prefix = get_cache_key_prefix(request)
-        return super().process_response(request, response)
+        if key_prefix := get_cache_key_prefix(request):
+            self.key_prefix = key_prefix
+            return super().process_response(request, response)
+        return response
+
 
 class FetchFromCacheForUserMiddleware(FetchFromCacheMiddleware):
     def process_request(self, request):
-        self.key_prefix = get_cache_key_prefix(request)
-        return super().process_request(request)
+        if key_prefix := get_cache_key_prefix(request):
+            self.key_prefix = key_prefix
+            return super().process_request(request)