Merge branch 'develop' into feature/import-admin2

Author: szabozoltan69

api/migrations/0150_event_emergency_response_contact_email.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.27 on 2022-03-22 10:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0149_auto_20220318_0413'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='emergency_response_contact_email',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='emergency response contact email'),
+        ),
+    ]

api/models.py

@@ -615,6 +615,11 @@ class Event(models.Model):
 
     # visibility
     visibility = EnumIntegerField(VisibilityChoices, verbose_name=_('visibility'), default=1)
+    emergency_response_contact_email = models.CharField(
+        verbose_name=_('emergency response contact email'),
+        null=True, blank=True,
+        max_length=255
+    )
 
     class Meta:
         ordering = ('-disaster_start_date',)

api/serializers.py

@@ -1,5 +1,4 @@
 import json
-import datetime
 from django.utils import timezone
 from rest_framework import serializers
 from django.contrib.auth.models import User
@@ -52,7 +51,6 @@
     MainContact
 )
 from notifications.models import Subscription
-from deployments.models import Personnel
 
 
 class GeoSerializerMixin:
@@ -92,7 +90,8 @@ class Meta:
 class RegionGeoSerializer(EnumSupportSerializerMixin, ModelSerializer):
     bbox = serializers.SerializerMethodField()
 
-    def get_bbox(self, region):
+    @staticmethod
+    def get_bbox(region):
         return region.bbox and json.loads(region.bbox.geojson)
 
     class Meta:
@@ -129,10 +128,12 @@ class CountryGeoSerializer(EnumSupportSerializerMixin, ModelSerializer):
     centroid = serializers.SerializerMethodField()
     record_type_display = serializers.CharField(source='get_record_type_display', read_only=True)
 
-    def get_bbox(self, country):
+    @staticmethod
+    def get_bbox(country):
         return country.bbox and json.loads(country.bbox.geojson)
 
-    def get_centroid(self, country):
+    @staticmethod
+    def get_centroid(country):
         return country.centroid and json.loads(country.centroid.geojson)
 
     class Meta:
@@ -168,12 +169,25 @@ class Meta:
         model = District
         fields = ('name', 'code', 'is_deprecated',)
 
+
 class MicroCountrySerializer(ModelSerializer):
     class Meta:
         model = Country
         fields = ('id', 'name', 'iso', 'iso3', 'society_name')
 
 
+class NanoCountrySerializer(ModelSerializer):
+    region = serializers.SerializerMethodField()
+
+    @staticmethod
+    def get_region(obj):
+        return obj.region.label if obj.region else None
+
+    class Meta:
+        model = Country
+        fields = ('iso3', 'name', 'society_name', 'region')
+
+
 class RegoCountrySerializer(ModelSerializer):
     class Meta:
         model = Country
@@ -219,7 +233,19 @@ class MiniDistrictGeoSerializer(GeoSerializerMixin, ModelSerializer):
     country_iso = serializers.CharField(source='country.iso', read_only=True)
     country_iso3 = serializers.CharField(source='country.iso3', read_only=True)
 
+    @staticmethod
+    def get_bbox(district):
+        if district.bbox:
+            return json.loads(district.bbox.geojson)
+        else:
+            return None
 
+    @staticmethod
+    def get_centroid(district):
+        if district.centroid:
+            return json.loads(district.centroid.geojson)
+        else:
+            return None
 
     class Meta:
         model = District
@@ -330,10 +356,12 @@ class RegionRelationSerializer(EnumSupportSerializerMixin, ModelSerializer):
     national_society_count = serializers.SerializerMethodField()
     country_cluster_count = serializers.SerializerMethodField()
 
-    def get_national_society_count(self, obj):
+    @staticmethod
+    def get_national_society_count(obj):
         return obj.get_national_society_count()
 
-    def get_country_cluster_count(self, obj):
+    @staticmethod
+    def get_country_cluster_count(obj):
         return obj.get_country_cluster_count()
 
     class Meta:
@@ -442,15 +470,15 @@ class Meta:
 class MiniEventSerializer(ModelSerializer):
     class Meta:
         model = Event
-        fields = ('name', 'dtype', 'id', 'slug', 'parent_event',)
+        fields = ('name', 'dtype', 'id', 'slug', 'parent_event', 'emergency_response_contact_email')
 
 
 class ListMiniEventSerializer(ModelSerializer):
     dtype = DisasterTypeSerializer(read_only=True)
 
     class Meta:
         model = Event
