Adding SurgeEventSerializer to eliminate FR fields

Author: szabozoltan69

api/serializers.py

@@ -510,6 +510,22 @@ class Meta:
         )
 
 
+class SurgeEventSerializer(ModelSerializer):
+    appeals = RelatedAppealSerializer(many=True, read_only=True)
+    countries = MiniCountrySerializer(many=True)
+    dtype = DisasterTypeSerializer()
+    ifrc_severity_level_display = serializers.CharField(source='get_ifrc_severity_level_display', read_only=True)
+
+    class Meta:
+        model = Event
+        fields = (
+            'name', 'dtype', 'countries', 'summary', 'num_affected', 'ifrc_severity_level', 'ifrc_severity_level_display',
+            'glide', 'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'is_featured', 'is_featured_region',
+            'updated_at', 'id', 'slug', 'parent_event', 'tab_one_title', 'tab_two_title', 'tab_three_title',
+            'emergency_response_contact_email',  # omitted intentionally: field_reports
+        )
+
+
 class ListEventTableauSerializer(EnumSupportSerializerMixin, serializers.ModelSerializer):
     appeals = serializers.SerializerMethodField()
     field_reports = serializers.SerializerMethodField()

deployments/drf_views.py

@@ -23,7 +23,6 @@
 from api.models import (
     Country,
     Region,
-    FieldReport,
 )
 from api.view_filters import ListFilter
 from api.visibility_class import ReadOnlyVisibilityViewsetMixin
@@ -151,21 +150,13 @@ def get_queryset(self):
             'country_from',
             'deployment__country_deployed_to',
             'deployment__event_deployed_to',
-            'deployment__event_deployed_to__dtype'
+            'deployment__event_deployed_to__dtype',
         ).prefetch_related(
             'deployment__event_deployed_to__countries',
             'deployment__event_deployed_to__appeals',
+            'molnix_tags',
         )
-
-        if self.request.GET.get('format') == 'csv':
-            return qs.prefetch_related(
-                models.Prefetch(
-                    'deployment__event_deployed_to__field_reports',
-                    queryset=FieldReport.objects.only('id', 'event_id')
-                )
-            ).distinct()
-
-        return qs.prefetch_related('deployment__event_deployed_to__field_reports').distinct()
+        return qs
 
     def get_serializer_class(self):
         request_format_type = self.request.GET.get('format', 'json')

deployments/serializers.py

@@ -15,6 +15,7 @@
 from api.serializers import (
     DisasterTypeSerializer,
     ListEventSerializer,
+    SurgeEventSerializer,
     SmallEventForPersonnelCsvSerializer,
     MiniEventSerializer,
     MiniCountrySerializer,
@@ -106,7 +107,7 @@ class Meta:
 
 class PersonnelDeploymentSerializer(ModelSerializer):
     country_deployed_to = MiniCountrySerializer()
-    event_deployed_to = ListEventSerializer()
+    event_deployed_to = SurgeEventSerializer()
 
     class Meta:
         model = PersonnelDeployment