Merge pull request #1380 from IFRCGo/fix/emergency-response

Add response_activity_count in event api

Author: szabozoltan69

api/drf_views.py

@@ -34,7 +34,6 @@
     Country,
     CountryKeyFigure,
     CountrySnippet,
-    
     District,
     Admin2,
 
@@ -247,10 +246,9 @@ class Meta:
 class DistrictRMDViewset(viewsets.ReadOnlyModelViewSet):
     queryset = District.objects.select_related('country').filter(is_deprecated=False)
     filterset_class = DistrictRMDFilter
-    search_fields = ('name', 'country__name',)  
+    search_fields = ('name', 'country__name',)
     serializer_class = DistrictSerializerRMD
 
-   
 
 class RegionKeyFigureFilter(filters.FilterSet):
     region = filters.NumberFilter(field_name='region', lookup_expr='exact')
@@ -343,7 +341,7 @@ def get_serializer_class(self):
 class Admin2Filter(filters.FilterSet):
     class Meta:
         model = Admin2
-        fields = ('admin1',)  
+        fields = ('admin1',)
 
 
 class Admin2Viewset(viewsets.ReadOnlyModelViewSet):
@@ -388,8 +386,7 @@ def get_queryset(self, *args, **kwargs):
             return qset.filter(parent_event__isnull=True).select_related('dtype')
         return (
             #Event.objects.filter(parent_event__isnull=True)
-            qset.filter(parent_event__isnull=True)
-            .select_related('dtype')
+            qset.filter(parent_event__isnull=True).select_related('dtype')
             .prefetch_related(
                 'regions',
                 Prefetch('appeals', queryset=Appeal.objects.select_related('dtype', 'event', 'country', 'region')),

api/serializers.py

@@ -51,6 +51,7 @@
     MainContact
 )
 from notifications.models import Subscription
+from deployments.models import EmergencyProject
 
 
 class GeoSerializerMixin:
@@ -653,6 +654,7 @@ class DetailEventSerializer(EnumSupportSerializerMixin, ModelSerializer):
     featured_documents = EventFeaturedDocumentSerializer(many=True, read_only=True)
     links = EventLinkSerializer(many=True, read_only=True)
     countries_for_preview = MiniCountrySerializer(many=True)
+    response_activity_count = serializers.SerializerMethodField()
 
     class Meta:
         model = Event
@@ -661,10 +663,14 @@ class Meta:
             'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'contacts', 'key_figures', 'is_featured',
             'is_featured_region', 'field_reports', 'hide_attached_field_reports', 'hide_field_report_map', 'updated_at',
             'id', 'slug', 'tab_one_title', 'ifrc_severity_level', 'ifrc_severity_level_display', 'parent_event', 'glide',
-            'featured_documents', 'links', 'emergency_response_contact_email', 'countries_for_preview'
+            'featured_documents', 'links', 'emergency_response_contact_email', 'countries_for_preview',
+            'response_activity_count'
         )
         lookup_field = 'slug'
 
+    def get_response_activity_count(self, event):
+        return EmergencyProject.objects.filter(event=event).count()
+
 
 class SituationReportTypeSerializer(ModelSerializer):
     class Meta:

api/snapshots/snap_test_views.py

@@ -77,6 +77,7 @@
     'name': 'event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf',
     'num_affected': 0,
     'parent_event': 1,
+    'response_activity_count': 0,
     'slug': 'ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki',
     'summary': 'MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh',
     'tab_one_title': 'XKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJgupDhrC',
@@ -150,6 +151,7 @@
     'name': 'event-OhbVrpoiVgRVIfLBcbfnoGMbJmTPSIAoCLrZaWZkSBvrjnWvgf',
     'num_affected': 0,
     'parent_event': 1,
+    'response_activity_count': 0,
     'slug': 'ygwwmqzcudihyfjsonxkmtecqoxsfogyrdoxkxwnqrsrpemoki',
     'summary': 'MGyDLJYVcCZKPmuMEGjdCgZvTfGPlcpTCCHHNkxxsyAXvRMdYOPvevgJRysqUQMjvfLQjwtPSQziMTftJyPYviQSVRHfPQBGxbxtlnvXFmoijesYgGXIVHcQvXNiMyjklSXNZkUCcAxRUpCNsWVYCoIptZYEmxRKCDXsXyGHAkmZMiqdPExJgTHhsfWkrCGjBfoCwbAdzGxpyfxobugTPvYjicsESiWTECNafbqnjJUMHBhXspthdpAOYNDehFMIbOGKpTjsBaNwpKAlQQfHxeHIGYGJbyEcOyxqVbwYewpUQOgXLVWvicwIvPlXRDSEOlZieTXDcsmcYmcutGzIEqcWPmswXdPvrhZxBzVCyvlFSFxZHrZfUBfBMlIsugfuQstCMTBkSCwCcUwNBrOYdeQOzxGZVRkbjMRYCciepXPxxyKcMjRCxxCWeKiHxzuPrphbVlFHyJhqXqTCnNsSFmhieClTCfZRuQwTeJIstkTTSOlYxGoh',
     'tab_one_title': 'XKANObFOIsPtEpZZRztDeSdkCAEDnvMjuTuUwziWxGJgupDhrC',

deployments/serializers.py

@@ -546,15 +546,9 @@ class Meta:
         )
 
     def validate(self, data):
-        event = data.get('event', self.instance and self.instance.event)
-        countries_id = list(event.countries.values_list('id', flat=True))
         reporting_ns = data.get('reporting_ns', self.instance and self.instance.reporting_ns)
         deployed_eru = data.get('deployed_eru', self.instance and self.instance.deployed_eru)
         country = data.get('country', None)
-        if country and country.id not in countries_id:
-            raise serializers.ValidationError({
-                'country': ugettext("Country should be from event's countries"),
-            })
         for district in data.get('districts') or []:
             if district.country_id != country.id:
                 raise serializers.ValidationError({