-        fields = ('id', 'name', 'slug', 'dtype', 'auto_generated_source')
+        fields = ('id', 'name', 'slug', 'dtype', 'auto_generated_source', 'emergency_response_contact_email')
 
 
 class ListEventSerializer(EnumSupportSerializerMixin, ModelSerializer):
@@ -466,6 +494,7 @@ class Meta:
             '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',
             'field_reports', 'updated_at', 'id', 'slug', 'parent_event', 'tab_one_title', 'tab_two_title', 'tab_three_title',
+            'emergency_response_contact_email',
         )
 
 
@@ -476,13 +505,16 @@ class ListEventTableauSerializer(EnumSupportSerializerMixin, serializers.ModelSe
     dtype = DisasterTypeSerializer()
     ifrc_severity_level_display = serializers.CharField(source='get_ifrc_severity_level_display', read_only=True)
 
-    def get_countries(self, obj):
+    @staticmethod
+    def get_countries(obj):
         return get_merged_items_by_fields(obj.countries.all(), ['id', 'name'])
 
-    def get_field_reports(self, obj):
+    @staticmethod
+    def get_field_reports(obj):
         return get_merged_items_by_fields(obj.field_reports.all(), ['id'])
 
-    def get_appeals(self, obj):
+    @staticmethod
+    def get_appeals(obj):
         return get_merged_items_by_fields(obj.appeals.all(), ['id'])
 
     class Meta:
@@ -501,13 +533,16 @@ class ListEventCsvSerializer(EnumSupportSerializerMixin, serializers.ModelSerial
     dtype = DisasterTypeSerializer()
     ifrc_severity_level_display = serializers.CharField(source='get_ifrc_severity_level_display', read_only=True)
 
-    def get_countries(self, obj):
+    @staticmethod
+    def get_countries(obj):
         return get_merged_items_by_fields(obj.countries.all(), ['id', 'name', 'iso', 'iso3', 'society_name'])
 
-    def get_field_reports(self, obj):
+    @staticmethod
+    def get_field_reports(obj):
         return get_merged_items_by_fields(obj.field_reports.all(), ['id'])
 
-    def get_appeals(self, obj):
+    @staticmethod
+    def get_appeals(obj):
         return get_merged_items_by_fields(obj.appeals.all(), ['id'])
 
     class Meta:
@@ -526,19 +561,23 @@ class ListEventForPersonnelCsvSerializer(EnumSupportSerializerMixin, serializers
     dtype_name = serializers.SerializerMethodField()
 
     # NOTE: prefetched at deployments/drf_views.py::PersonnelViewset::get_queryset
-    def get_countries(self, obj):
+    @staticmethod
+    def get_countries(obj):
         fields = ['id', 'name', 'iso', 'iso3', 'society_name']
         return get_merged_items_by_fields(obj.countries.all(), fields)
 
-    def get_field_reports(self, obj):
+    @staticmethod
+    def get_field_reports(obj):
         fields = ['id']
         return get_merged_items_by_fields(obj.field_reports.all(), fields)
 
-    def get_appeals(self, obj):
+    @staticmethod
+    def get_appeals(obj):
         fields = ['id', 'status']
         return get_merged_items_by_fields(obj.appeals.all(), fields)
 
-    def get_dtype_name(self, obj):
+    @staticmethod
+    def get_dtype_name(obj):
         return obj.dtype and obj.dtype.name
 
     class Meta:
@@ -550,6 +589,24 @@ class Meta:
         )
 
 
+class SmallEventForPersonnelCsvSerializer(EnumSupportSerializerMixin, serializers.ModelSerializer):
+    countries = serializers.SerializerMethodField()
+    dtype_name = serializers.SerializerMethodField()
+
+    @staticmethod
+    def get_countries(obj):
+        fields = ['name', 'iso3', 'society_name', 'region']
+        return get_merged_items_by_fields(obj.countries.all(), fields)
+
+    @staticmethod
+    def get_dtype_name(obj):
+        return obj.dtype and obj.dtype.name
+
+    class Meta:
+        model = Event
+        fields = ('name', 'dtype_name', 'countries', 'ifrc_severity_level', 'glide', 'id')
+
+
 class ListEventDeploymentsSerializer(serializers.Serializer):
     id = serializers.IntegerField()
     type = serializers.CharField()
@@ -560,7 +617,8 @@ class DeploymentsByEventSerializer(ModelSerializer):
     organizations_from = serializers.SerializerMethodField()
     personnel_count = serializers.IntegerField()
 
-    def get_organizations_from(self, obj):
+    @staticmethod
+    def get_organizations_from(obj):
         deployments = [d for d in obj.personneldeployment_set.all()]
         personnels = []
         for d in deployments:
@@ -650,7 +708,6 @@ class AppealHistoryTableauSerializer(EnumSupportSerializerMixin, serializers.Mod
     country = MiniCountrySerializer()
     dtype = DisasterTypeSerializer()
     region = RegionSerializer()
-    event = MiniEventSerializer()
     atype_display = serializers.CharField(source='get_atype_display', read_only=True)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
     code = serializers.CharField(source='appeal.code', read_only=True)
@@ -773,7 +830,8 @@ def update(self, instance, validated_data):
         instance.save()
         return instance
 
-    def get_is_ifrc_admin(self, obj):
+    @staticmethod
+    def get_is_ifrc_admin(obj):
         return obj.groups.filter(name__iexact="IFRC Admins").exists()
 
 
@@ -794,19 +852,22 @@ class Meta:
             'is_admin_for_countries', 'is_admin_for_regions', 'lang_permissions'
         )
 
-    def get_is_admin_for_countries(self, user):
+    @staticmethod
+    def get_is_admin_for_countries(user):
         return set([
             int(permission[18:]) for permission in user.get_all_permissions()
             if ('api.country_admin_' in permission and permission[18:].isdigit())
         ])
 
-    def get_is_admin_for_regions(self, user):
+    @staticmethod
+    def get_is_admin_for_regions(user):
         return set([
             int(permission[17:]) for permission in user.get_all_permissions()
             if ('api.region_admin_' in permission and permission[17:].isdigit())
         ])
 
-    def get_lang_permissions(self, user):
+    @staticmethod
+    def get_lang_permissions(user):
         return String.get_user_permissions_per_language(user)
 
 
@@ -889,16 +950,20 @@ class ListFieldReportTableauSerializer(FieldReportEnumDisplayMixin, ModelSeriali
     event = MiniEventSerializer()
     actions_taken = serializers.SerializerMethodField('get_actions_taken_for_organization')
 
-    def get_countries(self, obj):
+    @staticmethod
+    def get_countries(obj):
         return get_merged_items_by_fields(obj.countries.all(), ['id', 'name'])
 
-    def get_districts(self, obj):
+    @staticmethod
+    def get_districts(obj):
         return get_merged_items_by_fields(obj.districts.all(), ['id', 'name'])
 
-    def get_regions(self, obj):
+    @staticmethod
+    def get_regions(obj):
         return get_merged_items_by_fields(obj.regions.all(), ['id', 'region_name'])
 
-    def get_actions_taken_for_organization(self, obj):
+    @staticmethod
+    def get_actions_taken_for_organization(obj):
         actions_data = {}
         actions_taken = obj.actions_taken.all()
         for action in actions_taken:
@@ -927,16 +992,20 @@ class ListFieldReportCsvSerializer(FieldReportEnumDisplayMixin, ModelSerializer)
     event = MiniEventSerializer()
     actions_taken = serializers.SerializerMethodField('get_actions_taken_for_organization')
 
-    def get_countries(self, obj):
+    @staticmethod
+    def get_countries(obj):
         return get_merged_items_by_fields(obj.countries.all(), ['id', 'name', 'iso', 'iso3', 'society_name'])
 
-    def get_districts(self, obj):
+    @staticmethod
+    def get_districts(obj):
         return get_merged_items_by_fields(obj.districts.all(), ['id', 'name'])
 
-    def get_regions(self, obj):
+    @staticmethod
+    def get_regions(obj):
         return get_merged_items_by_fields(obj.regions.all(), ['id', 'region_name'])
 
-    def get_actions_taken_for_organization(self, obj):
+    @staticmethod
+    def get_actions_taken_for_organization(obj):
         actions_data = {}
         actions_taken = obj.actions_taken.all()
         for action in actions_taken: