Fix issue for delay time for eap list

Author: Rup-Narayan-Rajbanshi

api/drf_views.py

@@ -232,11 +232,12 @@ def get_databank(self, request, pk):
 
 class CountryFilterRMD(filters.FilterSet):
     region = filters.NumberFilter(field_name='region', lookup_expr='exact')
-    
+
     class Meta:
         model = Country
         fields = ('region', 'record_type',)
 
+
 class CountryRMDViewset(viewsets.ReadOnlyModelViewSet):
     queryset = Country.objects.filter(is_deprecated=False).filter(iso3__isnull=False).exclude(iso3="")
     filterset_class = CountryFilterRMD
@@ -247,7 +248,7 @@ class CountryRMDViewset(viewsets.ReadOnlyModelViewSet):
 class DistrictRMDFilter(filters.FilterSet):
     class Meta:
         model = District
-        fields = ('country','country__name')
+        fields = ('country', 'country__name')
 
 
 class DistrictRMDViewset(viewsets.ReadOnlyModelViewSet):

api/serializers.py

@@ -1061,8 +1061,9 @@ class Meta:
         fields = '__all__'
 
 
-from eap.serializers import EAPActivationSerializer  # It is imported here to avoid circular import issue
 class DetailFieldReportSerializer(FieldReportEnumDisplayMixin, ModelSerializer):
+    from eap.serializers import EAPActivationSerializer
+
     user = UserSerializer()
     dtype = DisasterTypeSerializer()
     contacts = FieldReportContactSerializer(many=True)
@@ -1117,6 +1118,7 @@ class Meta:
             'disaster_start_date', 'created_at', 'appeals',
         )
 
+
 class CountryOfFieldReportToReviewSerializer(ModelSerializer):
     class Meta:
         model = CountryOfFieldReportToReview

eap/factories.py

@@ -15,6 +15,7 @@
     EAP,
     EAPDocument,
     EAPActivation,
+    EAPActivationReport,
 )
 
 
@@ -116,5 +117,35 @@ def documents(self, create, extracted, **kwargs):
                 self.documents.add(document)
 
 
+class EAPActivationReportFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = EAPActivationReport
+
+    eap_activation = factory.SubFactory(EAPActivationFactory)
+    number_of_people_reached = fuzzy.FuzzyInteger(0, 9)
+    description = fuzzy.FuzzyText(length=20)
+    overall_objectives = fuzzy.FuzzyText(length=50)
+    challenges_and_lesson = fuzzy.FuzzyText(length=50)
+    general_lesson_and_recomendations = fuzzy.FuzzyText(length=50)
+
+    @factory.post_generation
+    def documents(self, create, extracted, **kwargs):
+        if not create:
+            return
+
+        if extracted:
+            for document in extracted:
+                self.documents.add(document)
+
+    @factory.post_generation
+    def operational_plans(self, create, extracted, **kwargs):
+        if not create:
+            return
+
+        if extracted:
+            for plan in extracted:
+                self.operational_plans.add(plan)
+
+
 
 

eap/serializers.py

