Add test case for EAP final report

Author: Rup-Narayan-Rajbanshi

eap/migrations/0007_auto_20220803_0936.py

@@ -0,0 +1,36 @@
+# Generated by Django 2.2.28 on 2022-08-03 09:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eap', '0006_auto_20220802_0835'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ActionAchievement',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('early_act_achievement', models.TextField(blank=True, null=True, verbose_name='Early Actions Achievements')),
+                ('client_id', models.CharField(blank=True, max_length=50, null=True)),
+                ('action', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='action_achievement', to='eap.Action')),
+                ('operational_plan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='action_achievement', to='eap.EAPOperationalPlan', verbose_name='Action Achievement')),
+            ],
+            options={
+                'verbose_name': 'Action Achievement',
+                'verbose_name_plural': 'Action Achievements',
+            },
+        ),
+        migrations.AlterField(
+            model_name='operationalplanindicator',
+            name='indicator',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operational_plan_indicator', to='eap.EarlyActionIndicator'),
+        ),
+        migrations.DeleteModel(
+            name='ActionAchievements',
+        ),
+    ]

eap/models.py

@@ -289,9 +289,10 @@ class OperationalPlanIndicator(models.Model):
         related_name="operational_plan_indicator", verbose_name=_('Operational Plan'),
         null=True, blank=True
     )
-    indicator = models.OneToOneField(
+    indicator = models.ForeignKey(
         EarlyActionIndicator,
         on_delete=models.SET_NULL,
+        related_name='operational_plan_indicator',
         null=True,
         blank=True
     )
@@ -305,13 +306,18 @@ def __str__(self):
         return f'{self.indicator.id}'
 
 
-class ActionAchievements(models.Model):
+class ActionAchievement(models.Model):
     operational_plan = models.ForeignKey(
         EAPOperationalPlan, on_delete=models.SET_NULL,
         related_name="action_achievement", verbose_name=_('Action Achievement'),
         null=True, blank=True
     )
-    action = models.OneToOneField(Action, on_delete=models.SET_NULL, null=True, blank=True)
+    action = models.ForeignKey(
+        Action,
+        on_delete=models.SET_NULL,
+        related_name='action_achievement',
+        null=True, blank=True
+    )
     early_act_achievement = models.TextField(verbose_name=_('Early Actions Achievements'), null=True, blank=True)
     client_id = models.CharField(max_length=50, null=True, blank=True)
 

eap/serializers.py

@@ -2,8 +2,6 @@
 
 from rest_framework import serializers
 
-from enumfields.drf.serializers import EnumSupportSerializerMixin
-
 from api.serializers import (
     UserNameSerializer,
     DisasterTypeSerializer,
@@ -22,8 +20,9 @@
     PrioritizedRisk,
     EAPActivation,
     EAPOperationalPlan,
-    ActionAchievements,
+    ActionAchievement,
     EAPActivationReport,
+    OperationalPlanIndicator,
 )
 
 from main.writable_nested_serializers import (
@@ -153,10 +152,17 @@ class Meta:
         exclude = ('eap', 'field_report')
 
 
-class ActionAchievementsSerializer(serializers.ModelSerializer):
+class ActionAchievementSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = ActionAchievement
+        exclude = ('operational_plan',)
+
+
+class OperationalPlanIndicatorSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = ActionAchievements
+        model = OperationalPlanIndicator
         exclude = ('operational_plan',)
 
 
@@ -165,8 +171,8 @@ class OperationalPlanSerializer(
     NestedCreateMixin,
     serializers.ModelSerializer
 ):
-    # indicators = EarlyActionIndicatorSerializer(many=True, required=False)
-    early_actions_achievements = ActionAchievementsSerializer(source='action_achievement', many=True, required=False)
+    indicators = OperationalPlanIndicatorSerializer(source='operational_plan_indicator', many=True, required=False)
+    early_actions_achievements = ActionAchievementSerializer(source='action_achievement', many=True, required=False)
 
     class Meta:
         model = EAPOperationalPlan

eap/test_views.py

@@ -4,7 +4,13 @@
 from django.contrib.auth.models import User
 
 from main.test_case import APITestCase
-from eap.models import EAP, EarlyAction, EAPActivationReport, Action
+from eap.models import (
+    EAP,
+    EarlyAction,
+    EAPActivationReport,
+    Action,
+    EarlyActionIndicator,
+)
 
 from api.factories.country import CountryFactory
 from api.factories.district import DistrictFactory
@@ -174,11 +180,19 @@ def setUp(self):
                     "prepo_activities_achievements": "test",
                     "early_actions_achievements": [
                         {
-                            "early_act_achievement": "test"
+                            "early_act_achievement": "test 1"
                         },
                         {
                             "early_act_achievement": "test 2"
                         }
+                    ],
+                    "indicators": [
+                        {
+                            "indicator_value": 200
+                        },
+                        {
+                            "indicator_value": 300
+                        }
                     ]
                 },
             ]
