Add api for eap options

- removed api for indicator, status
- created a model for prioritized_risk for early actions
- modified test cases to accept many prioritized risks

Author: Rup-Narayan-Rajbanshi

eap/admin.py

@@ -6,4 +6,5 @@
 
 @admin.register(EAP)
 class EAPAdmin(admin.ModelAdmin):
-    pass
+    list_display = ('eap_number', 'country', 'status', 'operational_timeframe', 'total_budget')
+

eap/migrations/0004_auto_20220715_0628.py

@@ -0,0 +1,40 @@
+# Generated by Django 2.2.28 on 2022-07-15 06:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eap', '0003_auto_20220713_1229'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='earlyaction',
+            name='prioritized_risk',
+        ),
+        migrations.AlterField(
+            model_name='eap',
+            name='eap_number',
+            field=models.CharField(max_length=50, verbose_name='EAP Number'),
+        ),
+        migrations.AlterField(
+            model_name='earlyaction',
+            name='sector',
+            field=models.CharField(choices=[('shelter_housing_and_settlements', 'Shelter, Housing And Settlements'), ('livelihoods', 'Livelihoods'), ('multi-purpose_cash', 'Multi-purpose Cash'), ('health_and_care', 'Health And Care'), ('water_sanitation_and_hygiene', 'Water, Sanitation And Hygiene'), ('protection_gender_and_inclusion', 'Protection, Gender And Inclusion'), ('education', 'Education'), ('migration', 'Migration'), ('risk_reduction_climate_adaptation_and_recovery', 'Risk Reduction, Climate Adaptation And Recovery'), ('community_engagement_and _accountability', 'Community Engagement And Accountability'), ('environment_sustainability ', 'Environment Sustainability'), ('shelter_cluster_coordination', 'Shelter Cluster Coordination')], max_length=255, verbose_name='sector'),
+        ),
+        migrations.CreateModel(
+            name='PrioritizedRisk',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('risks', models.TextField(blank=True, null=True)),
+                ('early_action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='early_actions_prioritized_risk', to='eap.EarlyAction', verbose_name='early action')),
+            ],
+            options={
+                'verbose_name': 'Prioritized risk',
+                'verbose_name_plural': 'Prioritized risks',
+            },
+        ),
+    ]

eap/models.py

@@ -3,8 +3,6 @@
 from django.utils.translation import ugettext_lazy as _
 
 from main.enums import TextChoices
-from deployments.models import Sectors
-from enumfields import EnumIntegerField
 from api.models import (
     Country,
     District,
@@ -32,13 +30,26 @@ def __str__(self):
 
 
 class EarlyAction(models.Model):
-    sector = EnumIntegerField(Sectors, verbose_name=_('sector'))
+    class Sector(TextChoices):
+        SHELTER_HOUSING_AND_SETTLEMENTS = 'shelter_housing_and_settlements', _('Shelter, Housing And Settlements')
+        LIVELIHOODS = 'livelihoods', _('Livelihoods')
+        MULTI_PURPOSE_CASH = 'multi-purpose_cash', _('Multi-purpose Cash')
+        HEALTH_AND_CARE = 'health_and_care', _('Health And Care')
+        WATER_SANITATION_AND_HYGIENE = 'water_sanitation_and_hygiene', _('Water, Sanitation And Hygiene')
+        PROTECTION_GENDER_AND_INCLUSION = 'protection_gender_and_inclusion', _('Protection, Gender And Inclusion')
+        EDUCATION = 'education', _('Education')
+        MIGRATION = 'migration', _('Migration')
+        RISK_REDUCTION_CLIMATE_ADAPTATION_AND_RECOVERY = \
+            'risk_reduction_climate_adaptation_and_recovery', _('Risk Reduction, Climate Adaptation And Recovery')
+        COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = \
+            'community_engagement_and _accountability', _('Community Engagement And Accountability')
+        ENVIRONMENT_SUSTAINABILITY = 'environment_sustainability ', _('Environment Sustainability')
+        SHELTER_CLUSTER_COORDINATION = 'shelter_cluster_coordination', _('Shelter Cluster Coordination')
+
+    sector = models.CharField(max_length=255, verbose_name=_('sector'), choices=Sector.choices)
     budget_per_sector = models.IntegerField(verbose_name=_('Budget per sector (CHF)'), null=True, blank=True)
     indicators = models.ManyToManyField(EarlyActionIndicator, verbose_name=_('Indicators'), blank=True)
-
-    prioritized_risk = models.TextField(verbose_name=_('Prioritized risk'), null=True, blank=True)
     targeted_people = models.IntegerField(verbose_name=_('Targeted people'), null=True, blank=True,)
-
     readiness_activities = models.TextField(verbose_name=_('Readiness Activities'), null=True, blank=True)
     prepositioning_activities = models.TextField(verbose_name=_('Pre-positioning Activities'), null=True, blank=True)
 
@@ -93,7 +104,7 @@ class Status(TextChoices):
         DisasterType, on_delete=models.SET_NULL, verbose_name=_('Disaster Type'),
         related_name='eap_disaster_type', null=True
     )
