Modified test case for field report to check EAP Activation Data

- Solve issue for empty document for eap activation create and update

Author: Rup-Narayan-Rajbanshi

api/drf_views.py

@@ -908,12 +908,15 @@ def create_event(self, report):
         report.save()
         return event
 
-    def create_eap_activation(self, eap_activation_data, fieldreport):
-        eap_id = eap_activation_data.pop('eap')
-        document_id = eap_activation_data.pop('document')
-        eap = EAP.objects.get(id=eap_id)
-        document = EAPDocument.objects.get(id=document_id)
-        eap_activation = EAPActivation.objects.create(eap=eap, field_report=fieldreport, document=document, **eap_activation_data)
+    def create_eap_activation(self, data, fieldreport):
+        eap = EAP.objects.filter(id=data.pop('eap', None)).first()
+        document = EAPDocument.objects.filter(id=data.pop('document', None)).first()
+        eap_activation = EAPActivation.objects.create(
+            eap=eap,
+            field_report=fieldreport,
+            document=document,
+            **data
+        )
         return eap_activation
 
     def create(self, request, *args, **kwargs):
@@ -932,7 +935,7 @@ def create(self, request, *args, **kwargs):
             # TODO: Use serializer to create fieldreport
             eap_activation_data = data.pop('eap_activation')
             fieldreport = FieldReport.objects.create(**data)
-            self.create_eap_activation(eap_activation_data, fieldreport)
+            self.create_eap_activation(eap_activation_data, fieldreport)  # activate respected eap for field report
             CreateFieldReportSerializer.trigger_field_translation(fieldreport)
         except Exception as e:
             try:
@@ -974,20 +977,22 @@ def create(self, request, *args, **kwargs):
         return Response({'id': fieldreport.id}, status=HTTP_201_CREATED)
 
 
-from eap.serializers import EAPActivationSerializer
+from eap.serializers import EAPActivationSerializer # It is imported here to avoid circular import issue
 class UpdateFieldReport(UpdateAPIView, GenericFieldReportView):
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsAuthenticated,)
     queryset = FieldReport.objects.all()
     serializer_class = CreateFieldReportSerializer
 
-    def update_eap_activation(self, eap_activation_data, fieldreport):
-        eap_activation_data.pop('eap')
-        document_id = eap_activation_data.pop('document')
-        eap_activation_obj = EAPActivation.objects.get(field_report=fieldreport)
-        eap_activation = EAPActivationSerializer().update(eap_activation_obj, eap_activation_data)
-        eap_activation_obj.document = EAPDocument.objects.get(id=document_id)
-        eap_activation_obj.save(update_fields=['document'])
+    # function for updating eap-activate in field report
+    def update_eap_activation(self, data, fieldreport):
+        eap_id = data.pop('eap', None)
+        document_id = data.pop('document', None)
+        instance = EAPActivation.objects.get(field_report=fieldreport)
+        eap_activation = EAPActivationSerializer().update(instance, data)
+        instance.document = EAPDocument.objects.filter(id=document_id).first()
+        instance.eap = EAP.objects.filter(id=eap_id).first()
+        instance.save(update_fields=['document', 'eap'])
         return eap_activation
 
     def partial_update(self, request, *args, **kwargs):
@@ -1004,6 +1009,7 @@ def update(self, request, *args, **kwargs):
 
         try:
             field_report = serializer.save()
+            # update respected eap-activation
             self.update_eap_activation(request.data['eap_activation'], field_report)
         except Exception:
             logger.error('Faild to update field report', exc_info=True)

api/serializers.py

@@ -1060,7 +1060,8 @@ class Meta:
         model = FieldReport
         fields = '__all__'
 
-from eap.serializers import EAPActivationSerializer
+
+from eap.serializers import EAPActivationSerializer  # It is imported here to avoid circular import issue
 class DetailFieldReportSerializer(FieldReportEnumDisplayMixin, ModelSerializer):
     user = UserSerializer()
     dtype = DisasterTypeSerializer()

api/test_views.py

@@ -13,6 +13,7 @@
     AppealFactory
 )
 from eap.factories import EAPFactory, EAPDocumentFactory
+from eap.models import EAPActivation
 
 
 class AuthTokenTest(APITestCase):
@@ -64,7 +65,6 @@ def test_sit_rep_types(self):
 
         # Filter by event
         response = self.client.get('/api/v2/situation_report/?limit=100&event=%s' % event1.id)
-        print(response)
         self.assertEqual(response.status_code, 200)
         count = response.json()['count']
         self.assertEqual(count, 3)
@@ -116,6 +116,15 @@ def test_create_and_update(self):
                 'description': 'test eap description',
                 'trigger_met_date': '2022-11-11 00:00',
                 'document': document1.id,
+                'originator_name': 'test name',
+                'originator_title': 'test originator title',
+                'originator_email': '[email protected]',
+                'nsc_name_operational': 'test name operational',
+                'nsc_title_operational': 'test nsc operational',
+                'nsc_email_operational': 'test nsc operational',
+                'ifrc_focal_name': 'test focal name',
+                'ifrc_focal_title': 'test focal title',
+                'ifrc_focal_email': '[email protected]'
             }
         }
         self.client.force_authenticate(user=user)
@@ -149,6 +158,13 @@ def test_create_and_update(self):
             self.aws_translator._fake_translation('test', 'es', 'en')
         )
 
+        # check eap-activation data
+        eap_activation_obj = EAPActivation.objects.get(field_report=created)
+        self.assertEqual(eap_activation_obj.title, 'eap activation title')
+        self.assertEqual(eap_activation_obj.eap.id, eap1.id)
+        self.assertEqual(eap_activation_obj.document.id, document1.id)
+        self.assertEqual(eap_activation_obj.field_report.id, created.id)
+
         # created an emergency automatically
         self.assertEqual(created.event.name, 'test')
         event_pk = created.event.id
@@ -168,7 +184,13 @@ def test_create_and_update(self):
             'trigger_met_date': '2022-11-11 01:00',
             'document': document2.id,
             'originator_name': 'test name',
+            'originator_title': 'test originator title',
+            'originator_email': '[email protected]',
             'nsc_name_operational': 'test name operational',
+            'nsc_title_operational': 'test nsc operational',
+            'nsc_email_operational': 'test nsc operational',
+            'ifrc_focal_name': 'test focal name',
+            'ifrc_focal_title': 'test focal title',
             'ifrc_focal_email': '[email protected]'
         }
 
@@ -200,6 +222,13 @@ def test_create_and_update(self):
             self.aws_translator._fake_translation('this is a test description', 'es', 'en'),
         )  # This has not been reset
 
+        # check eap-activation data
+        eap_activation_obj = EAPActivation.objects.get(field_report=updated)
+        self.assertEqual(eap_activation_obj.title, 'eap activation title updated')
+        self.assertEqual(eap_activation_obj.eap.id, eap2.id)
+        self.assertEqual(eap_activation_obj.document.id, document2.id)
+        self.assertEqual(eap_activation_obj.field_report.id, updated.id)
+
         body['summary'] = 'test [updated again]'
         with self.capture_on_commit_callbacks(execute=True):
             response = self.client.put(f'/api/v2/update_field_report/{created.id}/', body, format='json').json()

eap/serializers.py

@@ -145,6 +145,3 @@ class Meta:
         model = EAPActivation
         exclude = ('eap', 'field_report')
 
-    def update(self, instance, validated_data):
-        eap_activation = super().update(instance, validated_data)
-        return eap_activation