Merge pull request #1855 from IFRCGo/feature/molnix-1812

Feature/molnix 1812

Author: szabozoltan69

deployments/drf_views.py

@@ -222,6 +222,7 @@ def get_renderer_context(self):
             "deployment.event_deployed_to.countries.region",
             "role",
             "type",
+            "surge_alert_id",
         ]
         if not self.request.user.is_anonymous:
             context["header"] += ["name"]
@@ -275,6 +276,7 @@ def get_renderer_context(self):
         context["labels"]["country_from.iso3"] = "deployed_from_iso3"
         context["labels"]["country_from.society_name"] = "deployed_from_nationalsociety"
         context["labels"]["country_from.region"] = "deployed_from_regionname"
+        context["labels"]["surge_alert_id"] = "surge_alert_id"
 
         # https://github.com/mjumbewu/django-rest-framework-csv/blob/master/rest_framework_csv/renderers.py#L226-L229 uses bom when required:
         context["bom"] = True

deployments/forms.py

@@ -227,6 +227,7 @@ def _parse_integer(integer):
             disaster_type_id = disaster_types[disaster_type_name.lower()] if disaster_type_name else None
 
             row_errors = {}
+            project_country = Country.objects.filter(name__iexact=country_name).first()
             project_districts = []
             if district_names:
                 project_districts = list(District.objects.filter(
@@ -240,12 +241,11 @@ def _parse_integer(integer):
                 ).all())
                 # Check if all district_names is available in db
                 if len(project_districts) == len(district_names):
-                    project_country = project_districts[0].country
+                    if project_country is None:  # in case of we did not find a proper country name, trying to know it:
+                        project_country = project_districts[0].country
                 else:
-                    # District list can be empty. If not empty, we get country name from the first one.
-                    project_country = None
-            else:
-                project_country = Country.objects.filter(name__iexact=country_name).first()
+                    # but it can not happen that some of the given district-names cannot be found:
+                    row_errors['project_districts'] = [f'Some given district_names are not available. "{district_names}"']
 
             # A validation error will be raised. This is just a custom message
             if project_country is None:

deployments/serializers.py

@@ -144,6 +144,7 @@ class Meta:
         fields = (
             'start_date', 'end_date', 'role', 'type', 'country_from', 'country_to',
             'deployment', 'molnix_id', 'molnix_tags', 'is_active', 'id',
+            'surge_alert_id',
             'name',  # plus
         )
 
@@ -160,6 +161,7 @@ class Meta:
         fields = (
             'start_date', 'end_date', 'role', 'type', 'country_from', 'country_to',
             'deployment', 'molnix_id', 'molnix_tags', 'is_active', 'id',
+            'surge_alert_id',
         )
 
 
@@ -175,10 +177,12 @@ class Meta:
         fields = (
             'start_date', 'end_date', 'role', 'type', 'country_from', 'country_to',
             'deployment', 'molnix_id', 'molnix_tags', 'is_active', 'id',
+            'surge_alert_id',
             'name', 'molnix_status',  # 2 plus
         )
 
 
+# Don't forget to adapt drf_views::get_renderer_context if you change this:
 class PersonnelCsvSerializerBase(ModelSerializer):
     country_from = NanoCountrySerializer()
     country_to = NanoCountrySerializer()
@@ -194,6 +198,7 @@ class PersonnelCsvSerializerBase(ModelSerializer):
     inactive_status = serializers.SerializerMethodField()
     start_date = serializers.SerializerMethodField()
     end_date = serializers.SerializerMethodField()
+    surge_alert_id = serializers.SerializerMethodField()
 
     @staticmethod
     def get_start_date(obj):
@@ -242,6 +247,10 @@ def get_ongoing(obj):
         end = obj.end_date if obj.end_date else today
         return start <= today <= end
 
+    @staticmethod
+    def get_surge_alert_id(obj):
+        return obj.surge_alert_id
+
 
 # 3 versions: a "regular", an Anon(yme) and a Super(user) class:
 class PersonnelCsvSerializer(PersonnelCsvSerializerBase):
@@ -256,6 +265,7 @@ class Meta:
             'deployment', 'id', 'is_active', 'molnix_sector', 'molnix_id',
             'molnix_role_profile', 'molnix_language', 'molnix_region', 'molnix_scope',
             'molnix_modality', 'molnix_operation', 'ongoing', 'inactive_status',
+            'surge_alert_id',
         )
 
 
@@ -270,6 +280,7 @@ class Meta:
             'deployment', 'id', 'is_active', 'molnix_sector', 'molnix_id',
             'molnix_role_profile', 'molnix_language', 'molnix_region', 'molnix_scope',
             'molnix_modality', 'molnix_operation', 'ongoing', 'inactive_status',
+            'surge_alert_id',
         )
 
 
@@ -286,6 +297,7 @@ class Meta:
             'molnix_status',  # plus
             'molnix_role_profile', 'molnix_language', 'molnix_region', 'molnix_scope',
             'molnix_modality', 'molnix_operation', 'ongoing', 'inactive_status',
+            'surge_alert_id',
         )
 
 

deployments/snapshots/snap_tests.py

@@ -396,17 +396,17 @@
     ]
 }
 
-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
+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,surge_alert_id,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
 '''
 
 snapshots['TestProjectAPI::test_project_create 1'] = {