Merge pull request #1483 from IFRCGo/fix/surge-performance-2419

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
@@ -148,24 +147,17 @@ def get_queryset(self):
         if self.request.GET.get('format', 'json') != 'csv':
             qs = qs.filter(is_active=True)
         qs = qs.select_related(
-            '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',
+            'country_from',
+            'country_to',
+            '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/migrations/0066_auto_20220727_0708.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.27 on 2022-07-27 07:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0065_emergencyproject_visibility'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deployedperson',
+            name='end_date',
+            field=models.DateTimeField(db_index=True, null=True, verbose_name='end date'),
+        ),
+    ]

deployments/models.py

@@ -182,7 +182,7 @@ def __str__(self):
 @reversion.register()
 class DeployedPerson(models.Model):
     start_date = models.DateTimeField(verbose_name=_('start date'), null=True)
-    end_date = models.DateTimeField(verbose_name=_('end date'), null=True)
+    end_date = models.DateTimeField(verbose_name=_('end date'), null=True, db_index=True)
     name = models.CharField(verbose_name=_('name'), null=True, blank=True, max_length=255)
     role = models.CharField(verbose_name=_('role'), null=True, blank=True, max_length=512)
 

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

deployments/snapshots/snap_tests.py

@@ -449,16 +449,16 @@
 }
 
 snapshots['TestProjectAPI::test_personnel_csv_api 1'] = '''event_id,event_glide_id,event_name,event_ifrc_severity_level,event_disaster_type,event_country_name,event_country_iso3,event_country_nationalsociety,event_country_regionname,role,type,name,deployed_id,deployed_to_name,deployed_to_iso3,deployed_to_nationalsociety,deployed_to_regionname,deployed_from_name,deployed_from_iso3,deployed_from_nationalsociety,deployed_from_regionname,start_date,end_date,ongoing,is_active,molnix_id,molnix_sector,molnix_role_profile,molnix_language,molnix_region,molnix_scope,molnix_modality,molnix_operation\r
-,,,,,,,,,,,,1,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,2,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,3,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,4,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,5,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,6,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,7,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,8,,,,,,,,,,,True,True,,,,,,,,\r
-,,,,,,,,,,,,9,,,,,,,,,,,True,True,,,,,,,,\r
 ,,,,,,,,,,,,10,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,9,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,8,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,7,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,6,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,5,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,4,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,3,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,2,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,1,,,,,,,,,,,True,True,,,,,,,,\r
 '''
 
 snapshots['TestProjectAPI::test_project_create 1'] = {