Merge pull request #1825 from IFRCGo/develop

Small backend-release before big changes

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.481
+
+### Added
+ - Put back caching
+ - DREF regional permission views
+ - DREF account page and users behaviour
+ - Add more columns to AppealDocument Admin list
+
 ## 1.1.480
 
 ### Added
@@ -2242,7 +2250,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.480...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.481...HEAD
+[1.1.481]: https://github.com/IFRCGo/go-api/compare/1.1.480...1.1.481
 [1.1.480]: https://github.com/IFRCGo/go-api/compare/1.1.479...1.1.480
 [1.1.479]: https://github.com/IFRCGo/go-api/compare/1.1.478...1.1.479
 [1.1.478]: https://github.com/IFRCGo/go-api/compare/1.1.477...1.1.478

api/admin.py

@@ -402,9 +402,13 @@ def save_model(self, request, obj, form, change):
 
 
 class AppealDocumentAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
+    def appeal_document_label(self, obj):
+        return '%s - %s' % (obj.appeal, obj.name)
+
     country_in = 'appeal__country__in'
     region_in = 'appeal__region__in'
-    search_fields = ('name', 'appeal__code', 'appeal__name')
+    list_display = ('appeal_document_label', 'description', 'iso', 'created_at')
+    search_fields = ('name', 'appeal__code', 'appeal__name', 'description', 'iso__name')
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related('appeal')

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)

dref/serializers.py

@@ -179,17 +179,11 @@ class Meta:
         ]
 
     def get_operational_update_details(self, obj):
-        type_of_dref = self.context['view'].kwargs.get('type_of_dref')
-        queryset = DrefOperationalUpdate.objects.filter(dref_id=obj.id)
-        if type_of_dref:
-            queryset = queryset.filter(type_of_dref=type_of_dref)
+        queryset = DrefOperationalUpdate.objects.filter(dref_id=obj.id).order_by('-created_at')
         return MiniOperationalUpdateSerializer(queryset, many=True).data
 
     def get_final_report_details(self, obj):
-        type_of_dref = self.context['view'].kwargs.get('type_of_dref')
         queryset = DrefFinalReport.objects.filter(dref_id=obj.id)
-        if type_of_dref:
-            queryset = queryset.filter(type_of_dref=type_of_dref)
         return MiniDrefFinalReportSerializer(queryset, many=True).data
 
     def get_has_ops_update(self, obj):

dref/views.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.480'
+__version__ = '1.1.481'

main/__init__.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',

main/settings.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)