@@ -264,12 +278,17 @@ def test_create_and_update_eap_activation_report(self):
         self.client.force_authenticate(user=self.user)
         # create eap
         with self.capture_on_commit_callbacks(execute=True):
-            self.client.post('/api/v2/eap/', self.body, format='json').json()
-        actions = Action.objects.all().values_list('id', flat=True)
-        early_actions = EarlyAction.objects.all().values_list('id', flat=True)
-        self.eap_act_report_body['operational_plans'][0]['early_action'] = early_actions[0]
+            eap_resp = self.client.post('/api/v2/eap/', self.body, format='json').json()
+        early_action = EarlyAction.objects.get(id=eap_resp['early_actions'][0]['id'])
+
+        actions = list(Action.objects.filter(early_action=early_action).values_list('id', flat=True))
+        actions_indicators = early_action.indicators.all().values_list('id', flat=True)
+        self.eap_act_report_body['operational_plans'][0]['early_action'] = early_action.id
         self.eap_act_report_body['operational_plans'][0]['early_actions_achievements'][0]['action'] = actions[0]
         self.eap_act_report_body['operational_plans'][0]['early_actions_achievements'][1]['action'] = actions[1]
+
+        self.eap_act_report_body['operational_plans'][0]['indicators'][0]['indicator'] = actions_indicators[0]
+        self.eap_act_report_body['operational_plans'][0]['indicators'][1]['indicator'] = actions_indicators[1]
         # create eap_report
         with self.capture_on_commit_callbacks(execute=True):
             final_report_resp = self.client.post(
@@ -283,3 +302,54 @@ def test_create_and_update_eap_activation_report(self):
         self.assertEqual(final_report_resp['ifrc_financial_report'], self.document1.id)
         self.assertEqual(len(final_report_resp['documents']), 2)
         self.assertEqual(len(final_report_resp['operational_plans']), 1)
+        self.assertEqual(len(final_report_resp['operational_plans'][0]['early_actions_achievements']), 2)
+        self.assertEqual(len(final_report_resp['operational_plans'][0]['indicators']), 2)
+
+        # update eap_report
+        data = self.eap_act_report_body
+        data['description'] = 'updated description'
+        data['documents'] = [self.document1.id]
+        data['ifrc_financial_report'] = self.document2.id
+        data['operational_plans'] = [
+            {
+                "budget": 500000,
+                "value": 500,
+                "no_of_people_reached": 500,
+                "readiness_activities_achievements": "test updated",
+                "prepo_activities_achievements": "test updated",
+                "early_actions_achievements": [
+                    {
+                        'action': actions[0],
+                        "early_act_achievement": "test updated"
+                    },
+                    {
+                        'action': actions[1],
+                        "early_act_achievement": "test 2 updated"
+                    }
+                ],
+                "indicators": [
+                    {
+                        "indicator": actions_indicators[0],
+                        "indicator_value": 500
+                    },
+                    {
+                        'indicator': actions_indicators[1],
+                        "indicator_value": 500
+                    }
+                ]
+            },
+        ]
+        with self.capture_on_commit_callbacks(execute=True):
+            final_report_updated_resp = self.client.put(
+                f'/api/v2/eap_activation_report/{created.id}/',
+                data,
+                format='json'
+            ).json()
+        updated = EAPActivationReport.objects.get(id=final_report_updated_resp['id'])
+        self.assertEqual(updated.created_by.id, self.user.id)
+        self.assertEqual(final_report_updated_resp['eap_activation'], self.eap_activation.id)
+        self.assertEqual(final_report_updated_resp['ifrc_financial_report'], self.document2.id)
+        self.assertEqual(len(final_report_updated_resp['documents']), 1)
+        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)