Merge pull request #1564 from IFRCGo/fix/hide-some-affected-values

Fix/hide some affected values

Author: szabozoltan69

api/drf_views.py

@@ -446,6 +446,19 @@ def retrieve(self, request, pk=None, *args, **kwargs):
             raise BadRequest('Emergency ID or Slug parameters are missing')
 
         serializer = self.get_serializer(instance)
+
+        # Hide the "affected" values that are kept only for history – see (¤) in other code parts
+        if 'field_reports' in serializer.data:
+            for j, fr in enumerate(serializer.data['field_reports']):
+                if 'recent_affected' in fr:  # should always be True
+                    for i, field in enumerate([
+                        'num_affected',             'gov_num_affected',             'other_num_affected',
+                        'num_potentially_affected', 'gov_num_potentially_affected', 'other_num_potentially_affected']):
+                        if fr['recent_affected'] - 1 != i and field in serializer.data['field_reports'][j]:
+                            del serializer.data['field_reports'][j][field]
+                    del serializer.data['field_reports'][j]['recent_affected']
+
+
         return Response(serializer.data)
 
     @action(methods=['get'], detail=False, url_path='mini')
@@ -722,7 +735,7 @@ def serialize(self, data, instance=None):
         else:
             data['visibility'] = VisibilityChoices.MEMBERSHIP
 
-        # Set RecentAffected according to the sent _affected key
+        # Set RecentAffected according to the sent _affected key – see (¤) in other code parts
         if 'status' in data and data['status'] == FieldReport.Status.EW:  # Early Warning
             if 'num_potentially_affected' in data:
                 data['recent_affected'] = FieldReport.RecentAffected.RCRC_POTENTIALLY

api/models.py

@@ -1165,7 +1165,7 @@ class RecentAffected(models.IntegerChoices):
         RCRC_POTENTIALLY = 4, _('Red Cross / Red Crescent, potentially')
         GOVERNMENT_POTENTIALLY = 5, _('Government, potentially')
         OTHER_POTENTIALLY = 6, _('Other, potentially')
-        # Take care, these values are connected to (¤) in serializers.py, search it!
+        # Take care of these values – see (¤) in other code parts
 
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL, verbose_name=_('user'), related_name='user',

api/serializers.py

@@ -451,7 +451,7 @@ class Meta:
             'other_affected_pop_centres', 'epi_cases', 'epi_suspected_cases', 'epi_probable_cases', 'epi_confirmed_cases',
             'epi_figures_source', 'epi_figures_source_display', 'epi_cases_since_last_fr', 'epi_deaths_since_last_fr',
             'epi_notes_since_last_fr', 'visibility', 'visibility_display', 'request_assistance', 'ns_request_assistance',
-            'notes_health', 'notes_ns', 'notes_socioeco'
+            'notes_health', 'notes_ns', 'notes_socioeco', 'recent_affected'
         )
 
 
@@ -1067,7 +1067,7 @@ def __init__(self, *args, **kwargs):
             'num_affected',             'gov_num_affected',             'other_num_affected',
             'num_potentially_affected', 'gov_num_potentially_affected', 'other_num_potentially_affected']):
             # We allow only 1 of these _affected values ^, pointed by RecentAffected. The other 5 gets 0 on client side.
-            # Attention! This indexing is related to RecentAffected values – in models.py: (¤)
+            # About "recent_affected - 1" as index see (¤) in other code parts:
             if self.instance.recent_affected - 1 != i:
                 self.fields.pop(field)