@@ -112,19 +112,60 @@ class EAPSerializer(
     districts_details = MiniDistrictSerializer(source='districts', many=True, read_only=True)
     references = EAPReferenceSerializer(source='eap_reference', many=True, required=False)
     partners = EAPPartnerSerializer(source='eap_partner', many=True, required=False)
-    early_actions = EarlyActionSerializer(many=True)
-    created_by_details = UserNameSerializer(source='created_by', read_only=True)
-    modified_by_details = UserNameSerializer(source='modified_by', read_only=True)
-    hazard_type_details = DisasterTypeSerializer(source='disaster_type', read_only=True)
-    documents_details = EAPDocumentSerializer(source='documents', many=True, read_only=True, required=False)
+    # early_actions = EarlyActionSerializer(many=True)
+    # created_by_details = UserNameSerializer(source='created_by', read_only=True)
+    # modified_by_details = UserNameSerializer(source='modified_by', read_only=True)
+    # hazard_type_details = DisasterTypeSerializer(source='disaster_type', read_only=True)
+    # documents_details = EAPDocumentSerializer(source='documents', many=True, read_only=True, required=False)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
 
     class Meta:
         model = EAP
-        fields = '__all__'
+        fields = [
+            "id",
+            "created_at",
+            "modified_at",
+            "eap_number",
+            "approval_date",
+            "status",
+            "operational_timeframe",
+            "lead_time",
+            "eap_timeframe",
+            "num_of_people",
+            "total_budget",
+            "readiness_budget",
+            "pre_positioning_budget",
+            "early_action_budget",
+            "trigger_statement",
+            "overview",
+            "originator_name",
+            "originator_title",
+            "originator_email",
+            "originator_phone",
+            "nsc_name",
+            "nsc_title",
+            "nsc_email",
+            "nsc_phone",
+            "ifrc_focal_name",
+            "ifrc_focal_title",
+            "ifrc_focal_email",
+            "ifrc_focal_phone",
+            "created_by",
+            "modified_by",
+            "country",
+            "disaster_type",
+            "status_display",
+            "country_details",
+            "districts_details",
+            "references",
+            "partners",
+
+        ]
 
     def validate(self, validated_data):
-        districts = validated_data['districts']
+        if self.partial:
+            return validated_data
+        districts = validated_data.get('districts', None)
         if districts:
             for district in districts:
                 if district.country != validated_data['country']:

eap/test_views.py

@@ -6,10 +6,10 @@
 from main.test_case import APITestCase
 from eap.models import (
     EAP,
+    Action,
     EarlyAction,
+    EAPDocument,
     EAPActivationReport,
-    Action,
-    EarlyActionIndicator,
 )
 
 from api.factories.country import CountryFactory
@@ -21,6 +21,7 @@
     EAPDocumentFactory,
     EAPFactory,
     EAPActivationFactory,
+    EAPActivationReportFactory,
 )
 
 
@@ -245,6 +246,12 @@ def test_create_and_update_eap(self):
         self.assertEqual(len(response['references']), 1)
         self.assertEqual(len(response['partners']), 1)
 
+        # test patch
+        data = {'status': EAP.Status.APPROVED}
+        response = self.client.patch(f'/api/v2/eap/{created.id}/', data=data, format='json').json()
+        pached = EAP.objects.get(id=response['id'])
+        self.assertEqual(pached.status, EAP.Status.APPROVED)
+
     def test_get_eap(self):
         user1 = UserFactory.create(username='abc')
         eap1, eap2, eap3 = EAPFactory.create_batch(3, created_by=user1)
@@ -353,3 +360,56 @@ def test_create_and_update_eap_activation_report(self):
         self.assertEqual(len(final_report_updated_resp['operational_plans']), 1)
         self.assertEqual(len(final_report_updated_resp['operational_plans'][0]['early_actions_achievements']), 2)
         self.assertEqual(len(final_report_updated_resp['operational_plans'][0]['indicators']), 2)
