Merge pull request #1616 from IFRCGo/fix/1613-timeout-surgealert-all-csv

Fix timeout for Export All SurgeAlerts

Author: szabozoltan69

notifications/drf_views.py

@@ -42,7 +42,9 @@ def get_queryset(self):
         limit = 14  # days
         cond1 = Q(is_stood_down=True)
         cond2 = Q(end__lt=datetime.utcnow().replace(tzinfo=timezone.utc)-timedelta(days=limit))
-        return SurgeAlert.objects.exclude(cond1 & cond2)
+        return super().get_queryset().\
+            select_related('country').\
+            exclude(cond1 & cond2)  # 'event' inclusion ^ to _related needs frontend change, otherwise the Position column shows garbage in /alerts/all
 
 
 class SubscriptionViewset(viewsets.ModelViewSet):

notifications/serializers.py

@@ -1,14 +1,14 @@
 from rest_framework import serializers
 
-from api.serializers import MiniEventSerializer, ListEventSerializer, MiniCountrySerializer
+from api.serializers import MiniEventSerializer, SurgeEventSerializer, MiniCountrySerializer
 from lang.serializers import ModelSerializer
 
 from .models import SurgeAlert, Subscription
 from deployments.serializers import MolnixTagSerializer
 
 
 class SurgeAlertSerializer(ModelSerializer):
-    event = ListEventSerializer()
+    event = SurgeEventSerializer()
     country = MiniCountrySerializer()
     atype_display = serializers.CharField(source='get_atype_display', read_only=True)
     category_display = serializers.CharField(source='get_category_display', read_only=True)