-    eap_number = models.CharField(max_length=50, editable=False, verbose_name=_('EAP Number'))
+    eap_number = models.CharField(max_length=50, verbose_name=_('EAP Number'))
     approval_date = models.DateField(verbose_name=_('Date of EAP Approval'))
     status = models.CharField(
         max_length=255, choices=Status.choices, default=Status.APPROVED,
@@ -181,3 +192,20 @@ class Meta:
 
     def __str__(self):
         return f'{self.id}'
+
+
+class PrioritizedRisk(models.Model):
+    early_action = models.ForeignKey(
+        EarlyAction,
+        on_delete=models.CASCADE,
+        related_name='early_actions_prioritized_risk',
+        verbose_name=_('early action')
+    )
+    risks = models.TextField(null=True, blank=True)
+
+    class Meta:
+        verbose_name = _('Prioritized risk')
+        verbose_name_plural = _('Prioritized risks')
+
+    def __str__(self):
+        return f'{self.id}'

eap/serializers.py

@@ -19,6 +19,7 @@
     EarlyAction,
     EarlyActionIndicator,
     EAPDocument,
+    PrioritizedRisk,
 )
 
 from main.writable_nested_serializers import (
@@ -54,13 +55,21 @@ class Meta:
         read_only_fields = ('early_action',)
 
 
+class PrioritizedRiskSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PrioritizedRisk
+        fields = ('__all__')
+        read_only_fields = ('early_action',)
+
+
 class EarlyActionSerializer(
     NestedUpdateMixin,
     NestedCreateMixin,
     serializers.ModelSerializer
 ):
     indicators = EarlyActionIndicatorSerializer(many=True, required=False)
     actions = ActionSerializer(source='action', many=True, required=False)
+    prioritized_risks = PrioritizedRiskSerializer(source='early_actions_prioritized_risk', many=True, required=False)
     sector_display = serializers.CharField(source='get_sector_display', read_only=True)
 
     class Meta:

eap/test_views.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User
 
 from main.test_case import APITestCase
-from eap.models import EAP
+from eap.models import EAP, EarlyAction
 
 from api.factories.country import CountryFactory
 from api.factories.district import DistrictFactory
@@ -81,9 +81,16 @@ def setUp(self):
             "disaster_type": self.disaster_type.id,
             "early_actions": [
                 {
-                    "sector": "Health",
+                    "sector": EarlyAction.Sector.LIVELIHOODS,
                     "budget_per_sector": 1000,
-                    "prioritized_risk": "test",
+                    "prioritized_risks": [
+                        {
+                            "risks": "test1"
+                        },
+                        {
+                            "risks": "test2"
+                        }
+                    ],
                     "targeted_people": 100,
                     "readiness_activities": "test",
                     "prepositioning_activities": "test",
@@ -108,9 +115,16 @@ def setUp(self):
 
                 },
                 {
-                    "sector": "Health",
+                    "sector": EarlyAction.Sector.MIGRATION,
                     "budget_per_sector": 1000,
-                    "prioritized_risk": "prioritized_risk",
+                    "prioritized_risks": [
+                        {
+                            "risks": "test1"
+                        },
+                        {
+                            "risks": "test2"
+                        }
+                    ],
                     "targeted_people": 200,
                     "readiness_activities": "test",
                     "prepositioning_activities": "test",

eap/views.py

@@ -1,16 +1,17 @@
 # Create your views here.
 
-from rest_framework.response import Response
 from rest_framework import (
     views,
     viewsets,
+    response,
     permissions,
     mixins,
 )
 from .models import (
     EarlyActionIndicator,
     EAP,
     EAPDocument,
+    EarlyAction,
 )
 from .serializers import (
     EAPSerializer,
@@ -38,27 +39,31 @@ def get_queryset(self):
         return EAP.objects.all().order_by('-created_at')
 
 
-class EAPStatusOptions(views.APIView):
-    def get(self, request, format=None):
-        options = {
-            'eap_status': [
-                {
-                    'value': value,
-                    'label': label,
-                } for value, label in EAP.Status.choices
-            ]
-        }
-        return Response(options)
-
+class EAPOptionsView(views.APIView):
+    """
+    Options for various attribute related to eap
+    """
+    permission_classes = [permissions.IsAuthenticated]
 
-class EarlyActionIndicatorOptions(views.APIView):
-    def get(self, request, format=None):
+    def get(self, request, version=None):
         options = {
-            'eap_status': [
+            "status": [
+                {
+                    "key": status.value,
+                    "value": status.label
+                } for status in EAP.Status
+            ],
+            "early_actions_indicators": [
+                {
+                    "key": indicator.value,
+                    "value": indicator.label
+                } for indicator in EarlyActionIndicator.IndicatorChoices
+            ],
+            "sectors": [
                 {
-                    'value': value,
-                    'label': label,
-                } for value, label in EarlyActionIndicator.IndicatorChoices.choices
-            ]
+                    "key": sector.value,
+                    "value": sector.label
+                } for sector in EarlyAction.Sector
+            ],
         }
-        return Response(options)
+        return response.Response(options)

main/urls.py

@@ -181,8 +181,7 @@
     url(r'^api/v2/add_cronjob_log/', AddCronJobLog.as_view()),
     url(r'^api/v2/flash-update-options/', flash_views.FlashUpdateOptions.as_view()),
     url(r'^api/v2/export-flash-update/(?P<pk>\d+)/', flash_views.ExportFlashUpdateView.as_view()),
-    url(r'^api/v2/eap-status/', eap_views.EAPStatusOptions.as_view()),
-    url(r'^api/v2/eap-indicators/', eap_views.EarlyActionIndicatorOptions.as_view()),
+    url(r'^api/v2/eap-options/', eap_views.EAPOptionsView.as_view()),
     url(r'^register', NewRegistration.as_view()),
     # url(r'^createperform', CreatePerForm.as_view()),
     url(r'^updateperform', UpdatePerForm.as_view()),