+
+        # test patch
+        data = {'ifrc_financial_report': self.document1.id}
+        with self.capture_on_commit_callbacks(execute=True):
+            final_report_patched_resp = self.client.patch(
+                f'/api/v2/eap-activation-report/{created.id}/',
+                data,
+                format='json'
+            ).json()
+        updated = EAPActivationReport.objects.get(id=final_report_patched_resp['id'])
+        self.assertEqual(final_report_patched_resp['ifrc_financial_report'], self.document1.id)
+
+    def test_get_eap_activation_report(self):
+        user1 = UserFactory.create(username='abc')
+        report1, report2, report3 = EAPActivationReportFactory.create_batch(3, created_by=user1)
+        self.client.force_authenticate(user=user1)
+        response1 = self.client.get('/api/v2/eap-activation-report/').json()
+        self.assertEqual(response1['results'][0]['created_by'], user1.id)
+        self.assertEqual(len(response1['results']), 3)
+        assert all(item in [data['id'] for data in response1['results']] for item in [report1.id, report2.id, report3.id])
+
+        #  query single eap
+        response = self.client.get(f'/api/v2/eap-activation-report/{report1.id}/').json()
+        self.assertEqual(response['created_by'], user1.id)
+        self.assertEqual(response['id'], report1.id)
+
+        #  try with another user
+        user2 = User.objects.create(username='xyz')
+        self.client.force_authenticate(user=user2)
+        report4, report5 = EAPActivationReportFactory.create_batch(2, created_by=user2)
+        response2 = self.client.get('/api/v2/eap-activation-report/').json()
+        self.assertEqual(response2['results'][0]['created_by'], user2.id)
+        self.assertIn(report4.id, [data['id'] for data in response2['results']])
+        self.assertNotIn([data['id'] for data in response2['results']], [data['id'] for data in response1['results']])
+
+        # try with users who has no any eap created
+        user3 = User.objects.create(username='ram')
+        self.client.force_authenticate(user=user3)
+        response3 = self.client.get('/api/v2/eap-activation-report/').json()
+        self.assertEqual(response3['count'], 5)
+
+    def test_eap_upload_multiple_file(self):
+        file_count = EAPDocument.objects.count()
+        url = '/api/v2/eap-file/multiple/'
+        data = {
+            'file': [open(self.file, 'rb'), open(self.file, 'rb'), open(self.file, 'rb')]
+        }
+
+        self.authenticate()
+        response = self.client.post(url, data, format='multipart')
+        self.assert_201(response)
+        self.assertEqual(EAPDocument.objects.count(), file_count + 3)
+

eap/views.py

@@ -6,7 +6,9 @@
     response,
     permissions,
     mixins,
+    status,
 )
+from rest_framework.decorators import action
 from .models import (
     EarlyActionIndicator,
     EAP,
@@ -32,13 +34,38 @@ class EAPDocumentViewSet(
     def get_queryset(self):
         return EAPDocument.objects.all()
 
+    @action(
+        detail=False,
+        url_path='multiple',
+        methods=['POST'],
+        permission_classes=[permissions.IsAuthenticated],
+    )
+    def multiple_file(self, request, pk=None, version=None):
+        # converts querydict to original dict
+        files = dict((request.data).lists())['file']
+        data = [{'file': file} for file in files]
+        file_serializer = EAPDocumentSerializer(data=data, context={'request': request}, many=True)
+        if file_serializer.is_valid():
+            file_serializer.save()
+            return response.Response(file_serializer.data, status=status.HTTP_201_CREATED)
+        else:
+            return response.Response(file_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
 
 class EAPViewSet(viewsets.ModelViewSet):
     serializer_class = EAPSerializer
     permission_classes = [permissions.IsAuthenticated]
 
     def get_queryset(self):
-        return EAP.objects.all().order_by('-created_at')
+        return EAP.objects.all().order_by(
+            '-created_at'
+        ).select_related(
+            'country',
+        ).prefetch_related(
+            'districts',
+            'eap_reference__eap',
+            'eap_partner__eap'
+        )
 
 
 class EAPActivationReportViewSet(viewsets.ModelViewSet):

test

@@ -0,0 +1,32 @@
+"id",
+            "created_at",
+            "modified_at",
+            "eap_number",
+            "approval_date",
+            "status",
+            "operational_timeframe",
+            "lead_time",
+            "eap_timeframe",
+            "num_of_people",
+            "total_budget",
+            "readiness_budget",
+            "pre_positioning_budget",
+            "early_action_budget",
+            "trigger_statement",
+            "overview",
+            "originator_name",
+            "originator_title",
+            "originator_email",
+            "originator_phone",
+            "nsc_name",
+            "nsc_title",
+            "nsc_email",
+            "nsc_phone",
+            "ifrc_focal_name",
+            "ifrc_focal_title",
+            "ifrc_focal_email",
+            "ifrc_focal_phone",
+            "created_by",
+            "modified_by",
+            "country",
+            "disaster_type",